From aaefaf1f0a302faf009bdb7e10dac59b642e966a Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Tue, 10 Oct 2023 23:41:18 +0200 Subject: [PATCH 01/12] Make master 2.0.0-SNAPSHOT --- maven-resolver-api/pom.xml | 2 +- maven-resolver-connector-basic/pom.xml | 2 +- maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml | 2 +- maven-resolver-demos/maven-resolver-demo-snippets/pom.xml | 2 +- maven-resolver-demos/pom.xml | 2 +- maven-resolver-impl/pom.xml | 2 +- maven-resolver-named-locks-hazelcast/pom.xml | 2 +- maven-resolver-named-locks-redisson/pom.xml | 2 +- maven-resolver-named-locks/pom.xml | 2 +- maven-resolver-spi/pom.xml | 2 +- maven-resolver-supplier/pom.xml | 2 +- maven-resolver-test-util/pom.xml | 2 +- maven-resolver-transport-classpath/pom.xml | 2 +- maven-resolver-transport-file/pom.xml | 2 +- maven-resolver-transport-http/pom.xml | 2 +- maven-resolver-transport-wagon/pom.xml | 2 +- maven-resolver-util/pom.xml | 2 +- pom.xml | 4 ++-- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/maven-resolver-api/pom.xml b/maven-resolver-api/pom.xml index 1d9773a80..c3a9991c0 100644 --- a/maven-resolver-api/pom.xml +++ b/maven-resolver-api/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.resolver maven-resolver - 1.9.17-SNAPSHOT + 2.0.0-SNAPSHOT maven-resolver-api diff --git a/maven-resolver-connector-basic/pom.xml b/maven-resolver-connector-basic/pom.xml index e9061dd67..f7dff4654 100644 --- a/maven-resolver-connector-basic/pom.xml +++ b/maven-resolver-connector-basic/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.resolver maven-resolver - 1.9.17-SNAPSHOT + 2.0.0-SNAPSHOT maven-resolver-connector-basic diff --git a/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml b/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml index 15efba65a..620acbabd 100644 --- a/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml +++ b/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.resolver maven-resolver-demos - 1.9.17-SNAPSHOT + 2.0.0-SNAPSHOT resolver-demo-maven-plugin diff --git a/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml b/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml index d36ccc2d1..bdc1dc2e8 100644 --- a/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml +++ b/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.resolver maven-resolver-demos - 1.9.17-SNAPSHOT + 2.0.0-SNAPSHOT maven-resolver-demo-snippets diff --git a/maven-resolver-demos/pom.xml b/maven-resolver-demos/pom.xml index b1de669e9..9342a7961 100644 --- a/maven-resolver-demos/pom.xml +++ b/maven-resolver-demos/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.resolver maven-resolver - 1.9.17-SNAPSHOT + 2.0.0-SNAPSHOT maven-resolver-demos diff --git a/maven-resolver-impl/pom.xml b/maven-resolver-impl/pom.xml index 98bf1c8a1..64614cb9d 100644 --- a/maven-resolver-impl/pom.xml +++ b/maven-resolver-impl/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.resolver maven-resolver - 1.9.17-SNAPSHOT + 2.0.0-SNAPSHOT maven-resolver-impl diff --git a/maven-resolver-named-locks-hazelcast/pom.xml b/maven-resolver-named-locks-hazelcast/pom.xml index 3c9d32f42..074417c87 100644 --- a/maven-resolver-named-locks-hazelcast/pom.xml +++ b/maven-resolver-named-locks-hazelcast/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.resolver maven-resolver - 1.9.17-SNAPSHOT + 2.0.0-SNAPSHOT maven-resolver-named-locks-hazelcast diff --git a/maven-resolver-named-locks-redisson/pom.xml b/maven-resolver-named-locks-redisson/pom.xml index cf8840fd6..ef8aab3f0 100644 --- a/maven-resolver-named-locks-redisson/pom.xml +++ b/maven-resolver-named-locks-redisson/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.resolver maven-resolver - 1.9.17-SNAPSHOT + 2.0.0-SNAPSHOT maven-resolver-named-locks-redisson diff --git a/maven-resolver-named-locks/pom.xml b/maven-resolver-named-locks/pom.xml index 177d897d7..bb8f3dab2 100644 --- a/maven-resolver-named-locks/pom.xml +++ b/maven-resolver-named-locks/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.resolver maven-resolver - 1.9.17-SNAPSHOT + 2.0.0-SNAPSHOT maven-resolver-named-locks diff --git a/maven-resolver-spi/pom.xml b/maven-resolver-spi/pom.xml index af2c1fcf1..78bfe7ac9 100644 --- a/maven-resolver-spi/pom.xml +++ b/maven-resolver-spi/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.resolver maven-resolver - 1.9.17-SNAPSHOT + 2.0.0-SNAPSHOT maven-resolver-spi diff --git a/maven-resolver-supplier/pom.xml b/maven-resolver-supplier/pom.xml index e6e7c8c0a..fee4e6e2a 100644 --- a/maven-resolver-supplier/pom.xml +++ b/maven-resolver-supplier/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.resolver maven-resolver - 1.9.17-SNAPSHOT + 2.0.0-SNAPSHOT maven-resolver-supplier diff --git a/maven-resolver-test-util/pom.xml b/maven-resolver-test-util/pom.xml index 5a709dad5..5431cb1d7 100644 --- a/maven-resolver-test-util/pom.xml +++ b/maven-resolver-test-util/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.resolver maven-resolver - 1.9.17-SNAPSHOT + 2.0.0-SNAPSHOT maven-resolver-test-util diff --git a/maven-resolver-transport-classpath/pom.xml b/maven-resolver-transport-classpath/pom.xml index 694e85b6d..f49877505 100644 --- a/maven-resolver-transport-classpath/pom.xml +++ b/maven-resolver-transport-classpath/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.resolver maven-resolver - 1.9.17-SNAPSHOT + 2.0.0-SNAPSHOT maven-resolver-transport-classpath diff --git a/maven-resolver-transport-file/pom.xml b/maven-resolver-transport-file/pom.xml index 024591eff..89ce65de2 100644 --- a/maven-resolver-transport-file/pom.xml +++ b/maven-resolver-transport-file/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.resolver maven-resolver - 1.9.17-SNAPSHOT + 2.0.0-SNAPSHOT maven-resolver-transport-file diff --git a/maven-resolver-transport-http/pom.xml b/maven-resolver-transport-http/pom.xml index e087f0e7b..928c8305b 100644 --- a/maven-resolver-transport-http/pom.xml +++ b/maven-resolver-transport-http/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.resolver maven-resolver - 1.9.17-SNAPSHOT + 2.0.0-SNAPSHOT maven-resolver-transport-http diff --git a/maven-resolver-transport-wagon/pom.xml b/maven-resolver-transport-wagon/pom.xml index 5985df226..bb37726d8 100644 --- a/maven-resolver-transport-wagon/pom.xml +++ b/maven-resolver-transport-wagon/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.resolver maven-resolver - 1.9.17-SNAPSHOT + 2.0.0-SNAPSHOT maven-resolver-transport-wagon diff --git a/maven-resolver-util/pom.xml b/maven-resolver-util/pom.xml index cfaec8d0d..4ef5e8e8c 100644 --- a/maven-resolver-util/pom.xml +++ b/maven-resolver-util/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.resolver maven-resolver - 1.9.17-SNAPSHOT + 2.0.0-SNAPSHOT maven-resolver-util diff --git a/pom.xml b/pom.xml index 2adbb19d0..46997cb76 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.apache.maven.resolver maven-resolver - 1.9.17-SNAPSHOT + 2.0.0-SNAPSHOT pom Maven Artifact Resolver @@ -96,7 +96,7 @@ 3.9.4 [3.8.7,) [1.8.0-362,) - 2023-09-22T18:13:46Z + 2023-10-10T21:40:45Z From 6f974f924dc04b5df3591b781cb6c10855474dad Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Wed, 11 Oct 2023 00:12:48 +0200 Subject: [PATCH 02/12] Up Java, drop animal sniffer, leave test scoped deps out of bytecodeenforcer --- pom.xml | 57 +++++++++++++++++++++++++++++---------------------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/pom.xml b/pom.xml index 46997cb76..4c89bf69d 100644 --- a/pom.xml +++ b/pom.xml @@ -85,17 +85,20 @@ 8 + ${javaVersion} + ${javaVersion} + ${javaVersion} true ${surefire.redirectTestOutputToFile} resolver-archives/resolver-LATEST None - 0.3.5 - 5.1.0 + 0.9.0.M2 + 6.0.0 1.7.36 - 3.9.4 - [3.8.7,) - [1.8.0-362,) + 3.9.5 + [3.8.8,) + [17.0.6,) 2023-10-10T21:40:45Z @@ -305,6 +308,27 @@ + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-bytecode-version + + enforce + + + + + ${maven.compiler.release} + test + + + true + + + + org.apache.maven.plugins maven-javadoc-plugin @@ -488,29 +512,6 @@ - - - org.codehaus.mojo - animal-sniffer-maven-plugin - 1.23 - - - org.codehaus.mojo.signature - java18 - 1.0 - - - - - check-java-compat - - check - - process-classes - - - - From 0c88f1dbd6ac1dde2480bca3f4e317dd6f6b0d6e Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Wed, 11 Oct 2023 00:19:50 +0200 Subject: [PATCH 03/12] Limit matrix --- .github/workflows/maven-verify.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml index dbdabb6f1..1e19619cf 100644 --- a/.github/workflows/maven-verify.yml +++ b/.github/workflows/maven-verify.yml @@ -27,5 +27,6 @@ jobs: uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v3 with: ff-site-run: false - + maven_version: 3.9.5 + jdk-matrix: '[ "17" ]' From 981ad85c136ac7498605e4bd89af1c2239153296 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Wed, 11 Oct 2023 00:21:32 +0200 Subject: [PATCH 04/12] Drop undefined --- .github/workflows/maven-verify.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml index 1e19619cf..412f9a777 100644 --- a/.github/workflows/maven-verify.yml +++ b/.github/workflows/maven-verify.yml @@ -27,6 +27,5 @@ jobs: uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v3 with: ff-site-run: false - maven_version: 3.9.5 jdk-matrix: '[ "17" ]' From 14fae66991a88a390fb91837c44dcdab1f98cfde Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Wed, 11 Oct 2023 20:52:39 +0200 Subject: [PATCH 05/12] Fix CI jobs Using Java 17 and 21 --- .github/workflows/maven-verify.yml | 2 +- Jenkinsfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml index 412f9a777..00202b1ff 100644 --- a/.github/workflows/maven-verify.yml +++ b/.github/workflows/maven-verify.yml @@ -27,5 +27,5 @@ jobs: uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v3 with: ff-site-run: false - jdk-matrix: '[ "17" ]' + jdk-matrix: '[ "17", "21" ]' diff --git a/Jenkinsfile b/Jenkinsfile index d89f893d1..0550633eb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,5 +19,5 @@ // Currently we can only build with JDK8+ based on the usage // of bnd-maven-plugin. -asfMavenTlpStdBuild( 'jdks' : [ "8", "11", "17" ] ) +asfMavenTlpStdBuild( 'jdks' : [ "17", "21" ] ) From cf21738b17a325eb1d1b04f6e64bf46e0e5fc9ce Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Wed, 11 Oct 2023 20:53:14 +0200 Subject: [PATCH 06/12] Add Java 21 fix for spotless --- pom.xml | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4c89bf69d..5d2d6fa96 100644 --- a/pom.xml +++ b/pom.xml @@ -85,8 +85,6 @@ 8 - ${javaVersion} - ${javaVersion} ${javaVersion} true ${surefire.redirectTestOutputToFile} @@ -510,6 +508,38 @@ + + + com.diffplug.spotless + spotless-maven-plugin + 2.40.0 + + + + + + 2.38.0 + + + + config/maven-eclipse-importorder.txt + + + config/maven-header-plain.txt + + + + + false + + true + + + + true + + + From 1fec038f9906f108f4d2a28daaf34695295f9bfc Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Wed, 11 Oct 2023 23:12:21 +0200 Subject: [PATCH 07/12] PR comment --- Jenkinsfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0550633eb..a6a4e6469 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,5 @@ * under the License. */ -// Currently we can only build with JDK8+ based on the usage -// of bnd-maven-plugin. asfMavenTlpStdBuild( 'jdks' : [ "17", "21" ] ) From 217b8c1b337da2222d09a11cb8766905efa704db Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Thu, 12 Oct 2023 18:48:32 +0200 Subject: [PATCH 08/12] POM fixes: * sisu was invoked twice * compiler: we do not use annotation processors (while Sisu APT is present, so we do not want it auto-picked up) * compiler: be explicit about deprecations (to help us removing that cruft) --- pom.xml | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index 5d2d6fa96..9a9577df9 100644 --- a/pom.xml +++ b/pom.xml @@ -451,20 +451,6 @@ - - org.eclipse.sisu - sisu-maven-plugin - ${sisuVersion} - - - generate-index - - main-index - - process-classes - - - org.apache.rat apache-rat-plugin @@ -542,6 +528,22 @@ + + + org.apache.maven.plugins + maven-compiler-plugin + + none + + -Xlint:deprecation + + + + + org.eclipse.sisu + sisu-maven-plugin + + From 16c8d8a58540701d0050083ab60585712b9f2044 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Thu, 12 Oct 2023 22:22:57 +0200 Subject: [PATCH 09/12] Lower to latest 11 LTS --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9a9577df9..b04ff0f75 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ 3.9.5 [3.8.8,) - [17.0.6,) + [11.0.20,) 2023-10-10T21:40:45Z From 6b9d179396e2e85453a8abc601d37770f5928e62 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Thu, 12 Oct 2023 22:25:43 +0200 Subject: [PATCH 10/12] Return JDK 11 to CI --- .github/workflows/maven-verify.yml | 2 +- Jenkinsfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml index 00202b1ff..be6eeb616 100644 --- a/.github/workflows/maven-verify.yml +++ b/.github/workflows/maven-verify.yml @@ -27,5 +27,5 @@ jobs: uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v3 with: ff-site-run: false - jdk-matrix: '[ "17", "21" ]' + jdk-matrix: '[ "11", "17", "21" ]' diff --git a/Jenkinsfile b/Jenkinsfile index a6a4e6469..ef5393dda 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,5 +17,5 @@ * under the License. */ -asfMavenTlpStdBuild( 'jdks' : [ "17", "21" ] ) +asfMavenTlpStdBuild( 'jdks' : [ "11", "17", "21" ] ) From 05d3aa2b9a02a55f1f65298bab0f75ded16b1825 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Thu, 12 Oct 2023 22:46:46 +0200 Subject: [PATCH 11/12] Add page to track migration gotchas --- .../resolver-major-version-migration.md | 26 +++++++++++++++++++ src/site/site.xml | 1 + 2 files changed, 27 insertions(+) create mode 100644 src/site/markdown/resolver-major-version-migration.md diff --git a/src/site/markdown/resolver-major-version-migration.md b/src/site/markdown/resolver-major-version-migration.md new file mode 100644 index 000000000..2909ecb2d --- /dev/null +++ b/src/site/markdown/resolver-major-version-migration.md @@ -0,0 +1,26 @@ +# Resolver major versions + + +This page will collect quick guides for developers upgrading from one to +another major version of Resolver. + +# Upgrading from 1.x to 2.x + +Maven Resolver upcoming major version 2.x should be "smooth sailing", as long you +do not depend (directly or indirectly) on **deprecated** classes from Resolver +1.x line. Always use latest 1.x release to check for deprecated classes. diff --git a/src/site/site.xml b/src/site/site.xml index fdb5af531..1e4cfa624 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -33,6 +33,7 @@ under the License. + From 7cf2a66d4ada9706f39fa9f188e4ea0fc0a6e02c Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Thu, 12 Oct 2023 22:48:47 +0200 Subject: [PATCH 12/12] Rename page source --- ...esolver-major-version-migration.md => upgrading-resolver.md} | 2 +- src/site/site.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename src/site/markdown/{resolver-major-version-migration.md => upgrading-resolver.md} (96%) diff --git a/src/site/markdown/resolver-major-version-migration.md b/src/site/markdown/upgrading-resolver.md similarity index 96% rename from src/site/markdown/resolver-major-version-migration.md rename to src/site/markdown/upgrading-resolver.md index 2909ecb2d..454bbbefb 100644 --- a/src/site/markdown/resolver-major-version-migration.md +++ b/src/site/markdown/upgrading-resolver.md @@ -1,4 +1,4 @@ -# Resolver major versions +# Upgrading Resolver (major versions)