Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MINOR: Update dependencies for 0.11 #2872

Closed
wants to merge 1 commit into from
Closed

MINOR: Update dependencies for 0.11 #2872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 7 additions & 10 deletions build.gradle
View file
Open in desktop
Expand Up @@ -24,8 +24,8 @@ buildscript {

dependencies {
// For Apache Rat plugin to ignore non-Git files
classpath "org.ajoberstar:grgit:1.7.0"
classpath 'com.github.ben-manes:gradle-versions-plugin:0.13.0'
classpath "org.ajoberstar:grgit:1.9.2"
classpath 'com.github.ben-manes:gradle-versions-plugin:0.14.0'
classpath 'org.scoverage:gradle-scoverage:2.1.0'
classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.4'
}
Expand Down Expand Up @@ -68,7 +68,7 @@ allprojects {
}

ext {
gradleVersion = "3.2.1"
gradleVersion = "3.5"
buildVersionFileName = "kafka-version.properties"

maxPermSizeArgs = []
Expand Down Expand Up @@ -881,9 +881,9 @@ project(':jmh-benchmarks') {
dependencies {
compile project(':clients')
compile project(':streams')
compile 'org.openjdk.jmh:jmh-core:1.17.5'
compile 'org.openjdk.jmh:jmh-generator-annprocess:1.17.5'
compile 'org.openjdk.jmh:jmh-core-benchmarks:1.17.5'
compile 'org.openjdk.jmh:jmh-core:1.18'
compile 'org.openjdk.jmh:jmh-generator-annprocess:1.18'
compile 'org.openjdk.jmh:jmh-core-benchmarks:1.18'
}

jar {
Expand Down Expand Up @@ -1052,10 +1052,7 @@ project(':connect:runtime') {
compile libs.jettyServer
compile libs.jettyServlet
compile libs.jettyServlets
compile(libs.reflections) {
// Exclude because of LGPL license
exclude group: 'com.google.code.findbugs', module: 'annotations'
}
compile(libs.reflections)

testCompile project(':clients').sourceSets.test.output
testCompile libs.easymock
Expand Down
14 changes: 7 additions & 7 deletions gradle/dependencies.gradle
View file
Open in desktop
Expand Up @@ -26,7 +26,7 @@ versions += [
apacheda: "1.0.0-M33",
apacheds: "2.0.0-M21",
argparse4j: "0.7.0",
bcpkix: "1.55",
bcpkix: "1.56",
easymock: "3.4",
jackson: "2.8.5",
jetty: "9.2.15.v20160210",
Expand All @@ -37,22 +37,22 @@ versions += [
lz4: "1.3.0",
metrics: "2.2.0",
powermock: "1.6.4",
reflections: "0.9.10",
reflections: "0.9.11",
rocksDB: "5.0.1",
scalaTest: "3.0.1",
scalaTest: "3.0.2",
scalaParserCombinators: "1.0.4",
scoverage: "1.3.0",
slf4j: "1.7.21",
slf4j: "1.7.25",
snappy: "1.1.2.6",
zkclient: "0.10",
zookeeper: "3.4.9",
zookeeper: "3.4.10",
jfreechart: "1.0.0",
]

// Add Scala version
def defaultScala210Version = '2.10.6'
def defaultScala211Version = '2.11.8'
def defaultScala212Version = '2.12.1'
def defaultScala211Version = '2.11.11'
def defaultScala212Version = '2.12.2'
if (hasProperty('scalaVersion')) {
if (scalaVersion == '2.10') {
versions["scala"] = defaultScala210Version
Expand Down