Skip to content

Commit 8f1c124

Browse files
svc-excavator-botRobert Kruszewski
svc-excavator-bot
authored and
Robert Kruszewski
committed
Excavator: Upgrades gradle wrapper to the latest version (apache-spark-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.
1 parent 7fed5a0 commit 8f1c124

File tree

12 files changed

+112
-46
lines changed

12 files changed

+112
-46
lines changed

‎.circleci/config.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,8 +277,7 @@ jobs:
277277
- *restore-gradle-wrapper-cache
278278
- *restore-gradle-cache
279279
- setup_remote_docker: { docker_layer_caching: true }
280-
- run: |
281-
./gradlew --info --stacktrace test | tee /tmp/run-spark-docker-gradle-plugin-tests.log
280+
- run: ./gradlew --info --parallel --continue --stacktrace test
282281

283282
run-backcompat-tests:
284283
# depends on build-sbt

‎dev/.rat-excludes

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,9 @@ kafka-source-initial-offset-version-2.1.0.bin
119119
kafka-source-initial-offset-future-version.bin
120120
vote.tmpl
121121
gradle-build/*
122+
gradlew
123+
gradlew.bat
124+
gradle-wrapper.properties
122125
spark-docker-image-generator/gradle-build/*
123126
spark-docker-image-generator/plugin-test-project/gradle-build/*
124127
spark-docker-image-generator/plugin-test-project/build/*

‎gradle/wrapper/gradle-wrapper.jar

1.3 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,5 @@
1-
#
2-
# Licensed to the Apache Software Foundation (ASF) under one or more
3-
# contributor license agreements. See the NOTICE file distributed with
4-
# this work for additional information regarding copyright ownership.
5-
# The ASF licenses this file to You under the Apache License, Version 2.0
6-
# (the "License"); you may not use this file except in compliance with
7-
# the License. You may obtain a copy of the License at
8-
#
9-
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
11-
# Unless required by applicable law or agreed to in writing, software
12-
# distributed under the License is distributed on an "AS IS" BASIS,
13-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
# See the License for the specific language governing permissions and
15-
# limitations under the License.
16-
#
17-
181
distributionBase=GRADLE_USER_HOME
192
distributionPath=wrapper/dists
20-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-bin.zip
214
zipStoreBase=GRADLE_USER_HOME
225
zipStorePath=wrapper/dists

‎gradlew

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,5 @@
11
#!/usr/bin/env sh
22

3-
#
4-
# Licensed to the Apache Software Foundation (ASF) under one or more
5-
# contributor license agreements. See the NOTICE file distributed with
6-
# this work for additional information regarding copyright ownership.
7-
# The ASF licenses this file to You under the Apache License, Version 2.0
8-
# (the "License"); you may not use this file except in compliance with
9-
# the License. You may obtain a copy of the License at
10-
#
11-
# http://www.apache.org/licenses/LICENSE-2.0
12-
#
13-
# Unless required by applicable law or agreed to in writing, software
14-
# distributed under the License is distributed on an "AS IS" BASIS,
15-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16-
# See the License for the specific language governing permissions and
17-
# limitations under the License.
18-
#
19-
20-
# Wrapper script that runs the Spark tests then reports QA results
21-
# to github via its API.
22-
# Environment variables are populated by the code here:
23-
# https://github.com/jenkinsci/ghprb-plugin/blob/master/src/main/java/org/jenkinsci/plugins/ghprb/GhprbTrigger.java#L139
24-
253
##############################################################################
264
##
275
## Gradle start up script for UN*X
@@ -50,7 +28,7 @@ APP_NAME="Gradle"
5028
APP_BASE_NAME=`basename "$0"`
5129

5230
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
53-
DEFAULT_JVM_OPTS=""
31+
DEFAULT_JVM_OPTS='"-Xmx64m"'
5432

5533
# Use the maximum available, or set MAX_FD != -1 to use that value.
5634
MAX_FD="maximum"

‎gradlew.bat

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
@if "%DEBUG%" == "" @echo off
2+
@rem ##########################################################################
3+
@rem
4+
@rem Gradle startup script for Windows
5+
@rem
6+
@rem ##########################################################################
7+
8+
@rem Set local scope for the variables with windows NT shell
9+
if "%OS%"=="Windows_NT" setlocal
10+
11+
set DIRNAME=%~dp0
12+
if "%DIRNAME%" == "" set DIRNAME=.
13+
set APP_BASE_NAME=%~n0
14+
set APP_HOME=%DIRNAME%
15+
16+
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
17+
set DEFAULT_JVM_OPTS="-Xmx64m"
18+
19+
@rem Find java.exe
20+
if defined JAVA_HOME goto findJavaFromJavaHome
21+
22+
set JAVA_EXE=java.exe
23+
%JAVA_EXE% -version >NUL 2>&1
24+
if "%ERRORLEVEL%" == "0" goto init
25+
26+
echo.
27+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
28+
echo.
29+
echo Please set the JAVA_HOME variable in your environment to match the
30+
echo location of your Java installation.
31+
32+
goto fail
33+
34+
:findJavaFromJavaHome
35+
set JAVA_HOME=%JAVA_HOME:"=%
36+
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
37+
38+
if exist "%JAVA_EXE%" goto init
39+
40+
echo.
41+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
42+
echo.
43+
echo Please set the JAVA_HOME variable in your environment to match the
44+
echo location of your Java installation.
45+
46+
goto fail
47+
48+
:init
49+
@rem Get command-line arguments, handling Windows variants
50+
51+
if not "%OS%" == "Windows_NT" goto win9xME_args
52+
53+
:win9xME_args
54+
@rem Slurp the command line arguments.
55+
set CMD_LINE_ARGS=
56+
set _SKIP=2
57+
58+
:win9xME_args_slurp
59+
if "x%~1" == "x" goto execute
60+
61+
set CMD_LINE_ARGS=%*
62+
63+
:execute
64+
@rem Setup the command line
65+
66+
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
67+
68+
@rem Execute Gradle
69+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
70+
71+
:end
72+
@rem End local scope for the variables with windows NT shell
73+
if "%ERRORLEVEL%"=="0" goto mainEnd
74+
75+
:fail
76+
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
77+
rem the _cmd.exe /c_ return code!
78+
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
79+
exit /b 1
80+
81+
:mainEnd
82+
if "%OS%"=="Windows_NT" endlocal
83+
84+
:omega

‎settings.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,3 @@
1919
rootProject.name = 'spark'
2020

2121
include ':spark-docker-image-generator'
22-
enableFeaturePreview('STABLE_PUBLISHING')

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
public final class SparkDockerPluginSuite {
3737

38-
private static final File TEST_PROJECT_DIR = Paths.get("plugin-test-project").toFile();
38+
private static final File TEST_PROJECT_DIR = Paths.get("src/test/resources/plugin-test-project").toFile();
3939

4040
private String dockerTag;
4141

‎spark-docker-image-generator/plugin-test-project/.gitignore renamed to ‎spark-docker-image-generator/src/test/resources/plugin-test-project/.gitignore

File renamed without changes.

‎spark-docker-image-generator/plugin-test-project/build.gradle renamed to ‎spark-docker-image-generator/src/test/resources/plugin-test-project/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ apply plugin: 'java'
3636
version '1.0'
3737
group 'org.apache.spark'
3838
sourceCompatibility = 1.8
39-
buildDir = 'gradle-build'
4039

4140
dependencies {
4241
compile 'com.google.guava:guava:21.0'

0 commit comments

Comments
 (0)