From 9ea6ed448b13d15ce23abf767517efad2ee3f244 Mon Sep 17 00:00:00 2001 From: Martin Stockhammer Date: Thu, 29 Aug 2019 22:09:26 +0200 Subject: [PATCH] Changing build to maven 3.5.4 --- Jenkinsfile | 6 +++--- Jenkinsfile-itest | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 69126491d..e3a5335ef 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -32,7 +32,7 @@ buildJdk = 'JDK 1.8 (latest)' buildJdk9 = 'JDK 1.9 (latest)' buildJdk10 = 'JDK 10 (latest)' buildJdk11 = 'JDK 11 (latest)' -buildMvn = 'Maven 3.5.2' +buildMvn = 'Maven 3.5.4' //localRepository = ".repository" localRepository = "../.maven_repositories/${env.EXECUTOR_NUMBER}" mavenOpts = '-Xms1g -Xmx2g -Djava.awt.headless=true' @@ -95,7 +95,7 @@ pipeline { // -Dmaven.compiler.fork=true: Do compile in a separate forked process // -Dmaven.test.failure.ignore=true: Do not stop, if some tests fail // -Pci-build: Profile for CI-Server - sh "export PATH=$MVN_CMD_DIR:$PATH && mvn clean deploy -B -U -e -fae -Dmaven.compiler.fork=true -Pci-build -T3" + sh "mvn clean deploy -B -U -e -fae -Dmaven.compiler.fork=true -Pci-build -T3" } } } @@ -136,7 +136,7 @@ pipeline { options: publishers ) { - sh "export PATH=$MVN_CMD_DIR:$PATH && mvn clean install -U -B -e -fae -Dmaven.compiler.fork=true -Pci-build -T3" + sh "mvn clean install -U -B -e -fae -Dmaven.compiler.fork=true -Pci-build -T3" } } } diff --git a/Jenkinsfile-itest b/Jenkinsfile-itest index aa7d3bb6b..18e3e7473 100644 --- a/Jenkinsfile-itest +++ b/Jenkinsfile-itest @@ -26,7 +26,7 @@ LABEL = 'ubuntu' buildJdk = 'JDK 1.8 (latest)' -buildMvn = 'Maven 3.5.2' +buildMvn = 'Maven 3.5.4' deploySettings = 'archiva-uid-jenkins' DOCKERHUB_CREDS = 'c725478f-9125-460a-900f-1da562e51026' //localRepository = ".repository" -- 2.39.5