From bdf23e25be5d2ca7e0bf9194422d92e8c7acf767 Mon Sep 17 00:00:00 2001
From: Manuele Simi <manuele.simi@isti.cnr.it>
Date: Thu, 23 Jul 2020 23:17:15 -0400
Subject: [PATCH 1/5] Restore make-uberjar execution of assembly plugin.

---
 pom.xml | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 101 insertions(+)

diff --git a/pom.xml b/pom.xml
index fb6f31b..6467fc6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -676,6 +676,107 @@
 						</execution>
 					</executions>
 				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-assembly-plugin</artifactId>
+					<version>2.6</version>
+					<dependencies>
+						<dependency>
+							<groupId>org.gcube.tools</groupId>
+							<artifactId>shared-assemblies</artifactId>
+							<version>1.1.0</version>
+						</dependency>
+					</dependencies>
+					<executions>
+						<!-- uberjar creation -->
+						<execution>
+							<id>make-uberjar</id>
+							<configuration>
+								<descriptorRefs>
+									<descriptorRef>gcube-uberjar</descriptorRef>
+								</descriptorRefs>
+								<!--
+                                override the plugin-scope configuration that some components have in their pom:
+                                    <descriptors>
+                                            <descriptor>${distroDirectory}/descriptor.xml</descriptor>
+                                    </descriptors>
+
+                                If not done, the servicearchive will be built also during this execution.
+                                -->
+								<descriptors combine.self="override"></descriptors>
+
+								<!--
+                                 make sure the "-src" is appended to the filename. It is the default
+                                 behaviour but it has been set explicitly because some components
+                                 (e.g. ghn-distribution) set it to false in their pom
+                                -->
+								<appendAssemblyId>true</appendAssemblyId>
+							</configuration>
+							<goals>
+								<goal>single</goal>
+							</goals>
+						</execution>
+
+						<!-- default servicearchive creation-->
+						<execution>
+							<id>make-servicearchive</id>
+							<configuration>
+								<descriptorRefs>
+									<descriptorRef>gcube-default-servicearchive</descriptorRef>
+								</descriptorRefs>
+
+								<!--
+                                override the plugin-scope configuration that some components have in their pom:
+                                    <descriptors>
+                                            <descriptor>${distroDirectory}/descriptor.xml</descriptor>
+                                    </descriptors>
+
+                                If not done, the servicearchive will be built also during this execution.
+                                -->
+								<descriptors combine.self="override"></descriptors>
+
+								<!--
+                                 make sure the "-src" is appended to the filename. It is the default
+                                 behaviour but it has been set explicitly because some components
+                                 (e.g. ghn-distribution) set it to false in their pom
+                                -->
+								<appendAssemblyId>true</appendAssemblyId>
+							</configuration>
+							<goals>
+								<goal>single</goal>
+							</goals>
+						</execution>
+						<!-- source package creation -->
+						<execution>
+							<id>make-source-package</id>
+							<configuration>
+								<descriptorRefs>
+									<descriptorRef>gcube-source-package</descriptorRef>
+								</descriptorRefs>
+
+								<!--
+                                override the plugin-scope configuration that some components have in their pom:
+                                    <descriptors>
+                                            <descriptor>${distroDirectory}/descriptor.xml</descriptor>
+                                    </descriptors>
+
+                                If not done, the servicearchive will be built also during this execution.
+                                -->
+								<descriptors combine.self="override"></descriptors>
+
+								<!--
+                                 make sure the "-src" is appended to the filename. It is the default
+                                 behaviour but it has been set explicitly because some components
+                                 (e.g. ghn-distribution) set it to false in their pom
+                                -->
+								<appendAssemblyId>true</appendAssemblyId>
+							</configuration>
+							<goals>
+								<goal>single</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
 
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>

From e6051b8b74dadb1851d9ae4b7c14b822f6a04716 Mon Sep 17 00:00:00 2001
From: Manuele Simi <manuele.simi@isti.cnr.it>
Date: Fri, 24 Jul 2020 23:16:36 -0400
Subject: [PATCH 2/5] Add version of commonly used plugins as properties.

---
 pom.xml | 55 +++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 37 insertions(+), 18 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6467fc6..d7a7243 100644
--- a/pom.xml
+++ b/pom.xml
@@ -108,7 +108,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-assembly-plugin</artifactId>
-						<version>2.6</version>
+						<version>${plugin.assembly.version}</version>
 						<executions>
 							<execution>
 								<id>make-source-package</id>
@@ -170,6 +170,7 @@
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>build-helper-maven-plugin</artifactId>
+						<version>${plugin.build.helper.version}</version>
 						<executions>
 							<execution>
 								<!-- sets the skip.when.is.release.used property to true if SNAPSHOT is NOT used,
@@ -192,7 +193,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-deploy-plugin</artifactId>
-						<version>3.0.0-M1</version>
+						<version>${plugin.deploy.version}</version>
 						<configuration>
 							<skip>${skip.when.is.release.used}</skip>
 						</configuration>
@@ -243,6 +244,7 @@
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>build-helper-maven-plugin</artifactId>
+						<version>${plugin.build.helper.version}</version>
 						<executions>
 							<execution>
 								<!-- sets the skip.when.is.release.used property to true if SNAPSHOT is NOT used,
@@ -265,7 +267,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-deploy-plugin</artifactId>
-						<version>3.0.0-M1</version>
+						<version>${plugin.deploy.version}</version>
 						<configuration>
 							<skip>${skip.when.is.release.used}</skip>
 						</configuration>
@@ -340,6 +342,7 @@
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>build-helper-maven-plugin</artifactId>
+						<version>${plugin.build.helper.version}</version>
 						<executions>
 							<execution>
 								<!-- sets the skip.when.is.snapshot.used property to true if SNAPSHOT was used,
@@ -376,7 +379,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-deploy-plugin</artifactId>
-						<version>3.0.0-M1</version>
+						<version>${plugin.deploy.version}</version>
 						<executions>
 							<execution>
 								<id>fail-if-snapshot-used</id>
@@ -390,7 +393,7 @@
 					<plugin>
 						<groupId>io.github.olivierlemasle.maven</groupId>
 						<artifactId>plaintext-maven-plugin</artifactId>
-						<version>1.0.0</version>
+						<version>${plugin.plaintext.version}</version>
 						<configuration>
 							<outputDirectory>${env.MAVEN_CONFIG_FOLDER}</outputDirectory>
 							<files>
@@ -477,6 +480,7 @@
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>build-helper-maven-plugin</artifactId>
+						<version>${plugin.build.helper.version}</version>
 						<executions>
 							<execution>
 								<!-- sets the skip.when.is.snapshot.used property to true if SNAPSHOT was used,
@@ -513,7 +517,7 @@
 					<plugin>
 						<groupId>io.github.olivierlemasle.maven</groupId>
 						<artifactId>plaintext-maven-plugin</artifactId>
-						<version>1.0.0</version>
+						<version>${plugin.plaintext.version}</version>
 						<configuration>
 							<outputDirectory>${env.MAVEN_CONFIG_FOLDER}</outputDirectory>
 							<files>
@@ -539,7 +543,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-deploy-plugin</artifactId>
-						<version>3.0.0-M1</version>
+						<version>${plugin.deploy.version}</version>
 						<executions>
 							<execution>
 								<id>fail-if-snapshot-used</id>
@@ -570,7 +574,7 @@
 						<plugin>
 							<groupId>org.apache.maven.plugins</groupId>
 							<artifactId>maven-deploy-plugin</artifactId>
-							<version>3.0.0-M1</version>
+							<version>${plugin.deploy.version}</version>
 							<configuration>
 								<skip>true</skip>
 							</configuration>
@@ -589,7 +593,7 @@
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>buildnumber-maven-plugin</artifactId>
-					<version>1.4</version>
+					<version>${plugin.buildnumber.version}</version>
 					<executions>
 						<execution>
 							<id>useLastCommittedRevision</id>
@@ -610,7 +614,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-jar-plugin</artifactId>
-					<version>3.1.2</version>
+					<version>${plugin.jar.version}</version>
 					<configuration>
 						<archive>
 							<manifest>
@@ -630,7 +634,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-war-plugin</artifactId>
-					<version>3.2.3</version>
+					<version>${plugin.war.version}</version>
 					<configuration>
 						<archive>
 							<manifest>
@@ -649,6 +653,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-enforcer-plugin</artifactId>
+					<version>${plugin.enforcer.version}</version>
 					<executions>
 						<execution>
 							<id>enforce</id>
@@ -679,7 +684,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-assembly-plugin</artifactId>
-					<version>2.6</version>
+					<version>${plugin.assembly.version}</version>
 					<dependencies>
 						<dependency>
 							<groupId>org.gcube.tools</groupId>
@@ -799,6 +804,7 @@
 									<pluginExecutionFilter>
 										<groupId>org.apache.maven.plugins</groupId>
 										<artifactId>maven-enforcer-plugin</artifactId>
+										<version>${plugin.enforcer.version}</version>
 										<goals>
 											<goal>enforce</goal>
 										</goals>
@@ -857,7 +863,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.8.1</version>
+					<version>${plugin.compiler.version}</version>
 					<configuration>
 						<target>${maven.compiler.target}</target>
 						<source>${maven.compiler.source}</source>
@@ -873,14 +879,14 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>buildnumber-maven-plugin</artifactId>
-                <version>1.4</version>
+                <version>${plugin.buildnumber.version}</version>
             </plugin>
 
 			<!-- enforce integration build requirements -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-enforcer-plugin</artifactId>
-				<version>3.0.0-M3</version>
+				<version>${plugin.enforcer.version}</version>
 				<executions>
 					<execution>
 						<id>enforce-files-exist</id>
@@ -905,13 +911,13 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>build-helper-maven-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>${plugin.build.helper.version}</version>
             </plugin>
 
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
-				<version>2.1.2</version>
+				<version>${plugin.source.version}</version>
 				<executions>
 					<execution>
 						<id>generate-sources</id>
@@ -926,7 +932,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.8</version>
+				<version>${plugin.javadoc.version}</version>
 				<executions>
 					<execution>
 						<id>generate-doc</id>
@@ -973,6 +979,19 @@
 	</build>
 
 	<properties>
+		<!-- version of commonly used plugins -->
+		<plugin.enforcer.version>3.0.0-M3</plugin.enforcer.version>
+		<plugin.buildnumber.version>1.4</plugin.buildnumber.version>
+		<plugin.build.helper.version>3.0.0</plugin.build.helper.version>
+		<plugin.deploy.version>3.0.0-M1</plugin.deploy.version>
+		<plugin.plaintext.version>1.0.0</plugin.plaintext.version>
+		<plugin.jar.version>3.1.2</plugin.jar.version>
+		<plugin.war.version>3.2.3</plugin.war.version>
+		<plugin.assembly.version>2.6</plugin.assembly.version>
+		<plugin.compiler.version>3.8.1</plugin.compiler.version>
+		<plugin.source.version>2.1.2</plugin.source.version>
+		<plugin.javadoc.version>2.8</plugin.javadoc.version>
+
 		<!-- default value for the distro directory -->
 		<distroDirectory>distro</distroDirectory>
 

From 01a4ecb6e6dfa085a433384466d3a1cf2c1fc246 Mon Sep 17 00:00:00 2001
From: Manuele Simi <manuele.simi@isti.cnr.it>
Date: Sat, 25 Jul 2020 16:41:42 -0400
Subject: [PATCH 3/5] Add and filter gcube/extra-resources folder to the output
 jar/war.

---
 pom.xml | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/pom.xml b/pom.xml
index d7a7243..53cf2d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -914,6 +914,45 @@
                 <version>${plugin.build.helper.version}</version>
             </plugin>
 
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<version>${plugin.resources.version}</version>
+				<executions>
+					<execution>
+						<id>copy-web-inf</id>
+						<phase>validate</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.build.outputDirectory}/WEB-INF</outputDirectory>
+							<resources>
+								<resource>
+									<directory>gcube/extra-resources/WEB-INF</directory>
+									<filtering>true</filtering>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+					<execution>
+						<id>copy-meta-inf</id>
+						<phase>validate</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.build.outputDirectory}/META-INF</outputDirectory>
+							<resources>
+								<resource>
+									<directory>gcube/extra-resources/META-INF</directory>
+									<filtering>true</filtering>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
@@ -991,6 +1030,7 @@
 		<plugin.compiler.version>3.8.1</plugin.compiler.version>
 		<plugin.source.version>2.1.2</plugin.source.version>
 		<plugin.javadoc.version>2.8</plugin.javadoc.version>
+		<plugin.resources.version>3.1.0</plugin.resources.version>
 
 		<!-- default value for the distro directory -->
 		<distroDirectory>distro</distroDirectory>

From 411c6cde4c4c18f1330619a433d993fb324f5091 Mon Sep 17 00:00:00 2001
From: Manuele Simi <manuele.simi@isti.cnr.it>
Date: Sat, 25 Jul 2020 16:44:15 -0400
Subject: [PATCH 4/5] Add src/main/resources folder to the output jar/war.

---
 pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pom.xml b/pom.xml
index 53cf2d3..a173e95 100644
--- a/pom.xml
+++ b/pom.xml
@@ -165,6 +165,13 @@
 						</includes>
 						<targetPath>META-INF</targetPath>
 					</resource>
+					<resource>
+						<directory>${project.basedir}/src/main/resources/META-INF</directory>
+						<targetPath>META-INF</targetPath>
+					</resource><resource>
+						<directory>${project.basedir}/src/main/resources/WEB-INF</directory>
+						<targetPath>WEB-INF</targetPath>
+					</resource>
 				</resources>
 				<plugins>
 					<plugin>

From ecb4487ab45b9823da72bd9293d71082b493c7da Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Fri, 31 Jul 2020 17:38:04 +0200
Subject: [PATCH 5/5] Switched tag from version to versionRange which is more
 appropriated

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a173e95..6c415eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -811,7 +811,7 @@
 									<pluginExecutionFilter>
 										<groupId>org.apache.maven.plugins</groupId>
 										<artifactId>maven-enforcer-plugin</artifactId>
-										<version>${plugin.enforcer.version}</version>
+										<versionRange>${plugin.enforcer.version}</versionRange>
 										<goals>
 											<goal>enforce</goal>
 										</goals>