You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by an...@apache.org on 2020/10/20 14:22:10 UTC
[zookeeper] branch branch-3.5 updated: ZOOKEEPER-3980: Fix
Jenkinsfiles with new tool names
This is an automated email from the ASF dual-hosted git repository.
andor pushed a commit to branch branch-3.5
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/branch-3.5 by this push:
new db9fed4 ZOOKEEPER-3980: Fix Jenkinsfiles with new tool names
db9fed4 is described below
commit db9fed4c95e4828389b30c0f6e94182db26ff99b
Author: Enrico Olivelli <eo...@apache.org>
AuthorDate: Tue Oct 20 16:21:30 2020 +0200
ZOOKEEPER-3980: Fix Jenkinsfiles with new tool names
Author: Enrico Olivelli <eo...@apache.org>
Reviewers: andor@apache.org
Closes #1510 from eolivelli/fix/ZOOKEEPER-3980 and squashes the following commits:
15beb5713 [Enrico Olivelli] fix java
5d8418f5c [Enrico Olivelli] ZOOKEEPER-3980 Fix Jenkinsfiles with new tool names
(cherry picked from commit eeb1ceb6f82b67b8b46d5ff9481908f7ec943f19)
Signed-off-by: Andor Molnar <an...@apache.org>
---
Jenkinsfile | 4 ++--
Jenkinsfile-PreCommit | 4 ++--
Jenkinsfile-owasp | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index ab7baed..ed074c9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -39,12 +39,12 @@ pipeline {
axes {
axis {
name 'JAVA_VERSION'
- values 'JDK 1.8 (latest)', 'JDK 11 (latest)'
+ values 'jdk_1.8_latest', 'jdk_11_latest'
}
}
tools {
- maven "Maven (latest)"
+ maven "maven_latest"
jdk "${JAVA_VERSION}"
}
diff --git a/Jenkinsfile-PreCommit b/Jenkinsfile-PreCommit
index 90b3f99..600ad1d 100644
--- a/Jenkinsfile-PreCommit
+++ b/Jenkinsfile-PreCommit
@@ -29,8 +29,8 @@ pipeline {
}
tools {
- maven "Maven (latest)"
- jdk "JDK 1.8 (latest)"
+ maven "maven_latest"
+ jdk "jdk_1.8_latest"
}
stages {
diff --git a/Jenkinsfile-owasp b/Jenkinsfile-owasp
index 7641635..03ba497 100644
--- a/Jenkinsfile-owasp
+++ b/Jenkinsfile-owasp
@@ -28,8 +28,8 @@ pipeline {
}
tools {
- maven "Maven (latest)"
- jdk "JDK 1.8 (latest)"
+ maven "maven_latest"
+ jdk "jdk_1.8_latest"
}
stages {