From 98deafcab2f1957f5beeb12da7aed7c1ef311489 Mon Sep 17 00:00:00 2001
From: David Arthur <mumrah@gmail.com>
Date: Tue, 9 Feb 2021 12:57:01 -0500
Subject: [PATCH] Backport Jenkinsfile fix and remove Travis build for 2.5
 (#10087)

This is a backport of #9453 which fixes the Jenkinsfile tool names. Travis build is also removed
---
 .travis.yml | 54 -----------------------------------------------------
 Jenkinsfile |  6 +++---
 2 files changed, 3 insertions(+), 57 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 8a22c9bc4cd4a..0000000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-
-sudo: required
-dist: trusty
-language: java
-
-env:
-  - _DUCKTAPE_OPTIONS="--subset 0  --subsets 15"
-  - _DUCKTAPE_OPTIONS="--subset 1  --subsets 15"
-  - _DUCKTAPE_OPTIONS="--subset 2  --subsets 15"
-  - _DUCKTAPE_OPTIONS="--subset 3  --subsets 15"
-  - _DUCKTAPE_OPTIONS="--subset 4  --subsets 15"
-  - _DUCKTAPE_OPTIONS="--subset 5  --subsets 15"
-  - _DUCKTAPE_OPTIONS="--subset 6  --subsets 15"
-  - _DUCKTAPE_OPTIONS="--subset 7  --subsets 15"
-  - _DUCKTAPE_OPTIONS="--subset 8  --subsets 15"
-  - _DUCKTAPE_OPTIONS="--subset 9  --subsets 15"
-  - _DUCKTAPE_OPTIONS="--subset 10 --subsets 15"
-  - _DUCKTAPE_OPTIONS="--subset 11 --subsets 15"
-  - _DUCKTAPE_OPTIONS="--subset 12 --subsets 15"
-  - _DUCKTAPE_OPTIONS="--subset 13 --subsets 15"
-  - _DUCKTAPE_OPTIONS="--subset 14 --subsets 15"
-
-jdk:
-  - oraclejdk8
-
-before_install:
-  - gradle wrapper
-
-script:
-  - ./gradlew rat
-  - ./gradlew systemTestLibs && /bin/bash ./tests/docker/run_tests.sh
-
-services:
-  - docker
-
-before_cache:
-  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
-  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
-cache:
-  directories:
-    - "$HOME/.m2/repository"
-    - "$HOME/.gradle/caches/"
-    - "$HOME/.gradle/wrapper/"
diff --git a/Jenkinsfile b/Jenkinsfile
index c9f0d5d3b6488..4ca9ff7c619b5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -101,8 +101,8 @@ pipeline {
         stage('JDK 8') {
           agent { label 'ubuntu' }
           tools {
-            jdk 'JDK 1.8 (latest)'
-            maven 'Maven 3.6.3'
+            jdk 'jdk_1.8_latest'
+            maven 'maven_3_latest'
           }
           options {
             timeout(time: 8, unit: 'HOURS')
@@ -122,7 +122,7 @@ pipeline {
         stage('JDK 11') {
           agent { label 'ubuntu' }
           tools {
-            jdk 'JDK 11 (latest)'
+            jdk 'jdk_11_latest'
           }
           options {
             timeout(time: 8, unit: 'HOURS')