Skip to content

MINOR: Update dependencies for Kafka 2.4 #7126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ijuma merged 6 commits into from
Aug 8, 2019
Merged

MINOR: Update dependencies for Kafka 2.4 #7126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b0ca96c
Update deps
ijuma Jul 28, 2019
c287a74
Update to Scala 2.12.9
ijuma Aug 6, 2019
3d31eeb
Revert jersey version update
ijuma Aug 7, 2019
88a6ef6
Bump dependency vulnerability checker to 5.2.1
ijuma Aug 7, 2019
012db3b
Bump slf4j to 1.7.27
ijuma Aug 7, 2019
1bc5a67
Bump scala collection compat to 2.1.2
ijuma Aug 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/kafka-run-class.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bin/windows/kafka-run-class.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 [""] (
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
20 changes: 10 additions & 10 deletions gradle/dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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') {
Expand Down Expand Up @@ -63,18 +63,18 @@ 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",
jetty: "9.4.19.v20190610",
jersey: "2.28",
jmh: "1.21",
hamcrest: "2.1",
Expand All @@ -97,25 +97,25 @@ 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.1",
powermock: "2.0.2",
reflections: "0.9.11",
rocksDB: "5.18.3",
scalaCollectionCompat: "2.1.0",
scalaCollectionCompat: "2.1.2",
scalafmt: "1.5.1",
scalaJava8Compat : "0.9.0",
scalatest: "3.0.8",
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",
spotlessPlugin: "3.23.0",
spotlessPlugin: "3.23.1",
zookeeper: "3.5.5",
zstd: "1.4.0-1"
zstd: "1.4.2-1"
]

libs += [
Expand Down