Use the Maven Wrapper only in Jenkinsfile

eclipse · Mar 6, 2024 · 76d8f2b · 76d8f2b
1 parent 52b5d7a
commit 76d8f2b
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 4 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -25,7 +25,6 @@ pipeline {
   }
 
   tools {
-     maven "apache-maven-3.9.2"
      jdk "temurin-jdk17-latest"
   }
 

diff --git a/full-build.sh b/full-build.sh
@@ -44,6 +44,8 @@ done
 
 MVN_ARGS+=(-PuseJenkinsSnapshots)
 
+MVN_ARGS+=("-Dmaven.home=$(./mvnw --version | grep "Maven home:" | cut -c 13-)")
+
 echo ./mvnw -B -f org.eclipse.xtext.full.releng ${MVN_ARGS[@]} $@
 
 #echo "Using target platform '$TARGET_PLATFORM'"

diff --git a/full-deploy.sh b/full-deploy.sh
@@ -44,6 +44,8 @@ done
 
 MVN_ARGS+=(-PuseJenkinsSnapshots)
 
+MVN_ARGS+=("-Dmaven.home=$(./mvnw --version | grep "Maven home:" | cut -c 13-)")
+
 echo ./mvnw -B -f org.eclipse.xtext.full.releng ${MVN_ARGS[@]} $@
 
 ./mvnw -B \

diff --git a/jenkins/milestone-deploy/Jenkinsfile b/jenkins/milestone-deploy/Jenkinsfile
@@ -25,7 +25,6 @@ pipeline {
   }
 
   tools {
-    maven "apache-maven-3.9.2"
     jdk "temurin-jdk17-latest"
   }
 

diff --git a/jenkins/nightly-deploy/Jenkinsfile b/jenkins/nightly-deploy/Jenkinsfile
@@ -13,7 +13,6 @@ pipeline {
   }
 
   tools {
-    maven "apache-maven-3.9.2"
     jdk "temurin-jdk17-latest"
   }
 

diff --git a/jenkins/release-deploy/Jenkinsfile b/jenkins/release-deploy/Jenkinsfile
@@ -21,7 +21,6 @@ pipeline {
   }
 
   tools {
-    maven "apache-maven-3.9.2"
     jdk "temurin-jdk17-latest"
   }