From 3c1db8d388865ef2c76c2f65c5829f8729e8c87a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=96NCEL?= Date: Mon, 15 Feb 2021 22:15:24 +0300 Subject: [PATCH 01/19] Add ProGuard to Maven build Note: Only for shrinking & optimizing. This also fixes the Maven Shade Plugin build warning. That warning was the actual reason we'll considering to switch ProGuard anyway. There is a PR fixes that but there have been 15 days and it has not yet been merged. Switching to Gradle is not a goal at this point, but maybe in future. --- pom.xml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pom.xml b/pom.xml index fd9dbc9..fd6dbef 100644 --- a/pom.xml +++ b/pom.xml @@ -397,6 +397,27 @@ false + + com.github.wvengen + proguard-maven-plugin + + + package + + proguard + + + + + 7.0.1 + + + + + ${java.home}/jmods/java.base.jmod + + + org.apache.maven.plugins maven-deploy-plugin From 4ce38e64629597c29a19562cb47fbbf198691523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=96NCEL?= Date: Mon, 15 Feb 2021 22:19:22 +0300 Subject: [PATCH 02/19] Fix Maven Shade Plugin build warning & build --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fd6dbef..d440587 100644 --- a/pom.xml +++ b/pom.xml @@ -311,7 +311,7 @@ true - true + false *:* @@ -400,6 +400,7 @@ com.github.wvengen proguard-maven-plugin + 2.3.1 package From 6266ba3b800ed6e6ab2886820683898b45741b8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=96NCEL?= Date: Mon, 15 Feb 2021 22:43:56 +0300 Subject: [PATCH 03/19] Try to fix build Note: This uses JCenter, we should switch to alternatives before release. --- pom.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pom.xml b/pom.xml index d440587..6c532d4 100644 --- a/pom.xml +++ b/pom.xml @@ -50,6 +50,14 @@ 2021-2-02T00:00:00Z + + + + jcenter + jcenter-bintray + https://jcenter.bintray.com/ + + @@ -418,6 +426,13 @@ ${java.home}/jmods/java.base.jmod + + + com.guardsquare + proguard-base + 7.0.1 + + org.apache.maven.plugins From d5191ce1323b721246fd556cc673a77caca5ec7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=96NCEL?= Date: Mon, 15 Feb 2021 22:48:31 +0300 Subject: [PATCH 04/19] Build fix test one Will try proguard-gradle next --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6c532d4..b87b999 100644 --- a/pom.xml +++ b/pom.xml @@ -429,7 +429,7 @@ com.guardsquare - proguard-base + proguard-core 7.0.1 From 5dac8bae98fec87244eba20c905129f11840a73b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=96NCEL?= Date: Mon, 15 Feb 2021 22:56:05 +0300 Subject: [PATCH 05/19] Apparently both base and core is required This should fix build --- pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pom.xml b/pom.xml index b87b999..b6a5b8a 100644 --- a/pom.xml +++ b/pom.xml @@ -426,6 +426,13 @@ ${java.home}/jmods/java.base.jmod + + + com.guardsquare + proguard-base + 7.0.1 + + com.guardsquare From f4308095f2faa7f1904a055976efa990c8e67091 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=96NCEL?= Date: Mon, 15 Feb 2021 23:01:42 +0300 Subject: [PATCH 06/19] Last time I hope --- pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/pom.xml b/pom.xml index b6a5b8a..d49a40b 100644 --- a/pom.xml +++ b/pom.xml @@ -432,8 +432,6 @@ proguard-base 7.0.1 - - com.guardsquare proguard-core From fd47ceabbbf5906e228b0c86daa2502a14e197d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=96NCEL?= Date: Mon, 15 Feb 2021 23:26:40 +0300 Subject: [PATCH 07/19] Exclude module info --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d49a40b..b6d1a9b 100644 --- a/pom.xml +++ b/pom.xml @@ -423,7 +423,7 @@ - ${java.home}/jmods/java.base.jmod + ${java.home}/jmods/java.base.jmod(!**.jar;!module-info.class) From 0a9abc112472870e976a4deb6c0bdb0de5ca05fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=96NCEL?= Date: Mon, 15 Feb 2021 23:29:08 +0300 Subject: [PATCH 08/19] Can't exclude this way apparently --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b6d1a9b..d49a40b 100644 --- a/pom.xml +++ b/pom.xml @@ -423,7 +423,7 @@ - ${java.home}/jmods/java.base.jmod(!**.jar;!module-info.class) + ${java.home}/jmods/java.base.jmod From b0d1cfaead99330d065a8da719fd2efb54c9d753 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=96NCEL?= Date: Fri, 30 Apr 2021 20:48:13 +0300 Subject: [PATCH 09/19] Update pom.xml --- pom.xml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pom.xml b/pom.xml index d49a40b..fc97c76 100644 --- a/pom.xml +++ b/pom.xml @@ -50,14 +50,6 @@ 2021-2-02T00:00:00Z - - - - jcenter - jcenter-bintray - https://jcenter.bintray.com/ - - From e65a23abda8fdcb4d0f7f23f6339cda6bec679a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=96NCEL?= Date: Fri, 30 Apr 2021 20:48:43 +0300 Subject: [PATCH 10/19] Update pom.xml --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index fc97c76..3f52643 100644 --- a/pom.xml +++ b/pom.xml @@ -422,12 +422,12 @@ com.guardsquare proguard-base - 7.0.1 + 7.1.0-beta3 com.guardsquare proguard-core - 7.0.1 + 7.1.0-beta3 From 70054d92c2a19481671cde817de1be6995ac1869 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=96NCEL?= Date: Fri, 30 Apr 2021 21:06:39 +0300 Subject: [PATCH 11/19] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 05acbd5..747416d 100644 --- a/pom.xml +++ b/pom.xml @@ -463,7 +463,7 @@ - 7.0.1 + 7.1.0-beta3 From 3fb0da2ecd62b0afe52b42a61d2189b8bd2c015e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=96NCEL?= Date: Fri, 30 Apr 2021 21:11:27 +0300 Subject: [PATCH 12/19] Update pom.xml --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 747416d..22d0887 100644 --- a/pom.xml +++ b/pom.xml @@ -469,6 +469,7 @@ ${java.home}/jmods/java.base.jmod + ${java.home}/jmods/java.sql.jmod From 99f23a0dda2ccf670e095e6301a9c7979909348c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=96NCEL?= Date: Fri, 30 Apr 2021 21:15:42 +0300 Subject: [PATCH 13/19] Update pom.xml --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 22d0887..73e3b69 100644 --- a/pom.xml +++ b/pom.xml @@ -466,6 +466,7 @@ 7.1.0-beta3 + ${java.home}/jmods/java.base.jmod From 89c44977a27c4bc7dd65479265933af33dab51f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=96NCEL?= Date: Fri, 30 Apr 2021 21:20:28 +0300 Subject: [PATCH 14/19] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 73e3b69..01528c1 100644 --- a/pom.xml +++ b/pom.xml @@ -466,7 +466,7 @@ 7.1.0-beta3 - + ${java.home}/jmods/java.base.jmod From 68462aeaade9198693502e859d84abbe8071ece4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=96NCEL?= Date: Fri, 30 Apr 2021 21:25:12 +0300 Subject: [PATCH 15/19] Update pom.xml --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 01528c1..f6a75c3 100644 --- a/pom.xml +++ b/pom.xml @@ -467,6 +467,7 @@ + ${java.home}/jmods/java.base.jmod From cc60d178d9898e065fa6aba985149a5a56cda155 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=96NCEL?= Date: Fri, 30 Apr 2021 21:32:31 +0300 Subject: [PATCH 16/19] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f6a75c3..1564115 100644 --- a/pom.xml +++ b/pom.xml @@ -467,7 +467,7 @@ - + ${java.home}/jmods/java.base.jmod From c6dda2a8a1e0accc41e7a05fade1c4a4aed3407e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=96NCEL?= Date: Fri, 30 Apr 2021 22:02:07 +0300 Subject: [PATCH 17/19] Update pom.xml --- pom.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pom.xml b/pom.xml index 1564115..c3d3ef5 100644 --- a/pom.xml +++ b/pom.xml @@ -466,8 +466,18 @@ 7.1.0-beta3 + + + + + + + + + + ${java.home}/jmods/java.base.jmod From aca20ee5b43cc40bd68014250e39f6add7e69b3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=96NCEL?= Date: Fri, 30 Apr 2021 22:07:55 +0300 Subject: [PATCH 18/19] Update maven.yml --- .github/workflows/maven.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 828fe2f..c3804ba 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -71,6 +71,12 @@ jobs: run: | ./mvnw clean verify --threads 1C --batch-mode --errors + - name: Upload Artifact + uses: actions/upload-artifact@v2.2.3 + with: + name: bytecode-version-analyzer-nightly.jar + path: target/bytecode-version-analyzer.jar + - name: Test CLI run: | java -jar target/bytecode-version-analyzer.jar --debug --fail-verbosity warn --loadPom --help @@ -79,11 +85,5 @@ jobs: java -jar target/bytecode-version-analyzer.jar --debug --fail-verbosity warn --loadPom target/original-bytecode-version-analyzer.jar java -jar target/bytecode-version-analyzer.jar --debug --fail-verbosity warn --loadPom target/classes/com/lifemcserver/bytecodeversionanalyzer/BytecodeVersionAnalyzer.class target/original-bytecode-version-analyzer.jar - - name: Upload Artifact - uses: actions/upload-artifact@v2.2.3 - with: - name: bytecode-version-analyzer-nightly.jar - path: target/bytecode-version-analyzer.jar - - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@main From ce9f2c125fc1334c17882185a3c7762fe1791a79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=96NCEL?= Date: Mon, 13 Sep 2021 23:20:05 +0300 Subject: [PATCH 19/19] Update pom.xml --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index c3d3ef5..928ed12 100644 --- a/pom.xml +++ b/pom.xml @@ -463,7 +463,7 @@ - 7.1.0-beta3 + 7.2.0-beta2 @@ -488,12 +488,12 @@ com.guardsquare proguard-base - 7.1.0-beta3 + 7.2.0-beta2 com.guardsquare proguard-core - 7.1.0-beta3 + 8.0.1