From b0ca96cd06029ef26e245af29207c136402d653f Mon Sep 17 00:00:00 2001 From: Ismael Juma Date: Sat, 27 Jul 2019 23:20:19 -0700 Subject: [PATCH 1/6] Update deps --- gradle/dependencies.gradle | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index d4368338995f6..2fbbade03ec18 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -63,19 +63,19 @@ versions += [ apacheda: "1.0.2", apacheds: "2.0.0-M24", argparse4j: "0.7.0", - bcpkix: "1.61", + bcpkix: "1.62", checkstyle: "8.20", commonsCli: "1.4", gradle: "5.4.1", gradleVersionsPlugin: "0.21.0", grgit: "3.1.1", - httpclient: "4.5.8", + httpclient: "4.5.9", easymock: "4.0.2", jackson: "2.9.9", jacksonDatabind: "2.9.9.3", jacoco: "0.8.3", - jetty: "9.4.18.v20190429", - jersey: "2.28", + jetty: "9.4.19.v20190610", + jersey: "2.29", jmh: "1.21", hamcrest: "2.1", log4j: "1.2.17", @@ -97,12 +97,12 @@ versions += [ lz4: "1.6.0", mavenArtifact: "3.6.1", metrics: "2.2.0", - mockito: "2.27.0", - owaspDepCheckPlugin: "4.0.2", + mockito: "3.0.0", + owaspDepCheckPlugin: "5.2.0", powermock: "2.0.2", reflections: "0.9.11", rocksDB: "5.18.3", - scalaCollectionCompat: "2.1.0", + scalaCollectionCompat: "2.1.1", scalafmt: "1.5.1", scalaJava8Compat : "0.9.0", scalatest: "3.0.8", @@ -113,9 +113,9 @@ versions += [ snappy: "1.1.7.3", spotbugs: "3.1.12", spotbugsPlugin: "1.6.9", - spotlessPlugin: "3.23.0", + spotlessPlugin: "3.23.1", zookeeper: "3.5.5", - zstd: "1.4.0-1" + zstd: "1.4.2-1" ] libs += [ From c287a741afc8c46eda4b1502f301291c5ddf17ee Mon Sep 17 00:00:00 2001 From: Ismael Juma Date: Mon, 5 Aug 2019 19:59:10 -0700 Subject: [PATCH 2/6] Update to Scala 2.12.9 --- bin/kafka-run-class.sh | 2 +- bin/windows/kafka-run-class.bat | 2 +- gradle.properties | 2 +- gradle/dependencies.gradle | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/kafka-run-class.sh b/bin/kafka-run-class.sh index 7098925b940c4..dc0235e1cbece 100755 --- a/bin/kafka-run-class.sh +++ b/bin/kafka-run-class.sh @@ -48,7 +48,7 @@ should_include_file() { base_dir=$(dirname $0)/.. if [ -z "$SCALA_VERSION" ]; then - SCALA_VERSION=2.12.8 + SCALA_VERSION=2.12.9 fi if [ -z "$SCALA_BINARY_VERSION" ]; then diff --git a/bin/windows/kafka-run-class.bat b/bin/windows/kafka-run-class.bat index 3bec536e67a73..cc9f3d6a26021 100755 --- a/bin/windows/kafka-run-class.bat +++ b/bin/windows/kafka-run-class.bat @@ -27,7 +27,7 @@ set BASE_DIR=%CD% popd IF ["%SCALA_VERSION%"] EQU [""] ( - set SCALA_VERSION=2.12.8 + set SCALA_VERSION=2.12.9 ) IF ["%SCALA_BINARY_VERSION%"] EQU [""] ( diff --git a/gradle.properties b/gradle.properties index c4b58b94339cb..9c4949629c2fe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,6 +21,6 @@ group=org.apache.kafka # - tests/kafkatest/version.py (variable DEV_VERSION) # - kafka-merge-pr.py version=2.4.0-SNAPSHOT -scalaVersion=2.12.8 +scalaVersion=2.12.9 task=build org.gradle.jvmargs=-Xmx1024m -Xss2m diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 2fbbade03ec18..ac05b74da10ac 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -30,7 +30,7 @@ ext { // Add Scala version def defaultScala211Version = '2.11.12' -def defaultScala212Version = '2.12.8' +def defaultScala212Version = '2.12.9' def defaultScala213Version = '2.13.0' if (hasProperty('scalaVersion')) { if (scalaVersion == '2.11') { From 3d31eeb2bfd863732d3a8a3aa61fdd5e90447f9c Mon Sep 17 00:00:00 2001 From: Ismael Juma Date: Wed, 7 Aug 2019 00:08:18 -0700 Subject: [PATCH 3/6] Revert jersey version update --- gradle/dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index ac05b74da10ac..9106f67464ee4 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -75,7 +75,7 @@ versions += [ jacksonDatabind: "2.9.9.3", jacoco: "0.8.3", jetty: "9.4.19.v20190610", - jersey: "2.29", + jersey: "2.28", jmh: "1.21", hamcrest: "2.1", log4j: "1.2.17", From 88a6ef60427aabf5a913bf5793377ac28839a11d Mon Sep 17 00:00:00 2001 From: Ismael Juma Date: Wed, 7 Aug 2019 00:10:34 -0700 Subject: [PATCH 4/6] Bump dependency vulnerability checker to 5.2.1 --- gradle/dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 9106f67464ee4..3e016e3669d5e 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -98,7 +98,7 @@ versions += [ mavenArtifact: "3.6.1", metrics: "2.2.0", mockito: "3.0.0", - owaspDepCheckPlugin: "5.2.0", + owaspDepCheckPlugin: "5.2.1", powermock: "2.0.2", reflections: "0.9.11", rocksDB: "5.18.3", From 012db3bc0f947e8c1b2965ec5b93cfc58917ef0b Mon Sep 17 00:00:00 2001 From: Ismael Juma Date: Wed, 7 Aug 2019 00:13:49 -0700 Subject: [PATCH 5/6] Bump slf4j to 1.7.27 --- gradle/dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 3e016e3669d5e..8634f0504da91 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -109,7 +109,7 @@ versions += [ scoverage: "1.4.0", scoveragePlugin: "2.5.0", shadowPlugin: "4.0.4", - slf4j: "1.7.26", + slf4j: "1.7.27", snappy: "1.1.7.3", spotbugs: "3.1.12", spotbugsPlugin: "1.6.9", From 1bc5a672a2ebd6ac557dbca2d35e231f150cd25f Mon Sep 17 00:00:00 2001 From: Ismael Juma Date: Wed, 7 Aug 2019 00:16:01 -0700 Subject: [PATCH 6/6] Bump scala collection compat to 2.1.2 --- gradle/dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 8634f0504da91..f3d0e31d37dbb 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -102,7 +102,7 @@ versions += [ powermock: "2.0.2", reflections: "0.9.11", rocksDB: "5.18.3", - scalaCollectionCompat: "2.1.1", + scalaCollectionCompat: "2.1.2", scalafmt: "1.5.1", scalaJava8Compat : "0.9.0", scalatest: "3.0.8",