From 0da6898e4bbbe5aa055497f86618131263e8bf37 Mon Sep 17 00:00:00 2001 From: eziosudo Date: Sun, 9 Jul 2023 09:54:31 -0700 Subject: [PATCH 1/5] KAFKA-15159 upgrade minor dependencies --- gradle/dependencies.gradle | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index cc74819c8974c..d45768502eed3 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -77,7 +77,7 @@ versions += [ apacheda: "1.0.2", apacheds: "2.0.0-M24", argparse4j: "0.7.0", - bcpkix: "1.73", + bcpkix: "1.75", caffeine: "2.9.3", // 3.x supports JDK 11 and above checkstyle: "8.36.2", commonsCli: "1.4", @@ -103,7 +103,7 @@ versions += [ jopt: "5.0.4", jose4j: "0.9.3", junit: "5.9.3", - jqwik: "1.7.2", + jqwik: "1.7.4", kafka_0100: "0.10.0.1", kafka_0101: "0.10.1.1", kafka_0102: "0.10.2.2", @@ -124,9 +124,9 @@ versions += [ kafka_32: "3.2.3", kafka_33: "3.3.1", lz4: "1.8.0", - mavenArtifact: "3.8.4", + mavenArtifact: "3.8.8", metrics: "2.2.0", - netty: "4.1.92.Final", + netty: "4.1.94.Final", pcollections: "4.0.1", powermock: "2.0.9", reflections: "0.9.12", @@ -142,8 +142,8 @@ versions += [ slf4j: "1.7.36", snappy: "1.1.10.1", spotbugs: "4.7.3", - swaggerAnnotations: "2.2.8", - swaggerJaxrs2: "2.2.8", + swaggerAnnotations: "2.2.14", + swaggerJaxrs2: "2.2.14", zinc: "1.8.0", zookeeper: "3.6.4", zstd: "1.5.5-1" From 8e70b491b9127632c9be7bf31007edeb337d29a8 Mon Sep 17 00:00:00 2001 From: Damon Xie Date: Mon, 10 Jul 2023 10:58:47 -0700 Subject: [PATCH 2/5] KAFKA-15159 update LICENSE-binary for netty upgrade --- LICENSE-binary | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/LICENSE-binary b/LICENSE-binary index 0b6845ae32868..df7c6a764a81a 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -241,15 +241,15 @@ lz4-java-1.8.0 maven-artifact-3.8.4 metrics-core-4.1.12.1 metrics-core-2.2.0 -netty-buffer-4.1.92.Final -netty-codec-4.1.92.Final -netty-common-4.1.92.Final -netty-handler-4.1.92.Final -netty-resolver-4.1.92.Final -netty-transport-4.1.92.Final -netty-transport-classes-epoll-4.1.92.Final -netty-transport-native-epoll-4.1.92.Final -netty-transport-native-unix-common-4.1.92.Final +netty-buffer-.Final +netty-codec-4.1.94.Final +netty-common-4.1.94.Final +netty-handler-4.1.94.Final +netty-resolver-4.1.94.Final +netty-transport-4.1.94.Final +netty-transport-classes-epoll-4.1.94.Final +netty-transport-native-epoll-4.1.94.Final +netty-transport-native-unix-common-4.1.94.Final plexus-utils-3.3.0 reload4j-1.2.25 rocksdbjni-7.1.2 From 006243afeb6093209c29465b3746cad8550e0590 Mon Sep 17 00:00:00 2001 From: Damon Xie Date: Mon, 10 Jul 2023 10:59:39 -0700 Subject: [PATCH 3/5] KAFKA-15159 update LICENSE-binary for netty upgrade --- LICENSE-binary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE-binary b/LICENSE-binary index df7c6a764a81a..711f686bdde4b 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -241,7 +241,7 @@ lz4-java-1.8.0 maven-artifact-3.8.4 metrics-core-4.1.12.1 metrics-core-2.2.0 -netty-buffer-.Final +netty-buffer-4.1.94.Final netty-codec-4.1.94.Final netty-common-4.1.94.Final netty-handler-4.1.94.Final From b9d8d7fca769e2b11f423f25a189a160cb888e4e Mon Sep 17 00:00:00 2001 From: Damon Xie Date: Mon, 10 Jul 2023 11:02:25 -0700 Subject: [PATCH 4/5] KAFKA-15159 update LICENSE-binary with dependencies upgrade --- LICENSE-binary | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE-binary b/LICENSE-binary index 711f686bdde4b..2fbb1f65cac08 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -238,7 +238,7 @@ jetty-util-9.4.51.v20230217 jetty-util-ajax-9.4.51.v20230217 jose4j-0.9.3 lz4-java-1.8.0 -maven-artifact-3.8.4 +maven-artifact-3.8.8 metrics-core-4.1.12.1 metrics-core-2.2.0 netty-buffer-4.1.94.Final @@ -259,7 +259,7 @@ scala-logging_2.13-3.9.4 scala-reflect-2.13.11 scala-java8-compat_2.13-1.0.2 snappy-java-1.1.10.1 -swagger-annotations-2.2.8 +swagger-annotations-2.2.14 zookeeper-3.6.4 zookeeper-jute-3.6.4 From 2b768b65a2121e1fa5070aadeb9739b5a23a6626 Mon Sep 17 00:00:00 2001 From: Damon Xie Date: Mon, 10 Jul 2023 15:09:33 -0700 Subject: [PATCH 5/5] KAFKA-15159 revert swagger version back to 2.2.8 since 2.2.14 requires minimum JDK 11. --- LICENSE-binary | 2 +- gradle/dependencies.gradle | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/LICENSE-binary b/LICENSE-binary index 2fbb1f65cac08..1b6ea58afe09a 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -259,7 +259,7 @@ scala-logging_2.13-3.9.4 scala-reflect-2.13.11 scala-java8-compat_2.13-1.0.2 snappy-java-1.1.10.1 -swagger-annotations-2.2.14 +swagger-annotations-2.2.8 zookeeper-3.6.4 zookeeper-jute-3.6.4 diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index d45768502eed3..fc3c5b8e4f056 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -142,8 +142,9 @@ versions += [ slf4j: "1.7.36", snappy: "1.1.10.1", spotbugs: "4.7.3", - swaggerAnnotations: "2.2.14", - swaggerJaxrs2: "2.2.14", + // New version of Swagger 2.2.14 requires minimum JDK 11. + swaggerAnnotations: "2.2.8", + swaggerJaxrs2: "2.2.8", zinc: "1.8.0", zookeeper: "3.6.4", zstd: "1.5.5-1"