-
Notifications
You must be signed in to change notification settings - Fork 383
fix kafka CVE-2023-25194, update kafka client to 3.4.0 #2481
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.
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
Closed
Closed
Changes from 10 commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
eb27dad
Update build.gradle
xie-shujian 5add07c
Update build.gradle
xie-shujian cf73d78
Update build.gradle
xie-shujian 48e2e96
Update build.gradle
xie-shujian 8c49e35
Update integration-tests.yml
xie-shujian f9227e5
Update build.gradle
xie-shujian 3d90ae3
Update build.gradle
xie-shujian 1f8e535
Update build.gradle
xie-shujian dfd6df1
Update build.gradle
xie-shujian 9741d41
Update build.gradle
xie-shujian e1a3b5c
Update build.gradle
xie-shujian a29762a
Update integration-tests.yml
xie-shujian d5bb486
Merge pull request #1 from xie-shujian/kafka-3.4.0
xie-shujian 3a408e7
Update integration-tests.yml
xie-shujian File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,7 +24,8 @@ buildscript { | |
| opensearch_build = version_tokens[0] + '.0' | ||
|
|
||
| common_utils_version = System.getProperty("common_utils.version", '3.0.0.0-SNAPSHOT') | ||
| kafka_version = '3.0.2' | ||
| kafka_version = '3.4.0' | ||
| kafkaVersion = '3.4.0' | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Unused, lets remove |
||
|
|
||
| if (buildVersionQualifier) { | ||
| opensearch_build += "-${buildVersionQualifier}" | ||
|
|
@@ -411,16 +412,16 @@ dependencies { | |
| runtimeOnly 'com.google.j2objc:j2objc-annotations:1.3' | ||
| runtimeOnly 'com.google.code.findbugs:jsr305:3.0.2' | ||
| runtimeOnly 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava' | ||
| runtimeOnly 'org.lz4:lz4-java:1.7.1' | ||
| runtimeOnly 'org.lz4:lz4-java:1.8.0' | ||
| runtimeOnly 'io.dropwizard.metrics:metrics-core:3.1.2' | ||
| runtimeOnly 'org.slf4j:slf4j-api:1.7.30' | ||
| runtimeOnly 'org.xerial.snappy:snappy-java:1.1.8.1' | ||
| runtimeOnly 'org.xerial.snappy:snappy-java:1.1.8.4' | ||
| runtimeOnly 'org.codehaus.woodstox:stax2-api:4.2.1' | ||
| runtimeOnly 'org.glassfish.jaxb:txw2:2.3.4' | ||
| runtimeOnly 'com.fasterxml.woodstox:woodstox-core:6.4.0' | ||
| runtimeOnly 'org.apache.ws.xmlschema:xmlschema-core:2.2.5' | ||
| runtimeOnly 'org.apache.santuario:xmlsec:2.2.3' | ||
| runtimeOnly 'com.github.luben:zstd-jni:1.5.0-2' | ||
| runtimeOnly 'com.github.luben:zstd-jni:1.5.2-1' | ||
| runtimeOnly 'org.checkerframework:checker-qual:3.5.0' | ||
| runtimeOnly "org.bouncycastle:bcpkix-jdk15on:${versions.bouncycastle}" | ||
|
|
||
|
|
@@ -443,9 +444,10 @@ dependencies { | |
| testImplementation 'org.apache.httpcomponents:fluent-hc:4.5.13' | ||
| testImplementation "org.apache.httpcomponents.client5:httpclient5-fluent:${versions.httpclient5}" | ||
| testImplementation "org.apache.kafka:kafka_2.13:${kafka_version}" | ||
| testImplementation "org.apache.kafka:kafka-group-coordinator:${kafka_version}" | ||
| testImplementation "org.apache.kafka:kafka_2.13:${kafka_version}:test" | ||
| testImplementation "org.apache.kafka:kafka-clients:${kafka_version}:test" | ||
| testImplementation 'org.springframework.kafka:spring-kafka-test:2.8.6' | ||
| testImplementation 'org.springframework.kafka:spring-kafka-test:3.0.3' | ||
| testImplementation 'org.springframework:spring-beans:5.3.20' | ||
| testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2' | ||
| testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2' | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.