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 21:59:37 UTC
[kafka] branch 1.1 updated (ceb8ac9 -> 0bcc1c4)
This is an automated email from the ASF dual-hosted git repository.
ijuma pushed a change to branch 1.1
in repository https://gitbox.apache.org/repos/asf/kafka.git.
discard ceb8ac9 MINOR: Update gradle wrapper
new 0bcc1c4 MINOR: Update gradle wrapper
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (ceb8ac9)
\
N -- N -- N refs/heads/1.1 (0bcc1c4)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build.gradle | 2 +-
gradle/dependencies.gradle | 1 +
gradlew | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
[kafka] 01/01: MINOR: Update gradle wrapper
Posted by ij...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ijuma pushed a commit to branch 1.1
in repository https://gitbox.apache.org/repos/asf/kafka.git
commit 0bcc1c4192cc911a5788d68d9646d118c9eac656
Author: Ismael Juma <is...@juma.me.uk>
AuthorDate: Thu Nov 21 08:47:55 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 b9f9391..8a22ea1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -78,7 +78,7 @@ allprojects {
}
ext {
- gradleVersion = "4.8.1"
+ gradleVersion = "$versions.gradle"
buildVersionFileName = "kafka-version.properties"
maxPermSizeArgs = []
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 701da3c..786d094 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -53,6 +53,7 @@ versions += [
argparse4j: "0.7.0",
bcpkix: "1.59",
easymock: "3.6",
+ gradle: "4.8.1",
jackson: "2.9.7",
jetty: "9.2.24.v20180105",
jersey: "2.25.1",
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3a8f801..3de9b8d 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-4.8.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index f3276ba..d92ee99 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/v4.8.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"`