From b54474f5f11cb691ef0e175a0b29394422800a1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= Date: Mon, 10 Feb 2025 10:11:14 +0000 Subject: [PATCH 1/4] update multiple dependencies * io.confluent:common-config:6.2.15 * io.confluent:common-utils:6.2.15 * io.confluent:kafka-avro-serializer:6.2.15 * io.confluent:kafka-schema-registry-client:6.2.15 * io.confluent:kafka-schema-serializer:6.2.15 * org.apache.avro:avro:1.11.4 * org.xerial.snappy:snappy-java:1.1.10.4 --- build.gradle | 16 +++++++--------- lib/logstash-integration-kafka_jars.rb | 16 +++++++--------- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/build.gradle b/build.gradle index 978c11bd..cc7560ba 100644 --- a/build.gradle +++ b/build.gradle @@ -42,15 +42,15 @@ repositories { } dependencies { - implementation('io.confluent:kafka-avro-serializer:6.2.2') { + implementation('io.confluent:kafka-avro-serializer:6.2.15') { exclude group: 'org.apache.kafka', module:'kafka-clients' } - implementation('io.confluent:kafka-schema-serializer:6.2.2') { + implementation('io.confluent:kafka-schema-serializer:6.2.15') { exclude group: 'org.apache.kafka', module:'kafka-clients' } - implementation 'io.confluent:common-config:6.2.2' - implementation 'org.apache.avro:avro:1.11.3' - implementation('io.confluent:kafka-schema-registry-client:6.2.2') { + implementation 'io.confluent:common-config:6.2.15' + implementation 'org.apache.avro:avro:1.11.4' + implementation('io.confluent:kafka-schema-registry-client:6.2.15') { exclude group: 'org.apache.kafka', module:'kafka-clients' } implementation('org.apache.kafka:kafka_2.12:2.8.1') { @@ -58,16 +58,14 @@ dependencies { // transitive dependencies transitive = false } - implementation 'io.confluent:common-utils:6.2.2' - implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1' - implementation 'org.glassfish.jersey.core:jersey-common:2.33' + implementation 'io.confluent:common-utils:6.2.15' // given https://docs.confluent.io/current/installation/versions-interoperability.html matrix // Confluent Platform 6.2.x is Apache Kafka 2.8.x implementation 'org.apache.kafka:kafka-clients:2.8.1' implementation 'com.github.luben:zstd-jni:1.5.2-2' implementation 'org.slf4j:slf4j-api:1.7.36' implementation 'org.lz4:lz4-java:1.7.1' - implementation 'org.xerial.snappy:snappy-java:1.1.8.4' + implementation 'org.xerial.snappy:snappy-java:1.1.10.4' } task generateGemJarRequiresFile { doLast { diff --git a/lib/logstash-integration-kafka_jars.rb b/lib/logstash-integration-kafka_jars.rb index 2f4a83a6..4c0508ab 100644 --- a/lib/logstash-integration-kafka_jars.rb +++ b/lib/logstash-integration-kafka_jars.rb @@ -1,17 +1,15 @@ # AUTOGENERATED BY THE GRADLE SCRIPT. DO NOT EDIT. require 'jar_dependencies' -require_jar('io.confluent', 'kafka-avro-serializer', '6.2.2') -require_jar('io.confluent', 'kafka-schema-serializer', '6.2.2') -require_jar('io.confluent', 'common-config', '6.2.2') -require_jar('org.apache.avro', 'avro', '1.11.0') -require_jar('io.confluent', 'kafka-schema-registry-client', '6.2.2') +require_jar('io.confluent', 'kafka-avro-serializer', '6.2.15') +require_jar('io.confluent', 'kafka-schema-serializer', '6.2.15') +require_jar('io.confluent', 'common-config', '6.2.15') +require_jar('org.apache.avro', 'avro', '1.11.4') +require_jar('io.confluent', 'kafka-schema-registry-client', '6.2.15') require_jar('org.apache.kafka', 'kafka_2.12', '2.8.1') -require_jar('io.confluent', 'common-utils', '6.2.2') -require_jar('javax.ws.rs', 'javax.ws.rs-api', '2.1.1') -require_jar('org.glassfish.jersey.core', 'jersey-common', '2.33') +require_jar('io.confluent', 'common-utils', '6.2.15') require_jar('org.apache.kafka', 'kafka-clients', '2.8.1') require_jar('com.github.luben', 'zstd-jni', '1.5.2-2') require_jar('org.slf4j', 'slf4j-api', '1.7.36') require_jar('org.lz4', 'lz4-java', '1.7.1') -require_jar('org.xerial.snappy', 'snappy-java', '1.1.8.4') +require_jar('org.xerial.snappy', 'snappy-java', '1.1.10.4') From 95a4a299f390065e7d8e818d7d4574e95bbb19ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= Date: Wed, 12 Feb 2025 10:02:28 +0000 Subject: [PATCH 2/4] revert 6.2.15 kafka bump --- build.gradle | 10 +++++----- lib/logstash-integration-kafka_jars.rb | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index cc7560ba..5b9a6a99 100644 --- a/build.gradle +++ b/build.gradle @@ -42,15 +42,15 @@ repositories { } dependencies { - implementation('io.confluent:kafka-avro-serializer:6.2.15') { + implementation('io.confluent:kafka-avro-serializer:6.2.2') { exclude group: 'org.apache.kafka', module:'kafka-clients' } - implementation('io.confluent:kafka-schema-serializer:6.2.15') { + implementation('io.confluent:kafka-schema-serializer:6.2.2') { exclude group: 'org.apache.kafka', module:'kafka-clients' } - implementation 'io.confluent:common-config:6.2.15' + implementation 'io.confluent:common-config:6.2.2' implementation 'org.apache.avro:avro:1.11.4' - implementation('io.confluent:kafka-schema-registry-client:6.2.15') { + implementation('io.confluent:kafka-schema-registry-client:6.2.2') { exclude group: 'org.apache.kafka', module:'kafka-clients' } implementation('org.apache.kafka:kafka_2.12:2.8.1') { @@ -58,7 +58,7 @@ dependencies { // transitive dependencies transitive = false } - implementation 'io.confluent:common-utils:6.2.15' + implementation 'io.confluent:common-utils:6.2.2' // given https://docs.confluent.io/current/installation/versions-interoperability.html matrix // Confluent Platform 6.2.x is Apache Kafka 2.8.x implementation 'org.apache.kafka:kafka-clients:2.8.1' diff --git a/lib/logstash-integration-kafka_jars.rb b/lib/logstash-integration-kafka_jars.rb index 4c0508ab..a76fc72b 100644 --- a/lib/logstash-integration-kafka_jars.rb +++ b/lib/logstash-integration-kafka_jars.rb @@ -1,13 +1,13 @@ # AUTOGENERATED BY THE GRADLE SCRIPT. DO NOT EDIT. require 'jar_dependencies' -require_jar('io.confluent', 'kafka-avro-serializer', '6.2.15') -require_jar('io.confluent', 'kafka-schema-serializer', '6.2.15') -require_jar('io.confluent', 'common-config', '6.2.15') +require_jar('io.confluent', 'kafka-avro-serializer', '6.2.2') +require_jar('io.confluent', 'kafka-schema-serializer', '6.2.2') +require_jar('io.confluent', 'common-config', '6.2.2') require_jar('org.apache.avro', 'avro', '1.11.4') -require_jar('io.confluent', 'kafka-schema-registry-client', '6.2.15') +require_jar('io.confluent', 'kafka-schema-registry-client', '6.2.2') require_jar('org.apache.kafka', 'kafka_2.12', '2.8.1') -require_jar('io.confluent', 'common-utils', '6.2.15') +require_jar('io.confluent', 'common-utils', '6.2.2') require_jar('org.apache.kafka', 'kafka-clients', '2.8.1') require_jar('com.github.luben', 'zstd-jni', '1.5.2-2') require_jar('org.slf4j', 'slf4j-api', '1.7.36') From 4f208044256f2548aa3fe0d499e2e977a4c2b2b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= Date: Wed, 12 Feb 2025 10:24:00 +0000 Subject: [PATCH 3/4] [skip ci] Update logstash-integration-kafka.gemspec --- logstash-integration-kafka.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/logstash-integration-kafka.gemspec b/logstash-integration-kafka.gemspec index d6e702a0..fb75ebeb 100644 --- a/logstash-integration-kafka.gemspec +++ b/logstash-integration-kafka.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = 'logstash-integration-kafka' - s.version = '10.12.1' + s.version = '10.12.2' s.licenses = ['Apache-2.0'] s.summary = "Integration with Kafka - input and output plugins" s.description = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline "+ From fef172556ac2474f7e47a932de176ba63dadb7e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= Date: Wed, 12 Feb 2025 10:27:53 +0000 Subject: [PATCH 4/4] [skip ci] Update CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7947256b..aa5e883c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 10.12.2 + - Upgrade avro to 1.11.4 and snappy-java to 1.1.10.4 and removed javax.ws.rs-api and jersey-common [#190](https://github.com/logstash-plugins/logstash-integration-kafka/pull/190) + ## 10.12.1 - Fix: update Avro library on 10.x [#149](https://api.github.com/repos/logstash-plugins/logstash-integration-kafka/pulls/149)