From d8ef1cf792e8168ac9efbe4c02e03ddd4d8bf966 Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Thu, 6 Aug 2020 17:27:30 +0200
Subject: [PATCH 1/3] Fixed output directory of filter resources

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6c415eb..60464b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -932,7 +932,7 @@
 							<goal>copy-resources</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>${project.build.outputDirectory}/WEB-INF</outputDirectory>
+							<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF</outputDirectory>
 							<resources>
 								<resource>
 									<directory>gcube/extra-resources/WEB-INF</directory>
@@ -948,7 +948,7 @@
 							<goal>copy-resources</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>${project.build.outputDirectory}/META-INF</outputDirectory>
+							<outputDirectory>${project.build.directory}/${project.build.finalName}/META-INF</outputDirectory>
 							<resources>
 								<resource>
 									<directory>gcube/extra-resources/META-INF</directory>

From e1c2282b2dcf995323c38eeeb0174decf8358a8f Mon Sep 17 00:00:00 2001
From: Manuele Simi <manuele.simi@isti.cnr.it>
Date: Fri, 7 Aug 2020 09:53:59 -0400
Subject: [PATCH 2/3] Update output paths for WEB/META-INF extra resources.

---
 pom.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 60464b6..2d6e296 100644
--- a/pom.xml
+++ b/pom.xml
@@ -163,14 +163,14 @@
 						<includes>
 							<include>LICENSE.md</include>
 						</includes>
-						<targetPath>META-INF</targetPath>
+						<targetPath>${basedir}/target/classes/META-INF/</targetPath>
 					</resource>
 					<resource>
 						<directory>${project.basedir}/src/main/resources/META-INF</directory>
-						<targetPath>META-INF</targetPath>
+						<targetPath>${basedir}/target/classes/META-INF/</targetPath>
 					</resource><resource>
 						<directory>${project.basedir}/src/main/resources/WEB-INF</directory>
-						<targetPath>WEB-INF</targetPath>
+						<targetPath>${basedir}/target/classes/WEB-INF/</targetPath>
 					</resource>
 				</resources>
 				<plugins>
@@ -932,7 +932,7 @@
 							<goal>copy-resources</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF</outputDirectory>
+							<outputDirectory>${basedir}/target/classes/WEB-INF/</outputDirectory>
 							<resources>
 								<resource>
 									<directory>gcube/extra-resources/WEB-INF</directory>
@@ -948,7 +948,7 @@
 							<goal>copy-resources</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>${project.build.directory}/${project.build.finalName}/META-INF</outputDirectory>
+							<outputDirectory>${basedir}/target/classes/META-INF/</outputDirectory>
 							<resources>
 								<resource>
 									<directory>gcube/extra-resources/META-INF</directory>

From 3ba07236813dfdad253e88eefe1f1f59882174de Mon Sep 17 00:00:00 2001
From: Manuele Simi <manuele.simi@isti.cnr.it>
Date: Fri, 7 Aug 2020 23:38:33 -0400
Subject: [PATCH 3/3] Set output paths for WEB/META-INF extra resources with
 conditional properties.

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

diff --git a/pom.xml b/pom.xml
index 2d6e296..c4081df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -157,22 +157,6 @@
 			</distributionManagement>
 
 			<build>
-				<resources>
-					<resource>
-						<directory>${project.basedir}</directory>
-						<includes>
-							<include>LICENSE.md</include>
-						</includes>
-						<targetPath>${basedir}/target/classes/META-INF/</targetPath>
-					</resource>
-					<resource>
-						<directory>${project.basedir}/src/main/resources/META-INF</directory>
-						<targetPath>${basedir}/target/classes/META-INF/</targetPath>
-					</resource><resource>
-						<directory>${project.basedir}/src/main/resources/WEB-INF</directory>
-						<targetPath>${basedir}/target/classes/WEB-INF/</targetPath>
-					</resource>
-				</resources>
 				<plugins>
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
@@ -334,16 +318,8 @@
 					<url>${repository.releases.url}</url>
 				</repository>
 			</distributionManagement>
+
 			<build>
-				<resources>
-					<resource>
-							<directory>${project.basedir}</directory>
-							<includes>
-								<include>LICENSE.md</include>
-							</includes>
-							<targetPath>META-INF</targetPath>
-					</resource>
-				</resources>
 
 				<plugins>
 					<plugin>
@@ -473,15 +449,6 @@
 				</repository>
 			</distributionManagement>
 			<build>
-				<resources>
-					<resource>
-						<directory>${project.basedir}</directory>
-						<includes>
-							<include>LICENSE.md</include>
-						</includes>
-						<targetPath>META-INF</targetPath>
-					</resource>
-				</resources>
 
 				<plugins>
 					<plugin>
@@ -618,6 +585,8 @@
 					</executions>
 
 				</plugin>
+
+
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-jar-plugin</artifactId>
@@ -880,7 +849,7 @@
 		</pluginManagement>
 
 
-		<!-- attached to all life-cycles -->
+		<!-- attached to all profiles -->
 		<plugins>
 
 			<plugin>
@@ -921,18 +890,69 @@
                 <version>${plugin.build.helper.version}</version>
             </plugin>
 
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<version>1.7</version>
+				<executions>
+					<execution>
+						<id>print</id>
+						<phase>compile</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<tasks>
+								<echo>******** Displaying value of *.outputDirectory properties ********</echo>
+								<echo>project.metainf.outputDirectory=${project.metainf.outputDirectory}</echo>
+								<echo>project.webinf.outputDirectory=${project.webinf.outputDirectory}</echo>
+							</tasks>
+						</configuration>
+					</execution>
+					<execution>
+						<id>set-vars</id>
+						<phase>validate</phase>
+						<configuration>
+							<exportAntProperties>true</exportAntProperties>
+							<target>
+								<condition property="isService">
+									<contains string="${project.packaging}" substring="war" />
+								</condition>
+								<condition property="project.webinf.outputDirectory"
+										   value="${project.build.directory}/${project.build.finalName}/WEB-INF">
+									<isset property="isService" />
+								</condition>
+								<condition property="project.metainf.outputDirectory"
+										   value="${project.build.directory}/${project.build.finalName}/META-INF">
+									<isset property="isService" />
+								</condition>
+								<!-- Properties in ant are immutable, so the following assignments
+                                    will only take place if the properties are not yet set. -->
+								<property name="project.webinf.outputDirectory"
+										  value="${project.build.outputDirectory}/WEB-INF" />
+
+								<property name="project.metainf.outputDirectory"
+										  value="${project.build.outputDirectory}/META-INF" />
+							</target>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<artifactId>maven-resources-plugin</artifactId>
 				<version>${plugin.resources.version}</version>
 				<executions>
 					<execution>
 						<id>copy-web-inf</id>
-						<phase>validate</phase>
+						<phase>generate-resources</phase>
 						<goals>
 							<goal>copy-resources</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>${basedir}/target/classes/WEB-INF/</outputDirectory>
+							<outputDirectory>${project.webinf.outputDirectory}</outputDirectory>
 							<resources>
 								<resource>
 									<directory>gcube/extra-resources/WEB-INF</directory>
@@ -943,12 +963,12 @@
 					</execution>
 					<execution>
 						<id>copy-meta-inf</id>
-						<phase>validate</phase>
+						<phase>generate-resources</phase>
 						<goals>
 							<goal>copy-resources</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>${basedir}/target/classes/META-INF/</outputDirectory>
+							<outputDirectory>${project.metainf.outputDirectory}</outputDirectory>
 							<resources>
 								<resource>
 									<directory>gcube/extra-resources/META-INF</directory>
@@ -957,6 +977,25 @@
 							</resources>
 						</configuration>
 					</execution>
+					<execution>
+						<id>copy-license</id>
+						<phase>compile</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.metainf.outputDirectory}</outputDirectory>
+							<resources>
+								<resource>
+									<directory>${project.basedir}</directory>
+									<includes>
+										<include>LICENSE.md</include>
+									</includes>
+									<filtering>true</filtering>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
 				</executions>
 			</plugin>
 
@@ -1032,7 +1071,7 @@
 		<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.war.version>3.3.1</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>