From 06d5b5f362cf529f00dca6ba25c0add489eabf3b Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Tue, 27 Feb 2024 09:47:52 -0500 Subject: [PATCH 1/5] update parent pom to 41 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7a36744..1443946 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.plugins maven-plugins - 39 + 41 From 169e3c607802725eeb5d4d72cfda480f263b2bb2 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Tue, 27 Feb 2024 18:50:06 +0100 Subject: [PATCH 2/5] Upgrade maven dependency (but not requirement) --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 1443946..8d4937c 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ under the License. - ${mavenVersion} + 3.2.5 @@ -68,7 +68,7 @@ under the License. 8 - 3.2.5 + 3.9.6 2022-06-18T21:03:59Z From 148543cfad8c59c3fd2d7fa33aad6d521954e71e Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Tue, 27 Feb 2024 18:55:38 +0100 Subject: [PATCH 3/5] Spotless should only be run on JDK >= 11, so just use the pluginManagement --- pom.xml | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/pom.xml b/pom.xml index 8d4937c..3dbed58 100644 --- a/pom.xml +++ b/pom.xml @@ -93,24 +93,26 @@ under the License. - - - com.diffplug.spotless - spotless-maven-plugin - - - - pom.xml - src/it/**/pom.xml - - - - - src/**/*.java - - - - - + + + + com.diffplug.spotless + spotless-maven-plugin + + + + pom.xml + src/it/**/pom.xml + + + + + src/**/*.java + + + + + + From 79ee1277442685fcdae6cba45ab1f195c55144ad Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Tue, 27 Feb 2024 19:53:15 +0100 Subject: [PATCH 4/5] Align with the one tested --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3dbed58..3bc53f3 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ under the License. - 3.2.5 + 3.6.3 From 38213f7eca3817222faa474a917606f514d0d26d Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Wed, 28 Feb 2024 13:15:01 +0100 Subject: [PATCH 5/5] Move maven version change to a different PR --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 3bc53f3..308e10f 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ under the License. - 3.6.3 + ${mavenVersion} @@ -68,7 +68,7 @@ under the License. 8 - 3.9.6 + 3.2.5 2022-06-18T21:03:59Z