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

Reviewed-on: #28

CHANGELOG.md

@@ -1,10 +1,19 @@
 # Changelog for Maven-Parent
 
-## [v1.2.0-SNAPSHOT] - 2023-05-02
+## [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)
 * add new group repositories for managing jdk17 dependencies resolution
+* 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
 

README.md

@@ -3,7 +3,7 @@
 A parent pom for all the gCube artifacts.
 
 # Enforcements 
-* Java 8 (target and source)
+* Java 8 (target and source) unless otherwise specified inside the pom
 * OpenJDK as target Java VM.
 * Maven 3.3.9+
 * README.md, CHANGELOG.md and LICENSE.md are present in the baseDir of each Maven module
@@ -11,19 +11,41 @@ A parent pom for all the gCube artifacts.
 
 # Build Profiles
 
-## gcube-developer
+The build profiles are separated in three main branches: developer, staging, releases.
+Each branch has a set of profile based on the idk.
+The developer branch contains the profiles related to the snapshot build:
+
+* gcore-legacy jdk7
+* gcube-legacy - jdk8
+* gcube-official -jdk11
+* gcube-experimental - jdk17
+
+In the same way are organised the other branch profiles related to the staging (integration) phase and to the release phase.
+
+In addition there are a set of common profiles useful in order to avoid replication of plugins and rules definitions:
+
+* common-snapshot
+* common-release
+* dry-run
+* disable-java8-doclint
+* set-local-classpath
+* generate-distribution-packages
+
+Below the descriptions of the most used profiles by gCube components:
+
+## common-snapshot
+This profile defines the common plugin used by all the snapshot profiles
+
+## common-releases
+This profile defines the common plugin used by all the staging and release profiles
+
+## gcube-official
 * Dependencies resolved against local, gcube-snapshots and gcube-releases
 * Snapshot artifacts installed to local
 * Snapshot artifacts deployed to gcube-snapshots
 * Deployments of releases artifacts are not permitted
 
-## jenkins-snapshots
-* Dependencies resolved against local-snapshots, gcube-snapshots and gcube-releases
-* Snapshot artifacts installed to local-snapshots
-* Snapshot artifacts deployed to gcube-snapshots
-* Deployments of release artifacts are not permitted
-
-## jenkins-staging
+## jenkins-staging-official
 * Dependencies resolved against local-staging, gcube-jenkins-staging, gcube-staging and gcube-releases
 * Release/snapshot artifacts installed to local-staging
 * Release/snapshot artifacts deployed to gcube-jenkins-staging
@@ -41,3 +63,6 @@ This profile disables the deployment of the artifacts.
 This profile sets an additional parameter for javadoc generation to disables the doclint. 
 It avoids the build fails if formal/syntax errors are found in javadoc comments.
 
+## set-local-classpath
+This profile set a generic folder that will be added to the classpath
+

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>org.gcube.tools</groupId>
     <artifactId>maven-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.0</version>
     <packaging>pom</packaging>
 
     <scm>
@@ -78,6 +78,20 @@
                 <javadoc.opts>-Xdoclint:none</javadoc.opts>
             </properties>
         </profile>
+    <!--profile set-local-classpath commented see #26841-->
+        <!--profile>
+            <id>set-local-classpath</id>
+            <activation>
+                <jdk>[1.8,)</jdk>
+            </activation>
+			<build>
+				<resources>
+					<resource>
+						<directory>${maven.local.classpath}</directory>
+					</resource>
+				</resources>
+			</build>
+        </profile-->
         <profile>
             <id>generate-distribution-packages</id>
             <activation>
@@ -350,7 +364,6 @@
                     <name>!Release</name>
                 </property>
             </activation>
-
             <!--             Repositories for dependency resolution -->
             <repositories>
                 <repository>
@@ -399,7 +412,7 @@
          <profile>
              <id>gcube-legacy</id> 
             <activation> 
-                 <jdk>[1.8, 9)</jdk>
+                 <jdk>[1.8,9)</jdk>
                  <property> 
  				   <name>!Release</name> 
  				 </property> 
@@ -1476,13 +1489,12 @@
                             <goal>jar</goal>
                         </goals>
                         <configuration>
+							<source>${java_version}</source>
                             <additionalparam>${javadoc.opts}</additionalparam>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
-
-
             <plugin>
                 <groupId>org.codehaus.gmaven</groupId>
                 <artifactId>groovy-maven-plugin</artifactId>
@@ -1508,8 +1520,16 @@
                         </configuration>
                     </execution>
                 </executions>
+                <dependencies>
+			        <dependency>
+			            <groupId>org.codehaus.groovy</groupId>
+			            <artifactId>groovy-all</artifactId>
+			            <version>3.0.13</version>
+			            <!--version>3.0.0-beta-3</version-->
+			            <type>pom</type>
+			        </dependency>
+			    </dependencies>
             </plugin>
-
         </plugins>
     </build>
 
@@ -1525,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 -->
@@ -1537,6 +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-->
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.version>3.3.9</maven.version>