Skip to content

Commit

Permalink
KAFKA-3227; Conservative update of Kafka dependencies
Browse files Browse the repository at this point in the history
Patch version bumps for bouncy castle, minikdc, snappy, slf4j, scalatest and powermock. Notable fixes:

* Snappy: fixes a resource leak
* Bouncy castle: security fixes

Also update Gradle to 2.11 (where the notable change is improved IDE integration) and the grgit build dependency.

Author: Ismael Juma <[email protected]>

Reviewers: Grant Henke <[email protected]>, Ewen Cheslack-Postava <[email protected]>

Closes apache#903 from ijuma/kafka-3227-conservative-update-of-kafka-deps
  • Loading branch information
ijuma authored and ewencp committed Feb 16, 2016
1 parent d7fc7cf commit f355918
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ buildscript {
apply from: file('gradle/buildscript.gradle'), to: buildscript

dependencies {
// For Apache Rat plugin to ignore non-Git files, need ancient version for Java 6 compatibility
classpath group: 'org.ajoberstar', name: 'grgit', version: '0.2.3'
// For Apache Rat plugin to ignore non-Git files
classpath "org.ajoberstar:grgit:1.5.0"
}
}

Expand All @@ -36,7 +36,7 @@ allprojects {
}

ext {
gradleVersion = "2.10"
gradleVersion = "2.11"
buildVersionFileName = "kafka-version.properties"

userMaxForks = project.hasProperty('maxParallelForks') ? maxParallelForks.toInteger() : null
Expand Down
12 changes: 6 additions & 6 deletions gradle/dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ ext {

versions += [
argparse4j: "0.5.0",
bcpkix: "1.53",
hadoop: "2.7.1",
bcpkix: "1.54",
hadoop: "2.7.2",
easymock: "3.4",
jackson: "2.6.3",
jetty: "9.2.14.v20151106",
Expand All @@ -34,13 +34,13 @@ versions += [
junit: "4.12",
lz4: "1.3.0",
metrics: "2.2.0",
powermock: "1.6.3",
powermock: "1.6.4",
reflections: "0.9.10",
rocksDB: "3.10.1",
scalaTest: "2.2.5",
scalaTest: "2.2.6",
scalaParserCombinators: "1.0.4",
slf4j: "1.7.6",
snappy: "1.1.2",
slf4j: "1.7.15",
snappy: "1.1.2.1",
zkclient: "0.7",
zookeeper: "3.4.6",
]
Expand Down

0 comments on commit f355918

Please sign in to comment.