You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@samza.apache.org by ca...@apache.org on 2020/03/03 20:02:14 UTC
[samza] branch master updated: SAMZA-2473: gradleVersion and
wrapper jar are out-of-sync (#1295)
This is an automated email from the ASF dual-hosted git repository.
cameronlee pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/samza.git
The following commit(s) were added to refs/heads/master by this push:
new b9ef56a SAMZA-2473: gradleVersion and wrapper jar are out-of-sync (#1295)
b9ef56a is described below
commit b9ef56a23a3157b7a13d2fce517ceb63ef6ab265
Author: Kyle Moore <mo...@gmail.com>
AuthorDate: Tue Mar 3 12:02:06 2020 -0800
SAMZA-2473: gradleVersion and wrapper jar are out-of-sync (#1295)
---
build.gradle | 5 ++
gradle.properties | 1 +
gradle/maven.gradle | 10 ++--
gradle/wrapper/gradle-wrapper.jar | Bin 54417 -> 55190 bytes
gradle/wrapper/gradle-wrapper.properties | 2 +-
gradlew | 2 +-
gradlew.bat | 84 +++++++++++++++++++++++++++++++
7 files changed, 97 insertions(+), 7 deletions(-)
diff --git a/build.gradle b/build.gradle
index 0b918ad..089627e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -866,3 +866,8 @@ project(":samza-test_$scalaSuffix") {
from(configurations.archives.artifacts.files) { into("lib/") }
}
}
+
+// SAMZA-2473 read wrapper version from gradle.properties
+wrapper {
+ gradleVersion = project.gradleVersion
+}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index d3ce611..f213620 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,6 +18,7 @@ group=org.apache.samza
version=1.4.0-SNAPSHOT
scalaSuffix=2.11
+# after changing this value, run `$ ./gradlew wrapper` and commit the resulting changed files
gradleVersion=5.2.1
org.gradle.jvmargs="-XX:MaxPermSize=512m"
diff --git a/gradle/maven.gradle b/gradle/maven.gradle
index 7a4eb71..5f4ee8f 100644
--- a/gradle/maven.gradle
+++ b/gradle/maven.gradle
@@ -22,13 +22,13 @@ subprojects {
publishing {
publications {
mavenJava(MavenPublication) {
- from components.java
- if(project.name == 'samza-shell') {
- artifact shellTarGz {
- classifier "dist"
+ afterEvaluate {
+ from components.java
+ if(project.name == 'samza-shell') {
+ artifact shellTarGz
}
}
- }
+ }
}
}
}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 758de96..87b738c 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2d80b69..44e7c4d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index cccdd3d..af6708f 100755
--- a/gradlew
+++ b/gradlew
@@ -28,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"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..0f8d593
--- /dev/null
+++ b/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