From 1089f7518ecaa28c84ec422d236b529a79fd62df Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Mon, 31 Mar 2025 20:57:48 +1000 Subject: [PATCH 1/5] test mimir with Jenkinsfile Signed-off-by: Olivier Lamy --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 87c141ea3c27..c5187815562f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -67,6 +67,7 @@ def mavenBuild(jdk, extraArgs) { withEnv(["JAVA_HOME=${tool "$jdk"}", "PATH+MAVEN=${ tool "$jdk" }/bin:${tool "maven_3_latest"}/bin", "MAVEN_OPTS=-Xms4G -Xmx4G -Djava.awt.headless=true"]) { + sh "cp .github/ci-extensions.xml .mvn/extensions.xml" sh "mvn --errors --batch-mode --show-version org.apache.maven.plugins:maven-wrapper-plugin:3.3.2:wrapper -Dmaven=3.9.9" sh "./mvnw clean install -B -U -e -DskipTests -PversionlessMavenDist -V -DdistributionTargetDir=${env.WORKSPACE}/.apache-maven-master" // we use two steps so that we can cache artifacts downloaded from Maven Central repository From f8fdcfcad8e36878b6eec7839aa3795c107db2d7 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Thu, 3 Apr 2025 17:04:55 +1000 Subject: [PATCH 2/5] build with 4.0.0-rc3, mimir extension in user home Signed-off-by: Olivier Lamy --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c5187815562f..74a5b081e4d7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -67,8 +67,8 @@ def mavenBuild(jdk, extraArgs) { withEnv(["JAVA_HOME=${tool "$jdk"}", "PATH+MAVEN=${ tool "$jdk" }/bin:${tool "maven_3_latest"}/bin", "MAVEN_OPTS=-Xms4G -Xmx4G -Djava.awt.headless=true"]) { - sh "cp .github/ci-extensions.xml .mvn/extensions.xml" - sh "mvn --errors --batch-mode --show-version org.apache.maven.plugins:maven-wrapper-plugin:3.3.2:wrapper -Dmaven=3.9.9" + sh "cp .github/ci-extensions.xml ~/.m2/extensions.xml" + sh "mvn --errors --batch-mode --show-version org.apache.maven.plugins:maven-wrapper-plugin:3.3.2:wrapper -Dmaven=4.0.0-rc-3" sh "./mvnw clean install -B -U -e -DskipTests -PversionlessMavenDist -V -DdistributionTargetDir=${env.WORKSPACE}/.apache-maven-master" // we use two steps so that we can cache artifacts downloaded from Maven Central repository // without installing any local artifacts to not pollute the cache From fa281028ee8421177d0a0684d7e33fb148f3646e Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Mon, 7 Apr 2025 15:30:39 +1000 Subject: [PATCH 3/5] copy to ~/.m2/extensions.xml Signed-off-by: Olivier Lamy --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 74a5b081e4d7..abc0a310fefa 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -67,7 +67,7 @@ def mavenBuild(jdk, extraArgs) { withEnv(["JAVA_HOME=${tool "$jdk"}", "PATH+MAVEN=${ tool "$jdk" }/bin:${tool "maven_3_latest"}/bin", "MAVEN_OPTS=-Xms4G -Xmx4G -Djava.awt.headless=true"]) { - sh "cp .github/ci-extensions.xml ~/.m2/extensions.xml" + sh "cp .github/ci-extensions.xml ~/.mvn/extensions.xml" sh "mvn --errors --batch-mode --show-version org.apache.maven.plugins:maven-wrapper-plugin:3.3.2:wrapper -Dmaven=4.0.0-rc-3" sh "./mvnw clean install -B -U -e -DskipTests -PversionlessMavenDist -V -DdistributionTargetDir=${env.WORKSPACE}/.apache-maven-master" // we use two steps so that we can cache artifacts downloaded from Maven Central repository From fbc63f3399929b803776bcd6526e19fddb1c76f7 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Mon, 7 Apr 2025 15:34:23 +1000 Subject: [PATCH 4/5] copy to .mvn/extensions.xml Signed-off-by: Olivier Lamy --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index abc0a310fefa..2d475ecd5bf3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -67,7 +67,7 @@ def mavenBuild(jdk, extraArgs) { withEnv(["JAVA_HOME=${tool "$jdk"}", "PATH+MAVEN=${ tool "$jdk" }/bin:${tool "maven_3_latest"}/bin", "MAVEN_OPTS=-Xms4G -Xmx4G -Djava.awt.headless=true"]) { - sh "cp .github/ci-extensions.xml ~/.mvn/extensions.xml" + sh "cp .github/ci-extensions.xml .mvn/extensions.xml" sh "mvn --errors --batch-mode --show-version org.apache.maven.plugins:maven-wrapper-plugin:3.3.2:wrapper -Dmaven=4.0.0-rc-3" sh "./mvnw clean install -B -U -e -DskipTests -PversionlessMavenDist -V -DdistributionTargetDir=${env.WORKSPACE}/.apache-maven-master" // we use two steps so that we can cache artifacts downloaded from Maven Central repository From 4c4052215e765333a53e45eb688d552c26f019f0 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Tue, 8 Apr 2025 19:19:13 +1000 Subject: [PATCH 5/5] cleanup files from ~/.m2/ Signed-off-by: Olivier Lamy --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 2d475ecd5bf3..159b6622148b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -67,6 +67,7 @@ def mavenBuild(jdk, extraArgs) { withEnv(["JAVA_HOME=${tool "$jdk"}", "PATH+MAVEN=${ tool "$jdk" }/bin:${tool "maven_3_latest"}/bin", "MAVEN_OPTS=-Xms4G -Xmx4G -Djava.awt.headless=true"]) { + sh "rm -f ~/.m2/extensions.xml" sh "cp .github/ci-extensions.xml .mvn/extensions.xml" sh "mvn --errors --batch-mode --show-version org.apache.maven.plugins:maven-wrapper-plugin:3.3.2:wrapper -Dmaven=4.0.0-rc-3" sh "./mvnw clean install -B -U -e -DskipTests -PversionlessMavenDist -V -DdistributionTargetDir=${env.WORKSPACE}/.apache-maven-master"