root
/
kafka
mirror of https://github.com/apache/kafka.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

MINOR: Update to Scala 2.11.12 (part 2) 

Missed a few places in the previous commit.

Author: Ismael Juma <ismael@juma.me.uk>

Reviewers: Rajini Sivaram <rajinisivaram@googlemail.com>

Closes #4200 from ijuma/scala-2.11.12-part2
This commit is contained in:
Ismael Juma 2017-11-09 18:24:48 +00:00
parent e23de3caee
commit 3e86161b84
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -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

2
bin/kafka-run-class.sh
View File

@ -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

2
bin/windows/kafka-run-class.bat
View File

@ -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 [""] (

2
gradle.properties
View File

@ -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