From 8286aaa563b67c4d2a3669723402ed654fc3610f Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Tue, 2 May 2023 16:01:30 +0200 Subject: [PATCH] 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