root
/
kafka
mirror of https://github.com/apache/kafka.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

MINOR: Update Scala to 2.12.11 (#8308) 

Highlights:
* Performance improvements in the ollections
library: algorithmic improvements and
changes to avoid unnecessary allocations.
* Performance improvements in the compiler.
* ASM was upgraded to 7.3.1, allowing the
optimizer to run on JDK 13+.

Full release notes: https://github.com/scala/scala/releases/tag/v2.12.11

Reviewers: Manikumar Reddy <manikumar.reddy@gmail.com>, Chia-Ping Tsai <chia7712@gmail.com>
This commit is contained in:
Ismael Juma 2020-03-18 09:33:14 -07:00 committed by GitHub
parent da7d134640
commit 93f082e093
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/kafka-run-class.sh
View File

@ -48,7 +48,7 @@ should_include_file() {
base_dir=$(dirname $0)/.. base_dir=$(dirname $0)/..
if [ -z "$SCALA_VERSION" ]; then if [ -z "$SCALA_VERSION" ]; then
SCALA_VERSION=2.12.10 SCALA_VERSION=2.12.11
if [[ -f "$base_dir/gradle.properties" ]]; then if [[ -f "$base_dir/gradle.properties" ]]; then
SCALA_VERSION=`grep "^scalaVersion=" "$base_dir/gradle.properties" | cut -d= -f 2` SCALA_VERSION=`grep "^scalaVersion=" "$base_dir/gradle.properties" | cut -d= -f 2`
fi fi

2
bin/windows/kafka-run-class.bat
View File

@ -27,7 +27,7 @@ set BASE_DIR=%CD%
popd popd
IF ["%SCALA_VERSION%"] EQU [""] ( IF ["%SCALA_VERSION%"] EQU [""] (
set SCALA_VERSION=2.12.10 set SCALA_VERSION=2.12.11
) )
IF ["%SCALA_BINARY_VERSION%"] EQU [""] ( IF ["%SCALA_BINARY_VERSION%"] EQU [""] (

2
gradle.properties
View File

@ -21,6 +21,6 @@ group=org.apache.kafka
# - tests/kafkatest/version.py (variable DEV_VERSION) # - tests/kafkatest/version.py (variable DEV_VERSION)
# - kafka-merge-pr.py # - kafka-merge-pr.py
version=2.6.0-SNAPSHOT version=2.6.0-SNAPSHOT
scalaVersion=2.12.10 scalaVersion=2.12.11
task=build task=build
org.gradle.jvmargs=-Xmx1024m -Xss2m org.gradle.jvmargs=-Xmx1024m -Xss2m

2
gradle/dependencies.gradle
View File

@ -29,7 +29,7 @@ ext {
} }
// Add Scala version // Add Scala version
def defaultScala212Version = '2.12.10' def defaultScala212Version = '2.12.11'
def defaultScala213Version = '2.13.1' def defaultScala213Version = '2.13.1'
if (hasProperty('scalaVersion')) { if (hasProperty('scalaVersion')) {
if (scalaVersion == '2.12') { if (scalaVersion == '2.12') {

6
gradle/spotbugs-exclude.xml
View File

@ -148,6 +148,12 @@ For a detailed description of spotbugs bug categories, see https://spotbugs.read
<Bug pattern="UMAC_UNCALLABLE_METHOD_OF_ANONYMOUS_CLASS"/> <Bug pattern="UMAC_UNCALLABLE_METHOD_OF_ANONYMOUS_CLASS"/>
</Match> </Match>
<Match>
<!-- offsets is a lazy val and it confuses spotBugs with its locking scheme -->
<Class name="kafka.server.checkpoints.LazyOffsetCheckpointMap"/>
<Bug pattern="IS2_INCONSISTENT_SYNC"/>
</Match>
<Match> <Match>
<!-- Uncallable anonymous methods are left behind after inlining by scalac 2.12, fixed in 2.13 --> <!-- Uncallable anonymous methods are left behind after inlining by scalac 2.12, fixed in 2.13 -->
<Source name="LogManager.scala"/> <Source name="LogManager.scala"/>