From 62686e818e99c54bf5b853a82753e1dd16daba7e Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Fri, 13 Oct 2023 10:42:51 +0200 Subject: [PATCH 01/12] moved to 1.2.1-SNAPSHOT. see #25872 update groovy-all plugin related to jdk17 profile --- pom.xml | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c662b7f..c2977c3 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.gcube.tools maven-parent - 1.2.0 + 1.2.1-SNAPSHOT pom @@ -354,6 +354,46 @@ ${repository.snapshots.url} + + + + + org.codehaus.gmaven + groovy-maven-plugin + 2.1.1 + + + process-classes + + execute + + + + tag + + + def fileContents = new File("${project.basedir}/CHANGELOG.md").getText('UTF-8') + matcher = (fileContents =~ /(?s).\[v$project.version\].*?/) + if (!matcher.find()) { + throw new IllegalArgumentException("Tag [v$project.version] not found in ${project.basedir}/CHANGELOG.md") + } + assert matcher[0][1]: "Tag [v$project.version] not found in ${project.basedir}/CHANGELOG.md" + + + + + + + org.codehaus.groovy + groovy-all + 3.0.8 + pom + + + + + + gcore-legacy -- 2.17.1 From 99cde69cfe55e19d8f6431f8de108f7128b1c896 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Fri, 13 Oct 2023 10:50:28 +0200 Subject: [PATCH 02/12] update CHANGELOG --- CHANGELOG.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d93b79..bf3de7f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,12 @@ # Changelog for Maven-Parent + +## [v1.2.1-SNAPSHOT] - 2023-10-13 + ## [v1.2.0] - 2023-05-12 -### Features -* new maven profiles for managing jdk7 (gcore-legacy) and jdk17 build (see #24259) -* add new group repositories for managing jdk17 dependencies resolution -* update groovy-maven and javadoc plugin configuration #25108 -* add classpath external folder. see #25106 +### Bug +* update jdk17 profiles groovy plugin version in order to fix #25872 ## [v1.1.0] - 2022-10-27 -- 2.17.1 From 4d24257b08c3527ffd402847a401a09b7adac966 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Fri, 13 Oct 2023 11:26:48 +0200 Subject: [PATCH 03/12] migrate plugin dependency from groovy-all to groovy in gcube-experimental profile --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c2977c3..6857dc7 100644 --- a/pom.xml +++ b/pom.xml @@ -385,7 +385,7 @@ org.codehaus.groovy - groovy-all + groovy 3.0.8 pom -- 2.17.1 From 0315b09ce79c33e7ffb1f930d4405a5d5f69bd65 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Fri, 13 Oct 2023 12:05:58 +0200 Subject: [PATCH 04/12] update groovy-all plugin to 3.0.13 in gcube-experimental profile --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6857dc7..9e4e1d5 100644 --- a/pom.xml +++ b/pom.xml @@ -385,8 +385,8 @@ org.codehaus.groovy - groovy - 3.0.8 + groovy-all + 3.0.13 pom -- 2.17.1 From 067dcfa23b4709d22cb10b968050d84c23f6e5aa Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Fri, 13 Oct 2023 12:25:25 +0200 Subject: [PATCH 05/12] move common plugin declaration inside gcube-official profile, just for testing --- pom.xml | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 9e4e1d5..c57364d 100644 --- a/pom.xml +++ b/pom.xml @@ -294,6 +294,46 @@ ${repository.snapshots.url} + + + + + org.codehaus.gmaven + groovy-maven-plugin + 2.1.1 + + + process-classes + + execute + + + + tag + + + def fileContents = new File("${project.basedir}/CHANGELOG.md").getText('UTF-8') + matcher = (fileContents =~ /(?s).\[v$project.version\].*?/) + if (!matcher.find()) { + throw new IllegalArgumentException("Tag [v$project.version] not found in ${project.basedir}/CHANGELOG.md") + } + assert matcher[0][1]: "Tag [v$project.version] not found in ${project.basedir}/CHANGELOG.md" + + + + + + + org.codehaus.groovy + groovy-all + 3.0.0-beta-3 + pom + + + + + + @@ -1535,7 +1575,7 @@ - + -- 2.17.1 From 60e3ab5e5f123c80b27edf08642a24e3c34c1947 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Fri, 13 Oct 2023 14:57:46 +0200 Subject: [PATCH 06/12] restrict the disable-java8-doclint profile --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c57364d..93cc6be 100644 --- a/pom.xml +++ b/pom.xml @@ -72,7 +72,7 @@ disable-java8-doclint - [1.8,) + [1.8,17) -Xdoclint:none -- 2.17.1 From 7db55f6d04d2c0e20227507b70143ad75463cd4d Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Fri, 13 Oct 2023 16:59:52 +0200 Subject: [PATCH 07/12] enable disable-java8-doclint profile also for jdk17 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 93cc6be..c57364d 100644 --- a/pom.xml +++ b/pom.xml @@ -72,7 +72,7 @@ disable-java8-doclint - [1.8,17) + [1.8,) -Xdoclint:none -- 2.17.1 From f4225749b0400d772682799330741d604e6c301e Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Mon, 16 Oct 2023 09:32:47 +0200 Subject: [PATCH 08/12] try to update common plugins to groovy-all 3.0.13 --- pom.xml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index c57364d..0363177 100644 --- a/pom.xml +++ b/pom.xml @@ -294,7 +294,7 @@ ${repository.snapshots.url} - + @@ -394,7 +394,7 @@ ${repository.snapshots.url} - + pom - + -- 2.17.1 From 6f66a8c87c61fef02d40949f82ea3036462d5afa Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Mon, 16 Oct 2023 09:36:02 +0200 Subject: [PATCH 09/12] fix syntax --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0363177..6c9dbf0 100644 --- a/pom.xml +++ b/pom.xml @@ -433,7 +433,7 @@ - + gcore-legacy -- 2.17.1 From eb6f53379005972c76874a95eafa5923c3d892fe Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Mon, 16 Oct 2023 09:47:45 +0200 Subject: [PATCH 10/12] removed commented plugin declarations --- pom.xml | 81 --------------------------------------------------------- 1 file changed, 81 deletions(-) diff --git a/pom.xml b/pom.xml index 6c9dbf0..996ded9 100644 --- a/pom.xml +++ b/pom.xml @@ -294,46 +294,6 @@ ${repository.snapshots.url} - @@ -394,46 +354,6 @@ ${repository.snapshots.url} - gcore-legacy @@ -443,7 +363,6 @@ !Release - -- 2.17.1 From af347b82f7f18f791a55250cde485c29b098b094 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Mon, 16 Oct 2023 09:49:11 +0200 Subject: [PATCH 11/12] update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bf3de7f..650d562 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## [v1.2.1-SNAPSHOT] - 2023-10-13 +* update groovy-all plugin dependency from 3.0.0-beta to 3.0.13 #25872 ## [v1.2.0] - 2023-05-12 -- 2.17.1 From cc285dad976316ec88cc2d596fe206fd1cd15a28 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Wed, 3 Apr 2024 11:16:12 +0200 Subject: [PATCH 12/12] move to 1.2.0 version --- CHANGELOG.md | 14 ++++++++------ pom.xml | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 650d562..84f7f81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,15 @@ # Changelog for Maven-Parent - -## [v1.2.1-SNAPSHOT] - 2023-10-13 -* update groovy-all plugin dependency from 3.0.0-beta to 3.0.13 #25872 - -## [v1.2.0] - 2023-05-12 +## [v1.2.0] - 2023-10-13 ### Bug -* update jdk17 profiles groovy plugin version in order to fix #25872 +* update groovy-all plugin dependency from 3.0.0-beta to 3.0.13 #25872 + +### Features +* new maven profiles for managing jdk7 (gcore-legacy) and jdk17 build (see #24259) +* add new group repositories for managing jdk17 dependencies resolution +* update groovy-maven and javadoc plugin configuration #25108 +* add classpath external folder. see #25106 ## [v1.1.0] - 2022-10-27 diff --git a/pom.xml b/pom.xml index 996ded9..ee54f5e 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.gcube.tools maven-parent - 1.2.1-SNAPSHOT + 1.2.0 pom -- 2.17.1