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-02-22 10:02:29 +01:00 · 2024-02-22 09:59:23 +01:00 · 2024-02-22 09:54:52 +01:00
2 changed files with 10 additions and 5 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,8 +1,9 @@
 # Changelog for Maven-Parent

-## [v1.2.0] - 2023-10-13
+## [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
@ -11,6 +12,9 @@
 * update groovy-maven and javadoc plugin configuration #25108
 * add classpath external folder. see #25106

+### Bug
+* removed set-local-classpath profile. see #26841
+
 ## [v1.1.0] - 2022-10-27

 ### Features 
--- a/pom.xml
+++ b/pom.xml
@ -78,7 +78,8 @@
                <javadoc.opts>-Xdoclint:none</javadoc.opts>
            </properties>
        </profile>
-        <profile>
+    <!--profile set-local-classpath commented see #26841-->
+        <!--profile>
            <id>set-local-classpath</id>
            <activation>
                <jdk>[1.8,)</jdk>
@ -90,7 +91,7 @@
 					</resource>
 				</resources>
 			</build>
-        </profile>        
+        </profile-->
        <profile>
            <id>generate-distribution-packages</id>
            <activation>
@ -1544,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 -->
@ -1556,7 +1557,7 @@
        <java.expected.vm>.*OpenJDK.*</java.expected.vm>
        <maven.compiler.source>${java_version}</maven.compiler.source>
        <maven.compiler.target>${java_version}</maven.compiler.target>
-        <maven.local.classpath>/opt/gcube/local-classpath</maven.local.classpath>
+        <!--maven.local.classpath>/opt/gcube/local-classpath</maven.local.classpath-->

        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <maven.version>3.3.9</maven.version>
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	b857fce1bc	Merge pull request 'bug/26841' (!25 ) from bug/26841 into master Reviewed-on: #25	2024-02-22 10:02:29 +01:00
Roberto Cirillo	29b9eab140	set 1.2.0 version	2024-02-22 09:59:23 +01:00
Roberto Cirillo	e8fde085c0	fix changelog version	2024-02-22 09:54:52 +01:00
Roberto Cirillo	06024a761c	removed set-local-classpath profile. see #26841	2024-02-22 09:54:04 +01:00
Roberto Cirillo	fb4823b683	removed set-local-classpath profile. see #26841	2024-02-22 09:50:30 +01:00