fix/19854 #9

Manually merged
manuele.simi merged 3 commits from fix/19854 into master 2020-10-07 15:48:30 +02:00
1 changed files with 1291 additions and 1268 deletions

105
pom.xml
View File

@ -384,7 +384,9 @@
<name>build_commits.csv</name>
<append>true</append>
<lines>
<line>${project.groupId},${project.artifactId},${project.version},${project.scm.url},${buildNumber},${repository.releases.url},${project.build.finalName},${project.packaging}</line>
<line>
${project.groupId},${project.artifactId},${project.version},${project.scm.url},${buildNumber},${repository.releases.url},${project.build.finalName},${project.packaging}
</line>
</lines>
</file>
</files>
@ -499,7 +501,9 @@
<name>build_commits.csv</name>
<append>true</append>
<lines>
<line>${project.groupId},${project.artifactId},${project.version},${project.scm.url},${buildNumber},${repository.jenkins.staging.url},${project.build.finalName},${project.packaging}</line>
<line>
${project.groupId},${project.artifactId},${project.version},${project.scm.url},${buildNumber},${repository.jenkins.staging.url},${project.build.finalName},${project.packaging}
</line>
</lines>
</file>
</files>
@ -641,7 +645,9 @@
<rules>
<requireMavenVersion>
<version>[${maven.version},)</version>
<message>Check for Maven version &gt;=${maven.version} failed. Update your Maven install.</message>
<message>Check for Maven version &gt;=${maven.version} failed. Update your Maven
install.
</message>
</requireMavenVersion>
<!--requireJavaVersion>
<version>${java_version}</version>
@ -780,6 +786,19 @@
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<versionRange>[1.8,)</versionRange>
<goals>
<goal>run</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
</action>
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
@ -834,6 +853,19 @@
<ignore></ignore>
</action>
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<versionRange>${plugin.resources.version}</versionRange>
<goals>
<goal>copy-resources</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
@ -897,28 +929,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
<version>3.0.0</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>
<phase>generate-resources</phase>
<configuration>
<exportAntProperties>true</exportAntProperties>
<target>
<target name="seOuttputDirectories">
<condition property="isService">
<contains string="${project.packaging}" substring="war"/>
</condition>
@ -943,6 +961,20 @@
<goal>run</goal>
</goals>
</execution>
<execution>
<id>print</id>
<phase>compile</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target name="printOutputDirectories">
<echo>******** Displaying value of *.outputDirectory properties ********</echo>
<echo>project.metainf.outputDirectory=${project.metainf.outputDirectory}</echo>
<echo>project.webinf.outputDirectory=${project.webinf.outputDirectory}</echo>
</target>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
@ -1094,12 +1126,19 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.version>3.3.9</maven.version>
<repository.snapshots.url>http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-snapshots</repository.snapshots.url>
<repository.releases.url>http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-releases</repository.releases.url>
<repository.jenkins.staging.url>http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-staging-jenkins</repository.jenkins.staging.url>
<repository.staging.url>http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-staging/</repository.staging.url>
<repository.snapshots.url>http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-snapshots
</repository.snapshots.url>
<repository.releases.url>http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-releases
</repository.releases.url>
<repository.jenkins.staging.url>
http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-staging-jenkins
</repository.jenkins.staging.url>
<repository.staging.url>http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-staging/
</repository.staging.url>
<repository.externals.readonly>http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-externals</repository.externals.readonly>
<repository.externals.readonly>
http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-externals
</repository.externals.readonly>
<!-- following properties contains common information on gCube that are used for filtering resources like README, LICENSE, ... -->
@ -1148,7 +1187,6 @@
or has expressed by any other mean his willingness to license under the EUPL.
1. Definitions
In this Licence, the following terms have the following meaning:
@ -1189,7 +1227,6 @@
person.
2. Scope of the rights granted by the Licence
The Licensor hereby grants You a world-wide, royalty-free, non-exclusive,
@ -1215,7 +1252,6 @@
rights granted on the Work under this Licence.
3. Communication of the Source Code
The Licensor may provide the Work either in its Source Code form, or as
@ -1227,7 +1263,6 @@
continues to distribute and/or communicate the Work.
4. Limitations on copyright
Nothing in this Licence is intended to deprive the Licensee of the benefits from
@ -1236,7 +1271,6 @@
applicable limitations thereto.
5. Obligations of the Licensee
The grant of the rights mentioned above is subject to some restrictions and
@ -1277,7 +1311,6 @@
reproducing the content of the copyright notice.
6. Chain of Authorship
The original Licensor warrants that the copyright in the Original Work granted
@ -1293,7 +1326,6 @@
terms of this Licence.
7. Disclaimer of Warranty
The Work is a work in progress, which is continuously improved by numerous
@ -1310,7 +1342,6 @@
for the grant of any rights to the Work.
8. Disclaimer of Liability
Except in the cases of wilful misconduct or damages directly caused to natural
@ -1323,7 +1354,6 @@
laws as far such laws apply to the Work.
9. Additional agreements
While distributing the Original Work or Derivative Works, You may choose to
@ -1337,7 +1367,6 @@
any such warranty or additional liability.
10. Acceptance of the Licence
The provisions of this Licence can be accepted by clicking on an icon “I agree”
@ -1352,7 +1381,6 @@
Distribution and/or Communication by You of the Work or copies thereof.
11. Information to the public
In case of any Distribution and/or Communication of the Work by means of
@ -1363,7 +1391,6 @@
accessible, concluded, stored and reproduced by the Licensee.
12. Termination of the Licence
The Licence and the rights granted hereunder will terminate automatically upon
@ -1374,7 +1401,6 @@
remain in full compliance with the Licence.
13. Miscellaneous
Without prejudice of Article 9 above, the Licence represents the complete
@ -1395,7 +1421,6 @@
their choice.
14. Jurisdiction
Any litigation resulting from the interpretation of this License, arising
@ -1409,7 +1434,6 @@
conducts its primary business.
15. Applicable Law
This Licence shall be governed by the law of the European Union country where
@ -1428,7 +1452,6 @@
Appendix
“Compatible Licences” according to article 5 EUPL are: