Repository: kafka Updated Branches: refs/heads/trunk d8fe98efe -> 66c6f9b1c
kafka-2039; Update Scala to 2.10.5 and 2.11.6; patched by Ismael Juma; reviewed by Jun Rao Project: http://git-wip-us.apache.org/repos/asf/kafka/repo Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/66c6f9b1 Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/66c6f9b1 Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/66c6f9b1 Branch: refs/heads/trunk Commit: 66c6f9b1c436187635674f82a9e9940d8f5331f2 Parents: d8fe98e Author: Ismael Juma <[email protected]> Authored: Wed Apr 1 13:26:45 2015 -0700 Committer: Jun Rao <[email protected]> Committed: Wed Apr 1 13:26:45 2015 -0700 ---------------------------------------------------------------------- README.md | 2 +- bin/kafka-run-class.sh | 2 +- bin/windows/kafka-run-class.bat | 2 +- build.gradle | 18 +++++++++--------- gradle.properties | 2 +- scala.gradle | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kafka/blob/66c6f9b1/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index 784daaf..946ec62 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ The release file can be found inside ./core/build/distributions/. ### Cleaning the build ### ./gradlew clean -### Running a task on a particular version of Scala (either 2.9.1, 2.9.2, 2.10.4 or 2.11.5) ### +### Running a task on a particular version of Scala (either 2.9.1, 2.9.2, 2.10.5 or 2.11.6) ### #### (If building a jar with a version other than 2.10, need to set SCALA_BINARY_VERSION variable or change it in bin/kafka-run-class.sh to run quick start.) #### ./gradlew -PscalaVersion=2.9.1 jar ./gradlew -PscalaVersion=2.9.1 test http://git-wip-us.apache.org/repos/asf/kafka/blob/66c6f9b1/bin/kafka-run-class.sh ---------------------------------------------------------------------- diff --git a/bin/kafka-run-class.sh b/bin/kafka-run-class.sh index 881f578..8c3fa28 100755 --- a/bin/kafka-run-class.sh +++ b/bin/kafka-run-class.sh @@ -32,7 +32,7 @@ if [ ! -d "$LOG_DIR" ]; then fi if [ -z "$SCALA_VERSION" ]; then - SCALA_VERSION=2.10.4 + SCALA_VERSION=2.10.5 fi if [ -z "$SCALA_BINARY_VERSION" ]; then http://git-wip-us.apache.org/repos/asf/kafka/blob/66c6f9b1/bin/windows/kafka-run-class.bat ---------------------------------------------------------------------- diff --git a/bin/windows/kafka-run-class.bat b/bin/windows/kafka-run-class.bat index 9df3d2b..4aa2ab8 100644 --- a/bin/windows/kafka-run-class.bat +++ b/bin/windows/kafka-run-class.bat @@ -28,7 +28,7 @@ popd set CLASSPATH= IF ["%SCALA_VERSION%"] EQU [""] ( - set SCALA_VERSION=2.10.4 + set SCALA_VERSION=2.10.5 ) IF ["%SCALA_BINARY_VERSION%"] EQU [""] ( http://git-wip-us.apache.org/repos/asf/kafka/blob/66c6f9b1/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index 0f0fe60..4775ee4 100644 --- a/build.gradle +++ b/build.gradle @@ -137,7 +137,7 @@ subprojects { } } -for ( sv in ['2_9_1', '2_9_2', '2_10_4', '2_11_5'] ) { +for ( sv in ['2_9_1', '2_9_2', '2_10_5', '2_11_6'] ) { String svInDot = sv.replaceAll( "_", ".") tasks.create(name: "jar_core_${sv}", type: GradleBuild) { @@ -177,20 +177,20 @@ for ( sv in ['2_9_1', '2_9_2', '2_10_4', '2_11_5'] ) { } } -tasks.create(name: "jarAll", dependsOn: ['jar_core_2_9_1', 'jar_core_2_9_2', 'jar_core_2_10_4', 'jar_core_2_11_5', 'clients:jar', 'examples:jar', 'contrib:hadoop-consumer:jar', 'contrib:hadoop-producer:jar']) { +tasks.create(name: "jarAll", dependsOn: ['jar_core_2_9_1', 'jar_core_2_9_2', 'jar_core_2_10_5', 'jar_core_2_11_6', 'clients:jar', 'examples:jar', 'contrib:hadoop-consumer:jar', 'contrib:hadoop-producer:jar']) { } -tasks.create(name: "srcJarAll", dependsOn: ['srcJar_2_9_1', 'srcJar_2_9_2', 'srcJar_2_10_4', 'srcJar_2_11_5', 'clients:srcJar', 'examples:srcJar', 'contrib:hadoop-consumer:srcJar', 'contrib:hadoop-producer:srcJar']) { } +tasks.create(name: "srcJarAll", dependsOn: ['srcJar_2_9_1', 'srcJar_2_9_2', 'srcJar_2_10_5', 'srcJar_2_11_6', 'clients:srcJar', 'examples:srcJar', 'contrib:hadoop-consumer:srcJar', 'contrib:hadoop-producer:srcJar']) { } -tasks.create(name: "docsJarAll", dependsOn: ['docsJar_2_9_1', 'docsJar_2_9_2', 'docsJar_2_10_4', 'docsJar_2_11_5', 'clients:docsJar', 'examples:docsJar', 'contrib:hadoop-consumer:docsJar', 'contrib:hadoop-producer:docsJar']) { } +tasks.create(name: "docsJarAll", dependsOn: ['docsJar_2_9_1', 'docsJar_2_9_2', 'docsJar_2_10_5', 'docsJar_2_11_6', 'clients:docsJar', 'examples:docsJar', 'contrib:hadoop-consumer:docsJar', 'contrib:hadoop-producer:docsJar']) { } -tasks.create(name: "testAll", dependsOn: ['test_core_2_9_1', 'test_core_2_9_2', 'test_core_2_10_4', 'test_core_2_11_5', 'clients:test']) { +tasks.create(name: "testAll", dependsOn: ['test_core_2_9_1', 'test_core_2_9_2', 'test_core_2_10_5', 'test_core_2_11_6', 'clients:test']) { } -tasks.create(name: "releaseTarGzAll", dependsOn: ['releaseTarGz_2_9_1', 'releaseTarGz_2_9_2', 'releaseTarGz_2_10_4', 'releaseTarGz_2_11_5']) { +tasks.create(name: "releaseTarGzAll", dependsOn: ['releaseTarGz_2_9_1', 'releaseTarGz_2_9_2', 'releaseTarGz_2_10_5', 'releaseTarGz_2_11_6']) { } -tasks.create(name: "uploadArchivesAll", dependsOn: ['uploadCoreArchives_2_9_1', 'uploadCoreArchives_2_9_2', 'uploadCoreArchives_2_10_4', 'uploadCoreArchives_2_11_5', 'clients:uploadArchives', 'examples:uploadArchives', 'contrib:hadoop-consumer:uploadArchives', 'contrib:hadoop-producer:uploadArchives']) { +tasks.create(name: "uploadArchivesAll", dependsOn: ['uploadCoreArchives_2_9_1', 'uploadCoreArchives_2_9_2', 'uploadCoreArchives_2_10_5', 'uploadCoreArchives_2_11_6', 'clients:uploadArchives', 'examples:uploadArchives', 'contrib:hadoop-consumer:uploadArchives', 'contrib:hadoop-producer:uploadArchives']) { } project(':core') { @@ -216,8 +216,8 @@ project(':core') { if (scalaVersion.startsWith('2.10')) { testCompile 'org.scalatest:scalatest_2.10:1.9.1' } else if (scalaVersion.startsWith('2.11')) { - compile 'org.scala-lang.modules:scala-xml_2.11:1.0.2' - compile 'org.scala-lang.modules:scala-parser-combinators_2.11:1.0.2' + compile 'org.scala-lang.modules:scala-xml_2.11:1.0.3' + compile 'org.scala-lang.modules:scala-parser-combinators_2.11:1.0.3' testCompile "org.scalatest:scalatest_2.11:2.2.0" } else { testCompile "org.scalatest:scalatest_$scalaVersion:1.8" http://git-wip-us.apache.org/repos/asf/kafka/blob/66c6f9b1/gradle.properties ---------------------------------------------------------------------- diff --git a/gradle.properties b/gradle.properties index 19150cf..90b1945 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,7 @@ group=org.apache.kafka version=0.8.3-SNAPSHOT -scalaVersion=2.10.4 +scalaVersion=2.10.5 task=build org.gradle.jvmargs=-XX:MaxPermSize=512m -Xmx1024m http://git-wip-us.apache.org/repos/asf/kafka/blob/66c6f9b1/scala.gradle ---------------------------------------------------------------------- diff --git a/scala.gradle b/scala.gradle index 3c6f38a..cabb59c 100644 --- a/scala.gradle +++ b/scala.gradle @@ -1,7 +1,7 @@ if (!hasProperty('scalaVersion')) { - ext.scalaVersion = '2.10.4' + ext.scalaVersion = '2.10.5' } -ext.defaultScalaVersion = '2.10.4' +ext.defaultScalaVersion = '2.10.5' if (scalaVersion.startsWith('2.10')) { ext.baseScalaVersion = '2.10' } else if (scalaVersion.startsWith('2.11')) {
