This is an automated email from the ASF dual-hosted git repository.
ijuma pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/trunk by this push:
new dfaae317b82 MINOR: Upgrade Scala for Java 20/21 support (#13840)
dfaae317b82 is described below
commit dfaae317b82035323ba9c693b3ad7f02a6a58395
Author: Ismael Juma <ism...@juma.me.uk>
AuthorDate: Tue Jun 20 10:29:23 2023 -0700
MINOR: Upgrade Scala for Java 20/21 support (#13840)
Upgrade to Scala 2.13.11 and Scala 2.12.18. A minor test change was required
to fix compilation with Scala 2.13.11.
Scala 2.13 release notes:
* https://github.com/scala/scala/releases/tag/v2.13.11
Scala 2.12 release notes:
* https://github.com/scala/scala/releases/tag/v2.12.16
* https://github.com/scala/scala/releases/tag/v2.12.17
* https://github.com/scala/scala/releases/tag/v2.12.18
Reviewers: Justine Olshan <jols...@confluent.io>, Josep Prat
<josep.p...@aiven.io>
---
LICENSE-binary | 4 ++--
bin/kafka-run-class.sh | 2 +-
bin/windows/kafka-run-class.bat | 2 +-
core/src/test/scala/unit/kafka/server/ReplicaManagerTest.scala | 7 ++++---
gradle.properties | 2 +-
gradle/dependencies.gradle | 4 ++--
6 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/LICENSE-binary b/LICENSE-binary
index 249947286cc..916d4192dca 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -253,9 +253,9 @@ plexus-utils-3.3.0
reload4j-1.2.25
rocksdbjni-7.1.2
scala-collection-compat_2.13-2.10.0
-scala-library-2.13.10
+scala-library-2.13.11
scala-logging_2.13-3.9.4
-scala-reflect-2.13.10
+scala-reflect-2.13.11
scala-java8-compat_2.13-1.0.2
snappy-java-1.1.10.1
swagger-annotations-2.2.8
diff --git a/bin/kafka-run-class.sh b/bin/kafka-run-class.sh
index 025fd8d79d6..9ab96d7f2e1 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.13.10
+ SCALA_VERSION=2.13.11
if [[ -f "$base_dir/gradle.properties" ]]; then
SCALA_VERSION=`grep "^scalaVersion=" "$base_dir/gradle.properties" | cut
-d= -f 2`
fi
diff --git a/bin/windows/kafka-run-class.bat b/bin/windows/kafka-run-class.bat
index 3783b3b4951..42903fba956 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.13.10
+ set SCALA_VERSION=2.13.11
)
IF ["%SCALA_BINARY_VERSION%"] EQU [""] (
diff --git a/core/src/test/scala/unit/kafka/server/ReplicaManagerTest.scala
b/core/src/test/scala/unit/kafka/server/ReplicaManagerTest.scala
index 767709997c8..c3866476a69 100644
--- a/core/src/test/scala/unit/kafka/server/ReplicaManagerTest.scala
+++ b/core/src/test/scala/unit/kafka/server/ReplicaManagerTest.scala
@@ -2499,15 +2499,16 @@ class ReplicaManagerTest {
time: Time,
threadNamePrefix:
Option[String],
replicationQuotaManager: ReplicationQuotaManager): ReplicaFetcherManager = {
- new ReplicaFetcherManager(config, this, metrics, time,
threadNamePrefix, replicationQuotaManager, () =>
metadataCache.metadataVersion(), () => 1) {
+ val rm = this
+ new ReplicaFetcherManager(config, rm, metrics, time, threadNamePrefix,
replicationQuotaManager, () => metadataCache.metadataVersion(), () => 1) {
override def createFetcherThread(fetcherId: Int, sourceBroker:
BrokerEndPoint): ReplicaFetcherThread = {
val logContext = new LogContext(s"[ReplicaFetcher
replicaId=${config.brokerId}, leaderId=${sourceBroker.id}, " +
s"fetcherId=$fetcherId] ")
val fetchSessionHandler = new FetchSessionHandler(logContext,
sourceBroker.id)
val leader = new RemoteLeaderEndPoint(logContext.logPrefix,
blockingSend, fetchSessionHandler, config,
- replicaManager, quotaManager.follower, () =>
config.interBrokerProtocolVersion, () => 1)
- new ReplicaFetcherThread(s"ReplicaFetcherThread-$fetcherId",
leader, config, failedPartitions, replicaManager,
+ rm, quotaManager.follower, () =>
config.interBrokerProtocolVersion, () => 1)
+ new ReplicaFetcherThread(s"ReplicaFetcherThread-$fetcherId",
leader, config, failedPartitions, rm,
quotaManager.follower, logContext.logPrefix, () =>
config.interBrokerProtocolVersion) {
override def doWork(): Unit = {
// In case the thread starts before the partition is added by
AbstractFetcherManager,
diff --git a/gradle.properties b/gradle.properties
index d4bcddfd169..7cefc403c8c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -24,7 +24,7 @@ group=org.apache.kafka
# - streams/quickstart/java/src/main/resources/archetype-resources/pom.xml
# - streams/quickstart/java/pom.xml
version=3.6.0-SNAPSHOT
-scalaVersion=2.13.10
+scalaVersion=2.13.11
task=build
org.gradle.jvmargs=-Xmx2g -Xss4m -XX:+UseParallelGC
org.gradle.parallel=true
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 10389c47cd7..56c3448b788 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -27,8 +27,8 @@ ext {
}
// Add Scala version
-def defaultScala212Version = '2.12.15'
-def defaultScala213Version = '2.13.10'
+def defaultScala212Version = '2.12.18'
+def defaultScala213Version = '2.13.11'
if (hasProperty('scalaVersion')) {
if (scalaVersion == '2.12') {
versions["scala"] = defaultScala212Version
