Excavator: Upgrades gradle wrapper to the latest version (apache-spar…

…k-on-k8s#449)

###### _excavator_ is a bot for automating changes across repositories.

Changes produced by the roomba/latest-gradle-wrapper-oss check.

{runtimeCheckDesc}
To enable or disable this check, please contact the maintainers of Excavator.

.circleci/config.yml

@@ -277,8 +277,7 @@ jobs:
       - *restore-gradle-wrapper-cache
       - *restore-gradle-cache
       - setup_remote_docker: { docker_layer_caching: true }
-      - run: |
-          ./gradlew --info --stacktrace test | tee /tmp/run-spark-docker-gradle-plugin-tests.log
+      - run: ./gradlew --info --parallel --continue --stacktrace test
 
   run-backcompat-tests:
     # depends on build-sbt

dev/.rat-excludes

@@ -119,6 +119,9 @@ kafka-source-initial-offset-version-2.1.0.bin
 kafka-source-initial-offset-future-version.bin
 vote.tmpl
 gradle-build/*
+gradlew
+gradlew.bat
+gradle-wrapper.properties
 spark-docker-image-generator/gradle-build/*
 spark-docker-image-generator/plugin-test-project/gradle-build/*
 spark-docker-image-generator/plugin-test-project/build/*

gradle/wrapper/gradle-wrapper.properties

@@ -1,22 +1,5 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-#
-
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,27 +1,5 @@
 #!/usr/bin/env sh
 
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-#
-
-# Wrapper script that runs the Spark tests then reports QA results
-# to github via its API.
-# Environment variables are populated by the code here:
-# https://github.com/jenkinsci/ghprb-plugin/blob/master/src/main/java/org/jenkinsci/plugins/ghprb/GhprbTrigger.java#L139
-
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -50,7 +28,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"

gradlew.bat

@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

settings.gradle

@@ -19,4 +19,3 @@
 rootProject.name = 'spark'
 
 include ':spark-docker-image-generator'
-enableFeaturePreview('STABLE_PUBLISHING')

spark-docker-image-generator/src/test/java/org/apache/spark/deploy/kubernetes/docker/gradle/SparkDockerPluginSuite.java

@@ -35,7 +35,7 @@
 
 public final class SparkDockerPluginSuite {
 
-  private static final File TEST_PROJECT_DIR = Paths.get("plugin-test-project").toFile();
+  private static final File TEST_PROJECT_DIR = Paths.get("src/test/resources/plugin-test-project").toFile();
 
   private String dockerTag;
 

spark-docker-image-generator/plugin-test-project/build.gradle → spark-docker-image-generator/src/test/resources/plugin-test-project/build.gradle

@@ -36,7 +36,6 @@ apply plugin: 'java'
 version '1.0'
 group 'org.apache.spark'
 sourceCompatibility = 1.8
-buildDir = 'gradle-build'
 
 dependencies {
   compile 'com.google.guava:guava:21.0'

spark-docker-image-generator/src/test/resources/plugin-test-project/settings.gradle

@@ -0,0 +1,18 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+
+rootProject.name = "plugin-test-project"

spark-docker-image-generator/plugin-test-project/src/main/java/org/apache/spark/test/HelloWorld.java → spark-docker-image-generator/src/test/resources/plugin-test-project/src/main/java/org/apache/spark/test/HelloWorld.java

@@ -23,6 +23,9 @@
 import com.google.common.collect.ImmutableList;
 
 public final class HelloWorld {
+
+  private HelloWorld() { }
+
   public static void main(String[] args) {
     List<String> strs = ImmutableList.of("Hello", "World");
     System.out.println(Joiner.on(",").join(strs));