mirror of https://github.com/apache/kafka.git
KAFKA-17653 Update Scala version to 2.13.15 for support Java 23 (3.9 backport) (#19307)
cherry picked from commit 9cb49092f0
in trunk
Co-authored-by: Ken Huang <s7133700@gmail.com>
Reviewers: Luke Chen <showuon@gmail.com>
This commit is contained in:
parent
fd4c90a7c9
commit
e71b9ab3be
|
@ -261,11 +261,11 @@ rocksdbjni-7.9.2
|
|||
scala-collection-compat_2.12-2.10.0
|
||||
scala-collection-compat_2.13-2.10.0
|
||||
scala-library-2.12.19
|
||||
scala-library-2.13.14
|
||||
scala-library-2.13.15
|
||||
scala-logging_2.12-3.9.5
|
||||
scala-logging_2.13-3.9.5
|
||||
scala-reflect-2.12.19
|
||||
scala-reflect-2.13.14
|
||||
scala-reflect-2.13.15
|
||||
scala-java8-compat_2.12-1.0.2
|
||||
scala-java8-compat_2.13-1.0.2
|
||||
snappy-java-1.1.10.5
|
||||
|
|
|
@ -49,7 +49,7 @@ should_include_file() {
|
|||
base_dir=$(dirname $0)/..
|
||||
|
||||
if [ -z "$SCALA_VERSION" ]; then
|
||||
SCALA_VERSION=2.13.14
|
||||
SCALA_VERSION=2.13.15
|
||||
if [[ -f "$base_dir/gradle.properties" ]]; then
|
||||
SCALA_VERSION=`grep "^scalaVersion=" "$base_dir/gradle.properties" | cut -d= -f 2`
|
||||
fi
|
||||
|
|
|
@ -27,7 +27,7 @@ set BASE_DIR=%CD%
|
|||
popd
|
||||
|
||||
IF ["%SCALA_VERSION%"] EQU [""] (
|
||||
set SCALA_VERSION=2.13.14
|
||||
set SCALA_VERSION=2.13.15
|
||||
)
|
||||
|
||||
IF ["%SCALA_BINARY_VERSION%"] EQU [""] (
|
||||
|
|
|
@ -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.9.1-SNAPSHOT
|
||||
scalaVersion=2.13.14
|
||||
scalaVersion=2.13.15
|
||||
# Adding swaggerVersion in gradle.properties to have a single version in place for swagger
|
||||
# New version of Swagger 2.2.14 requires minimum JDK 11.
|
||||
swaggerVersion=2.2.8
|
||||
|
|
|
@ -28,7 +28,7 @@ ext {
|
|||
|
||||
// Add Scala version
|
||||
def defaultScala212Version = '2.12.19'
|
||||
def defaultScala213Version = '2.13.14'
|
||||
def defaultScala213Version = '2.13.15'
|
||||
if (hasProperty('scalaVersion')) {
|
||||
if (scalaVersion == '2.12') {
|
||||
versions["scala"] = defaultScala212Version
|
||||
|
|
Loading…
Reference in New Issue