From 20aff9b597ebfd1a5b66f832eb5280564424d000 Mon Sep 17 00:00:00 2001 From: Christian Beikov Date: Mon, 9 Oct 2023 15:27:12 +0200 Subject: [PATCH] Add build option for configuring maven central mirror --- Jenkinsfile | 2 +- ci/jpa-3.1-tck.Jenkinsfile | 2 +- ci/jpa-3.2-tck.Jenkinsfile | 2 +- settings.gradle | 3 +++ 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 731b72a2a4..e74dff4c9e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -110,7 +110,7 @@ stage('Build') { // Use withEnv instead of setting env directly, as that is global! // See https://github.com/jenkinsci/pipeline-plugin/blob/master/TUTORIAL.md withEnv(["JAVA_HOME=${javaHome}", "PATH+JAVA=${javaHome}/bin"]) { - state[buildEnv.tag]['additionalOptions'] = '' + state[buildEnv.tag]['additionalOptions'] = '-PmavenMirror=nexus-load-balancer-c4cf05fd92f43ef8.elb.us-east-1.amazonaws.com' if ( testJavaHome ) { state[buildEnv.tag]['additionalOptions'] = state[buildEnv.tag]['additionalOptions'] + " -Ptest.jdk.version=${buildEnv.testJdkVersion} -Porg.gradle.java.installations.paths=${javaHome},${testJavaHome}" diff --git a/ci/jpa-3.1-tck.Jenkinsfile b/ci/jpa-3.1-tck.Jenkinsfile index 6552edce9a..63b6cd2b6e 100644 --- a/ci/jpa-3.1-tck.Jenkinsfile +++ b/ci/jpa-3.1-tck.Jenkinsfile @@ -47,7 +47,7 @@ pipeline { } dir('hibernate') { checkout scm - sh './gradlew publishToMavenLocal -DjakartaJpaVersion=3.1.0' + sh './gradlew publishToMavenLocal -PmavenMirror=nexus-load-balancer-c4cf05fd92f43ef8.elb.us-east-1.amazonaws.com -DjakartaJpaVersion=3.1.0' script { env.HIBERNATE_VERSION = sh ( script: "grep hibernateVersion gradle/version.properties|cut -d'=' -f2", diff --git a/ci/jpa-3.2-tck.Jenkinsfile b/ci/jpa-3.2-tck.Jenkinsfile index 507dca2354..f1ed45c16e 100644 --- a/ci/jpa-3.2-tck.Jenkinsfile +++ b/ci/jpa-3.2-tck.Jenkinsfile @@ -41,7 +41,7 @@ pipeline { } dir('hibernate') { checkout scm - sh './gradlew publishToMavenLocal -DjakartaJpaVersion=3.2.0-SNAPSHOT' + sh './gradlew publishToMavenLocal -PmavenMirror=nexus-load-balancer-c4cf05fd92f43ef8.elb.us-east-1.amazonaws.com -DjakartaJpaVersion=3.2.0-SNAPSHOT' script { env.HIBERNATE_VERSION = sh ( script: "grep hibernateVersion gradle/version.properties|cut -d'=' -f2", diff --git a/settings.gradle b/settings.gradle index bfdf789bae..758e0ec15a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -25,6 +25,9 @@ plugins { dependencyResolutionManagement { repositories { + if ( rootProject.hasProperty( "mavenMirror" ) ) { + url( rootProject.property( "mavenMirror" ) ) + } mavenCentral() // Needed for the RC versions of Jakarta Persistence maven {