You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by ij...@apache.org on 2019/11/21 19:40:56 UTC
[kafka] 01/01: MINOR: Update gradle wrapper
This is an automated email from the ASF dual-hosted git repository.
ijuma pushed a commit to branch 2.2
in repository https://gitbox.apache.org/repos/asf/kafka.git
commit 758174d220d7b75115e6999f67ec17fca44eb30e
Author: Ismael Juma <is...@juma.me.uk>
AuthorDate: Thu Nov 21 08:41:04 2019 -0800
MINOR: Update gradle wrapper
---
build.gradle | 2 +-
gradle/dependencies.gradle | 1 +
gradle/wrapper/gradle-wrapper.properties | 2 +-
gradlew | 24 ++++++++++++++++++++----
4 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/build.gradle b/build.gradle
index 420edf7..0ef3239 100644
--- a/build.gradle
+++ b/build.gradle
@@ -89,7 +89,7 @@ allprojects {
}
ext {
- gradleVersion = "5.1.1"
+ gradleVersion = "$versions.gradle"
minJavaVersion = "8"
buildVersionFileName = "kafka-version.properties"
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 69b40e3..b0d2534 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -54,6 +54,7 @@ versions += [
bcpkix: "1.60",
httpclient: "4.5.7",
easymock: "4.0.2",
+ gradle: "5.1.1",
jackson: "2.10.0",
jetty: "9.4.14.v20181114",
jersey: "2.27",
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3a8f801..19af522 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -14,6 +14,6 @@
# limitations under the License.
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index f3276ba..af43217 100755
--- a/gradlew
+++ b/gradlew
@@ -14,6 +14,22 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+#
+# Copyright 2015 the original author or authors.
+#
+# 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
+#
+# https://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.
+#
+
##############################################################################
##
## Gradle start up script for UN*X
@@ -42,7 +58,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='"-Xmx64m"'
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
@@ -82,7 +98,7 @@ esac
# Loop in case we encounter an error.
for attempt in 1 2 3; do
if [ ! -e $APP_HOME/gradle/wrapper/gradle-wrapper.jar ]; then
- if ! curl -s -S --retry 3 -L -o "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" "https://raw.githubusercontent.com/gradle/gradle/v5.0.0/gradle/wrapper/gradle-wrapper.jar"; then
+ if ! curl -s -S --retry 3 -L -o "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" "https://raw.githubusercontent.com/gradle/gradle/v5.1.1/gradle/wrapper/gradle-wrapper.jar"; then
rm -f "$APP_HOME/gradle/wrapper/gradle-wrapper.jar"
# Pause for a bit before looping in case the server throttled us.
sleep 5
@@ -136,8 +152,8 @@ if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`