Merge pull request 'fix conflict with master' (!28 ) from conflict into master

Reviewed-on: #28
fix conflict with master
2024-04-05 15:36:30 +02:00 · 2024-04-05 15:35:28 +02:00 · 2024-04-03 11:18:14 +02:00 · 2024-04-03 11:16:12 +02:00 · 2023-10-16 09:49:11 +02:00 · 2023-10-16 09:47:45 +02:00
2 changed files with 8 additions and 4 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,6 +1,10 @@
 # Changelog for Maven-Parent

-## [v1.2.0] - 2023-05-12
+## [v1.2.0] - 2024-04-03
+
+### Bug
+* update maven-javadoc-plugin to from 2.6.8 to 3.6.3. #25877
+* 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)
--- a/pom.xml
+++ b/pom.xml
@ -364,7 +364,6 @@
                    <name>!Release</name>
                </property>
            </activation>
-
            <!--             Repositories for dependency resolution -->
            <repositories>
                <repository>
@ -1525,7 +1524,8 @@
 			        <dependency>
 			            <groupId>org.codehaus.groovy</groupId>
 			            <artifactId>groovy-all</artifactId>
-			            <version>3.0.0-beta-3</version>
+			            <version>3.0.13</version>
+			            <!--version>3.0.0-beta-3</version-->
 			            <type>pom</type>
 			        </dependency>
 			    </dependencies>
@ -1545,7 +1545,7 @@
        <plugin.assembly.version>2.6</plugin.assembly.version>
        <plugin.compiler.version>3.10.1</plugin.compiler.version>
        <plugin.source.version>2.1.2</plugin.source.version>
-        <plugin.javadoc.version>2.8</plugin.javadoc.version>
+        <plugin.javadoc.version>3.6.3</plugin.javadoc.version>
        <plugin.resources.version>3.1.0</plugin.resources.version>

        <!-- default value for the distro directory -->
Author	SHA1	Message	Date
Roberto Cirillo	1ba2854b80	Merge pull request 'fix conflict with master' (!28 ) from conflict into master Reviewed-on: #28	2024-04-05 15:36:30 +02:00
Roberto Cirillo	0b40060d28	fix conflict with master	2024-04-05 15:35:28 +02:00
Roberto Cirillo	2542cc2eca	Merge pull request 'bug/25872' (!26 ) from bug/25872 into master Reviewed-on: #26	2024-04-03 11:18:14 +02:00
Roberto Cirillo	cc285dad97	move to 1.2.0 version	2024-04-03 11:16:12 +02:00
Roberto Cirillo	af347b82f7	update CHANGELOG.md	2023-10-16 09:49:11 +02:00
Roberto Cirillo	eb6f533790	removed commented plugin declarations	2023-10-16 09:47:45 +02:00
Roberto Cirillo	6f66a8c87c	fix syntax	2023-10-16 09:36:02 +02:00
Roberto Cirillo	f4225749b0	try to update common plugins to groovy-all 3.0.13	2023-10-16 09:32:47 +02:00
Roberto Cirillo	7db55f6d04	enable disable-java8-doclint profile also for jdk17	2023-10-13 16:59:52 +02:00
Roberto Cirillo	60e3ab5e5f	restrict the disable-java8-doclint profile	2023-10-13 14:57:46 +02:00
Roberto Cirillo	067dcfa23b	move common plugin declaration inside gcube-official profile, just for testing	2023-10-13 12:25:25 +02:00
Roberto Cirillo	0315b09ce7	update groovy-all plugin to 3.0.13 in gcube-experimental profile	2023-10-13 12:05:58 +02:00
Roberto Cirillo	4d24257b08	migrate plugin dependency from groovy-all to groovy in gcube-experimental profile	2023-10-13 11:26:48 +02:00
Roberto Cirillo	99cde69cfe	update CHANGELOG	2023-10-13 10:50:28 +02:00
Roberto Cirillo	62686e818e	moved to 1.2.1-SNAPSHOT. see #25872 update groovy-all plugin related to jdk17 profile	2023-10-13 10:42:51 +02:00