Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## 10.12.2
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Forward port this also to main

- 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)

Expand Down
6 changes: 2 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ dependencies {
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 'org.apache.avro:avro:1.11.4'
implementation('io.confluent:kafka-schema-registry-client:6.2.2') {
exclude group: 'org.apache.kafka', module:'kafka-clients'
}
Expand All @@ -59,15 +59,13 @@ 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'
// 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 {
Expand Down
6 changes: 2 additions & 4 deletions lib/logstash-integration-kafka_jars.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,12 @@
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('org.apache.avro', 'avro', '1.11.4')
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.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('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')
2 changes: 1 addition & 1 deletion logstash-integration-kafka.gemspec
Original file line number Diff line number Diff line change
@@ -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 "+
Expand Down