From commits-return-8566-archive-asf-public=cust-asf.ponee.io@zookeeper.apache.org Tue Oct 20 14:22:12 2020 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mxout1-he-de.apache.org (mxout1-he-de.apache.org [95.216.194.37]) by mx-eu-01.ponee.io (Postfix) with ESMTPS id 5425F180654 for ; Tue, 20 Oct 2020 16:22:12 +0200 (CEST) Received: from mail.apache.org (mailroute1-lw-us.apache.org [207.244.88.153]) by mxout1-he-de.apache.org (ASF Mail Server at mxout1-he-de.apache.org) with SMTP id B43BA64325 for ; Tue, 20 Oct 2020 14:22:11 +0000 (UTC) Received: (qmail 78804 invoked by uid 500); 20 Oct 2020 14:22:11 -0000 Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@zookeeper.apache.org Delivered-To: mailing list commits@zookeeper.apache.org Received: (qmail 78762 invoked by uid 99); 20 Oct 2020 14:22:10 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Oct 2020 14:22:10 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id C856181786; Tue, 20 Oct 2020 14:22:10 +0000 (UTC) Date: Tue, 20 Oct 2020 14:22:10 +0000 To: "commits@zookeeper.apache.org" Subject: [zookeeper] branch branch-3.5 updated: ZOOKEEPER-3980: Fix Jenkinsfiles with new tool names MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <160320373064.13031.5627665838307911921@gitbox.apache.org> From: andor@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: zookeeper X-Git-Refname: refs/heads/branch-3.5 X-Git-Reftype: branch X-Git-Oldrev: e8501cb209eabcdcb60647b0c878676585bed355 X-Git-Newrev: db9fed4c95e4828389b30c0f6e94182db26ff99b X-Git-Rev: db9fed4c95e4828389b30c0f6e94182db26ff99b X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated 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 AuthorDate: Tue Oct 20 16:21:30 2020 +0200 ZOOKEEPER-3980: Fix Jenkinsfiles with new tool names Author: Enrico Olivelli 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 --- 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 {