Skip to content

Commit 7c2d672

Browse files
authored
MINOR: Update library dependencies (Q1 2022) (apache#11306)
- scala 2.13: 2.13.6 -> 2.13.8 * Support Java 18 and improve Android compatibility * https://www.scala-lang.org/news/2.13.7 * https://www.scala-lang.org/news/2.13.8 - scala 2.12: 2.12.14 -> 2.12.15. * The `-release` flag now works with Scala 2.12, backend parallelism can be enabled via `-Ybackend-parallelism N` and string interpolation is more efficient. * https://www.scala-lang.org/news/2.12.5 - gradle versions plugin: 0.38.0 -> 0.42.0 * Minor fixes * https://github.com/ben-manes/gradle-versions-plugin/releases/tag/v0.40.0 * https://github.com/ben-manes/gradle-versions-plugin/releases/tag/v0.41.0 * https://github.com/ben-manes/gradle-versions-plugin/releases/tag/v0.42.0 - gradle dependency check plugin: 6.1.6 -> 6.5.3 * Minor fixes - gradle spotbugs plugin: 4.7.1 -> 5.0.5 * Fixes and minor improvements * There were too many releases to include all the links, include the major version bump * https://github.com/spotbugs/spotbugs-gradle-plugin/releases/tag/5.0.0 - gradle scoverage plugin: 5.0.0 -> 7.0.0 * Support newer Gradle versions and other improvements * https://github.com/scoverage/gradle-scoverage/releases/tag/6.0.0 * https://github.com/scoverage/gradle-scoverage/releases/tag/6.1.0 * https://github.com/scoverage/gradle-scoverage/releases/tag/7.0.0 - gradle shadow plugin: 7.0.0 -> 7.1.2 * Support gradle toolchains and security fixes * https://github.com/johnrengelman/shadow/releases/tag/7.1.0 * https://github.com/johnrengelman/shadow/releases/tag/7.1.1 * https://github.com/johnrengelman/shadow/releases/tag/7.1.2 - bcpkix: 1.66 -> 1.70 * Several improvements and fixes * https://www.bouncycastle.org/releasenotes.html - jline: 3.12.1 -> 3.21.0 * Various fixes and improvements - jmh: 1.32 -> 1.34 * Compiler blackhole enabled by default when using Java 17 and improved gradle incremental compilation * https://mail.openjdk.java.net/pipermail/jmh-dev/2021-August/003355.html * https://mail.openjdk.java.net/pipermail/jmh-dev/2021-December/003406.html - scalaLogging: 3.9.3 -> 3.9.4 * Support for Scala 3.0 - jose4j: 0.7.8 -> 0.7.9 * Minor fixes - junit: 5.7.1 -> 5.8.2 * Minor improvements and fixes * https://junit.org/junit5/docs/current/release-notes/index.html#release-notes-5.8.0 * https://junit.org/junit5/docs/current/release-notes/index.html#release-notes-5.8.1 * https://junit.org/junit5/docs/current/release-notes/index.html#release-notes-5.8.2 - jqwik: 1.5.0 -> 1.6.3 * Numerous improvements * https://github.com/jlink/jqwik/releases/tag/1.6.0 - mavenArtifact: 3.8.1 -> 3.8.4 - mockito: 3.12.4 -> 4.3.1 * Removed deprecated methods, `DoNotMock` annotation and minor fixes/improvements * https://github.com/mockito/mockito/releases/tag/v4.0.0 * https://github.com/mockito/mockito/releases/tag/v4.1.0 * https://github.com/mockito/mockito/releases/tag/v4.2.0 * https://github.com/mockito/mockito/releases/tag/v4.3.0 - scalaCollectionCompat: 2.4.4 -> 2.6.0 * Minor fixes * https://github.com/scala/scala-collection-compat/releases/tag/v2.5.0 * https://github.com/scala/scala-collection-compat/releases/tag/v2.6.0 - scalaJava8Compat: 1.0.0 -> 1.0.2 * Minor changes - scoverage: 1.4.1 -> 1.4.11 * Support for newer Scala versions - slf4j: 1.7.30 -> 1.7.32 * Minor fixes, 1.7.35 automatically uses reload4j and 1.7.33/1.7.34 cause build failures, so we stick with 1.7.32 for now. - zstd: 1.5.0-4 -> 1.5.2-1 * zstd 1.5.2 * Small refinements and performance improvements * https://github.com/facebook/zstd/releases/tag/v1.5.1 * https://github.com/facebook/zstd/releases/tag/v1.5.2 Checkstyle, spotBugs and spotless will be upgraded separately as they either require non trivial code changes or they have regressions that affect us. Reviewers: Manikumar Reddy <[email protected]>
1 parent f1fdd31 commit 7c2d672

File tree

6 files changed

+27
-27
lines changed

6 files changed

+27
-27
lines changed

build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@ buildscript {
3131

3232
plugins {
3333
id 'com.diffplug.spotless' version '5.12.5'
34-
id 'com.github.ben-manes.versions' version '0.38.0'
34+
id 'com.github.ben-manes.versions' version '0.42.0'
3535
id 'idea'
3636
id 'java-library'
37-
id 'org.owasp.dependencycheck' version '6.1.6'
37+
id 'org.owasp.dependencycheck' version '6.5.3'
3838
id 'org.nosphere.apache.rat' version "0.7.0"
3939

40-
id "com.github.spotbugs" version '4.7.1' apply false
40+
id "com.github.spotbugs" version '5.0.5' apply false
4141
id 'org.gradle.test-retry' version '1.3.1' apply false
42-
id 'org.scoverage' version '5.0.0' apply false
43-
id 'com.github.johnrengelman.shadow' version '7.0.0' apply false
42+
id 'org.scoverage' version '7.0.0' apply false
43+
id 'com.github.johnrengelman.shadow' version '7.1.2' apply false
4444
}
4545

4646
spotless {

clients/src/test/java/org/apache/kafka/test/TestSslUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ static String pem(PrivateKey privateKey, Password password) throws IOException {
343343
pemWriter.writeObject(new JcaPKCS8Generator(privateKey, null));
344344
} else {
345345
JceOpenSSLPKCS8EncryptorBuilder encryptorBuilder = new JceOpenSSLPKCS8EncryptorBuilder(PKCS8Generator.PBE_SHA1_3DES);
346-
encryptorBuilder.setPasssword(password.value().toCharArray());
346+
encryptorBuilder.setPassword(password.value().toCharArray());
347347
try {
348348
pemWriter.writeObject(new JcaPKCS8Generator(privateKey, encryptorBuilder.build()));
349349
} catch (Exception e) {

core/src/main/scala/kafka/log/LazyIndex.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ class LazyIndex[T <: AbstractIndex] private (@volatile private var indexWrapper:
5454

5555
def get: T = {
5656
indexWrapper match {
57-
case indexValue: IndexValue[T] => indexValue.index
57+
case indexValue: IndexValue[_] => indexValue.index.asInstanceOf[T]
5858
case _: IndexFile =>
5959
inLock(lock) {
6060
indexWrapper match {
61-
case indexValue: IndexValue[T] => indexValue.index
61+
case indexValue: IndexValue[_] => indexValue.index.asInstanceOf[T]
6262
case indexFile: IndexFile =>
6363
val indexValue = new IndexValue(loadIndex(indexFile.file))
6464
indexWrapper = indexValue

gradle/dependencies.gradle

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ ext {
2727
}
2828

2929
// Add Scala version
30-
def defaultScala212Version = '2.12.14'
31-
def defaultScala213Version = '2.13.6'
30+
def defaultScala212Version = '2.12.15'
31+
def defaultScala213Version = '2.13.8'
3232
if (hasProperty('scalaVersion')) {
3333
if (scalaVersion == '2.12') {
3434
versions["scala"] = defaultScala212Version
@@ -58,7 +58,7 @@ versions += [
5858
apacheda: "1.0.2",
5959
apacheds: "2.0.0-M24",
6060
argparse4j: "0.7.0",
61-
bcpkix: "1.66",
61+
bcpkix: "1.70",
6262
checkstyle: "8.36.2",
6363
commonsCli: "1.4",
6464
dropwizardMetrics: "4.1.12.1",
@@ -71,18 +71,18 @@ versions += [
7171
javassist: "3.27.0-GA",
7272
jetty: "9.4.44.v20210927",
7373
jersey: "2.34",
74-
jline: "3.12.1",
75-
jmh: "1.32",
74+
jline: "3.21.0",
75+
jmh: "1.34",
7676
hamcrest: "2.2",
7777
log4j: "1.2.17",
78-
scalaLogging: "3.9.3",
78+
scalaLogging: "3.9.4",
7979
jaxb: "2.3.0",
8080
jaxrs: "2.1.1",
8181
jfreechart: "1.0.0",
8282
jopt: "5.0.4",
83-
jose4j: "0.7.8",
84-
junit: "5.7.1",
85-
jqwik: "1.5.0",
83+
jose4j: "0.7.9",
84+
junit: "5.8.2",
85+
jqwik: "1.6.3",
8686
kafka_0100: "0.10.0.1",
8787
kafka_0101: "0.10.1.1",
8888
kafka_0102: "0.10.2.2",
@@ -101,23 +101,23 @@ versions += [
101101
kafka_30: "3.0.0",
102102
kafka_31: "3.1.0",
103103
lz4: "1.8.0",
104-
mavenArtifact: "3.8.1",
104+
mavenArtifact: "3.8.4",
105105
metrics: "2.2.0",
106-
mockito: "3.12.4",
106+
mockito: "4.3.1",
107107
netty: "4.1.73.Final",
108108
powermock: "2.0.9",
109109
reflections: "0.9.12",
110110
rocksDB: "6.27.3",
111-
scalaCollectionCompat: "2.4.4",
111+
scalaCollectionCompat: "2.6.0",
112112
scalafmt: "2.7.5",
113-
scalaJava8Compat : "1.0.0",
114-
scoverage: "1.4.1",
115-
slf4j: "1.7.30",
113+
scalaJava8Compat : "1.0.2",
114+
scoverage: "1.4.11",
115+
slf4j: "1.7.32",
116116
snappy: "1.1.8.4",
117117
spotbugs: "4.2.2",
118118
zinc: "1.3.5",
119119
zookeeper: "3.6.3",
120-
zstd: "1.5.0-4"
120+
zstd: "1.5.2-1"
121121
]
122122
libs += [
123123
activation: "javax.activation:activation:$versions.activation",

streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/TopologyTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ class TopologyTest {
8080
def getTopologyJava: TopologyDescription = {
8181
val streamBuilder = new StreamsBuilderJ
8282
val textLines = streamBuilder.stream[String, String](inputTopic)
83-
val _: KStreamJ[String, String] = textLines.flatMapValues(s => pattern.split(s.toLowerCase).toIterable.asJava)
83+
val _: KStreamJ[String, String] = textLines.flatMapValues(s => pattern.split(s.toLowerCase).toBuffer.asJava)
8484
streamBuilder.build().describe()
8585
}
8686

@@ -114,7 +114,7 @@ class TopologyTest {
114114
val textLines: KStreamJ[String, String] = streamBuilder.stream[String, String](inputTopic)
115115

116116
val splits: KStreamJ[String, String] =
117-
textLines.flatMapValues(s => pattern.split(s.toLowerCase).toIterable.asJava)
117+
textLines.flatMapValues(s => pattern.split(s.toLowerCase).toBuffer.asJava)
118118

119119
val grouped: KGroupedStreamJ[String, String] = splits.groupBy((_, v) => v)
120120

streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/WordCountTest.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ class WordCountTest extends WordCountTestData {
154154
val pattern = Pattern.compile("\\W+", Pattern.UNICODE_CHARACTER_CLASS)
155155

156156
val splits: KStreamJ[String, String] = textLines.flatMapValues { line =>
157-
pattern.split(line.toLowerCase).toIterable.asJava
157+
pattern.split(line.toLowerCase).toBuffer.asJava
158158
}
159159

160160
val grouped: KGroupedStreamJ[String, String] = splits.groupBy { (_, v) =>

0 commit comments

Comments
 (0)