From 2b635b0ba845f60ffabbd92fdf11e0ad1a0ce280 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=9C=E6=96=B9=E6=9C=89=E9=B1=BC=E5=90=8D=E4=B8=BA?= =?UTF-8?q?=E5=92=B8?= Date: Thu, 18 Dec 2025 21:53:15 +0800 Subject: [PATCH 1/7] Update maven.yml --- .github/workflows/maven.yml | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index e113573..c13ea6e 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -9,6 +9,7 @@ on: branches: [ master ] pull_request: branches: [ master ] + workflow_dispatch: jobs: build: @@ -24,7 +25,8 @@ jobs: run: | wget -q https://archive.apache.org/dist/maven/maven-3/3.5.4/binaries/apache-maven-3.5.4-bin.tar.gz tar xzf apache-maven-3.5.4-bin.tar.gz - echo "$PWD/apache-maven-3.8.8/bin" >> $GITHUB_PATH + echo "$PWD/apache-maven-3.5.4/bin" >> $GITHUB_PATH + mvn -v - if: ${{ matrix.version == '8' }} name: Set up JDK 8 @@ -40,7 +42,7 @@ jobs: - if: ${{ matrix.version == '8' }} name: Build FOR JDK8 - run: mvn assembly:single -f pom.xml + run: mvn clean package -f pom.xml - if: ${{ matrix.version == '11' }} name: Set up JDK 11 ${{ matrix.version }} @@ -52,4 +54,19 @@ jobs: - if: ${{ matrix.version == '11' }} name: Build FOR JDK11 - run: mvn assembly:single -f pom-jdk11.xml + run: mvn clean package -f pom-jdk11.xml + + - name: Collect jars + shell: bash + run: | + set -euxo pipefail + mkdir -p dist + find . -type f -path "*/target/*" -name "*.jar" -print -exec cp -v {} dist/ \; + ls -lah dist + + - name: Upload jar artifacts + uses: actions/upload-artifact@v4 + with: + name: fofa_viewer-jdk${{ matrix.version }}-jars + path: dist/*.jar + if-no-files-found: error From a23c9002d33b191aa53ef60b351aae17e59525bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=9C=E6=96=B9=E6=9C=89=E9=B1=BC=E5=90=8D=E4=B8=BA?= =?UTF-8?q?=E5=92=B8?= Date: Thu, 18 Dec 2025 22:00:14 +0800 Subject: [PATCH 2/7] Update maven.yml --- .github/workflows/maven.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index c13ea6e..715df89 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -42,7 +42,7 @@ jobs: - if: ${{ matrix.version == '8' }} name: Build FOR JDK8 - run: mvn clean package -f pom.xml + run: mvn assembly:single -f pom.xml - if: ${{ matrix.version == '11' }} name: Set up JDK 11 ${{ matrix.version }} @@ -54,7 +54,7 @@ jobs: - if: ${{ matrix.version == '11' }} name: Build FOR JDK11 - run: mvn clean package -f pom-jdk11.xml + run: mvn assembly:single -f pom-jdk11.xml - name: Collect jars shell: bash From 53f157671547da05d606655c6cd9da9adc50dd16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=9C=E6=96=B9=E6=9C=89=E9=B1=BC=E5=90=8D=E4=B8=BA?= =?UTF-8?q?=E5=92=B8?= Date: Thu, 18 Dec 2025 22:06:19 +0800 Subject: [PATCH 3/7] Update application version to 1.1.16 --- src/main/java/org/fofaviewer/main/MainApp.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/fofaviewer/main/MainApp.java b/src/main/java/org/fofaviewer/main/MainApp.java index f8dbe40..50b65c6 100644 --- a/src/main/java/org/fofaviewer/main/MainApp.java +++ b/src/main/java/org/fofaviewer/main/MainApp.java @@ -7,7 +7,7 @@ import org.fofaviewer.controllers.MainController; public class MainApp extends Application { - private final String version = "1.1.15"; + private final String version = "1.1.16"; @Override public void start(Stage stage) throws Exception { From 7ec817978f62dd90762f54feb5e9a8aa121090ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=9C=E6=96=B9=E6=9C=89=E9=B1=BC=E5=90=8D=E4=B8=BA?= =?UTF-8?q?=E5=92=B8?= Date: Thu, 18 Dec 2025 22:10:42 +0800 Subject: [PATCH 4/7] Add assembly execution to Maven build process --- pom.xml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f76d1d3..5c6c1e2 100644 --- a/pom.xml +++ b/pom.xml @@ -95,7 +95,16 @@ + + + make-assembly + package + + single + + + - \ No newline at end of file + From 79aea8f1a324c88eec10d89417a95bc8c22b705a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=9C=E6=96=B9=E6=9C=89=E9=B1=BC=E5=90=8D=E4=B8=BA?= =?UTF-8?q?=E5=92=B8?= Date: Thu, 18 Dec 2025 22:11:02 +0800 Subject: [PATCH 5/7] Add execution for assembly in pom-jdk11.xml --- pom-jdk11.xml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pom-jdk11.xml b/pom-jdk11.xml index 8971160..f6ecc31 100644 --- a/pom-jdk11.xml +++ b/pom-jdk11.xml @@ -170,6 +170,15 @@ + + + make-assembly + package + + single + + + @@ -189,4 +198,4 @@ - \ No newline at end of file + From a42ed65fe6d96286686e5cdb7ffccade303d4d3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=9C=E6=96=B9=E6=9C=89=E9=B1=BC=E5=90=8D=E4=B8=BA?= =?UTF-8?q?=E5=92=B8?= Date: Thu, 18 Dec 2025 22:15:10 +0800 Subject: [PATCH 6/7] Update Maven build commands to skip tests --- .github/workflows/maven.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 715df89..965b57e 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -42,7 +42,7 @@ jobs: - if: ${{ matrix.version == '8' }} name: Build FOR JDK8 - run: mvn assembly:single -f pom.xml + run: mvn clean package -DskipTests -f pom.xml - if: ${{ matrix.version == '11' }} name: Set up JDK 11 ${{ matrix.version }} @@ -54,7 +54,7 @@ jobs: - if: ${{ matrix.version == '11' }} name: Build FOR JDK11 - run: mvn assembly:single -f pom-jdk11.xml + run: mvn clean package -DskipTests -f pom-jdk11.xml - name: Collect jars shell: bash From d92da9c1f36b4ebd0ee2943bdd13ec2962fbd7c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=9C=E6=96=B9=E6=9C=89=E9=B1=BC=E5=90=8D=E4=B8=BA?= =?UTF-8?q?=E5=92=B8?= Date: Thu, 18 Dec 2025 22:22:55 +0800 Subject: [PATCH 7/7] Update jar file copy command in maven.yml --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 965b57e..8b39aaf 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -61,7 +61,7 @@ jobs: run: | set -euxo pipefail mkdir -p dist - find . -type f -path "*/target/*" -name "*.jar" -print -exec cp -v {} dist/ \; + find . -type f -path "*/target/*" -name "fofaviewer-jar-with-dependencies.jar" -print -exec cp -v {} dist/ \; ls -lah dist - name: Upload jar artifacts