From 8acb508ddc4300c849dc41fe1e0de27402c668e9 Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Thu, 24 Oct 2019 09:15:14 -0400 Subject: [PATCH 01/85] Add entries to the manifest also for WARs. --- pom.xml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pom.xml b/pom.xml index 7713a4f..8c8bf2f 100644 --- a/pom.xml +++ b/pom.xml @@ -552,6 +552,26 @@ + + + org.apache.maven.plugins + maven-war-plugin + 3.2.3 + + + + true + true + + + ${buildNumber} + ${buildDate} + ${scmBranch} + ${project.scm.url}/commit/${buildNumber} + + + + org.apache.maven.plugins maven-enforcer-plugin -- 2.17.1 From e6112ed88652f21a5cb30d8289ae33d049d0e832 Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Thu, 24 Oct 2019 15:02:38 -0400 Subject: [PATCH 02/85] Use a customized build timestamp. --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 8c8bf2f..e20d9dc 100644 --- a/pom.xml +++ b/pom.xml @@ -545,7 +545,7 @@ ${buildNumber} - ${buildDate} + ${maven.build.timestamp} ${scmBranch} ${project.scm.url}/commit/${buildNumber} @@ -565,7 +565,7 @@ ${buildNumber} - ${buildDate} + ${maven.build.timestamp} ${scmBranch} ${project.scm.url}/commit/${buildNumber} @@ -871,7 +871,7 @@ https://wiki.gcube-system.org/gcube/index.php - yyyy-MM-dd + yyyyMMdd-HHmmss ${maven.build.timestamp} https://support.d4science.org/projects/gcube/ https://www.gcube-system.org/ -- 2.17.1 From 68ad69b7a261e957a9fe0cb5576da20005de34e7 Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Thu, 24 Oct 2019 15:03:38 -0400 Subject: [PATCH 03/85] Remove create-tiemestamp-id (create problems with M2E). --- pom.xml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/pom.xml b/pom.xml index e20d9dc..810176f 100644 --- a/pom.xml +++ b/pom.xml @@ -517,19 +517,6 @@ false - - create-timestamp-id - validate - - create-timestamp - - - yyyy-MM-dd HH:mm:ss.S - scmDate - - - -- 2.17.1 From fd1017eb0c95dbf8e0288413a6cd27db83ed047a Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Fri, 25 Oct 2019 14:33:01 -0400 Subject: [PATCH 04/85] Separate filename from packaging. --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 810176f..51f4550 100644 --- a/pom.xml +++ b/pom.xml @@ -347,7 +347,7 @@ build_commits.csv true - ${project.groupId},${project.artifactId},${project.version},${project.scm.url},${git.branch},${buildNumber},${repository.releases.url},${project.build.finalName}.${project.packaging} + ${project.groupId},${project.artifactId},${project.version},${project.scm.url},${git.branch},${buildNumber},${repository.releases.url},${project.build.finalName},${project.packaging} @@ -448,7 +448,7 @@ build_commits.csv true - ${project.groupId},${project.artifactId},${project.version},${project.scm.url},${scmBranch},${buildNumber},${repository.jenkins.staging.url},${project.build.finalName}.${project.packaging} + ${project.groupId},${project.artifactId},${project.version},${project.scm.url},${scmBranch},${buildNumber},${repository.jenkins.staging.url},${project.build.finalName},${project.packaging} -- 2.17.1 From 26e9c51456bf1ee75dda8adf07028ea20a5f5abb Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Mon, 28 Oct 2019 13:35:22 -0400 Subject: [PATCH 05/85] Remove branch column. --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 51f4550..4a02d97 100644 --- a/pom.xml +++ b/pom.xml @@ -347,7 +347,7 @@ build_commits.csv true - ${project.groupId},${project.artifactId},${project.version},${project.scm.url},${git.branch},${buildNumber},${repository.releases.url},${project.build.finalName},${project.packaging} + ${project.groupId},${project.artifactId},${project.version},${project.scm.url},${buildNumber},${repository.releases.url},${project.build.finalName},${project.packaging} @@ -448,7 +448,7 @@ build_commits.csv true - ${project.groupId},${project.artifactId},${project.version},${project.scm.url},${scmBranch},${buildNumber},${repository.jenkins.staging.url},${project.build.finalName},${project.packaging} + ${project.groupId},${project.artifactId},${project.version},${project.scm.url},${buildNumber},${repository.jenkins.staging.url},${project.build.finalName},${project.packaging} -- 2.17.1 From 60375a9b459fd8d2c35a1c1e5a0eb5c107076971 Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Sat, 25 Jan 2020 21:33:38 -0500 Subject: [PATCH 06/85] Fail if a snapshot suffix is detected and we are on staging/release. --- pom.xml | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4a02d97..e999372 100644 --- a/pom.xml +++ b/pom.xml @@ -331,11 +331,19 @@ ${project.version} .*-SNAPSHOT$ true - false + true + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0-M1 + + ${skip.when.is.snapshot.used} + + io.github.olivierlemasle.maven plaintext-maven-plugin @@ -432,7 +440,7 @@ ${project.version} .*-SNAPSHOT$ true - false + true @@ -463,6 +471,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0-M1 + + ${skip.when.is.snapshot.used} + + ${project.artifactId}-${project.version} -- 2.17.1 From 10263a5f46e6441c7524ac81484b0699e1d94e78 Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Sat, 25 Jan 2020 22:20:31 -0500 Subject: [PATCH 07/85] Invert regexp for staging/release. --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e999372..7b03442 100644 --- a/pom.xml +++ b/pom.xml @@ -329,7 +329,7 @@ skip.when.is.snapshot.used ${project.version} - .*-SNAPSHOT$ + ^((?!.*-SNAPSHOT).)*$ true true @@ -438,7 +438,7 @@ skip.when.is.snapshot.used ${project.version} - .*-SNAPSHOT$ + ^((?!.*-SNAPSHOT).)*$ true true -- 2.17.1 From d8aacfd01c3a0d792fe72e5ecc7c623a56cf2766 Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Mon, 27 Jan 2020 09:22:13 -0500 Subject: [PATCH 08/85] Correct regexs for skipping the deployments. --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 7b03442..cf66caa 100644 --- a/pom.xml +++ b/pom.xml @@ -174,7 +174,7 @@ skip.when.is.release.used ${project.version} - ^((?!.*-SNAPSHOT).)*$ + ^((?!-SNAPSHOT).)*$ true false @@ -329,7 +329,7 @@ skip.when.is.snapshot.used ${project.version} - ^((?!.*-SNAPSHOT).)*$ + .*-SNAPSHOT$ true true @@ -438,7 +438,7 @@ skip.when.is.snapshot.used ${project.version} - ^((?!.*-SNAPSHOT).)*$ + .*-SNAPSHOT$ true true -- 2.17.1 From cad1e191f7259350804916519192b5d3df645002 Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Mon, 27 Jan 2020 09:35:33 -0500 Subject: [PATCH 09/85] Check both -snapshot and not -snapshot in release/staging. --- pom.xml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/pom.xml b/pom.xml index cf66caa..aa89165 100644 --- a/pom.xml +++ b/pom.xml @@ -331,6 +331,20 @@ ${project.version} .*-SNAPSHOT$ true + false + + + + + fail-helper-regex-is-snapshot-used + validate + + regex-property + + + fail.when.is.snapshot.used + ${project.version} + ^((?!.*-SNAPSHOT).)*$ true @@ -440,6 +454,20 @@ ${project.version} .*-SNAPSHOT$ true + false + + + + + fail-helper-regex-is-snapshot-used + validate + + regex-property + + + fail.when.is.snapshot.used + ${project.version} + ^((?!.*-SNAPSHOT).)*$ true -- 2.17.1 From 10f9ecdb50437bd944899963399d2128a5106b7b Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Tue, 4 Feb 2020 22:21:41 -0500 Subject: [PATCH 10/85] Attach maven-deploy-plugin's executions to the deploy phase. --- pom.xml | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index aa89165..3b83f40 100644 --- a/pom.xml +++ b/pom.xml @@ -354,9 +354,15 @@ org.apache.maven.plugins maven-deploy-plugin 3.0.0-M1 - - ${skip.when.is.snapshot.used} - + + + fail-if-snapshot-used + deploy + + ${skip.when.is.snapshot.used} + + + io.github.olivierlemasle.maven @@ -503,9 +509,15 @@ org.apache.maven.plugins maven-deploy-plugin 3.0.0-M1 - - ${skip.when.is.snapshot.used} - + + + fail-if-snapshot-used + deploy + + ${skip.when.is.snapshot.used} + + + ${project.artifactId}-${project.version} -- 2.17.1 From e51cb2a04f9565a5d1d45801d65bfe87434d041e Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Sun, 5 Apr 2020 15:45:51 -0400 Subject: [PATCH 11/85] Deactivate the install phase when the -SNAPSHOT suffix is not present under the jenkins-snapshot profile. --- pom.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pom.xml b/pom.xml index 3b83f40..b6b8d10 100644 --- a/pom.xml +++ b/pom.xml @@ -263,6 +263,14 @@ ${skip.when.is.release.used} + + org.apache.maven.plugins + maven-install-plugin + 2.4 + + ${skip.when.is.release.used} + + -- 2.17.1 From cec724fb10f471421e7e7d3308480dd9d8854897 Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Sun, 7 Jun 2020 10:45:51 -0400 Subject: [PATCH 12/85] Add CHANGELOG.md. --- CHANGELOG.md | 12 ++++++++++++ README.md | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..f2eac9c --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,12 @@ +# Changelog for Maven-Parent + +## [v1.1.0] [r4.22.0] - 2020-01-27 + +* New build profiles to support CI/CD +* Enforcement for: + * Java 8 (target and source) + * OpenJDK as target Java VM. + * Maven 3.3.9+ + +## [v1.0.0] [r4.0.0] - 2017-12-20 + diff --git a/README.md b/README.md index ef8486a..caf0c60 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ A parent pom for all the gCube artifacts. # Enforcements * Java 8 (target and source) * OpenJDK as target Java VM. -* Maven 3.0.0+ +* Maven 3.3.9+ # Build Profiles -- 2.17.1 From 943956db98e143ce0be77a5236b54c417fee28e3 Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Tue, 9 Jun 2020 22:05:40 -0400 Subject: [PATCH 13/85] Update CHANGELOG.md. --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f2eac9c..415795e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog for Maven-Parent -## [v1.1.0] [r4.22.0] - 2020-01-27 +## [v1.1.0] [r4.23.0] 2020-01-27 * New build profiles to support CI/CD * Enforcement for: @@ -8,5 +8,5 @@ * OpenJDK as target Java VM. * Maven 3.3.9+ -## [v1.0.0] [r4.0.0] - 2017-12-20 +## [v1.0.0] [r4.0.0] 2017-12-20 -- 2.17.1 From a3f39056723dd5b9a45acecfa3239d9e0b82a781 Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Fri, 19 Jun 2020 14:50:26 -0400 Subject: [PATCH 14/85] Add LICENSE. --- LICENSE.md | 312 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 312 insertions(+) create mode 100644 LICENSE.md diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..3af0507 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,312 @@ +# European Union Public Licence V. 1.1 + + +EUPL © the European Community 2007 + + +This European Union Public Licence (the “EUPL”) applies to the Work or Software +(as defined below) which is provided under the terms of this Licence. Any use of +the Work, other than as authorised under this Licence is prohibited (to the +extent such use is covered by a right of the copyright holder of the Work). + +The Original Work is provided under the terms of this Licence when the Licensor +(as defined below) has placed the following notice immediately following the +copyright notice for the Original Work: + +Licensed under the EUPL V.1.1 + +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: + +- The Licence: this Licence. + +- The Original Work or the Software: the software distributed and/or + communicated by the Licensor under this Licence, available as Source Code and + also as Executable Code as the case may be. + +- Derivative Works: the works or software that could be created by the Licensee, + based upon the Original Work or modifications thereof. This Licence does not + define the extent of modification or dependence on the Original Work required + in order to classify a work as a Derivative Work; this extent is determined by + copyright law applicable in the country mentioned in Article 15. + +- The Work: the Original Work and/or its Derivative Works. + +- The Source Code: the human-readable form of the Work which is the most + convenient for people to study and modify. + +- The Executable Code: any code which has generally been compiled and which is + meant to be interpreted by a computer as a program. + +- The Licensor: the natural or legal person that distributes and/or communicates + the Work under the Licence. + +- Contributor(s): any natural or legal person who modifies the Work under the + Licence, or otherwise contributes to the creation of a Derivative Work. + +- The Licensee or “You”: any natural or legal person who makes any usage of the + Software under the terms of the Licence. + +- Distribution and/or Communication: any act of selling, giving, lending, + renting, distributing, communicating, transmitting, or otherwise making + available, on-line or off-line, copies of the Work or providing access to its + essential functionalities at the disposal of any other natural or legal + person. + + + +## 2. Scope of the rights granted by the Licence + +The Licensor hereby grants You a world-wide, royalty-free, non-exclusive, +sub-licensable licence to do the following, for the duration of copyright vested +in the Original Work: + +- use the Work in any circumstance and for all usage, reproduce the Work, modify +- the Original Work, and make Derivative Works based upon the Work, communicate +- to the public, including the right to make available or display the Work or +- copies thereof to the public and perform publicly, as the case may be, the +- Work, distribute the Work or copies thereof, lend and rent the Work or copies +- thereof, sub-license rights in the Work or copies thereof. + +Those rights can be exercised on any media, supports and formats, whether now +known or later invented, as far as the applicable law permits so. + +In the countries where moral rights apply, the Licensor waives his right to +exercise his moral right to the extent allowed by law in order to make effective +the licence of the economic rights here above listed. + +The Licensor grants to the Licensee royalty-free, non exclusive usage rights to +any patents held by the Licensor, to the extent necessary to make use of the +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 +Executable Code. If the Work is provided as Executable Code, the Licensor +provides in addition a machine-readable copy of the Source Code of the Work +along with each copy of the Work that the Licensor distributes or indicates, in +a notice following the copyright notice attached to the Work, a repository where +the Source Code is easily and freely accessible for as long as the Licensor +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 +any exception or limitation to the exclusive rights of the rights owners in the +Original Work or Software, of the exhaustion of those rights or of other +applicable limitations thereto. + + + +## 5. Obligations of the Licensee + +The grant of the rights mentioned above is subject to some restrictions and +obligations imposed on the Licensee. Those obligations are the following: + +Attribution right: the Licensee shall keep intact all copyright, patent or +trademarks notices and all notices that refer to the Licence and to the +disclaimer of warranties. The Licensee must include a copy of such notices and a +copy of the Licence with every copy of the Work he/she distributes and/or +communicates. The Licensee must cause any Derivative Work to carry prominent +notices stating that the Work has been modified and the date of modification. + +Copyleft clause: If the Licensee distributes and/or communicates copies of the +Original Works or Derivative Works based upon the Original Work, this +Distribution and/or Communication will be done under the terms of this Licence +or of a later version of this Licence unless the Original Work is expressly +distributed only under this version of the Licence. The Licensee (becoming +Licensor) cannot offer or impose any additional terms or conditions on the Work +or Derivative Work that alter or restrict the terms of the Licence. + +Compatibility clause: If the Licensee Distributes and/or Communicates Derivative +Works or copies thereof based upon both the Original Work and another work +licensed under a Compatible Licence, this Distribution and/or Communication can +be done under the terms of this Compatible Licence. For the sake of this clause, +“Compatible Licence” refers to the licences listed in the appendix attached to +this Licence. Should the Licensee’s obligations under the Compatible Licence +conflict with his/her obligations under this Licence, the obligations of the +Compatible Licence shall prevail. + +Provision of Source Code: When distributing and/or communicating copies of the +Work, the Licensee will provide a machine-readable copy of the Source Code or +indicate a repository where this Source will be easily and freely available for +as long as the Licensee continues to distribute and/or communicate the Work. + +Legal Protection: This Licence does not grant permission to use the trade names, +trademarks, service marks, or names of the Licensor, except as required for +reasonable and customary use in describing the origin of the Work and +reproducing the content of the copyright notice. + + + +## 6. Chain of Authorship + +The original Licensor warrants that the copyright in the Original Work granted +hereunder is owned by him/her or licensed to him/her and that he/she has the +power and authority to grant the Licence. + +Each Contributor warrants that the copyright in the modifications he/she brings +to the Work are owned by him/her or licensed to him/her and that he/she has the +power and authority to grant the Licence. + +Each time You accept the Licence, the original Licensor and subsequent +Contributors grant You a licence to their contributions to the Work, under the +terms of this Licence. + + + +## 7. Disclaimer of Warranty + +The Work is a work in progress, which is continuously improved by numerous +contributors. It is not a finished work and may therefore contain defects or +“bugs” inherent to this type of software development. + +For the above reason, the Work is provided under the Licence on an “as is” basis +and without warranties of any kind concerning the Work, including without +limitation merchantability, fitness for a particular purpose, absence of defects +or errors, accuracy, non-infringement of intellectual property rights other than +copyright as stated in Article 6 of this Licence. + +This disclaimer of warranty is an essential part of the Licence and a condition +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 +persons, the Licensor will in no event be liable for any direct or indirect, +material or moral, damages of any kind, arising out of the Licence or of the use +of the Work, including without limitation, damages for loss of goodwill, work +stoppage, computer failure or malfunction, loss of data or any commercial +damage, even if the Licensor has been advised of the possibility of such +damage. However, the Licensor will be liable under statutory product liability +laws as far such laws apply to the Work. + + + +## 9. Additional agreements + +While distributing the Original Work or Derivative Works, You may choose to +conclude an additional agreement to offer, and charge a fee for, acceptance of +support, warranty, indemnity, or other liability obligations and/or services +consistent with this Licence. However, in accepting such obligations, You may +act only on your own behalf and on your sole responsibility, not on behalf of +the original Licensor or any other Contributor, and only if You agree to +indemnify, defend, and hold each Contributor harmless for any liability incurred +by, or claims asserted against such Contributor by the fact You have accepted +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” +placed under the bottom of a window displaying the text of this Licence or by +affirming consent in any other similar way, in accordance with the rules of +applicable law. Clicking on that icon indicates your clear and irrevocable +acceptance of this Licence and all of its terms and conditions. + +Similarly, you irrevocably accept this Licence and all of its terms and +conditions by exercising any rights granted to You by Article 2 of this Licence, +such as the use of the Work, the creation by You of a Derivative Work or the +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 +electronic communication by You (for example, by offering to download the Work +from a remote location) the distribution channel or media (for example, a +website) must at least provide to the public the information requested by the +applicable law regarding the Licensor, the Licence and the way it may be +accessible, concluded, stored and reproduced by the Licensee. + + + +## 12. Termination of the Licence + +The Licence and the rights granted hereunder will terminate automatically upon +any breach by the Licensee of the terms of the Licence. + +Such a termination will not terminate the licences of any person who has +received the Work from the Licensee under the Licence, provided such persons +remain in full compliance with the Licence. + + + +## 13. Miscellaneous + +Without prejudice of Article 9 above, the Licence represents the complete +agreement between the Parties as to the Work licensed hereunder. + +If any provision of the Licence is invalid or unenforceable under applicable +law, this will not affect the validity or enforceability of the Licence as a +whole. Such provision will be construed and/or reformed so as necessary to make +it valid and enforceable. + +The European Commission may publish other linguistic versions and/or new +versions of this Licence, so far this is required and reasonable, without +reducing the scope of the rights granted by the Licence. New versions of the +Licence will be published with a unique version number. + +All linguistic versions of this Licence, approved by the European Commission, +have identical value. Parties can take advantage of the linguistic version of +their choice. + + + +## 14. Jurisdiction + +Any litigation resulting from the interpretation of this License, arising +between the European Commission, as a Licensor, and any Licensee, will be +subject to the jurisdiction of the Court of Justice of the European Communities, +as laid down in article 238 of the Treaty establishing the European Community. + +Any litigation arising between Parties, other than the European Commission, and +resulting from the interpretation of this License, will be subject to the +exclusive jurisdiction of the competent court where the Licensor resides or +conducts its primary business. + + + +## 15. Applicable Law + +This Licence shall be governed by the law of the European Union country where +the Licensor resides or has his registered office. + +This licence shall be governed by the Belgian law if: + +- a litigation arises between the European Commission, as a Licensor, and any +- Licensee; the Licensor, other than the European Commission, has no residence +- or registered office inside a European Union country. + + + +## Appendix + + + +“Compatible Licences” according to article 5 EUPL are: + + +- GNU General Public License (GNU GPL) v. 2 + +- Open Software License (OSL) v. 2.1, v. 3.0 + +- Common Public License v. 1.0 + +- Eclipse Public License v. 1.0 + +- Cecill v. 2.0 + -- 2.17.1 From 9802ce9e42f7ff06e1aa3406ab2a91e473521014 Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Fri, 19 Jun 2020 23:34:28 -0400 Subject: [PATCH 15/85] Add enforcer for few required files in the project. --- pom.xml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/pom.xml b/pom.xml index b6b8d10..8af74d0 100644 --- a/pom.xml +++ b/pom.xml @@ -898,6 +898,32 @@ + + org.apache.maven.plugins + maven-enforcer-plugin + 3.0.0-M3 + + + enforce-files-exist + + enforce + + + + + + ${project.basedir}/README.md + ${project.basedir}/LICENSE.md + ${project.basedir}/CHANGELOG.md + + + + true + + + + + -- 2.17.1 From 4b88c3e8a25282a06e639f827e33e4485abd1160 Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Sun, 21 Jun 2020 16:09:23 -0400 Subject: [PATCH 16/85] Add enforcer for the version tag in CHANGELOG.md. --- pom.xml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/pom.xml b/pom.xml index 8af74d0..30fce9b 100644 --- a/pom.xml +++ b/pom.xml @@ -924,6 +924,33 @@ + + org.codehaus.gmaven + groovy-maven-plugin + 2.0 + + + process-classes + + execute + + + + tag + + + def fileContents = new File("${project.basedir}/CHANGELOG.md").getText('UTF-8') + matcher = (fileContents =~ /(?s).\[v$project.version\].*?/) + if (!matcher.find()) { + throw new IllegalArgumentException("Tag [v$project.version] not found in CHANGELOG.md") + } + assert matcher[0][1]: "Tag [v$project.version] not found in CHANGELOG.md" + + + + + + -- 2.17.1 From 1959cdf6d8776363813f98cac6b7e755f0e69bad Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Wed, 24 Jun 2020 18:50:41 -0400 Subject: [PATCH 17/85] Add LICENSE.md to META-INF folder when running with staging or release profile. --- pom.xml | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 30fce9b..e485450 100644 --- a/pom.xml +++ b/pom.xml @@ -157,6 +157,15 @@ + + + ${project.basedir} + + LICENSE.md + + META-INF + + org.codehaus.mojo @@ -319,8 +328,17 @@ - + + + ${project.basedir} + + LICENSE.md + + META-INF + + + org.codehaus.mojo build-helper-maven-plugin @@ -448,8 +466,17 @@ - + + + ${project.basedir} + + LICENSE.md + + META-INF + + + org.codehaus.mojo build-helper-maven-plugin @@ -942,9 +969,9 @@ def fileContents = new File("${project.basedir}/CHANGELOG.md").getText('UTF-8') matcher = (fileContents =~ /(?s).\[v$project.version\].*?/) if (!matcher.find()) { - throw new IllegalArgumentException("Tag [v$project.version] not found in CHANGELOG.md") + throw new IllegalArgumentException("Tag [v$project.version] not found in ${project.basedir}/CHANGELOG.md") } - assert matcher[0][1]: "Tag [v$project.version] not found in CHANGELOG.md" + assert matcher[0][1]: "Tag [v$project.version] not found in ${project.basedir}/CHANGELOG.md" -- 2.17.1 From f8a4a175b9618624b01481d8177fc8d8490b12c1 Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Wed, 24 Jun 2020 21:21:05 -0400 Subject: [PATCH 18/85] Update README with the new enforcements. --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index caf0c60..6a2fced 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,8 @@ A parent pom for all the gCube artifacts. * Java 8 (target and source) * 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 +* CHANGELOG.md must declare a tag [v+Pom version] (e.g. [v1.0.0]) # Build Profiles -- 2.17.1 From 6acb0b5b6697b58bef06ddff2bcab891829204e3 Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Mon, 6 Jul 2020 13:43:41 -0400 Subject: [PATCH 19/85] Remove release numbers from changelog. --- CHANGELOG.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 415795e..1141b31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Changelog for Maven-Parent -## [v1.1.0] [r4.23.0] 2020-01-27 +## [v1.1.0] - 2020-01-27 + +### Features * New build profiles to support CI/CD * Enforcement for: @@ -8,5 +10,5 @@ * OpenJDK as target Java VM. * Maven 3.3.9+ -## [v1.0.0] [r4.0.0] 2017-12-20 +## [v1.0.0] - 2017-12-20 -- 2.17.1 From 7f10392c8f900ace99a87b20a9f75aaa89c36cde Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Mon, 13 Jul 2020 13:51:21 -0400 Subject: [PATCH 20/85] Use a unique version of enforcer plugin. --- pom.xml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index e485450..75ae091 100644 --- a/pom.xml +++ b/pom.xml @@ -653,7 +653,6 @@ org.apache.maven.plugins maven-enforcer-plugin - 1.0.1 enforce @@ -804,7 +803,6 @@ org.apache.maven.plugins maven-enforcer-plugin - 1.0.1 enforce @@ -885,7 +883,7 @@ org.apache.maven.plugins maven-enforcer-plugin - + 3.0.0-M3 org.codehaus.mojo @@ -928,7 +926,6 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.0.0-M3 enforce-files-exist -- 2.17.1 From 73686d24d12f421f1a3c14afe32c5c8630d8c677 Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Mon, 13 Jul 2020 14:01:36 -0400 Subject: [PATCH 21/85] Attach the executions to the declaration of the enforcer plugin. --- pom.xml | 44 ++++++++++++++++++++------------------------ 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/pom.xml b/pom.xml index 75ae091..2b053d8 100644 --- a/pom.xml +++ b/pom.xml @@ -884,6 +884,26 @@ org.apache.maven.plugins maven-enforcer-plugin 3.0.0-M3 + + + enforce-files-exist + + enforce + + + + + + ${project.basedir}/README.md + ${project.basedir}/LICENSE.md + ${project.basedir}/CHANGELOG.md + + + + true + + + org.codehaus.mojo @@ -923,30 +943,6 @@ - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-files-exist - - enforce - - - - - - ${project.basedir}/README.md - ${project.basedir}/LICENSE.md - ${project.basedir}/CHANGELOG.md - - - - true - - - - org.codehaus.gmaven -- 2.17.1 From d30c8dcc3f135dbdbf40261fa40094eaa2987164 Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Mon, 13 Jul 2020 14:06:41 -0400 Subject: [PATCH 22/85] Use a unique version of build helper plugin. --- pom.xml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 2b053d8..1b4fa6f 100644 --- a/pom.xml +++ b/pom.xml @@ -170,7 +170,6 @@ org.codehaus.mojo build-helper-maven-plugin - 3.0.0 -- 2.17.1 From 44d2106149469e4bd00bd9700358dee0acf8552d Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Mon, 13 Jul 2020 14:09:52 -0400 Subject: [PATCH 24/85] Remove service archive generation. --- pom.xml | 101 -------------------------------------------------------- 1 file changed, 101 deletions(-) diff --git a/pom.xml b/pom.xml index 6467fc6..fb6f31b 100644 --- a/pom.xml +++ b/pom.xml @@ -676,107 +676,6 @@ - - org.apache.maven.plugins - maven-assembly-plugin - 2.6 - - - org.gcube.tools - shared-assemblies - 1.1.0 - - - - - - make-uberjar - - - gcube-uberjar - - - - - - true - - - single - - - - - - make-servicearchive - - - gcube-default-servicearchive - - - - - - - true - - - single - - - - - make-source-package - - - gcube-source-package - - - - - - - true - - - single - - - - org.apache.maven.plugins -- 2.17.1 From bdf23e25be5d2ca7e0bf9194422d92e8c7acf767 Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Thu, 23 Jul 2020 23:17:15 -0400 Subject: [PATCH 25/85] 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 @@ + + org.apache.maven.plugins + maven-assembly-plugin + 2.6 + + + org.gcube.tools + shared-assemblies + 1.1.0 + + + + + + make-uberjar + + + gcube-uberjar + + + + + + true + + + single + + + + + + make-servicearchive + + + gcube-default-servicearchive + + + + + + + true + + + single + + + + + make-source-package + + + gcube-source-package + + + + + + + true + + + single + + + + org.apache.maven.plugins -- 2.17.1 From e6051b8b74dadb1851d9ae4b7c14b822f6a04716 Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Fri, 24 Jul 2020 23:16:36 -0400 Subject: [PATCH 26/85] 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 @@ org.apache.maven.plugins maven-assembly-plugin - 2.6 + ${plugin.assembly.version} make-source-package @@ -170,6 +170,7 @@ org.codehaus.mojo build-helper-maven-plugin + ${plugin.build.helper.version} org.apache.maven.plugins maven-enforcer-plugin - 3.0.0-M3 + ${plugin.enforcer.version} enforce-files-exist @@ -905,13 +911,13 @@ org.codehaus.mojo build-helper-maven-plugin - 3.0.0 + ${plugin.build.helper.version} org.apache.maven.plugins maven-source-plugin - 2.1.2 + ${plugin.source.version} generate-sources @@ -926,7 +932,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.8 + ${plugin.javadoc.version} generate-doc @@ -973,6 +979,19 @@ + + 3.0.0-M3 + 1.4 + 3.0.0 + 3.0.0-M1 + 1.0.0 + 3.1.2 + 3.2.3 + 2.6 + 3.8.1 + 2.1.2 + 2.8 + distro -- 2.17.1 From 01a4ecb6e6dfa085a433384466d3a1cf2c1fc246 Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Sat, 25 Jul 2020 16:41:42 -0400 Subject: [PATCH 27/85] 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 @@ ${plugin.build.helper.version} + + maven-resources-plugin + ${plugin.resources.version} + + + copy-web-inf + validate + + copy-resources + + + ${project.build.outputDirectory}/WEB-INF + + + gcube/extra-resources/WEB-INF + true + + + + + + copy-meta-inf + validate + + copy-resources + + + ${project.build.outputDirectory}/META-INF + + + gcube/extra-resources/META-INF + true + + + + + + + org.apache.maven.plugins maven-source-plugin @@ -991,6 +1030,7 @@ 3.8.1 2.1.2 2.8 + 3.1.0 distro -- 2.17.1 From 411c6cde4c4c18f1330619a433d993fb324f5091 Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Sat, 25 Jul 2020 16:44:15 -0400 Subject: [PATCH 28/85] 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 @@ META-INF + + ${project.basedir}/src/main/resources/META-INF + META-INF + + ${project.basedir}/src/main/resources/WEB-INF + WEB-INF + -- 2.17.1 From ecb4487ab45b9823da72bd9293d71082b493c7da Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Fri, 31 Jul 2020 17:38:04 +0200 Subject: [PATCH 29/85] 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 @@ org.apache.maven.plugins maven-enforcer-plugin - ${plugin.enforcer.version} + ${plugin.enforcer.version} enforce -- 2.17.1 From d8ef1cf792e8168ac9efbe4c02e03ddd4d8bf966 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Thu, 6 Aug 2020 17:27:30 +0200 Subject: [PATCH 30/85] 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 @@ copy-resources - ${project.build.outputDirectory}/WEB-INF + ${project.build.directory}/${project.build.finalName}/WEB-INF gcube/extra-resources/WEB-INF @@ -948,7 +948,7 @@ copy-resources - ${project.build.outputDirectory}/META-INF + ${project.build.directory}/${project.build.finalName}/META-INF gcube/extra-resources/META-INF -- 2.17.1 From e1c2282b2dcf995323c38eeeb0174decf8358a8f Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Fri, 7 Aug 2020 09:53:59 -0400 Subject: [PATCH 31/85] 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 @@ LICENSE.md - META-INF + ${basedir}/target/classes/META-INF/ ${project.basedir}/src/main/resources/META-INF - META-INF + ${basedir}/target/classes/META-INF/ ${project.basedir}/src/main/resources/WEB-INF - WEB-INF + ${basedir}/target/classes/WEB-INF/ @@ -932,7 +932,7 @@ copy-resources - ${project.build.directory}/${project.build.finalName}/WEB-INF + ${basedir}/target/classes/WEB-INF/ gcube/extra-resources/WEB-INF @@ -948,7 +948,7 @@ copy-resources - ${project.build.directory}/${project.build.finalName}/META-INF + ${basedir}/target/classes/META-INF/ gcube/extra-resources/META-INF -- 2.17.1 From 3ba07236813dfdad253e88eefe1f1f59882174de Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Fri, 7 Aug 2020 23:38:33 -0400 Subject: [PATCH 32/85] 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 @@ - - - ${project.basedir} - - LICENSE.md - - ${basedir}/target/classes/META-INF/ - - - ${project.basedir}/src/main/resources/META-INF - ${basedir}/target/classes/META-INF/ - - ${project.basedir}/src/main/resources/WEB-INF - ${basedir}/target/classes/WEB-INF/ - - org.codehaus.mojo @@ -334,16 +318,8 @@ ${repository.releases.url} + - - - ${project.basedir} - - LICENSE.md - - META-INF - - @@ -473,15 +449,6 @@ - - - ${project.basedir} - - LICENSE.md - - META-INF - - @@ -618,6 +585,8 @@ + + org.apache.maven.plugins maven-jar-plugin @@ -880,7 +849,7 @@ - + @@ -921,18 +890,69 @@ ${plugin.build.helper.version} + + org.apache.maven.plugins + maven-antrun-plugin + 1.7 + + + print + compile + + run + + + + ******** Displaying value of *.outputDirectory properties ******** + project.metainf.outputDirectory=${project.metainf.outputDirectory} + project.webinf.outputDirectory=${project.webinf.outputDirectory} + + + + + set-vars + validate + + true + + + + + + + + + + + + + + + + + + run + + + + maven-resources-plugin ${plugin.resources.version} copy-web-inf - validate + generate-resources copy-resources - ${basedir}/target/classes/WEB-INF/ + ${project.webinf.outputDirectory} gcube/extra-resources/WEB-INF @@ -943,12 +963,12 @@ copy-meta-inf - validate + generate-resources copy-resources - ${basedir}/target/classes/META-INF/ + ${project.metainf.outputDirectory} gcube/extra-resources/META-INF @@ -957,6 +977,25 @@ + + copy-license + compile + + copy-resources + + + ${project.metainf.outputDirectory} + + + ${project.basedir} + + LICENSE.md + + true + + + + @@ -1032,7 +1071,7 @@ 3.0.0-M1 1.0.0 3.1.2 - 3.2.3 + 3.3.1 2.6 3.8.1 2.1.2 -- 2.17.1 From e944343a45ef5f411251fc3d6955e15410079941 Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Sun, 9 Aug 2020 17:09:36 -0400 Subject: [PATCH 33/85] Surefire plugin: migrate the deprecated forkMode parameter to forkCount and reuseForks. --- pom.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c4081df..a49e51a 100644 --- a/pom.xml +++ b/pom.xml @@ -762,9 +762,13 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M3 + 3.0.0-M5 - always + classes + 10 + 3 + true + ${project.build.directory}/surefire-reports -- 2.17.1 From 0570f634ecd88c047c7ae77b4a03f94b6f1cac79 Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Tue, 11 Aug 2020 13:56:17 -0400 Subject: [PATCH 34/85] Define and use the project.test.outputDirectory property. --- pom.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a49e51a..165ec31 100644 --- a/pom.xml +++ b/pom.xml @@ -768,7 +768,7 @@ 10 3 true - ${project.build.directory}/surefire-reports + ${project.test.outputDirectory} @@ -1085,6 +1085,8 @@ distro + ${project.build.directory}/surefire-reports + 1.8 .*OpenJDK.* ${java_version} -- 2.17.1 From b8437f7047cedcecec97ee7b26c2a9433b4a7e17 Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Sun, 27 Sep 2020 22:57:58 -0400 Subject: [PATCH 35/85] Advance antrun plugin to 3.0. Move the dynamic properties to generate-resources phase. --- pom.xml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/pom.xml b/pom.xml index 165ec31..515ccf9 100644 --- a/pom.xml +++ b/pom.xml @@ -897,28 +897,14 @@ org.apache.maven.plugins maven-antrun-plugin - 1.7 + 3.0.0 - - print - compile - - run - - - - ******** Displaying value of *.outputDirectory properties ******** - project.metainf.outputDirectory=${project.metainf.outputDirectory} - project.webinf.outputDirectory=${project.webinf.outputDirectory} - - - set-vars - validate + generate-resources true - + @@ -943,6 +929,20 @@ run + + print + compile + + run + + + + ******** Displaying value of *.outputDirectory properties ******** + project.metainf.outputDirectory=${project.metainf.outputDirectory} + project.webinf.outputDirectory=${project.webinf.outputDirectory} + + + -- 2.17.1 From b176b8f311e2382cf00ae8a3a6bfaba912183c25 Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Mon, 28 Sep 2020 16:33:54 +0200 Subject: [PATCH 36/85] Ignore validation of antrun and resources' plugins. --- pom.xml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/pom.xml b/pom.xml index 515ccf9..d2a75df 100644 --- a/pom.xml +++ b/pom.xml @@ -780,6 +780,19 @@ + + + org.apache.maven.plugins + maven-antrun-plugin + [1.8,) + + run + + + + + + org.apache.maven.plugins @@ -834,6 +847,19 @@ + + + org.apache.maven.plugins + maven-resources-plugin + ${plugin.resources.version} + + copy-resources + + + + + + -- 2.17.1 From 4f309ea0da0a81c5467f1be959fe3330067c4e1f Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Mon, 28 Sep 2020 11:10:55 -0400 Subject: [PATCH 37/85] Reformat code. --- pom.xml | 2581 +++++++++++++++++++++++++++---------------------------- 1 file changed, 1289 insertions(+), 1292 deletions(-) diff --git a/pom.xml b/pom.xml index d2a75df..3070e13 100644 --- a/pom.xml +++ b/pom.xml @@ -1,682 +1,688 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 4.0.0 + 4.0.0 - org.gcube.tools - maven-parent - 1.1.0 - pom + org.gcube.tools + maven-parent + 1.1.0 + pom - - scm:git:https://code-repo.d4science.org/gCubeSystem/maven-parent.git - scm:git:https://code-repo.d4science.org/gCubeSystem/maven-parent.git - https://code-repo.d4science.org/gCubeSystem/maven-parent - HEAD - + + scm:git:https://code-repo.d4science.org/gCubeSystem/maven-parent.git + scm:git:https://code-repo.d4science.org/gCubeSystem/maven-parent.git + https://code-repo.d4science.org/gCubeSystem/maven-parent + HEAD + - - - - gcube-snapshots - gCube Snapshots - http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-snapshots - - false - - - true - - - - gcube-releases - gCube Releases - http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-releases - - false - - - true - - + + + + gcube-snapshots + gCube Snapshots + http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-snapshots + + false + + + true + + + + gcube-releases + gCube Releases + http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-releases + + false + + + true + + - - gcube-staging-jenkins - gCube Jenkins Staging - http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-staging-jenkins - - false - - - true - - + + gcube-staging-jenkins + gCube Jenkins Staging + http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-staging-jenkins + + false + + + true + + - - gcube-staging - gCube Staging - http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-staging/ - - false - - - true - - + + gcube-staging + gCube Staging + http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-staging/ + + false + + + true + + - - gcube-externals - gCube Externals - http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-externals - - false - - - true - - - + + gcube-externals + gCube Externals + http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-externals + + false + + + true + + + - + - - - disable-java8-doclint - - [1.8,) - - - -Xdoclint:none - - + + disable-java8-doclint + + [1.8,) + + + -Xdoclint:none + + - - - generate-distribution-packages - - - generateDistribution - true - - - - - - org.apache.maven.plugins - maven-assembly-plugin - ${plugin.assembly.version} - - - make-source-package - install - - - - - - + + + generate-distribution-packages + + + generateDistribution + true + + + + + + org.apache.maven.plugins + maven-assembly-plugin + ${plugin.assembly.version} + + + make-source-package + install + + + + + + - - gcube-developer - - - true - + + gcube-developer + + + true + - - - - gcube-snapshots - gCube Snapshots - ${repository.snapshots.url} - - - gcube-releases - gCube Releases - ${repository.releases.url} - - - gcube-externals - gCube Externals - ${repository.externals.readonly} - - + + + + gcube-snapshots + gCube Snapshots + ${repository.snapshots.url} + + + gcube-releases + gCube Releases + ${repository.releases.url} + + + gcube-externals + gCube Externals + ${repository.externals.readonly} + + - - - - gcube-snapshots - gCube Snapshots - ${repository.snapshots.url} - - + + + + gcube-snapshots + gCube Snapshots + ${repository.snapshots.url} + + - - - - org.codehaus.mojo - build-helper-maven-plugin - ${plugin.build.helper.version} - - - - build-helper-regex-is-snapshot-used - validate - - regex-property - - - skip.when.is.release.used - ${project.version} - ^((?!-SNAPSHOT).)*$ - true - false - - - - - - org.apache.maven.plugins - maven-deploy-plugin - ${plugin.deploy.version} - - ${skip.when.is.release.used} - - - - - + build-helper-regex-is-snapshot-used + validate + + regex-property + + + skip.when.is.release.used + ${project.version} + ^((?!-SNAPSHOT).)*$ + true + false + + + + + + org.apache.maven.plugins + maven-deploy-plugin + ${plugin.deploy.version} + + ${skip.when.is.release.used} + + + + + - - jenkins-snapshots - - false - - jenkins-snapshots - true - - + + jenkins-snapshots + + false + + jenkins-snapshots + true + + - - - - gcube-snapshots - gCube Snapshots - ${repository.snapshots.url} - - - gcube-releases - gCube Releases - ${repository.releases.url} - - - gcube-externals - gCube Externals - ${repository.externals.readonly} - - + + + + gcube-snapshots + gCube Snapshots + ${repository.snapshots.url} + + + gcube-releases + gCube Releases + ${repository.releases.url} + + + gcube-externals + gCube Externals + ${repository.externals.readonly} + + - - - - gcube-snapshots - gCube Snapshots - ${repository.snapshots.url} - - - - - - org.codehaus.mojo - build-helper-maven-plugin - ${plugin.build.helper.version} - - - + + + gcube-snapshots + gCube Snapshots + ${repository.snapshots.url} + + + + + + org.codehaus.mojo + build-helper-maven-plugin + ${plugin.build.helper.version} + + + - build-helper-regex-is-snapshot-used - validate - - regex-property - - - skip.when.is.release.used - ${project.version} - ^((?!.*-SNAPSHOT).)*$ - true - false - - - - - - org.apache.maven.plugins - maven-deploy-plugin - ${plugin.deploy.version} - - ${skip.when.is.release.used} - - - - org.apache.maven.plugins - maven-install-plugin - 2.4 - - ${skip.when.is.release.used} - - - - - + build-helper-regex-is-snapshot-used + validate + + regex-property + + + skip.when.is.release.used + ${project.version} + ^((?!.*-SNAPSHOT).)*$ + true + false + + + + + + org.apache.maven.plugins + maven-deploy-plugin + ${plugin.deploy.version} + + ${skip.when.is.release.used} + + + + org.apache.maven.plugins + maven-install-plugin + 2.4 + + ${skip.when.is.release.used} + + + + + - - jenkins-releases + + jenkins-releases - - false - - jenkins-releases - true - - + + false + + jenkins-releases + true + + - - - - gcube-releases - gCube Releases - ${repository.releases.url} - - - gcube-jenkins-staging - gCube Jenkins Staging - ${repository.jenkins.staging.url} - - - gcube-staging - gCube Staging - ${repository.staging.url} - - - gcube-externals - gCube Externals - ${repository.externals.readonly} - - + + + + gcube-releases + gCube Releases + ${repository.releases.url} + + + gcube-jenkins-staging + gCube Jenkins Staging + ${repository.jenkins.staging.url} + + + gcube-staging + gCube Staging + ${repository.staging.url} + + + gcube-externals + gCube Externals + ${repository.externals.readonly} + + - - - - gcube-releases - gCube Releases - ${repository.releases.url} - - + + + + gcube-releases + gCube Releases + ${repository.releases.url} + + - + - - - org.codehaus.mojo - build-helper-maven-plugin - ${plugin.build.helper.version} - - - - build-helper-regex-is-snapshot-used - validate - - regex-property - - - skip.when.is.snapshot.used - ${project.version} - .*-SNAPSHOT$ - true - false - - - - - fail-helper-regex-is-snapshot-used - validate - - regex-property - - - fail.when.is.snapshot.used - ${project.version} - ^((?!.*-SNAPSHOT).)*$ - true - - - - - - org.apache.maven.plugins - maven-deploy-plugin - ${plugin.deploy.version} - - - fail-if-snapshot-used - deploy - - ${skip.when.is.snapshot.used} - - - - - - io.github.olivierlemasle.maven - plaintext-maven-plugin - ${plugin.plaintext.version} - - ${env.MAVEN_CONFIG_FOLDER} - - - build_commits.csv - true - - ${project.groupId},${project.artifactId},${project.version},${project.scm.url},${buildNumber},${repository.releases.url},${project.build.finalName},${project.packaging} - - - - - - - generate-file - package - - write - - - - - + build-helper-regex-is-snapshot-used + validate + + regex-property + + + skip.when.is.snapshot.used + ${project.version} + .*-SNAPSHOT$ + true + false + + + + + fail-helper-regex-is-snapshot-used + validate + + regex-property + + + fail.when.is.snapshot.used + ${project.version} + ^((?!.*-SNAPSHOT).)*$ + true + + + + + + org.apache.maven.plugins + maven-deploy-plugin + ${plugin.deploy.version} + + + fail-if-snapshot-used + deploy + + ${skip.when.is.snapshot.used} + + + + + + io.github.olivierlemasle.maven + plaintext-maven-plugin + ${plugin.plaintext.version} + + ${env.MAVEN_CONFIG_FOLDER} + + + build_commits.csv + true + + + ${project.groupId},${project.artifactId},${project.version},${project.scm.url},${buildNumber},${repository.releases.url},${project.build.finalName},${project.packaging} + + + + + + + + generate-file + package + + write + + + + + - ${project.artifactId}-${project.version} + ${project.artifactId}-${project.version} - - + + - - jenkins-staging - - false - - jenkins-staging - true - - + + jenkins-staging + + false + + jenkins-staging + true + + - - - - gcube-staging-jenkins - gCube Jenkins Staging - ${repository.jenkins.staging.url} - - - gcube-staging - gCube Staging - ${repository.staging.url} - - - gcube-releases - gCube Releases - ${repository.releases.url} - - - gcube-externals - gCube Externals - ${repository.externals.readonly} - - + + + + gcube-staging-jenkins + gCube Jenkins Staging + ${repository.jenkins.staging.url} + + + gcube-staging + gCube Staging + ${repository.staging.url} + + + gcube-releases + gCube Releases + ${repository.releases.url} + + + gcube-externals + gCube Externals + ${repository.externals.readonly} + + - - - - gcube-staging-jenkins - gCube Staging - ${repository.jenkins.staging.url} - - - + + + + gcube-staging-jenkins + gCube Staging + ${repository.jenkins.staging.url} + + + - - - org.codehaus.mojo - build-helper-maven-plugin - ${plugin.build.helper.version} - - - - build-helper-regex-is-snapshot-used - validate - - regex-property - - - skip.when.is.snapshot.used - ${project.version} - .*-SNAPSHOT$ - true - false - - - - - fail-helper-regex-is-snapshot-used - validate - - regex-property - - - fail.when.is.snapshot.used - ${project.version} - ^((?!.*-SNAPSHOT).)*$ - true - - - - - - io.github.olivierlemasle.maven - plaintext-maven-plugin - ${plugin.plaintext.version} - - ${env.MAVEN_CONFIG_FOLDER} - - - build_commits.csv - true - - ${project.groupId},${project.artifactId},${project.version},${project.scm.url},${buildNumber},${repository.jenkins.staging.url},${project.build.finalName},${project.packaging} - - - - - - - generate-file - package - - write - - - - - - org.apache.maven.plugins - maven-deploy-plugin - ${plugin.deploy.version} - - - fail-if-snapshot-used - deploy - - ${skip.when.is.snapshot.used} - - - - - - ${project.artifactId}-${project.version} - - + build-helper-regex-is-snapshot-used + validate + + regex-property + + + skip.when.is.snapshot.used + ${project.version} + .*-SNAPSHOT$ + true + false + + + + + fail-helper-regex-is-snapshot-used + validate + + regex-property + + + fail.when.is.snapshot.used + ${project.version} + ^((?!.*-SNAPSHOT).)*$ + true + + + + + + io.github.olivierlemasle.maven + plaintext-maven-plugin + ${plugin.plaintext.version} + + ${env.MAVEN_CONFIG_FOLDER} + + + build_commits.csv + true + + + ${project.groupId},${project.artifactId},${project.version},${project.scm.url},${buildNumber},${repository.jenkins.staging.url},${project.build.finalName},${project.packaging} + + + + + + + + generate-file + package + + write + + + + + + org.apache.maven.plugins + maven-deploy-plugin + ${plugin.deploy.version} + + + fail-if-snapshot-used + deploy + + ${skip.when.is.snapshot.used} + + + + + + ${project.artifactId}-${project.version} + + - - dry-run - - false - - build-dry-run - true - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - ${plugin.deploy.version} - - true - - - - - - - + + dry-run + + false + + build-dry-run + true + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + ${plugin.deploy.version} + + true + + + + + + + - + - - - - org.codehaus.mojo - buildnumber-maven-plugin - ${plugin.buildnumber.version} - - - useLastCommittedRevision - validate - - create - - - true - scmBranch - false - false - - - + + + + org.codehaus.mojo + buildnumber-maven-plugin + ${plugin.buildnumber.version} + + + useLastCommittedRevision + validate + + create + + + true + scmBranch + false + false + + + - + - - org.apache.maven.plugins - maven-jar-plugin - ${plugin.jar.version} - - - - true - true - - - ${buildNumber} - ${maven.build.timestamp} - ${scmBranch} - ${project.scm.url}/commit/${buildNumber} - - - - + + org.apache.maven.plugins + maven-jar-plugin + ${plugin.jar.version} + + + + true + true + + + ${buildNumber} + ${maven.build.timestamp} + ${scmBranch} + ${project.scm.url}/commit/${buildNumber} + + + + - - org.apache.maven.plugins - maven-war-plugin - ${plugin.war.version} - - - - true - true - - - ${buildNumber} - ${maven.build.timestamp} - ${scmBranch} - ${project.scm.url}/commit/${buildNumber} - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - ${plugin.enforcer.version} - - - enforce - validate - - enforce - - - - - [${maven.version},) - Check for Maven version >=${maven.version} failed. Update your Maven install. - - - - java.vm.name - Java Vendor must be OpenJDK. - ${java.expected.vm} - Java Vendor must be OpenJDK. Found: ${java.vm.name} - - - - - - - - org.apache.maven.plugins - maven-assembly-plugin - ${plugin.assembly.version} - - - org.gcube.tools - shared-assemblies - 1.1.0 - - - - - - make-uberjar - - - gcube-uberjar - - + + make-uberjar + + + gcube-uberjar + + - + - - true - - - single - - + true + + + single + + - - - make-servicearchive - - - gcube-default-servicearchive - + + + make-servicearchive + + + gcube-default-servicearchive + - - + - - true - - - single - - - - - make-source-package - - - gcube-source-package - + true + + + single + + + + + make-source-package + + + gcube-source-package + - - + - - true - - - single - - - - + true + + + single + + + + - - org.apache.maven.plugins - maven-surefire-plugin - 3.0.0-M5 - - classes - 10 - 3 - true - ${project.test.outputDirectory} - - + + org.apache.maven.plugins + maven-surefire-plugin + 3.0.0-M5 + + classes + 10 + 3 + true + ${project.test.outputDirectory} + + - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + - - org.apache.maven.plugins - maven-antrun-plugin - [1.8,) - - run - - - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - ${plugin.enforcer.version} - - enforce - - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 3.1.1 - - unpack - copy-dependencies - - - - - - - - - org.gcube.tools - maven-service-plugin - 1.0.0 - - stub-gen - - - - - - - - - org.gcube.tools - maven-service-plugin - 1.0.0 - - gar-gen - local-deploy - - - - - - + + org.apache.maven.plugins + maven-antrun-plugin + [1.8,) + + run + + + + + + - - org.apache.maven.plugins - maven-resources-plugin - ${plugin.resources.version} - - copy-resources - - - - - - - - - - + + org.apache.maven.plugins + maven-enforcer-plugin + ${plugin.enforcer.version} + + enforce + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 3.1.1 + + unpack + copy-dependencies + + + + + + + + + org.gcube.tools + maven-service-plugin + 1.0.0 + + stub-gen + + + + + + + + + org.gcube.tools + maven-service-plugin + 1.0.0 + + gar-gen + local-deploy + + + + + + + + + org.apache.maven.plugins + maven-resources-plugin + ${plugin.resources.version} + + copy-resources + + + + + + + + + + - - - org.apache.maven.plugins - maven-compiler-plugin - ${plugin.compiler.version} - - ${maven.compiler.target} - ${maven.compiler.source} - - - - + + + org.apache.maven.plugins + maven-compiler-plugin + ${plugin.compiler.version} + + ${maven.compiler.target} + ${maven.compiler.source} + + + + - - + + - - org.codehaus.mojo - buildnumber-maven-plugin + + org.codehaus.mojo + buildnumber-maven-plugin ${plugin.buildnumber.version} - - - org.apache.maven.plugins - maven-enforcer-plugin - ${plugin.enforcer.version} - - - enforce-files-exist - - enforce - - - - - - ${project.basedir}/README.md - ${project.basedir}/LICENSE.md - ${project.basedir}/CHANGELOG.md - - - - true - - - - - - org.codehaus.mojo - build-helper-maven-plugin + + + org.apache.maven.plugins + maven-enforcer-plugin + ${plugin.enforcer.version} + + + enforce-files-exist + + enforce + + + + + + ${project.basedir}/README.md + ${project.basedir}/LICENSE.md + ${project.basedir}/CHANGELOG.md + + + + true + + + + + + org.codehaus.mojo + build-helper-maven-plugin ${plugin.build.helper.version} - - org.apache.maven.plugins - maven-antrun-plugin - 3.0.0 - - - set-vars - generate-resources - - true - - - - - - - - - - - - - - - - - - run - - - - print - compile - - run - - - - ******** Displaying value of *.outputDirectory properties ******** - project.metainf.outputDirectory=${project.metainf.outputDirectory} - project.webinf.outputDirectory=${project.webinf.outputDirectory} - - - - - - - maven-resources-plugin - ${plugin.resources.version} - - - copy-web-inf - generate-resources - - copy-resources - - - ${project.webinf.outputDirectory} - - - gcube/extra-resources/WEB-INF - true - - - - - - copy-meta-inf - generate-resources - - copy-resources - - - ${project.metainf.outputDirectory} - - - gcube/extra-resources/META-INF - true - - - - - - copy-license - compile - - copy-resources - - - ${project.metainf.outputDirectory} - - - ${project.basedir} - - LICENSE.md - - true - - - - - - - - - org.apache.maven.plugins - maven-source-plugin - ${plugin.source.version} - - - generate-sources - install - - jar - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${plugin.javadoc.version} - - - generate-doc - install - - jar - - - ${javadoc.opts} - - - - - - - - org.codehaus.gmaven - groovy-maven-plugin - 2.0 - - - process-classes - - execute - - - - tag - - - def fileContents = new File("${project.basedir}/CHANGELOG.md").getText('UTF-8') - matcher = (fileContents =~ /(?s).\[v$project.version\].*?/) - if (!matcher.find()) { - throw new IllegalArgumentException("Tag [v$project.version] not found in ${project.basedir}/CHANGELOG.md") - } - assert matcher[0][1]: "Tag [v$project.version] not found in ${project.basedir}/CHANGELOG.md" - - - - - - - - - - - - 3.0.0-M3 - 1.4 - 3.0.0 - 3.0.0-M1 - 1.0.0 - 3.1.2 - 3.3.1 - 2.6 - 3.8.1 - 2.1.2 - 2.8 - 3.1.0 - - - distro - - ${project.build.directory}/surefire-reports - - 1.8 - .*OpenJDK.* - ${java_version} - ${java_version} - - UTF-8 - 3.3.9 - http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-snapshots - http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-releases - http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-staging-jenkins - http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-staging/ - - http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-externals - - - - https://wiki.gcube-system.org/gcube/index.php - yyyyMMdd-HHmmss - ${maven.build.timestamp} - https://support.d4science.org/projects/gcube/ - https://www.gcube-system.org/ - - This software is part of the gCube Framework (https://www.gcube-system.org/): an - open-source software toolkit used for building and operating Hybrid Data - Infrastructures enabling the dynamic deployment of Virtual Research Environments - by favouring the realisation of reuse oriented policies. - - - The projects leading to this software have received funding from a series of - European Union programmes including: - * the Sixth Framework Programme for Research and Technological Development - - DILIGENT (grant no. 004260); - * the Seventh Framework Programme for research, technological development and - demonstration - D4Science (grant no. 212488), D4Science-II (grant no. - 239019),ENVRI (grant no. 283465), EUBrazilOpenBio (grant no. 288754), iMarine - (grant no. 283644); - * the H2020 research and innovation programme - BlueBRIDGE (grant no. 675680), - EGIEngage (grant no. 654142), ENVRIplus (grant no. 654182), Parthenos (grant - no. 654119), SoBigData (grant no. 654024), AGINFRA PLUS (grant no. 731001). - - - European Union Public Licence V. 1.1 - - - EUPL © the European Community 2007 - - - This European Union Public Licence (the “EUPL”) applies to the Work or Software - (as defined below) which is provided under the terms of this Licence. Any use of - the Work, other than as authorised under this Licence is prohibited (to the - extent such use is covered by a right of the copyright holder of the Work). + + + + + + + run + + + + print + compile + + run + + + + ******** Displaying value of *.outputDirectory properties ******** + project.metainf.outputDirectory=${project.metainf.outputDirectory} + project.webinf.outputDirectory=${project.webinf.outputDirectory} + + + + + + + maven-resources-plugin + ${plugin.resources.version} + + + copy-web-inf + generate-resources + + copy-resources + + + ${project.webinf.outputDirectory} + + + gcube/extra-resources/WEB-INF + true + + + + + + copy-meta-inf + generate-resources + + copy-resources + + + ${project.metainf.outputDirectory} + + + gcube/extra-resources/META-INF + true + + + + + + copy-license + compile + + copy-resources + + + ${project.metainf.outputDirectory} + + + ${project.basedir} + + LICENSE.md + + true + + + + + + + + + org.apache.maven.plugins + maven-source-plugin + ${plugin.source.version} + + + generate-sources + install + + jar + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${plugin.javadoc.version} + + + generate-doc + install + + jar + + + ${javadoc.opts} + + + + + + + + org.codehaus.gmaven + groovy-maven-plugin + 2.0 + + + process-classes + + execute + + + + tag + + + def fileContents = new File("${project.basedir}/CHANGELOG.md").getText('UTF-8') + matcher = (fileContents =~ /(?s).\[v$project.version\].*?/) + if (!matcher.find()) { + throw new IllegalArgumentException("Tag [v$project.version] not found in ${project.basedir}/CHANGELOG.md") + } + assert matcher[0][1]: "Tag [v$project.version] not found in ${project.basedir}/CHANGELOG.md" + + + + + + + + + + + + 3.0.0-M3 + 1.4 + 3.0.0 + 3.0.0-M1 + 1.0.0 + 3.1.2 + 3.3.1 + 2.6 + 3.8.1 + 2.1.2 + 2.8 + 3.1.0 + + + distro + + ${project.build.directory}/surefire-reports + + 1.8 + .*OpenJDK.* + ${java_version} + ${java_version} + + UTF-8 + 3.3.9 + http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-snapshots + + http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-releases + + + http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-staging-jenkins + + http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-staging/ + + + + http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-externals + + + + + https://wiki.gcube-system.org/gcube/index.php + yyyyMMdd-HHmmss + ${maven.build.timestamp} + https://support.d4science.org/projects/gcube/ + https://www.gcube-system.org/ + + This software is part of the gCube Framework (https://www.gcube-system.org/): an + open-source software toolkit used for building and operating Hybrid Data + Infrastructures enabling the dynamic deployment of Virtual Research Environments + by favouring the realisation of reuse oriented policies. + + + The projects leading to this software have received funding from a series of + European Union programmes including: + * the Sixth Framework Programme for Research and Technological Development - + DILIGENT (grant no. 004260); + * the Seventh Framework Programme for research, technological development and + demonstration - D4Science (grant no. 212488), D4Science-II (grant no. + 239019),ENVRI (grant no. 283465), EUBrazilOpenBio (grant no. 288754), iMarine + (grant no. 283644); + * the H2020 research and innovation programme - BlueBRIDGE (grant no. 675680), + EGIEngage (grant no. 654142), ENVRIplus (grant no. 654182), Parthenos (grant + no. 654119), SoBigData (grant no. 654024), AGINFRA PLUS (grant no. 731001). + + + European Union Public Licence V. 1.1 + + + EUPL © the European Community 2007 + + + This European Union Public Licence (the “EUPL”) applies to the Work or Software + (as defined below) which is provided under the terms of this Licence. Any use of + the Work, other than as authorised under this Licence is prohibited (to the + extent such use is covered by a right of the copyright holder of the Work). + + The Original Work is provided under the terms of this Licence when the Licensor + (as defined below) has placed the following notice immediately following the + copyright notice for the Original Work: + + Licensed under the EUPL V.1.1 + + 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: + + - The Licence: this Licence. + + - The Original Work or the Software: the software distributed and/or + communicated by the Licensor under this Licence, available as Source Code and + also as Executable Code as the case may be. + + - Derivative Works: the works or software that could be created by the Licensee, + based upon the Original Work or modifications thereof. This Licence does not + define the extent of modification or dependence on the Original Work required + in order to classify a work as a Derivative Work; this extent is determined by + copyright law applicable in the country mentioned in Article 15. + + - The Work: the Original Work and/or its Derivative Works. + + - The Source Code: the human-readable form of the Work which is the most + convenient for people to study and modify. + + - The Executable Code: any code which has generally been compiled and which is + meant to be interpreted by a computer as a program. - The Original Work is provided under the terms of this Licence when the Licensor - (as defined below) has placed the following notice immediately following the - copyright notice for the Original Work: + - The Licensor: the natural or legal person that distributes and/or communicates + the Work under the Licence. - Licensed under the EUPL V.1.1 + - Contributor(s): any natural or legal person who modifies the Work under the + Licence, or otherwise contributes to the creation of a Derivative Work. - or has expressed by any other mean his willingness to license under the EUPL. + - The Licensee or “You”: any natural or legal person who makes any usage of the + Software under the terms of the Licence. + + - Distribution and/or Communication: any act of selling, giving, lending, + renting, distributing, communicating, transmitting, or otherwise making + available, on-line or off-line, copies of the Work or providing access to its + essential functionalities at the disposal of any other natural or legal + person. + 2. Scope of the rights granted by the Licence - 1. Definitions + The Licensor hereby grants You a world-wide, royalty-free, non-exclusive, + sub-licensable licence to do the following, for the duration of copyright vested + in the Original Work: - In this Licence, the following terms have the following meaning: + - use the Work in any circumstance and for all usage, reproduce the Work, modify + - the Original Work, and make Derivative Works based upon the Work, communicate + - to the public, including the right to make available or display the Work or + - copies thereof to the public and perform publicly, as the case may be, the + - Work, distribute the Work or copies thereof, lend and rent the Work or copies + - thereof, sub-license rights in the Work or copies thereof. - - The Licence: this Licence. + Those rights can be exercised on any media, supports and formats, whether now + known or later invented, as far as the applicable law permits so. - - The Original Work or the Software: the software distributed and/or - communicated by the Licensor under this Licence, available as Source Code and - also as Executable Code as the case may be. + In the countries where moral rights apply, the Licensor waives his right to + exercise his moral right to the extent allowed by law in order to make effective + the licence of the economic rights here above listed. - - Derivative Works: the works or software that could be created by the Licensee, - based upon the Original Work or modifications thereof. This Licence does not - define the extent of modification or dependence on the Original Work required - in order to classify a work as a Derivative Work; this extent is determined by - copyright law applicable in the country mentioned in Article 15. + The Licensor grants to the Licensee royalty-free, non exclusive usage rights to + any patents held by the Licensor, to the extent necessary to make use of the + rights granted on the Work under this Licence. - - The Work: the Original Work and/or its Derivative Works. - - The Source Code: the human-readable form of the Work which is the most - convenient for people to study and modify. + 3. Communication of the Source Code - - The Executable Code: any code which has generally been compiled and which is - meant to be interpreted by a computer as a program. + The Licensor may provide the Work either in its Source Code form, or as + Executable Code. If the Work is provided as Executable Code, the Licensor + provides in addition a machine-readable copy of the Source Code of the Work + along with each copy of the Work that the Licensor distributes or indicates, in + a notice following the copyright notice attached to the Work, a repository where + the Source Code is easily and freely accessible for as long as the Licensor + continues to distribute and/or communicate the Work. - - The Licensor: the natural or legal person that distributes and/or communicates - the Work under the Licence. - - Contributor(s): any natural or legal person who modifies the Work under the - Licence, or otherwise contributes to the creation of a Derivative Work. + 4. Limitations on copyright - - The Licensee or “You”: any natural or legal person who makes any usage of the - Software under the terms of the Licence. + Nothing in this Licence is intended to deprive the Licensee of the benefits from + any exception or limitation to the exclusive rights of the rights owners in the + Original Work or Software, of the exhaustion of those rights or of other + applicable limitations thereto. - - Distribution and/or Communication: any act of selling, giving, lending, - renting, distributing, communicating, transmitting, or otherwise making - available, on-line or off-line, copies of the Work or providing access to its - essential functionalities at the disposal of any other natural or legal - person. + 5. Obligations of the Licensee + The grant of the rights mentioned above is subject to some restrictions and + obligations imposed on the Licensee. Those obligations are the following: - 2. Scope of the rights granted by the Licence + Attribution right: the Licensee shall keep intact all copyright, patent or + trademarks notices and all notices that refer to the Licence and to the + disclaimer of warranties. The Licensee must include a copy of such notices and a + copy of the Licence with every copy of the Work he/she distributes and/or + communicates. The Licensee must cause any Derivative Work to carry prominent + notices stating that the Work has been modified and the date of modification. - The Licensor hereby grants You a world-wide, royalty-free, non-exclusive, - sub-licensable licence to do the following, for the duration of copyright vested - in the Original Work: + Copyleft clause: If the Licensee distributes and/or communicates copies of the + Original Works or Derivative Works based upon the Original Work, this + Distribution and/or Communication will be done under the terms of this Licence + or of a later version of this Licence unless the Original Work is expressly + distributed only under this version of the Licence. The Licensee (becoming + Licensor) cannot offer or impose any additional terms or conditions on the Work + or Derivative Work that alter or restrict the terms of the Licence. - - use the Work in any circumstance and for all usage, reproduce the Work, modify - - the Original Work, and make Derivative Works based upon the Work, communicate - - to the public, including the right to make available or display the Work or - - copies thereof to the public and perform publicly, as the case may be, the - - Work, distribute the Work or copies thereof, lend and rent the Work or copies - - thereof, sub-license rights in the Work or copies thereof. + Compatibility clause: If the Licensee Distributes and/or Communicates Derivative + Works or copies thereof based upon both the Original Work and another work + licensed under a Compatible Licence, this Distribution and/or Communication can + be done under the terms of this Compatible Licence. For the sake of this clause, + “Compatible Licence” refers to the licences listed in the appendix attached to + this Licence. Should the Licensee’s obligations under the Compatible Licence + conflict with his/her obligations under this Licence, the obligations of the + Compatible Licence shall prevail. - Those rights can be exercised on any media, supports and formats, whether now - known or later invented, as far as the applicable law permits so. + Provision of Source Code: When distributing and/or communicating copies of the + Work, the Licensee will provide a machine-readable copy of the Source Code or + indicate a repository where this Source will be easily and freely available for + as long as the Licensee continues to distribute and/or communicate the Work. - In the countries where moral rights apply, the Licensor waives his right to - exercise his moral right to the extent allowed by law in order to make effective - the licence of the economic rights here above listed. + Legal Protection: This Licence does not grant permission to use the trade names, + trademarks, service marks, or names of the Licensor, except as required for + reasonable and customary use in describing the origin of the Work and + reproducing the content of the copyright notice. - The Licensor grants to the Licensee royalty-free, non exclusive usage rights to - any patents held by the Licensor, to the extent necessary to make use of the - rights granted on the Work under this Licence. + 6. Chain of Authorship + The original Licensor warrants that the copyright in the Original Work granted + hereunder is owned by him/her or licensed to him/her and that he/she has the + power and authority to grant the Licence. - 3. Communication of the Source Code + Each Contributor warrants that the copyright in the modifications he/she brings + to the Work are owned by him/her or licensed to him/her and that he/she has the + power and authority to grant the Licence. - The Licensor may provide the Work either in its Source Code form, or as - Executable Code. If the Work is provided as Executable Code, the Licensor - provides in addition a machine-readable copy of the Source Code of the Work - along with each copy of the Work that the Licensor distributes or indicates, in - a notice following the copyright notice attached to the Work, a repository where - the Source Code is easily and freely accessible for as long as the Licensor - continues to distribute and/or communicate the Work. + Each time You accept the Licence, the original Licensor and subsequent + Contributors grant You a licence to their contributions to the Work, under the + terms of this Licence. + 7. Disclaimer of Warranty - 4. Limitations on copyright + The Work is a work in progress, which is continuously improved by numerous + contributors. It is not a finished work and may therefore contain defects or + “bugs” inherent to this type of software development. - Nothing in this Licence is intended to deprive the Licensee of the benefits from - any exception or limitation to the exclusive rights of the rights owners in the - Original Work or Software, of the exhaustion of those rights or of other - applicable limitations thereto. + For the above reason, the Work is provided under the Licence on an “as is” basis + and without warranties of any kind concerning the Work, including without + limitation merchantability, fitness for a particular purpose, absence of defects + or errors, accuracy, non-infringement of intellectual property rights other than + copyright as stated in Article 6 of this Licence. + This disclaimer of warranty is an essential part of the Licence and a condition + for the grant of any rights to the Work. - 5. Obligations of the Licensee + 8. Disclaimer of Liability - The grant of the rights mentioned above is subject to some restrictions and - obligations imposed on the Licensee. Those obligations are the following: + Except in the cases of wilful misconduct or damages directly caused to natural + persons, the Licensor will in no event be liable for any direct or indirect, + material or moral, damages of any kind, arising out of the Licence or of the use + of the Work, including without limitation, damages for loss of goodwill, work + stoppage, computer failure or malfunction, loss of data or any commercial + damage, even if the Licensor has been advised of the possibility of such + damage. However, the Licensor will be liable under statutory product liability + laws as far such laws apply to the Work. - Attribution right: the Licensee shall keep intact all copyright, patent or - trademarks notices and all notices that refer to the Licence and to the - disclaimer of warranties. The Licensee must include a copy of such notices and a - copy of the Licence with every copy of the Work he/she distributes and/or - communicates. The Licensee must cause any Derivative Work to carry prominent - notices stating that the Work has been modified and the date of modification. - Copyleft clause: If the Licensee distributes and/or communicates copies of the - Original Works or Derivative Works based upon the Original Work, this - Distribution and/or Communication will be done under the terms of this Licence - or of a later version of this Licence unless the Original Work is expressly - distributed only under this version of the Licence. The Licensee (becoming - Licensor) cannot offer or impose any additional terms or conditions on the Work - or Derivative Work that alter or restrict the terms of the Licence. + 9. Additional agreements - Compatibility clause: If the Licensee Distributes and/or Communicates Derivative - Works or copies thereof based upon both the Original Work and another work - licensed under a Compatible Licence, this Distribution and/or Communication can - be done under the terms of this Compatible Licence. For the sake of this clause, - “Compatible Licence” refers to the licences listed in the appendix attached to - this Licence. Should the Licensee’s obligations under the Compatible Licence - conflict with his/her obligations under this Licence, the obligations of the - Compatible Licence shall prevail. + While distributing the Original Work or Derivative Works, You may choose to + conclude an additional agreement to offer, and charge a fee for, acceptance of + support, warranty, indemnity, or other liability obligations and/or services + consistent with this Licence. However, in accepting such obligations, You may + act only on your own behalf and on your sole responsibility, not on behalf of + the original Licensor or any other Contributor, and only if You agree to + indemnify, defend, and hold each Contributor harmless for any liability incurred + by, or claims asserted against such Contributor by the fact You have accepted + any such warranty or additional liability. - Provision of Source Code: When distributing and/or communicating copies of the - Work, the Licensee will provide a machine-readable copy of the Source Code or - indicate a repository where this Source will be easily and freely available for - as long as the Licensee continues to distribute and/or communicate the Work. - Legal Protection: This Licence does not grant permission to use the trade names, - trademarks, service marks, or names of the Licensor, except as required for - reasonable and customary use in describing the origin of the Work and - reproducing the content of the copyright notice. + 10. Acceptance of the Licence + The provisions of this Licence can be accepted by clicking on an icon “I agree” + placed under the bottom of a window displaying the text of this Licence or by + affirming consent in any other similar way, in accordance with the rules of + applicable law. Clicking on that icon indicates your clear and irrevocable + acceptance of this Licence and all of its terms and conditions. + Similarly, you irrevocably accept this Licence and all of its terms and + conditions by exercising any rights granted to You by Article 2 of this Licence, + such as the use of the Work, the creation by You of a Derivative Work or the + Distribution and/or Communication by You of the Work or copies thereof. - 6. Chain of Authorship - The original Licensor warrants that the copyright in the Original Work granted - hereunder is owned by him/her or licensed to him/her and that he/she has the - power and authority to grant the Licence. + 11. Information to the public - Each Contributor warrants that the copyright in the modifications he/she brings - to the Work are owned by him/her or licensed to him/her and that he/she has the - power and authority to grant the Licence. + In case of any Distribution and/or Communication of the Work by means of + electronic communication by You (for example, by offering to download the Work + from a remote location) the distribution channel or media (for example, a + website) must at least provide to the public the information requested by the + applicable law regarding the Licensor, the Licence and the way it may be + accessible, concluded, stored and reproduced by the Licensee. - Each time You accept the Licence, the original Licensor and subsequent - Contributors grant You a licence to their contributions to the Work, under the - terms of this Licence. + 12. Termination of the Licence + The Licence and the rights granted hereunder will terminate automatically upon + any breach by the Licensee of the terms of the Licence. - 7. Disclaimer of Warranty + Such a termination will not terminate the licences of any person who has + received the Work from the Licensee under the Licence, provided such persons + remain in full compliance with the Licence. - The Work is a work in progress, which is continuously improved by numerous - contributors. It is not a finished work and may therefore contain defects or - “bugs” inherent to this type of software development. - For the above reason, the Work is provided under the Licence on an “as is” basis - and without warranties of any kind concerning the Work, including without - limitation merchantability, fitness for a particular purpose, absence of defects - or errors, accuracy, non-infringement of intellectual property rights other than - copyright as stated in Article 6 of this Licence. + 13. Miscellaneous - This disclaimer of warranty is an essential part of the Licence and a condition - for the grant of any rights to the Work. + Without prejudice of Article 9 above, the Licence represents the complete + agreement between the Parties as to the Work licensed hereunder. + If any provision of the Licence is invalid or unenforceable under applicable + law, this will not affect the validity or enforceability of the Licence as a + whole. Such provision will be construed and/or reformed so as necessary to make + it valid and enforceable. + The European Commission may publish other linguistic versions and/or new + versions of this Licence, so far this is required and reasonable, without + reducing the scope of the rights granted by the Licence. New versions of the + Licence will be published with a unique version number. - 8. Disclaimer of Liability + All linguistic versions of this Licence, approved by the European Commission, + have identical value. Parties can take advantage of the linguistic version of + their choice. - Except in the cases of wilful misconduct or damages directly caused to natural - persons, the Licensor will in no event be liable for any direct or indirect, - material or moral, damages of any kind, arising out of the Licence or of the use - of the Work, including without limitation, damages for loss of goodwill, work - stoppage, computer failure or malfunction, loss of data or any commercial - damage, even if the Licensor has been advised of the possibility of such - damage. However, the Licensor will be liable under statutory product liability - laws as far such laws apply to the Work. + 14. Jurisdiction + Any litigation resulting from the interpretation of this License, arising + between the European Commission, as a Licensor, and any Licensee, will be + subject to the jurisdiction of the Court of Justice of the European Communities, + as laid down in article 238 of the Treaty establishing the European Community. - 9. Additional agreements + Any litigation arising between Parties, other than the European Commission, and + resulting from the interpretation of this License, will be subject to the + exclusive jurisdiction of the competent court where the Licensor resides or + conducts its primary business. - While distributing the Original Work or Derivative Works, You may choose to - conclude an additional agreement to offer, and charge a fee for, acceptance of - support, warranty, indemnity, or other liability obligations and/or services - consistent with this Licence. However, in accepting such obligations, You may - act only on your own behalf and on your sole responsibility, not on behalf of - the original Licensor or any other Contributor, and only if You agree to - indemnify, defend, and hold each Contributor harmless for any liability incurred - by, or claims asserted against such Contributor by the fact You have accepted - any such warranty or additional liability. + 15. Applicable Law + This Licence shall be governed by the law of the European Union country where + the Licensor resides or has his registered office. - 10. Acceptance of the Licence + This licence shall be governed by the Belgian law if: - The provisions of this Licence can be accepted by clicking on an icon “I agree” - placed under the bottom of a window displaying the text of this Licence or by - affirming consent in any other similar way, in accordance with the rules of - applicable law. Clicking on that icon indicates your clear and irrevocable - acceptance of this Licence and all of its terms and conditions. + - a litigation arises between the European Commission, as a Licensor, and any + - Licensee; the Licensor, other than the European Commission, has no residence + - or registered office inside a European Union country. - Similarly, you irrevocably accept this Licence and all of its terms and - conditions by exercising any rights granted to You by Article 2 of this Licence, - such as the use of the Work, the creation by You of a Derivative Work or the - Distribution and/or Communication by You of the Work or copies thereof. + === - 11. Information to the public + Appendix - In case of any Distribution and/or Communication of the Work by means of - electronic communication by You (for example, by offering to download the Work - from a remote location) the distribution channel or media (for example, a - website) must at least provide to the public the information requested by the - applicable law regarding the Licensor, the Licence and the way it may be - accessible, concluded, stored and reproduced by the Licensee. + “Compatible Licences” according to article 5 EUPL are: - 12. Termination of the Licence + - GNU General Public License (GNU GPL) v. 2 - The Licence and the rights granted hereunder will terminate automatically upon - any breach by the Licensee of the terms of the Licence. + - Open Software License (OSL) v. 2.1, v. 3.0 - Such a termination will not terminate the licences of any person who has - received the Work from the Licensee under the Licence, provided such persons - remain in full compliance with the Licence. + - Common Public License v. 1.0 + - Eclipse Public License v. 1.0 + - Cecill v. 2.0 - 13. Miscellaneous - - Without prejudice of Article 9 above, the Licence represents the complete - agreement between the Parties as to the Work licensed hereunder. - - If any provision of the Licence is invalid or unenforceable under applicable - law, this will not affect the validity or enforceability of the Licence as a - whole. Such provision will be construed and/or reformed so as necessary to make - it valid and enforceable. - - The European Commission may publish other linguistic versions and/or new - versions of this Licence, so far this is required and reasonable, without - reducing the scope of the rights granted by the Licence. New versions of the - Licence will be published with a unique version number. - - All linguistic versions of this Licence, approved by the European Commission, - have identical value. Parties can take advantage of the linguistic version of - their choice. - - - - 14. Jurisdiction - - Any litigation resulting from the interpretation of this License, arising - between the European Commission, as a Licensor, and any Licensee, will be - subject to the jurisdiction of the Court of Justice of the European Communities, - as laid down in article 238 of the Treaty establishing the European Community. - - Any litigation arising between Parties, other than the European Commission, and - resulting from the interpretation of this License, will be subject to the - exclusive jurisdiction of the competent court where the Licensor resides or - conducts its primary business. - - - - 15. Applicable Law - - This Licence shall be governed by the law of the European Union country where - the Licensor resides or has his registered office. - - This licence shall be governed by the Belgian law if: - - - a litigation arises between the European Commission, as a Licensor, and any - - Licensee; the Licensor, other than the European Commission, has no residence - - or registered office inside a European Union country. - - - === - - - Appendix - - - - “Compatible Licences” according to article 5 EUPL are: - - - - GNU General Public License (GNU GPL) v. 2 - - - Open Software License (OSL) v. 2.1, v. 3.0 - - - Common Public License v. 1.0 - - - Eclipse Public License v. 1.0 - - - Cecill v. 2.0 - - - + + -- 2.17.1 From 921f710e8e16dbfb00ba630547e62dfc55709720 Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Wed, 7 Oct 2020 22:35:03 -0400 Subject: [PATCH 38/85] Remove version of managed plugins. --- pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/pom.xml b/pom.xml index 3070e13..afd0305 100644 --- a/pom.xml +++ b/pom.xml @@ -891,14 +891,12 @@ org.codehaus.mojo buildnumber-maven-plugin - ${plugin.buildnumber.version} org.apache.maven.plugins maven-enforcer-plugin - ${plugin.enforcer.version} enforce-files-exist -- 2.17.1 From e2cce721c9ffbdaabf940ffd71c63b49376e2408 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Thu, 8 Oct 2020 14:08:54 +0200 Subject: [PATCH 39/85] Ignored generated target directory and eclipse project file --- .gitignore | 1 + .settings/.gitignore | 1 + 2 files changed, 2 insertions(+) create mode 100644 .gitignore create mode 100644 .settings/.gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/.settings/.gitignore b/.settings/.gitignore new file mode 100644 index 0000000..b012ade --- /dev/null +++ b/.settings/.gitignore @@ -0,0 +1 @@ +/org.eclipse.core.resources.prefs -- 2.17.1 From 046c12b8febba84ef452b096623b9b686011d434 Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Thu, 15 Oct 2020 23:26:39 -0400 Subject: [PATCH 40/85] Downgrade maven-surefire-plugin to 2.22.2. Service maps are not loaded with 3.0. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index afd0305..0127704 100644 --- a/pom.xml +++ b/pom.xml @@ -768,7 +768,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M5 + 2.22.2 classes 10 -- 2.17.1 From c4599be5b7b572d311524683a4f0356516e3b530 Mon Sep 17 00:00:00 2001 From: roberto cirillo Date: Fri, 13 Nov 2020 17:08:10 +0100 Subject: [PATCH 41/85] nexus url changed --- pom.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 0127704..0d57272 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ gcube-snapshots gCube Snapshots - http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-snapshots + https://nexus.d4science.org/nexus/content/repositories/gcube-snapshots false @@ -31,7 +31,7 @@ gcube-releases gCube Releases - http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-releases + https://nexus.d4science.org/nexus/content/repositories/gcube-releases false @@ -43,7 +43,7 @@ gcube-staging-jenkins gCube Jenkins Staging - http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-staging-jenkins + https://nexus.d4science.org/nexus/content/repositories/gcube-staging-jenkins false @@ -55,7 +55,7 @@ gcube-staging gCube Staging - http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-staging/ + https://nexus.d4science.org/nexus/content/repositories/gcube-staging/ false @@ -67,7 +67,7 @@ gcube-externals gCube Externals - http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-externals + https://nexus.d4science.org/nexus/content/repositories/gcube-externals false @@ -1124,18 +1124,18 @@ UTF-8 3.3.9 - http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-snapshots + https://nexus.d4science.org/nexus/content/repositories/gcube-snapshots - http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-releases + https://nexus.d4science.org/nexus/content/repositories/gcube-releases - http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-staging-jenkins + https://nexus.d4science.org/nexus/content/repositories/gcube-staging-jenkins - http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-staging/ + https://nexus.d4science.org/nexus/content/repositories/gcube-staging/ - http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-externals + https://nexus.d4science.org/nexus/content/repositories/gcube-externals -- 2.17.1 From 2316d72c4587aaaad0702d1c49231a59c903c366 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Mon, 31 Jan 2022 11:10:16 +0100 Subject: [PATCH 42/85] upgrade groovy-maven-plugin to version 2.1.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0127704..63ed71e 100644 --- a/pom.xml +++ b/pom.xml @@ -1070,7 +1070,7 @@ org.codehaus.gmaven groovy-maven-plugin - 2.0 + 2.1.1 process-classes -- 2.17.1 From 382d09217a2ca1847e96746e2a815a44d9bd46ef Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Thu, 17 Feb 2022 17:05:27 +0100 Subject: [PATCH 43/85] delete jenkins-snapshot profile. Refactoring of all profiles. Added activation option on dev, staging and release profiles. Other changes should be done on settings.xml files in order to work properly. These profiles are currently under test --- pom.xml | 847 ++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 757 insertions(+), 90 deletions(-) diff --git a/pom.xml b/pom.xml index 132d8f7..b52ee74 100644 --- a/pom.xml +++ b/pom.xml @@ -82,15 +82,15 @@ - - disable-java8-doclint - - [1.8,) - - - -Xdoclint:none - - + + + + + + + + + + true + + + - + + + + + + + + + -Xdoclint:none + 1.8 + ${java_version} + ${java_version} + @@ -189,80 +206,6 @@ ${skip.when.is.release.used} - - - - - - jenkins-snapshots - - false - - jenkins-snapshots - true - - - - - - - gcube-snapshots - gCube Snapshots - ${repository.snapshots.url} - - - gcube-releases - gCube Releases - ${repository.releases.url} - - - gcube-externals - gCube Externals - ${repository.externals.readonly} - - - - - - - gcube-snapshots - gCube Snapshots - ${repository.snapshots.url} - - - - - - org.codehaus.mojo - build-helper-maven-plugin - ${plugin.build.helper.version} - - - - build-helper-regex-is-snapshot-used - validate - - regex-property - - - skip.when.is.release.used - ${project.version} - ^((?!.*-SNAPSHOT).)*$ - true - false - - - - - - org.apache.maven.plugins - maven-deploy-plugin - ${plugin.deploy.version} - - ${skip.when.is.release.used} - - org.apache.maven.plugins maven-install-plugin @@ -271,15 +214,313 @@ ${skip.when.is.release.used} - + + + org.codehaus.gmaven + groovy-maven-plugin + 2.0 + + + process-classes + + execute + + + + tag + + + def fileContents = new File("${project.basedir}/CHANGELOG.md").getText('UTF-8') + matcher = (fileContents =~ /(?s).\[v$project.version\].*?/) + if (!matcher.find()) { + throw new IllegalArgumentException("Tag [v$project.version] not found in ${project.basedir}/CHANGELOG.md") + } + assert matcher[0][1]: "Tag [v$project.version] not found in ${project.basedir}/CHANGELOG.md" + + + + + + + + gcube-developer-next + + false + [9,) + + !Release + + + + -Xdoclint:none + 11 + ${java_version} + ${java_version} + + + + + + gcube-snapshots + gCube Snapshots + ${repository.snapshots.url} + + + gcube-releases + gCube Releases + ${repository.releases.url} + + + gcube-externals + gCube Externals + ${repository.externals.readonly} + + + + + + gcube-snapshots + gCube Snapshots + ${repository.snapshots.url} + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + ${plugin.build.helper.version} + + + + + build-helper-regex-is-snapshot-used + validate + + regex-property + + + skip.when.is.release.used + ${project.version} + ^((?!-SNAPSHOT).)*$ + true + false + + + + + + org.apache.maven.plugins + maven-deploy-plugin + ${plugin.deploy.version} + + ${skip.when.is.release.used} + + + + org.apache.maven.plugins + maven-install-plugin + 2.4 + + ${skip.when.is.release.used} + + + + + org.apache.maven.plugins + maven-enforcer-plugin + ${plugin.enforcer.version} + + + enforce + validate + + enforce + + + + + [${maven.version},) + Check for Maven version >=${maven.version} failed. Update your Maven + install. + + + + [11,) + + + + + + + + org.codehaus.gmaven + groovy-maven-plugin + 2.1.1 + + + process-classes + + execute + + + + tag + + + def fileContents = new File("${project.basedir}/CHANGELOG.md").getText('UTF-8') + matcher = (fileContents =~ /(?s).\[v$project.version\].*?/) + if (!matcher.find()) { + throw new IllegalArgumentException("Tag [v$project.version] not found in ${project.basedir}/CHANGELOG.md") + } + assert matcher[0][1]: "Tag [v$project.version] not found in ${project.basedir}/CHANGELOG.md" + + + + + + + + + + + + gcube-developer-old + + [, 1.8) + + !Release + + + + + + + gcube-snapshots + gCube Snapshots + ${repository.snapshots.url} + + + gcube-releases + gCube Releases + ${repository.releases.url} + + + gcube-externals + gCube Externals + ${repository.externals.readonly} + + + + + + + gcube-snapshots + gCube Snapshots + ${repository.snapshots.url} + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + ${plugin.build.helper.version} + + + + + build-helper-regex-is-snapshot-used + validate + + regex-property + + + skip.when.is.release.used + ${project.version} + ^((?!-SNAPSHOT).)*$ + true + false + + + + + + org.apache.maven.plugins + maven-deploy-plugin + ${plugin.deploy.version} + + ${skip.when.is.release.used} + + + + + org.apache.maven.plugins + maven-enforcer-plugin + ${plugin.enforcer.version} + + + enforce + validate + + enforce + + + + + [${maven.version},) + Check for Maven version >=${maven.version} failed. Update your Maven + install. + + + + [1.8,) + + + + + + + + org.codehaus.gmaven + groovy-maven-plugin + 2.0 + + + process-classes + + execute + + + + tag + + + def fileContents = new File("${project.basedir}/CHANGELOG.md").getText('UTF-8') + matcher = (fileContents =~ /(?s).\[v$project.version\].*?/) + if (!matcher.find()) { + throw new IllegalArgumentException("Tag [v$project.version] not found in ${project.basedir}/CHANGELOG.md") + } + assert matcher[0][1]: "Tag [v$project.version] not found in ${project.basedir}/CHANGELOG.md" + + + + + + + + + jenkins-releases - false + [1.8,9) jenkins-releases true @@ -407,11 +648,145 @@ - - jenkins-staging + jenkins-releases-next - false + [9,) + + jenkins-releases + true + + + + + + gcube-releases + gCube Releases + ${repository.releases.url} + + + gcube-jenkins-staging + gCube Jenkins Staging + ${repository.jenkins.staging.url} + + + gcube-jenkins-staging-next + gCube Jenkins Staging Next + ${repository.jenkins.staging.java11.url} + + + gcube-staging + gCube Staging + ${repository.staging.url} + + + gcube-externals + gCube Externals + ${repository.externals.readonly} + + + + + + + gcube-releases + gCube Releases + ${repository.releases.url} + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + ${plugin.build.helper.version} + + + + build-helper-regex-is-snapshot-used + validate + + regex-property + + + skip.when.is.snapshot.used + ${project.version} + .*-SNAPSHOT$ + true + false + + + + + fail-helper-regex-is-snapshot-used + validate + + regex-property + + + fail.when.is.snapshot.used + ${project.version} + ^((?!.*-SNAPSHOT).)*$ + true + + + + + + org.apache.maven.plugins + maven-deploy-plugin + ${plugin.deploy.version} + + + fail-if-snapshot-used + deploy + + ${skip.when.is.snapshot.used} + + + + + + io.github.olivierlemasle.maven + plaintext-maven-plugin + ${plugin.plaintext.version} + + ${env.MAVEN_CONFIG_FOLDER} + + + build_commits.csv + true + + + ${project.groupId},${project.artifactId},${project.version},${project.scm.url},${buildNumber},${repository.releases.url},${project.build.finalName},${project.packaging} + + + + + + + + generate-file + package + + write + + + + + + + ${project.artifactId}-${project.version} + + + + + jenkins-staging-old + + [,1.8) jenkins-staging true @@ -532,6 +907,295 @@ + + + org.apache.maven.plugins + maven-enforcer-plugin + ${plugin.enforcer.version} + + + enforce + validate + + enforce + + + + + [${maven.version},) + Check for Maven version >=${maven.version} failed. Update your Maven + install. + + + + [1.8,) + + + + + + + + ${project.artifactId}-${project.version} + + + + jenkins-staging + + [1.8,9) + + jenkins-staging + true + + + + + + + gcube-staging-jenkins + gCube Jenkins Staging + ${repository.jenkins.staging.url} + + + gcube-staging + gCube Staging + ${repository.staging.url} + + + gcube-releases + gCube Releases + ${repository.releases.url} + + + gcube-externals + gCube Externals + ${repository.externals.readonly} + + + + + + + gcube-staging-jenkins + gCube Staging + ${repository.jenkins.staging.url} + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + ${plugin.build.helper.version} + + + + build-helper-regex-is-snapshot-used + validate + + regex-property + + + skip.when.is.snapshot.used + ${project.version} + .*-SNAPSHOT$ + true + false + + + + + fail-helper-regex-is-snapshot-used + validate + + regex-property + + + fail.when.is.snapshot.used + ${project.version} + ^((?!.*-SNAPSHOT).)*$ + true + + + + + + io.github.olivierlemasle.maven + plaintext-maven-plugin + ${plugin.plaintext.version} + + ${env.MAVEN_CONFIG_FOLDER} + + + build_commits.csv + true + + + ${project.groupId},${project.artifactId},${project.version},${project.scm.url},${buildNumber},${repository.jenkins.staging.url},${project.build.finalName},${project.packaging} + + + + + + + + generate-file + package + + write + + + + + + org.apache.maven.plugins + maven-deploy-plugin + ${plugin.deploy.version} + + + fail-if-snapshot-used + deploy + + ${skip.when.is.snapshot.used} + + + + + + ${project.artifactId}-${project.version} + + + + jenkins-staging-next + + [9,) + + jenkins-staging + true + + + + + + + gcube-staging-jenkins + gCube Jenkins Staging + ${repository.jenkins.staging.url} + + + gcube-staging-jenkins-java11 + gCube Jenkins Staging Java11 + ${repository.jenkins.staging.java11.url} + + + gcube-staging + gCube Staging + ${repository.staging.url} + + + gcube-releases + gCube Releases + ${repository.releases.url} + + + gcube-externals + gCube Externals + ${repository.externals.readonly} + + + + + + + gcube-staging-jenkins-java11 + gCube Staging + ${repository.jenkins.staging.java11.url} + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + ${plugin.build.helper.version} + + + + build-helper-regex-is-snapshot-used + validate + + regex-property + + + skip.when.is.snapshot.used + ${project.version} + .*-SNAPSHOT$ + true + false + + + + + fail-helper-regex-is-snapshot-used + validate + + regex-property + + + fail.when.is.snapshot.used + ${project.version} + ^((?!.*-SNAPSHOT).)*$ + true + + + + + + io.github.olivierlemasle.maven + plaintext-maven-plugin + ${plugin.plaintext.version} + + ${env.MAVEN_CONFIG_FOLDER} + + + build_commits.csv + true + + + ${project.groupId},${project.artifactId},${project.version},${project.scm.url},${buildNumber},${repository.jenkins.staging.java11.url},${project.build.finalName},${project.packaging} + + + + + + + + generate-file + package + + write + + + + + + org.apache.maven.plugins + maven-deploy-plugin + ${plugin.deploy.version} + + + fail-if-snapshot-used + deploy + + ${skip.when.is.snapshot.used} + + + + ${project.artifactId}-${project.version} @@ -1131,6 +1795,9 @@ https://nexus.d4science.org/nexus/content/repositories/gcube-staging-jenkins + + https://nexus.d4science.org/nexus/content/repositories/gcube-staging-jenkins-java11 + https://nexus.d4science.org/nexus/content/repositories/gcube-staging/ -- 2.17.1 From 0267fa38664a908f94530b1d618774aa09afed16 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Fri, 18 Feb 2022 12:25:30 +0100 Subject: [PATCH 44/85] add repository policies inside the profiles. Before they were configured inside the settings file --- pom.xml | 335 +++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 247 insertions(+), 88 deletions(-) diff --git a/pom.xml b/pom.xml index b52ee74..3f462ba 100644 --- a/pom.xml +++ b/pom.xml @@ -126,20 +126,12 @@ true - - - + - - - - - - - - -Xdoclint:none 1.8 ${java_version} @@ -151,16 +143,34 @@ gcube-snapshots gCube Snapshots ${repository.snapshots.url} + + true + + + false + gcube-releases gCube Releases ${repository.releases.url} + + false + + + true + gcube-externals gCube Externals ${repository.externals.readonly} + + false + + + true + @@ -260,33 +270,51 @@ ${java_version} - - - - gcube-snapshots - gCube Snapshots - ${repository.snapshots.url} - - - gcube-releases - gCube Releases - ${repository.releases.url} - - - gcube-externals - gCube Externals - ${repository.externals.readonly} - - + + + + gcube-snapshots + gCube Snapshots + ${repository.snapshots.url} + + true + + + false + + + + gcube-releases + gCube Releases + ${repository.releases.url} + + false + + + true + + + + gcube-externals + gCube Externals + ${repository.externals.readonly} + + false + + + true + + + - - - - gcube-snapshots - gCube Snapshots - ${repository.snapshots.url} - - + + + + gcube-snapshots + gCube Snapshots + ${repository.snapshots.url} + + @@ -398,32 +426,50 @@ - - - gcube-snapshots - gCube Snapshots - ${repository.snapshots.url} - - - gcube-releases - gCube Releases - ${repository.releases.url} - - - gcube-externals - gCube Externals - ${repository.externals.readonly} - - + + + gcube-snapshots + gCube Snapshots + ${repository.snapshots.url} + + true + + + false + + + + gcube-releases + gCube Releases + ${repository.releases.url} + + false + + + true + + + + gcube-externals + gCube Externals + ${repository.externals.readonly} + + false + + + true + + + - - - - gcube-snapshots - gCube Snapshots - ${repository.snapshots.url} - - + + + + gcube-snapshots + gCube Snapshots + ${repository.snapshots.url} + + @@ -533,21 +579,27 @@ gcube-releases gCube Releases ${repository.releases.url} - - - gcube-jenkins-staging - gCube Jenkins Staging - ${repository.jenkins.staging.url} - - - gcube-staging - gCube Staging - ${repository.staging.url} + + false + never + + + true + never + gcube-externals gCube Externals ${repository.externals.readonly} + + false + never + + + true + never + @@ -658,31 +710,33 @@ + gcube-releases gCube Releases ${repository.releases.url} - - - gcube-jenkins-staging - gCube Jenkins Staging - ${repository.jenkins.staging.url} - - - gcube-jenkins-staging-next - gCube Jenkins Staging Next - ${repository.jenkins.staging.java11.url} - - - gcube-staging - gCube Staging - ${repository.staging.url} + + false + never + + + true + never + gcube-externals gCube Externals ${repository.externals.readonly} + + false + never + + + true + never + @@ -695,6 +749,7 @@ + @@ -799,21 +854,53 @@ gcube-staging-jenkins gCube Jenkins Staging ${repository.jenkins.staging.url} + + false + never + + + true + never + gcube-staging gCube Staging ${repository.staging.url} + + false + never + + + true + never + gcube-releases gCube Releases ${repository.releases.url} + + false + never + + + true + never + gcube-externals gCube Externals ${repository.externals.readonly} + + false + never + + + true + never + @@ -950,26 +1037,58 @@ - + gcube-staging-jenkins gCube Jenkins Staging ${repository.jenkins.staging.url} + + false + never + + + true + never + gcube-staging gCube Staging ${repository.staging.url} + + false + never + + + true + never + gcube-releases gCube Releases ${repository.releases.url} + + false + never + + + true + never + gcube-externals gCube Externals ${repository.externals.readonly} + + false + never + + + true + never + @@ -1083,26 +1202,66 @@ gcube-staging-jenkins gCube Jenkins Staging ${repository.jenkins.staging.url} + + false + never + + + true + never + gcube-staging-jenkins-java11 gCube Jenkins Staging Java11 ${repository.jenkins.staging.java11.url} + + false + never + + + true + never + gcube-staging gCube Staging ${repository.staging.url} + + false + never + + + true + never + gcube-releases gCube Releases ${repository.releases.url} + + false + never + + + true + never + gcube-externals gCube Externals ${repository.externals.readonly} + + false + never + + + true + never + -- 2.17.1 From 98d2db3a13d5c15105b10824366a4a0cbb141ae3 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Fri, 18 Feb 2022 12:31:29 +0100 Subject: [PATCH 45/85] remove update policy from release artifact on gcube-staging-* repos. Before it was set to false but the artifact should be redeployed in staging repos --- pom.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pom.xml b/pom.xml index 3f462ba..10b626b 100644 --- a/pom.xml +++ b/pom.xml @@ -860,7 +860,6 @@ true - never @@ -873,7 +872,6 @@ true - never @@ -1048,7 +1046,6 @@ true - never @@ -1061,7 +1058,6 @@ true - never @@ -1208,7 +1204,6 @@ true - never @@ -1221,7 +1216,6 @@ true - never @@ -1234,7 +1228,6 @@ true - never -- 2.17.1 From 2b80696a817d87325e3e0573b32c477e9616a6b1 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Fri, 18 Feb 2022 15:11:02 +0100 Subject: [PATCH 46/85] remove skip install on gcube-developer* profiles --- pom.xml | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/pom.xml b/pom.xml index 10b626b..0d49bd1 100644 --- a/pom.xml +++ b/pom.xml @@ -78,23 +78,6 @@ - - - - - - - - - - - - - generate-distribution-packages @@ -216,14 +199,6 @@ ${skip.when.is.release.used} - - org.apache.maven.plugins - maven-install-plugin - 2.4 - - ${skip.when.is.release.used} - - org.codehaus.gmaven @@ -349,14 +324,6 @@ ${skip.when.is.release.used} - - org.apache.maven.plugins - maven-install-plugin - 2.4 - - ${skip.when.is.release.used} - - org.apache.maven.plugins -- 2.17.1 From 44c0025860cdc32447a7f484a9695e4620b07cda Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Mon, 21 Feb 2022 11:15:14 +0100 Subject: [PATCH 47/85] add maven-helper-plugin: show active profile --- pom.xml | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 0d49bd1..f068ce4 100644 --- a/pom.xml +++ b/pom.xml @@ -439,7 +439,8 @@ - + + org.codehaus.mojo build-helper-maven-plugin @@ -582,6 +583,7 @@ + org.codehaus.mojo build-helper-maven-plugin @@ -1670,7 +1672,20 @@ - + + org.apache.maven.plugins + maven-help-plugin + 3.0.1 + + + show-profiles + compile + + active-profiles + + + + org.codehaus.mojo buildnumber-maven-plugin -- 2.17.1 From aab964c1a8e799ff2b5d10eb8965a3bab495f0bc Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Mon, 21 Feb 2022 14:12:00 +0100 Subject: [PATCH 48/85] add "gcube-default" profile as default profile. --- pom.xml | 129 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 127 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f068ce4..c8b3343 100644 --- a/pom.xml +++ b/pom.xml @@ -105,11 +105,10 @@ - gcube-developer + gcube-default true - + -Xdoclint:none + 1.8 + ${java_version} + ${java_version} + + + + + gcube-snapshots + gCube Snapshots + ${repository.snapshots.url} + + true + + + false + + + + gcube-releases + gCube Releases + ${repository.releases.url} + + false + + + true + + + + gcube-externals + gCube Externals + ${repository.externals.readonly} + + false + + + true + + + + + + + + gcube-snapshots + gCube Snapshots + ${repository.snapshots.url} + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + ${plugin.build.helper.version} + + + + build-helper-regex-is-snapshot-used + validate + + regex-property + + + skip.when.is.release.used + ${project.version} + ^((?!-SNAPSHOT).)*$ + true + false + + + + + + org.apache.maven.plugins + maven-deploy-plugin + ${plugin.deploy.version} + + ${skip.when.is.release.used} + + + + + org.codehaus.gmaven + groovy-maven-plugin + 2.0 + + + process-classes + + execute + + + + tag + + + def fileContents = new File("${project.basedir}/CHANGELOG.md").getText('UTF-8') + matcher = (fileContents =~ /(?s).\[v$project.version\].*?/) + if (!matcher.find()) { + throw new IllegalArgumentException("Tag [v$project.version] not found in ${project.basedir}/CHANGELOG.md") + } + assert matcher[0][1]: "Tag [v$project.version] not found in ${project.basedir}/CHANGELOG.md" + + + + + + + gcube-developer-next -- 2.17.1 From ae1f5edd64406c834478f75f97aabc7df4e5c3a9 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Mon, 21 Feb 2022 14:40:32 +0100 Subject: [PATCH 49/85] restore profile disable-java8-doclint --- pom.xml | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index c8b3343..21dffdf 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,20 @@ + + + + disable-java8-doclint + + [1.8,) + + + -Xdoclint:none + + generate-distribution-packages @@ -111,10 +124,6 @@ true - - -Xdoclint:none 1.8 ${java_version} ${java_version} @@ -237,10 +246,6 @@ - - -Xdoclint:none 1.8 ${java_version} ${java_version} @@ -364,7 +369,6 @@ - -Xdoclint:none 11 ${java_version} ${java_version} -- 2.17.1 From d23a597fc6c3a5331d213fc16a939659013206d2 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Fri, 25 Feb 2022 16:01:15 +0100 Subject: [PATCH 50/85] add two common profiles: common-release-checks, common-snapshot-checks --- pom.xml | 715 ++++++-------------------------------------------------- 1 file changed, 74 insertions(+), 641 deletions(-) diff --git a/pom.xml b/pom.xml index 21dffdf..51494f0 100644 --- a/pom.xml +++ b/pom.xml @@ -115,66 +115,57 @@ - - - - gcube-default - - - true - - - 1.8 - ${java_version} - ${java_version} - - - - - gcube-snapshots - gCube Snapshots - ${repository.snapshots.url} - - true - - - false - - - - gcube-releases - gCube Releases - ${repository.releases.url} - - false - - - true - - - - gcube-externals - gCube Externals - ${repository.externals.readonly} - - false - - - true - - - - - - - - gcube-snapshots - gCube Snapshots - ${repository.snapshots.url} - - - - + + common-snapshot-checks + + + !Release + + + + + + org.codehaus.mojo + build-helper-maven-plugin + ${plugin.build.helper.version} + + + + build-helper-regex-is-snapshot-used + validate + + regex-property + + + skip.when.is.release.used + ${project.version} + ^((?!-SNAPSHOT).)*$ + true + false + + + + + + org.apache.maven.plugins + maven-deploy-plugin + ${plugin.deploy.version} + + ${skip.when.is.release.used} + + + + + + + common-release-checks + + + Release + + + org.codehaus.mojo @@ -182,7 +173,7 @@ ${plugin.build.helper.version} - build-helper-regex-is-snapshot-used validate @@ -190,52 +181,32 @@ regex-property - skip.when.is.release.used + skip.when.is.snapshot.used ${project.version} - ^((?!-SNAPSHOT).)*$ + .*-SNAPSHOT$ true false + + + fail-helper-regex-is-snapshot-used + validate + + regex-property + + + fail.when.is.snapshot.used + ${project.version} + ^((?!.*-SNAPSHOT).)*$ + true + + - - org.apache.maven.plugins - maven-deploy-plugin - ${plugin.deploy.version} - - ${skip.when.is.release.used} - - - - - org.codehaus.gmaven - groovy-maven-plugin - 2.0 - - - process-classes - - execute - - - - tag - - - def fileContents = new File("${project.basedir}/CHANGELOG.md").getText('UTF-8') - matcher = (fileContents =~ /(?s).\[v$project.version\].*?/) - if (!matcher.find()) { - throw new IllegalArgumentException("Tag [v$project.version] not found in ${project.basedir}/CHANGELOG.md") - } - assert matcher[0][1]: "Tag [v$project.version] not found in ${project.basedir}/CHANGELOG.md" - - - - - - - + + + gcube-developer @@ -295,70 +266,8 @@ ${repository.snapshots.url} - - - - - org.codehaus.mojo - build-helper-maven-plugin - ${plugin.build.helper.version} - - - - build-helper-regex-is-snapshot-used - validate - - regex-property - - - skip.when.is.release.used - ${project.version} - ^((?!-SNAPSHOT).)*$ - true - false - - - - - - org.apache.maven.plugins - maven-deploy-plugin - ${plugin.deploy.version} - - ${skip.when.is.release.used} - - - - - org.codehaus.gmaven - groovy-maven-plugin - 2.0 - - - process-classes - - execute - - - - tag - - - def fileContents = new File("${project.basedir}/CHANGELOG.md").getText('UTF-8') - matcher = (fileContents =~ /(?s).\[v$project.version\].*?/) - if (!matcher.find()) { - throw new IllegalArgumentException("Tag [v$project.version] not found in ${project.basedir}/CHANGELOG.md") - } - assert matcher[0][1]: "Tag [v$project.version] not found in ${project.basedir}/CHANGELOG.md" - - - - - - - + gcube-developer-next @@ -374,7 +283,7 @@ ${java_version} - + gcube-snapshots @@ -410,7 +319,6 @@ - @@ -419,99 +327,9 @@ ${repository.snapshots.url} - - - - - org.codehaus.mojo - build-helper-maven-plugin - ${plugin.build.helper.version} - - - - - build-helper-regex-is-snapshot-used - validate - - regex-property - - - skip.when.is.release.used - ${project.version} - ^((?!-SNAPSHOT).)*$ - true - false - - - - - - org.apache.maven.plugins - maven-deploy-plugin - ${plugin.deploy.version} - - ${skip.when.is.release.used} - - - - - org.apache.maven.plugins - maven-enforcer-plugin - ${plugin.enforcer.version} - - - enforce - validate - - enforce - - - - - [${maven.version},) - Check for Maven version >=${maven.version} failed. Update your Maven - install. - - - - [11,) - - - - - - - - org.codehaus.gmaven - groovy-maven-plugin - 2.1.1 - - - process-classes - - execute - - - - tag - - - def fileContents = new File("${project.basedir}/CHANGELOG.md").getText('UTF-8') - matcher = (fileContents =~ /(?s).\[v$project.version\].*?/) - if (!matcher.find()) { - throw new IllegalArgumentException("Tag [v$project.version] not found in ${project.basedir}/CHANGELOG.md") - } - assert matcher[0][1]: "Tag [v$project.version] not found in ${project.basedir}/CHANGELOG.md" - - - - - - - - + gcube-developer-old @@ -566,102 +384,10 @@ ${repository.snapshots.url} - - - - - - org.codehaus.mojo - build-helper-maven-plugin - ${plugin.build.helper.version} - - - - - build-helper-regex-is-snapshot-used - validate - - regex-property - - - skip.when.is.release.used - ${project.version} - ^((?!-SNAPSHOT).)*$ - true - false - - - - - - org.apache.maven.plugins - maven-deploy-plugin - ${plugin.deploy.version} - - ${skip.when.is.release.used} - - - - - org.apache.maven.plugins - maven-enforcer-plugin - ${plugin.enforcer.version} - - - enforce - validate - - enforce - - - - - [${maven.version},) - Check for Maven version >=${maven.version} failed. Update your Maven - install. - - - - [1.8,) - - - - - - - - org.codehaus.gmaven - groovy-maven-plugin - 2.0 - - - process-classes - - execute - - - - tag - - - def fileContents = new File("${project.basedir}/CHANGELOG.md").getText('UTF-8') - matcher = (fileContents =~ /(?s).\[v$project.version\].*?/) - if (!matcher.find()) { - throw new IllegalArgumentException("Tag [v$project.version] not found in ${project.basedir}/CHANGELOG.md") - } - assert matcher[0][1]: "Tag [v$project.version] not found in ${project.basedir}/CHANGELOG.md" - - - - - - - jenkins-releases - [1.8,9) @@ -710,60 +436,7 @@ - - - - org.codehaus.mojo - build-helper-maven-plugin - ${plugin.build.helper.version} - - - - build-helper-regex-is-snapshot-used - validate - - regex-property - - - skip.when.is.snapshot.used - ${project.version} - .*-SNAPSHOT$ - true - false - - - - - fail-helper-regex-is-snapshot-used - validate - - regex-property - - - fail.when.is.snapshot.used - ${project.version} - ^((?!.*-SNAPSHOT).)*$ - true - - - - - - org.apache.maven.plugins - maven-deploy-plugin - ${plugin.deploy.version} - - - fail-if-snapshot-used - deploy - - ${skip.when.is.snapshot.used} - - - - io.github.olivierlemasle.maven plaintext-maven-plugin @@ -793,9 +466,7 @@ - ${project.artifactId}-${project.version} - @@ -851,57 +522,6 @@ - - org.codehaus.mojo - build-helper-maven-plugin - ${plugin.build.helper.version} - - - - build-helper-regex-is-snapshot-used - validate - - regex-property - - - skip.when.is.snapshot.used - ${project.version} - .*-SNAPSHOT$ - true - false - - - - - fail-helper-regex-is-snapshot-used - validate - - regex-property - - - fail.when.is.snapshot.used - ${project.version} - ^((?!.*-SNAPSHOT).)*$ - true - - - - - - org.apache.maven.plugins - maven-deploy-plugin - ${plugin.deploy.version} - - - fail-if-snapshot-used - deploy - - ${skip.when.is.snapshot.used} - - - - io.github.olivierlemasle.maven plaintext-maven-plugin @@ -931,9 +551,7 @@ - ${project.artifactId}-${project.version} - @@ -1011,43 +629,6 @@ - - org.codehaus.mojo - build-helper-maven-plugin - ${plugin.build.helper.version} - - - - build-helper-regex-is-snapshot-used - validate - - regex-property - - - skip.when.is.snapshot.used - ${project.version} - .*-SNAPSHOT$ - true - false - - - - - fail-helper-regex-is-snapshot-used - validate - - regex-property - - - fail.when.is.snapshot.used - ${project.version} - ^((?!.*-SNAPSHOT).)*$ - true - - - - io.github.olivierlemasle.maven plaintext-maven-plugin @@ -1076,48 +657,6 @@ - - org.apache.maven.plugins - maven-deploy-plugin - ${plugin.deploy.version} - - - fail-if-snapshot-used - deploy - - ${skip.when.is.snapshot.used} - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - ${plugin.enforcer.version} - - - enforce - validate - - enforce - - - - - [${maven.version},) - Check for Maven version >=${maven.version} failed. Update your Maven - install. - - - - [1.8,) - - - - - - ${project.artifactId}-${project.version} @@ -1197,43 +736,6 @@ - - org.codehaus.mojo - build-helper-maven-plugin - ${plugin.build.helper.version} - - - - build-helper-regex-is-snapshot-used - validate - - regex-property - - - skip.when.is.snapshot.used - ${project.version} - .*-SNAPSHOT$ - true - false - - - - - fail-helper-regex-is-snapshot-used - validate - - regex-property - - - fail.when.is.snapshot.used - ${project.version} - ^((?!.*-SNAPSHOT).)*$ - true - - - - io.github.olivierlemasle.maven plaintext-maven-plugin @@ -1262,20 +764,6 @@ - - org.apache.maven.plugins - maven-deploy-plugin - ${plugin.deploy.version} - - - fail-if-snapshot-used - deploy - - ${skip.when.is.snapshot.used} - - - - ${project.artifactId}-${project.version} @@ -1367,43 +855,6 @@ - - org.codehaus.mojo - build-helper-maven-plugin - ${plugin.build.helper.version} - - - - build-helper-regex-is-snapshot-used - validate - - regex-property - - - skip.when.is.snapshot.used - ${project.version} - .*-SNAPSHOT$ - true - false - - - - - fail-helper-regex-is-snapshot-used - validate - - regex-property - - - fail.when.is.snapshot.used - ${project.version} - ^((?!.*-SNAPSHOT).)*$ - true - - - - io.github.olivierlemasle.maven plaintext-maven-plugin @@ -1432,25 +883,10 @@ - - org.apache.maven.plugins - maven-deploy-plugin - ${plugin.deploy.version} - - - fail-if-snapshot-used - deploy - - ${skip.when.is.snapshot.used} - - - - ${project.artifactId}-${project.version} - dry-run @@ -1476,10 +912,7 @@ - - - -- 2.17.1 From eb36893feba5b39cc1da536a2520516d23ed34dc Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Fri, 25 Feb 2022 16:07:42 +0100 Subject: [PATCH 51/85] remove jenkins-release-next profile. I think it's not strictly necessary now --- pom.xml | 86 --------------------------------------------------------- 1 file changed, 86 deletions(-) diff --git a/pom.xml b/pom.xml index 51494f0..887523a 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,6 @@ - - - - - gcube-releases - gCube Releases - ${repository.releases.url} - - false - never - - - true - never - - - - gcube-externals - gCube Externals - ${repository.externals.readonly} - - false - never - - - true - never - - - - - - - - gcube-releases - gCube Releases - ${repository.releases.url} - - - - - - - - - io.github.olivierlemasle.maven - plaintext-maven-plugin - ${plugin.plaintext.version} - - ${env.MAVEN_CONFIG_FOLDER} - - - build_commits.csv - true - - - ${project.groupId},${project.artifactId},${project.version},${project.scm.url},${buildNumber},${repository.releases.url},${project.build.finalName},${project.packaging} - - - - - - - - generate-file - package - - write - - - - - - ${project.artifactId}-${project.version} - - jenkins-staging-old -- 2.17.1 From 842fd40523f750ec1be25b8ee11b44eb3c4a3cb3 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Fri, 25 Feb 2022 16:57:07 +0100 Subject: [PATCH 52/85] remove some comments --- pom.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 887523a..241711f 100644 --- a/pom.xml +++ b/pom.xml @@ -327,7 +327,6 @@ - gcube-developer-old @@ -383,8 +382,7 @@ ${repository.snapshots.url} - - + jenkins-releases -- 2.17.1 From f99e144f5e06a25a82efb35f868c230c095a74f7 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Mon, 28 Feb 2022 14:27:45 +0100 Subject: [PATCH 53/85] rename profiles with official, legacy, experimental suffix --- pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 241711f..d47b443 100644 --- a/pom.xml +++ b/pom.xml @@ -207,7 +207,7 @@ - gcube-developer + gcube-official false [1.8,9) @@ -268,7 +268,7 @@ - gcube-developer-next + gcube-experimental false [9,) @@ -329,7 +329,7 @@ - gcube-developer-old + gcube-legacy [, 1.8) @@ -467,7 +467,7 @@ - jenkins-staging-old + jenkins-staging-legacy [,1.8) @@ -574,7 +574,7 @@ - jenkins-staging + jenkins-staging-official [1.8,9) @@ -681,7 +681,7 @@ - jenkins-staging-next + jenkins-staging-experimental [9,) -- 2.17.1 From f44fb68216f639acf2b305655acd1a8053c80937 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Tue, 1 Mar 2022 11:38:44 +0100 Subject: [PATCH 54/85] edit jdk range on jenkins-release profile --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d47b443..08f157f 100644 --- a/pom.xml +++ b/pom.xml @@ -386,7 +386,7 @@ jenkins-releases - [1.8,9) + [1.7,17) jenkins-releases true -- 2.17.1 From d445ee985e963e7372cce37598225bce732225bc Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Tue, 1 Mar 2022 12:13:12 +0100 Subject: [PATCH 55/85] move plaintext-maven-plugin release plugin to the profile common-release. --- pom.xml | 199 ++++++++++++++------------------------------------------ 1 file changed, 49 insertions(+), 150 deletions(-) diff --git a/pom.xml b/pom.xml index 08f157f..4bb33bc 100644 --- a/pom.xml +++ b/pom.xml @@ -115,7 +115,7 @@ - common-snapshot-checks + common-snapshot !Release @@ -158,7 +158,7 @@ - common-release-checks + common-release Release @@ -203,6 +203,34 @@ + + io.github.olivierlemasle.maven + plaintext-maven-plugin + ${plugin.plaintext.version} + + ${env.MAVEN_CONFIG_FOLDER} + + + build_commits.csv + true + + + ${project.groupId},${project.artifactId},${project.version},${project.scm.url},${buildNumber},${repository},${project.build.finalName},${project.packaging} + + + + + + + + generate-file + package + + write + + + + @@ -386,13 +414,15 @@ jenkins-releases - [1.7,17) + [1.8,17) jenkins-releases true - + + ${repository.releases.url} + @@ -431,38 +461,7 @@ ${repository.releases.url} - - - - io.github.olivierlemasle.maven - plaintext-maven-plugin - ${plugin.plaintext.version} - - ${env.MAVEN_CONFIG_FOLDER} - - - build_commits.csv - true - - - ${project.groupId},${project.artifactId},${project.version},${project.scm.url},${buildNumber},${repository.releases.url},${project.build.finalName},${project.packaging} - - - - - - - - generate-file - package - - write - - - - - ${project.artifactId}-${project.version} @@ -475,13 +474,15 @@ true - + + ${repository.staging.java7.url} + - gcube-staging-jenkins - gCube Jenkins Staging - ${repository.jenkins.staging.url} + gcube-staging-java7 + gCube Staging Java7 + ${repository.staging.java7.url} false never @@ -491,9 +492,9 @@ - gcube-staging - gCube Staging - ${repository.staging.url} + gcube-staging-gcore + gCube Staging gCore + ${repository.staging.gcore.url} false never @@ -502,19 +503,6 @@ true - - gcube-releases - gCube Releases - ${repository.releases.url} - - false - never - - - true - never - - gcube-externals gCube Externals @@ -539,37 +527,6 @@ - - - - io.github.olivierlemasle.maven - plaintext-maven-plugin - ${plugin.plaintext.version} - - ${env.MAVEN_CONFIG_FOLDER} - - - build_commits.csv - true - - - ${project.groupId},${project.artifactId},${project.version},${project.scm.url},${buildNumber},${repository.jenkins.staging.url},${project.build.finalName},${project.packaging} - - - - - - - - generate-file - package - - write - - - - - ${project.artifactId}-${project.version} @@ -582,7 +539,9 @@ true - + + ${repository.jenkins.staging.url} + @@ -646,37 +605,6 @@ - - - - io.github.olivierlemasle.maven - plaintext-maven-plugin - ${plugin.plaintext.version} - - ${env.MAVEN_CONFIG_FOLDER} - - - build_commits.csv - true - - - ${project.groupId},${project.artifactId},${project.version},${project.scm.url},${buildNumber},${repository.jenkins.staging.url},${project.build.finalName},${project.packaging} - - - - - - - - generate-file - package - - write - - - - - ${project.artifactId}-${project.version} @@ -689,7 +617,9 @@ true - + + ${repository.jenkins.staging.java11.url} + @@ -765,37 +695,6 @@ - - - - io.github.olivierlemasle.maven - plaintext-maven-plugin - ${plugin.plaintext.version} - - ${env.MAVEN_CONFIG_FOLDER} - - - build_commits.csv - true - - - ${project.groupId},${project.artifactId},${project.version},${project.scm.url},${buildNumber},${repository.jenkins.staging.java11.url},${project.build.finalName},${project.packaging} - - - - - - - - generate-file - package - - write - - - - - ${project.artifactId}-${project.version} -- 2.17.1 From c941b869c67b783c322575d1a87d949bff22fc51 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Tue, 1 Mar 2022 14:50:03 +0100 Subject: [PATCH 56/85] add staging depenencies repo to release profile, add release-experimental profile, remove updatePolicy set to never --- pom.xml | 116 ++++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 95 insertions(+), 21 deletions(-) diff --git a/pom.xml b/pom.xml index 4bb33bc..23e6306 100644 --- a/pom.xml +++ b/pom.xml @@ -414,7 +414,7 @@ jenkins-releases - [1.8,17) + [1.8,9) jenkins-releases true @@ -431,11 +431,9 @@ ${repository.releases.url} false - never true - never @@ -444,13 +442,21 @@ ${repository.externals.readonly} false - never true - never + + gcube-staging + gCube Staging + ${repository.staging.url} + + + gcube-jenkins-staging + gCube Jenkins Staging + ${repository.jenkins.staging.url} + @@ -465,6 +471,90 @@ ${project.artifactId}-${project.version} + + jenkins-releases-experimental + + [9,17) + + jenkins-releases + true + + + + ${repository.releases.url} + + + + + gcube-releases + gCube Releases + ${repository.releases.url} + + false + + + true + + + + gcube-externals + gCube Externals + ${repository.externals.readonly} + + false + + + true + + + + gcube-jenkins-staging-java11 + gCube Jenkins Staging Java11 + ${repository.jenkins.staging.java11.url} + + false + + + true + + + + gcube-staging + gCube Staging + ${repository.staging.url} + + false + + + true + + + + + gcube-jenkins-staging + gCube Jenkins Staging + ${repository.jenkins.staging.url} + + false + + + true + + + + + + + + gcube-releases + gCube Releases + ${repository.releases.url} + + + + ${project.artifactId}-${project.version} + + jenkins-staging-legacy @@ -497,7 +587,6 @@ ${repository.staging.gcore.url} false - never true @@ -509,11 +598,9 @@ ${repository.externals.readonly} false - never true - never @@ -550,7 +637,6 @@ ${repository.jenkins.staging.url} false - never true @@ -562,7 +648,6 @@ ${repository.staging.url} false - never true @@ -574,11 +659,9 @@ ${repository.releases.url} false - never true - never @@ -587,11 +670,9 @@ ${repository.externals.readonly} false - never true - never @@ -628,7 +709,6 @@ ${repository.jenkins.staging.url} false - never true @@ -640,7 +720,6 @@ ${repository.jenkins.staging.java11.url} false - never true @@ -652,7 +731,6 @@ ${repository.staging.url} false - never true @@ -664,11 +742,9 @@ ${repository.releases.url} false - never true - never @@ -677,11 +753,9 @@ ${repository.externals.readonly} false - never true - never -- 2.17.1 From d9d2fc38ba489b78089403f23dff1aed413fff2a Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Mon, 7 Mar 2022 11:06:56 +0100 Subject: [PATCH 57/85] Log level is set to info instead of warning --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 23e6306..1198bfa 100644 --- a/pom.xml +++ b/pom.xml @@ -1212,9 +1212,9 @@ - ******** Displaying value of *.outputDirectory properties ******** - project.metainf.outputDirectory=${project.metainf.outputDirectory} - project.webinf.outputDirectory=${project.webinf.outputDirectory} + ******** Displaying value of *.outputDirectory properties ******** + project.metainf.outputDirectory=${project.metainf.outputDirectory} + project.webinf.outputDirectory=${project.webinf.outputDirectory} -- 2.17.1 From 2bce41fbc67bb2c0ce8e7dc436e423a63e9fb0b0 Mon Sep 17 00:00:00 2001 From: "roberto.cirillo" Date: Wed, 21 Sep 2022 08:41:47 +0200 Subject: [PATCH 58/85] force java 1.8 on jdk11 activation profiles --- pom.xml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 1198bfa..13e0e44 100644 --- a/pom.xml +++ b/pom.xml @@ -305,7 +305,7 @@ - 11 + 1.8 ${java_version} ${java_version} @@ -481,8 +481,11 @@ - ${repository.releases.url} - + 1.8 + ${java_version} + ${java_version} + ${repository.releases.url} + @@ -699,6 +702,9 @@ + 1.8 + ${java_version} + ${java_version} ${repository.jenkins.staging.java11.url} -- 2.17.1 From ab2ba643c793cb12cff498db547b393cc30906ab Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Thu, 22 Sep 2022 09:53:31 +0200 Subject: [PATCH 59/85] add .idea to gitignore --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index b83d222..4e1f434 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,5 @@ /target/ +/.classpath +/*.project +/.settings +/.idea -- 2.17.1 From 0ba71cf9f6c6fb9e37ba440c10ef71999b63c71e Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Thu, 22 Sep 2022 10:25:34 +0200 Subject: [PATCH 60/85] removed gcube-staging repo. change deployment repo to gcube-staging-jenkins in jenkins-staging-experimental profile --- pom.xml | 67 +++++++-------------------------------------------------- 1 file changed, 8 insertions(+), 59 deletions(-) diff --git a/pom.xml b/pom.xml index 13e0e44..ca23515 100644 --- a/pom.xml +++ b/pom.xml @@ -52,18 +52,6 @@ - - gcube-staging - gCube Staging - https://nexus.d4science.org/nexus/content/repositories/gcube-staging/ - - false - - - true - - - gcube-externals gCube Externals @@ -447,11 +435,6 @@ true - - gcube-staging - gCube Staging - ${repository.staging.url} - gcube-jenkins-staging gCube Jenkins Staging @@ -521,18 +504,6 @@ true - - gcube-staging - gCube Staging - ${repository.staging.url} - - false - - - true - - - gcube-jenkins-staging gCube Jenkins Staging @@ -645,17 +616,6 @@ true - - gcube-staging - gCube Staging - ${repository.staging.url} - - false - - - true - - gcube-releases gCube Releases @@ -731,17 +691,6 @@ true - - gcube-staging - gCube Staging - ${repository.staging.url} - - false - - - true - - gcube-releases gCube Releases @@ -766,14 +715,14 @@ - - - - gcube-staging-jenkins-java11 - gCube Staging - ${repository.jenkins.staging.java11.url} - - + + + + gcube-staging-jenkins + gCube Staging + ${repository.jenkins.staging.url} + + ${project.artifactId}-${project.version} -- 2.17.1 From bc053fa213908fe8b90904248ae3be0b76bb86f2 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Thu, 22 Sep 2022 16:33:09 +0200 Subject: [PATCH 61/85] update maven-compiler plugin to 3.10.1; set forceJavacCompilerUse to true --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 13e0e44..a7b9d91 100644 --- a/pom.xml +++ b/pom.xml @@ -1117,6 +1117,7 @@ ${maven.compiler.target} ${maven.compiler.source} + true @@ -1358,7 +1359,7 @@ 3.1.2 3.3.1 2.6 - 3.8.1 + 3.10.1 2.1.2 2.8 3.1.0 -- 2.17.1 From e24359b40286e230e0480fcefe38ec246f30ae95 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Fri, 28 Oct 2022 12:06:26 +0200 Subject: [PATCH 62/85] Update 'CHANGELOG.md' update changelog --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1141b31..63f357c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,10 @@ # Changelog for Maven-Parent -## [v1.1.0] - 2020-01-27 +## [v1.1.0] - 2022-10-27 ### Features - +* force java 1.8 on jdk11 activation profiles +* update maven-compiler-plugin to 3.10.1 * New build profiles to support CI/CD * Enforcement for: * Java 8 (target and source) -- 2.17.1 From 43a43a274050f611315dacbfa5479f20f64e00d3 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Fri, 10 Feb 2023 11:20:04 +0100 Subject: [PATCH 63/85] add new execution phase to buildnumber-maven-plugin --- pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pom.xml b/pom.xml index 44045e6..b5465c9 100644 --- a/pom.xml +++ b/pom.xml @@ -773,6 +773,17 @@ false + + build.date + initialize + + create-timestamp + + + yyyy-MM-dd + build.date + + -- 2.17.1 From 8286aaa563b67c4d2a3669723402ed654fc3610f Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Tue, 2 May 2023 16:01:30 +0200 Subject: [PATCH 64/85] moved to 1.2.0-SNAPSHOT. see #24259 fix repository variable on pom --- CHANGELOG.md | 7 + pom.xml | 373 ++++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 301 insertions(+), 79 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 63f357c..3f61afd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,18 @@ # Changelog for Maven-Parent +## [v1.2.0-SNAPSHOT] - 2023-05-02 + +### Features +* new maven profiles for managing jdk7 (gcore-legacy) and jdk17 build (see #24259) +* add new group repositories for managing jdk17 dependencies resolution + ## [v1.1.0] - 2022-10-27 ### Features * force java 1.8 on jdk11 activation profiles * update maven-compiler-plugin to 3.10.1 * New build profiles to support CI/CD +* add new execution phase to buildnumber-maven-plugin * Enforcement for: * Java 8 (target and source) * OpenJDK as target Java VM. diff --git a/pom.xml b/pom.xml index b5465c9..9eae7ff 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.gcube.tools maven-parent - 1.1.0 + 1.2.0-SNAPSHOT pom @@ -226,7 +226,7 @@ gcube-official false - [1.8,9) + [9,17) !Release @@ -287,7 +287,7 @@ gcube-experimental false - [9,) + [17,) !Release @@ -297,8 +297,7 @@ ${java_version} ${java_version} - - + gcube-snapshots @@ -312,9 +311,9 @@ - gcube-releases - gCube Releases - ${repository.releases.url} + gcube-releases-all + gCube Releases All + ${repository.releases.all.url} false @@ -342,17 +341,69 @@ ${repository.snapshots.url} - - - + + + gcore-legacy + + [, 1.8) + + !Release + + + + + + + gcube-snapshots + gCube Snapshots + ${repository.snapshots.url} + + true + + + false + + + + gcube-releases-gcore + gCube Releases gCore + ${repository.releases.gcore.url} + + false + + + true + + + + gcube-externals + gCube Externals + ${repository.externals.readonly} + + false + + + true + + + + + + + gcube-snapshots + gCube Snapshots + ${repository.snapshots.url} + + + + gcube-legacy - [, 1.8) + [1.8, 9) !Release - - + @@ -389,7 +440,6 @@ - @@ -398,9 +448,64 @@ ${repository.snapshots.url} - + - jenkins-releases + jenkins-releases-gcore-legacy + + [,1.8) + + jenkins-releases + true + + + + ${repository.releases.gcore.url} + + + + + gcube-releases-gcore + gCube Releases + ${repository.releases.gcore.url} + + false + + + true + + + + gcube-externals + gCube Externals + ${repository.externals.readonly} + + false + + + true + + + + gcube-jenkins-staging-gcore + gCube Jenkins Staging + ${repository.jenkins.staging.gcore.url} + + + + + + + gcube-releases-gcore + gCube Releases + ${repository.releases.gcore.url} + + + + ${project.artifactId}-${project.version} + + + + jenkins-releases-legacy [1.8,9) @@ -408,9 +513,66 @@ true - - ${repository.releases.url} - + + ${repository.releases.url} + + + + + gcube-releases + gCube Releases + ${repository.releases.url} + + false + + + true + + + + gcube-externals + gCube Externals + ${repository.externals.readonly} + + false + + + true + + + + gcube-jenkins-staging + gCube Jenkins Staging + ${repository.jenkins.staging.url} + + + + + + gcube-releases + gCube Releases + ${repository.releases.url} + + + + ${project.artifactId}-${project.version} + + + + jenkins-releases + + [9,17) + + jenkins-releases + true + + + + 1.8 + ${java_version} + ${java_version} + ${repository.releases.url} + @@ -457,7 +619,7 @@ jenkins-releases-experimental - [9,17) + [17,) jenkins-releases true @@ -467,14 +629,14 @@ 1.8 ${java_version} ${java_version} - ${repository.releases.url} + ${repository.releases.next.url} - gcube-releases + gcube-releases-all gCube Releases - ${repository.releases.url} + ${repository.releases.all.url} false @@ -494,9 +656,9 @@ - gcube-jenkins-staging-java11 - gCube Jenkins Staging Java11 - ${repository.jenkins.staging.java11.url} + gcube-staging-all + gCube Staging All + ${repository.staging.all.url} false @@ -504,33 +666,22 @@ true - - gcube-jenkins-staging - gCube Jenkins Staging - ${repository.jenkins.staging.url} - - false - - - true - - - gcube-releases + gcube-releases-next gCube Releases - ${repository.releases.url} + ${repository.releases.next.url} ${project.artifactId}-${project.version} - + - jenkins-staging-legacy + jenkins-staging-gcore-legacy [,1.8) @@ -538,15 +689,15 @@ true - - ${repository.staging.java7.url} - + + ${repository.jenkins.staging.gcore.url} + gcube-staging-java7 gCube Staging Java7 - ${repository.staging.java7.url} + ${repository.jenkins.staging.java7.url} false never @@ -558,7 +709,7 @@ gcube-staging-gcore gCube Staging gCore - ${repository.staging.gcore.url} + ${repository.jenkins.staging.gcore.url} false @@ -579,6 +730,67 @@ + + + + gcube-staging-gcore + gCube Staging gCore + ${repository.jenkins.staging.gcore.url} + + + + ${project.artifactId}-${project.version} + + + + jenkins-staging-legacy + + [1.8,9) + + jenkins-staging + true + + + + ${repository.staging.url} + + + + + gcube-staging-jenkins + gCube Staging Jenkins + ${repository.jenkins.staging.url} + + false + never + + + true + + + + gcube-releases + gCube Releases + ${repository.releases.url} + + false + + + true + + + + gcube-externals + gCube Externals + ${repository.externals.readonly} + + false + + + true + + + @@ -594,15 +806,18 @@ jenkins-staging-official - [1.8,9) + [9,17) jenkins-staging true - - ${repository.jenkins.staging.url} - + + 1.8 + ${java_version} + ${java_version} + ${repository.jenkins.staging.url} + @@ -639,7 +854,6 @@ - @@ -655,7 +869,7 @@ jenkins-staging-experimental - [9,) + [17,) jenkins-staging true @@ -665,14 +879,14 @@ 1.8 ${java_version} ${java_version} - ${repository.jenkins.staging.java11.url} + ${repository.jenkins.staging.next.url} - gcube-staging-jenkins - gCube Jenkins Staging - ${repository.jenkins.staging.url} + gcube-staging-all + gCube Staging All + ${repository.staging.all.url} false @@ -680,21 +894,11 @@ true + - gcube-staging-jenkins-java11 - gCube Jenkins Staging Java11 - ${repository.jenkins.staging.java11.url} - - false - - - true - - - - gcube-releases + gcube-releases-all gCube Releases - ${repository.releases.url} + ${repository.releases.all.url} false @@ -718,9 +922,9 @@ - gcube-staging-jenkins - gCube Staging - ${repository.jenkins.staging.url} + gcube-staging-jenkins-next + gCube Jenkins Staging Next + ${repository.jenkins.staging.next.url} @@ -1338,17 +1542,28 @@ 3.3.9 https://nexus.d4science.org/nexus/content/repositories/gcube-snapshots + https://nexus.d4science.org/nexus/content/repositories/gcube-releases-gcore + https://nexus.d4science.org/nexus/content/repositories/gcube-releases + https://nexus.d4science.org/nexus/content/repositories/gcube-releases-next + + https://nexus.d4science.org/nexus/content/groups/gcube-releases-all + + + https://nexus.d4science.org/nexus/content/repositories/gcube-staging-gcore + + + https://nexus.d4science.org/nexus/content/repositories/gcube-staging-java7 + https://nexus.d4science.org/nexus/content/repositories/gcube-staging-jenkins - - https://nexus.d4science.org/nexus/content/repositories/gcube-staging-jenkins-java11 - - https://nexus.d4science.org/nexus/content/repositories/gcube-staging/ - - + + https://nexus.d4science.org/nexus/content/repositories/gcube-staging-jenkins-next + + https://nexus.d4science.org/nexus/content/groups/gcube-staging-all + https://nexus.d4science.org/nexus/content/repositories/gcube-externals -- 2.17.1 From 241cd80f38883c04871707947e1f1945e3847934 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Fri, 12 May 2023 14:30:19 +0200 Subject: [PATCH 65/85] add classpath resource #25106, change groovy-mavn and javadoc plugin configurations #25108 --- pom.xml | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 9eae7ff..e3deb82 100644 --- a/pom.xml +++ b/pom.xml @@ -78,6 +78,19 @@ -Xdoclint:none + + set-local-classpath + + [1.8,) + + + + + ${maven.local.classpath} + + + + generate-distribution-packages @@ -399,7 +412,7 @@ gcube-legacy - [1.8, 9) + [1.8,9) !Release @@ -1476,13 +1489,12 @@ jar + ${java_version} ${javadoc.opts} - - org.codehaus.gmaven groovy-maven-plugin @@ -1508,8 +1520,15 @@ + + + org.codehaus.groovy + groovy-all + 3.0.0-beta-3 + pom + + - @@ -1537,6 +1556,7 @@ .*OpenJDK.* ${java_version} ${java_version} + /opt/gcube/local-classpath UTF-8 3.3.9 -- 2.17.1 From 8c19d4b7d4db090116418506e95d90915b045412 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Fri, 12 May 2023 15:10:27 +0200 Subject: [PATCH 66/85] update to 1.2.0 version --- CHANGELOG.md | 4 +++- pom.xml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f61afd..1d93b79 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,12 @@ # Changelog for Maven-Parent -## [v1.2.0-SNAPSHOT] - 2023-05-02 +## [v1.2.0] - 2023-05-12 ### 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 ## [v1.1.0] - 2022-10-27 diff --git a/pom.xml b/pom.xml index e3deb82..c662b7f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.gcube.tools maven-parent - 1.2.0-SNAPSHOT + 1.2.0 pom -- 2.17.1 From e26f69443c8217e652457babe49ad4ba210d45a9 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Fri, 21 Jul 2023 12:58:38 +0200 Subject: [PATCH 67/85] improve README --- README.md | 41 ++++++++++++++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 6a2fced..9a06668 100644 --- a/README.md +++ b/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,39 @@ 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 +61,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 + -- 2.17.1 From 2df3a89dfc920975dc7bf12c57bc45ec28595ca9 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Wed, 26 Jul 2023 16:25:54 +0200 Subject: [PATCH 68/85] update README --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 9a06668..f265f89 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ A parent pom for all the gCube artifacts. 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 @@ -22,6 +23,7 @@ The developer branch contains the profiles related to the snapshot build: 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 -- 2.17.1 From 62686e818e99c54bf5b853a82753e1dd16daba7e Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Fri, 13 Oct 2023 10:42:51 +0200 Subject: [PATCH 69/85] moved to 1.2.1-SNAPSHOT. see #25872 update groovy-all plugin related to jdk17 profile --- pom.xml | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c662b7f..c2977c3 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.gcube.tools maven-parent - 1.2.0 + 1.2.1-SNAPSHOT pom @@ -354,6 +354,46 @@ ${repository.snapshots.url} + + + + + org.codehaus.gmaven + groovy-maven-plugin + 2.1.1 + + + process-classes + + execute + + + + tag + + + def fileContents = new File("${project.basedir}/CHANGELOG.md").getText('UTF-8') + matcher = (fileContents =~ /(?s).\[v$project.version\].*?/) + if (!matcher.find()) { + throw new IllegalArgumentException("Tag [v$project.version] not found in ${project.basedir}/CHANGELOG.md") + } + assert matcher[0][1]: "Tag [v$project.version] not found in ${project.basedir}/CHANGELOG.md" + + + + + + + org.codehaus.groovy + groovy-all + 3.0.8 + pom + + + + + + gcore-legacy -- 2.17.1 From 99cde69cfe55e19d8f6431f8de108f7128b1c896 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Fri, 13 Oct 2023 10:50:28 +0200 Subject: [PATCH 70/85] update CHANGELOG --- CHANGELOG.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d93b79..bf3de7f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,12 @@ # Changelog for Maven-Parent + +## [v1.2.1-SNAPSHOT] - 2023-10-13 + ## [v1.2.0] - 2023-05-12 -### 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 +* update jdk17 profiles groovy plugin version in order to fix #25872 ## [v1.1.0] - 2022-10-27 -- 2.17.1 From 4d24257b08c3527ffd402847a401a09b7adac966 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Fri, 13 Oct 2023 11:26:48 +0200 Subject: [PATCH 71/85] migrate plugin dependency from groovy-all to groovy in gcube-experimental profile --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c2977c3..6857dc7 100644 --- a/pom.xml +++ b/pom.xml @@ -385,7 +385,7 @@ org.codehaus.groovy - groovy-all + groovy 3.0.8 pom -- 2.17.1 From 0315b09ce79c33e7ffb1f930d4405a5d5f69bd65 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Fri, 13 Oct 2023 12:05:58 +0200 Subject: [PATCH 72/85] update groovy-all plugin to 3.0.13 in gcube-experimental profile --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6857dc7..9e4e1d5 100644 --- a/pom.xml +++ b/pom.xml @@ -385,8 +385,8 @@ org.codehaus.groovy - groovy - 3.0.8 + groovy-all + 3.0.13 pom -- 2.17.1 From 067dcfa23b4709d22cb10b968050d84c23f6e5aa Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Fri, 13 Oct 2023 12:25:25 +0200 Subject: [PATCH 73/85] move common plugin declaration inside gcube-official profile, just for testing --- pom.xml | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 9e4e1d5..c57364d 100644 --- a/pom.xml +++ b/pom.xml @@ -294,6 +294,46 @@ ${repository.snapshots.url} + + + + + org.codehaus.gmaven + groovy-maven-plugin + 2.1.1 + + + process-classes + + execute + + + + tag + + + def fileContents = new File("${project.basedir}/CHANGELOG.md").getText('UTF-8') + matcher = (fileContents =~ /(?s).\[v$project.version\].*?/) + if (!matcher.find()) { + throw new IllegalArgumentException("Tag [v$project.version] not found in ${project.basedir}/CHANGELOG.md") + } + assert matcher[0][1]: "Tag [v$project.version] not found in ${project.basedir}/CHANGELOG.md" + + + + + + + org.codehaus.groovy + groovy-all + 3.0.0-beta-3 + pom + + + + + + @@ -1535,7 +1575,7 @@ - + -- 2.17.1 From 60e3ab5e5f123c80b27edf08642a24e3c34c1947 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Fri, 13 Oct 2023 14:57:46 +0200 Subject: [PATCH 74/85] restrict the disable-java8-doclint profile --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c57364d..93cc6be 100644 --- a/pom.xml +++ b/pom.xml @@ -72,7 +72,7 @@ disable-java8-doclint - [1.8,) + [1.8,17) -Xdoclint:none -- 2.17.1 From 7db55f6d04d2c0e20227507b70143ad75463cd4d Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Fri, 13 Oct 2023 16:59:52 +0200 Subject: [PATCH 75/85] enable disable-java8-doclint profile also for jdk17 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 93cc6be..c57364d 100644 --- a/pom.xml +++ b/pom.xml @@ -72,7 +72,7 @@ disable-java8-doclint - [1.8,17) + [1.8,) -Xdoclint:none -- 2.17.1 From f4225749b0400d772682799330741d604e6c301e Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Mon, 16 Oct 2023 09:32:47 +0200 Subject: [PATCH 76/85] try to update common plugins to groovy-all 3.0.13 --- pom.xml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index c57364d..0363177 100644 --- a/pom.xml +++ b/pom.xml @@ -294,7 +294,7 @@ ${repository.snapshots.url} - + @@ -394,7 +394,7 @@ ${repository.snapshots.url} - + pom - + -- 2.17.1 From 6f66a8c87c61fef02d40949f82ea3036462d5afa Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Mon, 16 Oct 2023 09:36:02 +0200 Subject: [PATCH 77/85] fix syntax --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0363177..6c9dbf0 100644 --- a/pom.xml +++ b/pom.xml @@ -433,7 +433,7 @@ - + gcore-legacy -- 2.17.1 From eb6f53379005972c76874a95eafa5923c3d892fe Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Mon, 16 Oct 2023 09:47:45 +0200 Subject: [PATCH 78/85] removed commented plugin declarations --- pom.xml | 81 --------------------------------------------------------- 1 file changed, 81 deletions(-) diff --git a/pom.xml b/pom.xml index 6c9dbf0..996ded9 100644 --- a/pom.xml +++ b/pom.xml @@ -294,46 +294,6 @@ ${repository.snapshots.url} - @@ -394,46 +354,6 @@ ${repository.snapshots.url} - gcore-legacy @@ -443,7 +363,6 @@ !Release - -- 2.17.1 From af347b82f7f18f791a55250cde485c29b098b094 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Mon, 16 Oct 2023 09:49:11 +0200 Subject: [PATCH 79/85] update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bf3de7f..650d562 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## [v1.2.1-SNAPSHOT] - 2023-10-13 +* update groovy-all plugin dependency from 3.0.0-beta to 3.0.13 #25872 ## [v1.2.0] - 2023-05-12 -- 2.17.1 From fb4823b683680ebd26745b9d9b1b32814ae0f63a Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Thu, 22 Feb 2024 09:50:30 +0100 Subject: [PATCH 80/85] removed set-local-classpath profile. see #26841 --- pom.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index c662b7f..2dab2b9 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.gcube.tools maven-parent - 1.2.0 + 1.2.0-SNAPSHOT pom @@ -78,7 +78,8 @@ -Xdoclint:none - + + generate-distribution-packages @@ -1556,7 +1557,7 @@ .*OpenJDK.* ${java_version} ${java_version} - /opt/gcube/local-classpath + UTF-8 3.3.9 -- 2.17.1 From 06024a761cd162dc2231ceca6b4767dc6577e2f7 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Thu, 22 Feb 2024 09:54:04 +0100 Subject: [PATCH 81/85] removed set-local-classpath profile. see #26841 --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d93b79..c9433ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog for Maven-Parent +## [v1.2.0] - 2024-02-22 + +### Bug +* removed set-local-classpath profile. see #26841 + ## [v1.2.0] - 2023-05-12 ### Features -- 2.17.1 From e8fde085c08b1ab9d651dbe731abb191f12a29e8 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Thu, 22 Feb 2024 09:54:52 +0100 Subject: [PATCH 82/85] fix changelog version --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c9433ad..7fd59b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog for Maven-Parent -## [v1.2.0] - 2024-02-22 +## [v1.2.0-SNAPSHOT] - 2024-02-22 ### Bug * removed set-local-classpath profile. see #26841 -- 2.17.1 From 29b9eab1405953b591ccc01d01e168b9efdf0f4a Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Thu, 22 Feb 2024 09:59:23 +0100 Subject: [PATCH 83/85] set 1.2.0 version --- CHANGELOG.md | 8 +++----- pom.xml | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7fd59b4..6670444 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,5 @@ # Changelog for Maven-Parent -## [v1.2.0-SNAPSHOT] - 2024-02-22 - -### Bug -* removed set-local-classpath profile. see #26841 - ## [v1.2.0] - 2023-05-12 ### Features @@ -13,6 +8,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 diff --git a/pom.xml b/pom.xml index 2dab2b9..226ea78 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.gcube.tools maven-parent - 1.2.0-SNAPSHOT + 1.2.0 pom -- 2.17.1 From cc285dad976316ec88cc2d596fe206fd1cd15a28 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Wed, 3 Apr 2024 11:16:12 +0200 Subject: [PATCH 84/85] move to 1.2.0 version --- CHANGELOG.md | 14 ++++++++------ pom.xml | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 650d562..84f7f81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,15 @@ # Changelog for Maven-Parent - -## [v1.2.1-SNAPSHOT] - 2023-10-13 -* update groovy-all plugin dependency from 3.0.0-beta to 3.0.13 #25872 - -## [v1.2.0] - 2023-05-12 +## [v1.2.0] - 2023-10-13 ### Bug -* update jdk17 profiles groovy plugin version in order to fix #25872 +* 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 ## [v1.1.0] - 2022-10-27 diff --git a/pom.xml b/pom.xml index 996ded9..ee54f5e 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.gcube.tools maven-parent - 1.2.1-SNAPSHOT + 1.2.0 pom -- 2.17.1 From 0b40060d28180034eb24d359025d210bb8b695ab Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Fri, 5 Apr 2024 15:35:28 +0200 Subject: [PATCH 85/85] fix conflict with master --- CHANGELOG.md | 3 ++- pom.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 05e883d..3f9f957 100644 --- 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 diff --git a/pom.xml b/pom.xml index d406be3..631fcc5 100644 --- a/pom.xml +++ b/pom.xml @@ -1545,7 +1545,7 @@ 2.6 3.10.1 2.1.2 - 2.8 + 3.6.3 3.1.0 -- 2.17.1