kafka-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From guozh...@apache.org
Subject kafka git commit: KAFKA-2348; Drop support for Scala 2.9
Date Fri, 24 Jul 2015 16:19:51 GMT
Repository: kafka
Updated Branches:
  refs/heads/trunk 520a8135f -> fd3a3cd59


KAFKA-2348; Drop support for Scala 2.9

`testAll` passed locally.

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

Reviewers: Harsha, Ewen, Guozhang

Closes #87 from ijuma/kafka-2348-drop-support-for-scala-2.9 and squashes the following commits:

cf9796a [Ismael Juma] KAFKA-2348; Drop support for Scala 2.9


Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/fd3a3cd5
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/fd3a3cd5
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/fd3a3cd5

Branch: refs/heads/trunk
Commit: fd3a3cd59539a741b6d3c830870dae1d5a5f93b5
Parents: 520a813
Author: Ismael Juma <ismael@juma.me.uk>
Authored: Fri Jul 24 09:19:59 2015 -0700
Committer: Guozhang Wang <wangguoz@gmail.com>
Committed: Fri Jul 24 09:19:59 2015 -0700

----------------------------------------------------------------------
 README.md    |  8 ++++----
 build.gradle | 19 ++++++++-----------
 2 files changed, 12 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kafka/blob/fd3a3cd5/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 75877c0..a4a3f78 100644
--- a/README.md
+++ b/README.md
@@ -54,11 +54,11 @@ 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.5 or 2.11.7)
###
+### Running a task on a particular version of Scala (either 2.10.5 or 2.11.7) ###
 #### (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
-    ./gradlew -PscalaVersion=2.9.1 releaseTarGz
+    ./gradlew -PscalaVersion=2.11.7 jar
+    ./gradlew -PscalaVersion=2.11.7 test
+    ./gradlew -PscalaVersion=2.11.7 releaseTarGz
 
 ### Running a task for a specific project ###
 This is for 'core', 'contrib:hadoop-consumer', 'contrib:hadoop-producer', 'examples' and
'clients'

http://git-wip-us.apache.org/repos/asf/kafka/blob/fd3a3cd5/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index fb90843..0abec26 100644
--- a/build.gradle
+++ b/build.gradle
@@ -163,7 +163,7 @@ subprojects {
   }
 }
 
-for ( sv in ['2_9_1', '2_9_2', '2_10_5', '2_11_7'] ) {
+for ( sv in ['2_10_5', '2_11_7'] ) {
   String svInDot = sv.replaceAll( "_", ".")
 
   tasks.create(name: "jar_core_${sv}", type: GradleBuild) {
@@ -203,20 +203,20 @@ for ( sv in ['2_9_1', '2_9_2', '2_10_5', '2_11_7'] ) {
   }
 }
 
-tasks.create(name: "jarAll", dependsOn: ['jar_core_2_9_1', 'jar_core_2_9_2', 'jar_core_2_10_5',
'jar_core_2_11_7', 'clients:jar', 'examples:jar', 'contrib:hadoop-consumer:jar', 'contrib:hadoop-producer:jar',
'log4j-appender:jar']) {
+tasks.create(name: "jarAll", dependsOn: ['jar_core_2_10_5', 'jar_core_2_11_7', 'clients:jar',
'examples:jar', 'contrib:hadoop-consumer:jar', 'contrib:hadoop-producer:jar', 'log4j-appender:jar'])
{
 }
 
-tasks.create(name: "srcJarAll", dependsOn: ['srcJar_2_9_1', 'srcJar_2_9_2', 'srcJar_2_10_5',
'srcJar_2_11_7', 'clients:srcJar', 'examples:srcJar', 'contrib:hadoop-consumer:srcJar', 'contrib:hadoop-producer:srcJar',
'log4j-appender:srcJar']) { }
+tasks.create(name: "srcJarAll", dependsOn: ['srcJar_2_10_5', 'srcJar_2_11_7', 'clients:srcJar',
'examples:srcJar', 'contrib:hadoop-consumer:srcJar', 'contrib:hadoop-producer:srcJar', 'log4j-appender:srcJar'])
{ }
 
-tasks.create(name: "docsJarAll", dependsOn: ['docsJar_2_9_1', 'docsJar_2_9_2', 'docsJar_2_10_5',
'docsJar_2_11_7', 'clients:docsJar', 'examples:docsJar', 'contrib:hadoop-consumer:docsJar',
'contrib:hadoop-producer:docsJar', 'log4j-appender:docsJar']) { }
+tasks.create(name: "docsJarAll", dependsOn: ['docsJar_2_10_5', 'docsJar_2_11_7', 'clients:docsJar',
'examples:docsJar', 'contrib:hadoop-consumer:docsJar', 'contrib:hadoop-producer:docsJar',
'log4j-appender:docsJar']) { }
 
-tasks.create(name: "testAll", dependsOn: ['test_core_2_9_1', 'test_core_2_9_2', 'test_core_2_10_5',
'test_core_2_11_7', 'clients:test', 'log4j-appender:test']) {
+tasks.create(name: "testAll", dependsOn: ['test_core_2_10_5', 'test_core_2_11_7', 'clients:test',
'log4j-appender:test']) {
 }
 
-tasks.create(name: "releaseTarGzAll", dependsOn: ['releaseTarGz_2_9_1', 'releaseTarGz_2_9_2',
'releaseTarGz_2_10_5', 'releaseTarGz_2_11_7']) {
+tasks.create(name: "releaseTarGzAll", dependsOn: ['releaseTarGz_2_10_5', 'releaseTarGz_2_11_7'])
{
 }
 
-tasks.create(name: "uploadArchivesAll", dependsOn: ['uploadCoreArchives_2_9_1', 'uploadCoreArchives_2_9_2',
'uploadCoreArchives_2_10_5', 'uploadCoreArchives_2_11_7', 'clients:uploadArchives', 'examples:uploadArchives',
'contrib:hadoop-consumer:uploadArchives', 'contrib:hadoop-producer:uploadArchives', 'log4j-appender:uploadArchives'])
{
+tasks.create(name: "uploadArchivesAll", dependsOn: ['uploadCoreArchives_2_10_5', 'uploadCoreArchives_2_11_7',
'clients:uploadArchives', 'examples:uploadArchives', 'contrib:hadoop-consumer:uploadArchives',
'contrib:hadoop-producer:uploadArchives', 'log4j-appender:uploadArchives']) {
 }
 
 project(':core') {
@@ -241,10 +241,7 @@ project(':core') {
     testCompile 'junit:junit:4.6'
     testCompile 'org.easymock:easymock:3.0'
     testCompile 'org.objenesis:objenesis:1.2'
-    if (scalaVersion.startsWith('2.9'))
-      testCompile "org.scalatest:scalatest_$scalaVersion:1.9.1"
-    else
-      testCompile "org.scalatest:scalatest_$baseScalaVersion:2.2.5"
+    testCompile "org.scalatest:scalatest_$baseScalaVersion:2.2.5"
 
     testRuntime "$slf4jlog4j"
 


Mime
View raw message