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 2017/11/09 18:24:59 UTC
kafka git commit: MINOR: Update to Scala 2.11.12 (part 2)
Repository: kafka
Updated Branches:
refs/heads/trunk e23de3cae -> 3e86161b8
MINOR: Update to Scala 2.11.12 (part 2)
Missed a few places in the previous commit.
Author: Ismael Juma <is...@juma.me.uk>
Reviewers: Rajini Sivaram <ra...@googlemail.com>
Closes #4200 from ijuma/scala-2.11.12-part2
Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/3e86161b
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/3e86161b
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/3e86161b
Branch: refs/heads/trunk
Commit: 3e86161b8446e0b8f1c4fe537f1c7d65692b6a73
Parents: e23de3c
Author: Ismael Juma <is...@juma.me.uk>
Authored: Thu Nov 9 18:24:48 2017 +0000
Committer: Ismael Juma <is...@juma.me.uk>
Committed: Thu Nov 9 18:24:48 2017 +0000
----------------------------------------------------------------------
README.md | 4 ++--
bin/kafka-run-class.sh | 2 +-
bin/windows/kafka-run-class.bat | 2 +-
gradle.properties | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kafka/blob/3e86161b/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 5ed30b2..3a1d82a 100644
--- a/README.md
+++ b/README.md
@@ -77,9 +77,9 @@ The release file can be found inside `./core/build/distributions/`.
./gradlew clean
### Running a task on a particular version of Scala (either 2.11.x or 2.12.x) ###
-*Note that if building the jars with a version other than 2.11.11, you need to set the `SCALA_VERSION` variable or change it in `bin/kafka-run-class.sh` to run the quick start.*
+*Note that if building the jars with a version other than 2.11.12, you need to set the `SCALA_VERSION` variable or change it in `bin/kafka-run-class.sh` to run the quick start.*
-You can pass either the major version (eg 2.11) or the full version (eg 2.11.11):
+You can pass either the major version (eg 2.11) or the full version (eg 2.11.12):
./gradlew -PscalaVersion=2.11 jar
./gradlew -PscalaVersion=2.11 test
http://git-wip-us.apache.org/repos/asf/kafka/blob/3e86161b/bin/kafka-run-class.sh
----------------------------------------------------------------------
diff --git a/bin/kafka-run-class.sh b/bin/kafka-run-class.sh
index 137f4cd..fc89f25 100755
--- a/bin/kafka-run-class.sh
+++ b/bin/kafka-run-class.sh
@@ -48,7 +48,7 @@ should_include_file() {
base_dir=$(dirname $0)/..
if [ -z "$SCALA_VERSION" ]; then
- SCALA_VERSION=2.11.11
+ SCALA_VERSION=2.11.12
fi
if [ -z "$SCALA_BINARY_VERSION" ]; then
http://git-wip-us.apache.org/repos/asf/kafka/blob/3e86161b/bin/windows/kafka-run-class.bat
----------------------------------------------------------------------
diff --git a/bin/windows/kafka-run-class.bat b/bin/windows/kafka-run-class.bat
index c56f82c..1dfd9a5 100755
--- a/bin/windows/kafka-run-class.bat
+++ b/bin/windows/kafka-run-class.bat
@@ -27,7 +27,7 @@ set BASE_DIR=%CD%
popd
IF ["%SCALA_VERSION%"] EQU [""] (
- set SCALA_VERSION=2.11.11
+ set SCALA_VERSION=2.11.12
)
IF ["%SCALA_BINARY_VERSION%"] EQU [""] (
http://git-wip-us.apache.org/repos/asf/kafka/blob/3e86161b/gradle.properties
----------------------------------------------------------------------
diff --git a/gradle.properties b/gradle.properties
index 8e66cb9..7062ba0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,6 +17,6 @@ group=org.apache.kafka
# NOTE: When you change this version number, you should also make sure to update
# the version numbers in tests/kafkatest/__init__.py and kafka-merge-pr.py.
version=1.1.0-SNAPSHOT
-scalaVersion=2.11.11
+scalaVersion=2.11.12
task=build
org.gradle.jvmargs=-XX:MaxPermSize=512m -Xmx1024m -Xss2m