kafka-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jun...@apache.org
Subject kafka git commit: KAFKA-2800; Update outdated dependencies
Date Wed, 18 Nov 2015 18:42:19 GMT
Repository: kafka
Updated Branches:
  refs/heads/trunk 17c6f3312 -> 8f6ffe1c2


KAFKA-2800; Update outdated dependencies

Changes:
* org.scala-lang:scala-library [2.10.5 -> 2.10.6]
   * Scala 2.10.6 resolves a license incompatibility in scala.util.Sorting
   * Otherwise identical to Scala 2.10.5
* org.xerial.snappy:snappy-java [1.1.1.7 -> 1.1.2]
   * Fixes SnappyOutputStream.close() is not idempotent
* net.jpountz.lz4:lz4 [1.2.0 -> 1.3]
* junit:junit [4.11 -> 4.12]
* org.easymock:easymock [3.3.1 -> 3.4]
* org.powermock:powermock-api-easymock [1.6.2 -> 1.6.3]
* org.powermock:powermock-module-junit4 [1.6.2 -> 1.6.3]
* org.slf4j:slf4j-api [1.7.6 -> 1.7.12]
* org.slf4j:slf4j-log4j12 [1.7.6 -> 1.7.12]
* com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider [2.5.4 -> 2.6.3]
* com.fasterxml.jackson.core:jackson-databind [2.5.4 -> 2.6.3]
* org.eclipse.jetty:jetty-server [9.2.12.v20150709 -> 9.2.14.v20151106]
* org.eclipse.jetty:jetty-servlet [9.2.12.v20150709 -> 9.2.14.v20151106]
* org.bouncycastle:bcpkix-jdk15on [1.52 -> 1.53]
* net.sf.jopt-simple:jopt-simple [3.2 -> 4.9]
* removed explicit entry for org.objenesis:objenesis:2.2 (resolved transitively)

Author: Grant Henke <granthenke@gmail.com>

Reviewers: Ismael Juma <ismael@juma.me.uk>, Jun Rao <junrao@gmail.com>

Closes #513 from granthenke/update-deps


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

Branch: refs/heads/trunk
Commit: 8f6ffe1c28d43bebf1cef7198c1e154a2adc92c3
Parents: 17c6f33
Author: Grant Henke <granthenke@gmail.com>
Authored: Wed Nov 18 10:42:15 2015 -0800
Committer: Jun Rao <junrao@gmail.com>
Committed: Wed Nov 18 10:42:15 2015 -0800

----------------------------------------------------------------------
 README.md                       |  2 +-
 bin/kafka-run-class.sh          |  2 +-
 bin/windows/kafka-run-class.bat |  2 +-
 build.gradle                    | 33 ++++++++++++++++-----------------
 gradle.properties               |  6 +++---
 scala.gradle                    |  4 ++--
 6 files changed, 24 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kafka/blob/8f6ffe1c/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 6baa17e..c500a7a 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,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.10.5 or 2.11.7) ###
+### Running a task on a particular version of Scala (either 2.10.6 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.11.7 jar
     ./gradlew -PscalaVersion=2.11.7 test

http://git-wip-us.apache.org/repos/asf/kafka/blob/8f6ffe1c/bin/kafka-run-class.sh
----------------------------------------------------------------------
diff --git a/bin/kafka-run-class.sh b/bin/kafka-run-class.sh
index 9962e37..fcf442b 100755
--- a/bin/kafka-run-class.sh
+++ b/bin/kafka-run-class.sh
@@ -23,7 +23,7 @@ fi
 base_dir=$(dirname $0)/..
 
 if [ -z "$SCALA_VERSION" ]; then
-	SCALA_VERSION=2.10.5
+	SCALA_VERSION=2.10.6
 fi
 
 if [ -z "$SCALA_BINARY_VERSION" ]; then

http://git-wip-us.apache.org/repos/asf/kafka/blob/8f6ffe1c/bin/windows/kafka-run-class.bat
----------------------------------------------------------------------
diff --git a/bin/windows/kafka-run-class.bat b/bin/windows/kafka-run-class.bat
index f5b8faa..c5861be 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.5
+  set SCALA_VERSION=2.10.6
 )
 
 IF ["%SCALA_BINARY_VERSION%"] EQU [""] (

http://git-wip-us.apache.org/repos/asf/kafka/blob/8f6ffe1c/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 29e351f..1dba7ed 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,12 +29,12 @@ buildscript {
 
 def slf4jlog4j='org.slf4j:slf4j-log4j12:1.7.6'
 def slf4japi="org.slf4j:slf4j-api:1.7.6"
-def junit='junit:junit:4.11'
-def easymock='org.easymock:easymock:3.3.1'
-def powermock='org.powermock:powermock-module-junit4:1.6.2'
-def powermock_easymock='org.powermock:powermock-api-easymock:1.6.2'
-def jackson_version = '2.5.4'
-def jetty_version = '9.2.12.v20150709'
+def junit='junit:junit:4.12'
+def easymock='org.easymock:easymock:3.4'
+def powermock='org.powermock:powermock-module-junit4:1.6.3'
+def powermock_easymock='org.powermock:powermock-api-easymock:1.6.3'
+def jackson_version = '2.6.3'
+def jetty_version = '9.2.14.v20151106'
 def jersey_version = '2.22.1'
 
 allprojects {
@@ -190,7 +190,7 @@ subprojects {
   }
 }
 
-for ( sv in ['2_10_5', '2_11_7'] ) {
+for ( sv in ['2_10_6', '2_11_7'] ) {
   String svInDot = sv.replaceAll( "_", ".")
 
   tasks.create(name: "jar_core_${sv}", type: GradleBuild) {
@@ -234,19 +234,19 @@ def connectPkgs = ['connect:api', 'connect:runtime', 'connect:json',
'connect:fi
 def pkgs = ['clients', 'examples', 'log4j-appender', 'tools', 'streams'] + connectPkgs
 
 tasks.create(name: "jarConnect", dependsOn: connectPkgs.collect { it + ":jar" }) {}
-tasks.create(name: "jarAll", dependsOn: ['jar_core_2_10_5', 'jar_core_2_11_7'] + pkgs.collect
{ it + ":jar" }) { }
+tasks.create(name: "jarAll", dependsOn: ['jar_core_2_10_6', 'jar_core_2_11_7'] + pkgs.collect
{ it + ":jar" }) { }
 
-tasks.create(name: "srcJarAll", dependsOn: ['srcJar_2_10_5', 'srcJar_2_11_7'] + pkgs.collect
{ it + ":srcJar" }) { }
+tasks.create(name: "srcJarAll", dependsOn: ['srcJar_2_10_6', 'srcJar_2_11_7'] + pkgs.collect
{ it + ":srcJar" }) { }
 
-tasks.create(name: "docsJarAll", dependsOn: ['docsJar_2_10_5', 'docsJar_2_11_7'] + pkgs.collect
{ it + ":docsJar" }) { }
+tasks.create(name: "docsJarAll", dependsOn: ['docsJar_2_10_6', 'docsJar_2_11_7'] + pkgs.collect
{ it + ":docsJar" }) { }
 
 tasks.create(name: "testConnect", dependsOn: connectPkgs.collect { it + ":test" }) {}
-tasks.create(name: "testAll", dependsOn: ['test_core_2_10_5', 'test_core_2_11_7'] + pkgs.collect
{ it + ":test" }) { }
+tasks.create(name: "testAll", dependsOn: ['test_core_2_10_6', 'test_core_2_11_7'] + pkgs.collect
{ it + ":test" }) { }
 
-tasks.create(name: "releaseTarGzAll", dependsOn: ['releaseTarGz_2_10_5', 'releaseTarGz_2_11_7'])
{
+tasks.create(name: "releaseTarGzAll", dependsOn: ['releaseTarGz_2_10_6', 'releaseTarGz_2_11_7'])
{
 }
 
-tasks.create(name: "uploadArchivesAll", dependsOn: ['uploadCoreArchives_2_10_5', 'uploadCoreArchives_2_11_7']
+ pkgs.collect { it + ":uploadArchives" }) { }
+tasks.create(name: "uploadArchivesAll", dependsOn: ['uploadCoreArchives_2_10_6', 'uploadCoreArchives_2_11_7']
+ pkgs.collect { it + ":uploadArchives" }) { }
 
 project(':core') {
   println "Building project 'core' with Scala version $scalaVersion"
@@ -261,7 +261,7 @@ project(':core') {
     compile 'org.apache.zookeeper:zookeeper:3.4.6'
     compile 'com.101tec:zkclient:0.7'
     compile 'com.yammer.metrics:metrics-core:2.2.0'
-    compile 'net.sf.jopt-simple:jopt-simple:3.2'
+    compile 'net.sf.jopt-simple:jopt-simple:4.9'
     if (scalaVersion.startsWith('2.11')) {
       compile 'org.scala-lang.modules:scala-xml_2.11:1.0.4'
       compile 'org.scala-lang.modules:scala-parser-combinators_2.11:1.0.4'
@@ -269,8 +269,7 @@ project(':core') {
 
     testCompile "$junit"
     testCompile "$easymock"
-    testCompile 'org.objenesis:objenesis:1.2'
-    testCompile 'org.bouncycastle:bcpkix-jdk15on:1.52'
+    testCompile 'org.bouncycastle:bcpkix-jdk15on:1.53'
     testCompile "org.scalatest:scalatest_$baseScalaVersion:2.2.5"
     testCompile project(':clients')
     testCompile project(':clients').sourceSets.test.output
@@ -401,7 +400,7 @@ project(':clients') {
 
   dependencies {
     compile "$slf4japi"
-    compile 'org.xerial.snappy:snappy-java:1.1.1.7'
+    compile 'org.xerial.snappy:snappy-java:1.1.2'
     compile 'net.jpountz.lz4:lz4:1.2.0'
 
     testCompile 'org.bouncycastle:bcpkix-jdk15on:1.52'

http://git-wip-us.apache.org/repos/asf/kafka/blob/8f6ffe1c/gradle.properties
----------------------------------------------------------------------
diff --git a/gradle.properties b/gradle.properties
index faeaf88..aeb58a7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,9 +4,9 @@
 # The ASF licenses this file to You 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
-# 
+#
 #    http://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.
@@ -15,6 +15,6 @@
 
 group=org.apache.kafka
 version=0.9.0.0-SNAPSHOT
-scalaVersion=2.10.5
+scalaVersion=2.10.6
 task=build
 org.gradle.jvmargs=-XX:MaxPermSize=512m -Xmx1024m -Xss2m

http://git-wip-us.apache.org/repos/asf/kafka/blob/8f6ffe1c/scala.gradle
----------------------------------------------------------------------
diff --git a/scala.gradle b/scala.gradle
index 5eb2a65..8703af4 100644
--- a/scala.gradle
+++ b/scala.gradle
@@ -14,9 +14,9 @@
 // limitations under the License.
 
 if (!hasProperty('scalaVersion')) {
-  ext.scalaVersion = '2.10.5'
+  ext.scalaVersion = '2.10.6'
 }
-ext.defaultScalaVersion = '2.10.5'
+ext.defaultScalaVersion = '2.10.6'
 if (scalaVersion.startsWith('2.10')) {
     ext.baseScalaVersion = '2.10'
 } else if (scalaVersion.startsWith('2.11')) {


Mime
View raw message