Skip to content

[Backport 2.12] Updates several dependencies to address CVEs #5923

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
dlvenable merged 1 commit into from
Jul 30, 2025
Merged

[Backport 2.12] Updates several dependencies to address CVEs #5923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 13 additions & 7 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ allprojects {
}

checkstyle {
toolVersion = '10.12.3'
toolVersion = '10.26.1'
}
}

Expand Down Expand Up @@ -147,9 +147,9 @@ subprojects {
}
implementation('net.minidev:json-smart') {
version {
require '2.5.0'
require '2.5.2'
}
because 'CVE from transitive dependencies'
because 'CVE from transitive dependencies, including CVE-2024-57699'
}
implementation('org.jetbrains.kotlin:kotlin-stdlib') {
version {
Expand Down Expand Up @@ -217,18 +217,24 @@ subprojects {
}
because 'CVE-2024-25710, CVE-2024-26308'
}
implementation('commons-beanutils:commons-beanutils') {
version {
require '1.11.0'
}
because 'CVE-2025-48734'
}
}
}

configurations.all {
resolutionStrategy.eachDependency { def details ->
if (details.requested.group == 'io.netty') {
if (details.requested.name == 'netty') {
details.useTarget group: 'io.netty', name: 'netty-all', version: '4.1.108.Final'
details.because 'Fixes CVE-2022-41881, CVE-2021-21290 and CVE-2022-41915.'
details.useTarget group: 'io.netty', name: 'netty-all', version: '4.1.123.Final'
details.because 'Fixes CVE-2025-24970, CVE-2022-41881, CVE-2021-21290 and CVE-2022-41915.'
} else if (!details.requested.name.startsWith('netty-tcnative')) {
details.useVersion '4.1.108.Final'
details.because 'Fixes CVE-2022-41881, CVE-2021-21290 and CVE-2022-41915.'
details.useVersion '4.1.123.Final'
details.because 'Fixes CVE-2025-24970, CVE-2022-41881, CVE-2021-21290 and CVE-2022-41915.'
}
} else if (details.requested.group == 'log4j' && details.requested.name == 'log4j') {
details.useTarget group: 'org.apache.logging.log4j', name: 'log4j-1.2-api', version: '2.17.1'
Expand Down
14 changes: 7 additions & 7 deletions data-prepper-plugins/kafka-plugins/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,16 @@ dependencies {
implementation project(':data-prepper-plugins:encryption-plugin')
// bump io.confluent:* dependencies correspondingly when bumping org.apache.kafka.*
// https://docs.confluent.io/platform/current/release-notes/index.html
implementation 'org.apache.kafka:kafka-clients:3.6.1'
implementation 'org.apache.kafka:connect-json:3.6.1'
implementation 'org.apache.kafka:kafka-clients:3.9.1'
implementation 'org.apache.kafka:connect-json:3.9.1'
implementation project(':data-prepper-plugins:http-common')
implementation libs.avro.core
implementation 'com.fasterxml.jackson.core:jackson-databind'
implementation 'io.micrometer:micrometer-core'
implementation libs.commons.lang3
implementation 'io.confluent:kafka-avro-serializer:7.6.0'
implementation 'io.confluent:kafka-json-schema-serializer:7.6.0'
implementation 'io.confluent:kafka-schema-registry-client:7.6.0'
implementation 'io.confluent:kafka-avro-serializer:7.9.1'
implementation 'io.confluent:kafka-json-schema-serializer:7.9.1'
implementation 'io.confluent:kafka-schema-registry-client:7.9.1'
implementation 'software.amazon.awssdk:sts'
implementation 'software.amazon.awssdk:auth'
implementation 'software.amazon.awssdk:kafka'
Expand Down Expand Up @@ -77,8 +77,8 @@ dependencies {
testImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'

integrationTestImplementation testLibs.junit.vintage
integrationTestImplementation 'io.confluent:kafka-schema-registry:7.6.0'
integrationTestImplementation ('io.confluent:kafka-schema-registry:7.6.0:tests') {
integrationTestImplementation 'io.confluent:kafka-schema-registry:7.9.1'
integrationTestImplementation ('io.confluent:kafka-schema-registry:7.9.1:tests') {
exclude group: 'org.glassfish.jersey.containers', module: 'jersey-container-servlet'
exclude group: 'org.glassfish.jersey.inject', module: 'jersey-hk2'
exclude group: 'org.glassfish.jersey.ext', module: 'jersey-bean-validation'
Expand Down
12 changes: 0 additions & 12 deletions .../java/org/opensearch/dataprepper/plugins/kafka/source/EmbeddedKafkaClusterSingleNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import io.confluent.kafka.schemaregistry.RestApp;
import io.confluent.kafka.schemaregistry.avro.AvroCompatibilityLevel;
import io.confluent.kafka.schemaregistry.rest.SchemaRegistryConfig;
import kafka.server.KafkaConfig$;
import org.junit.rules.ExternalResource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -58,8 +57,6 @@ public void start() throws Exception {
log.debug("ZooKeeper instance is running at {}", zookeeper.connectString());

final Properties effectiveBrokerConfig = effectiveBrokerConfigFrom(brokerConfig, zookeeper);
log.debug("Starting a Kafka instance on ...",
effectiveBrokerConfig.getProperty(KafkaConfig$.MODULE$.ZkConnectDoc()));
broker = new EmbeddedKafkaServer(effectiveBrokerConfig);
log.debug("Kafka instance is running at {}, connected to ZooKeeper at {}",
broker.brokerList(), broker.zookeeperConnect());
Expand All @@ -80,15 +77,6 @@ public void start() throws Exception {
private Properties effectiveBrokerConfigFrom(final Properties brokerConfig, final EmbeddedZooKeeperServer zookeeper) {
final Properties effectiveConfig = new Properties();
effectiveConfig.putAll(brokerConfig);
effectiveConfig.put(KafkaConfig$.MODULE$.ZkConnectProp(), zookeeper.connectString());
effectiveConfig.put(KafkaConfig$.MODULE$.ZkSessionTimeoutMsProp(), 30 * 1000);
effectiveConfig.put(KafkaConfig$.MODULE$.ZkConnectionTimeoutMsProp(), 60 * 1000);
effectiveConfig.put(KafkaConfig$.MODULE$.DeleteTopicEnableProp(), true);
effectiveConfig.put(KafkaConfig$.MODULE$.LogCleanerDedupeBufferSizeProp(), 2 * 1024 * 1024L);
effectiveConfig.put(KafkaConfig$.MODULE$.GroupMinSessionTimeoutMsProp(), 0);
effectiveConfig.put(KafkaConfig$.MODULE$.OffsetsTopicReplicationFactorProp(), (short) 1);
effectiveConfig.put(KafkaConfig$.MODULE$.OffsetsTopicPartitionsProp(), 1);
effectiveConfig.put(KafkaConfig$.MODULE$.AutoCreateTopicsEnableProp(), true);
return effectiveConfig;
}

Expand Down
9 changes: 1 addition & 8 deletions ...grationTest/java/org/opensearch/dataprepper/plugins/kafka/source/EmbeddedKafkaServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@


import kafka.server.KafkaConfig;
import kafka.server.KafkaConfig$;
import kafka.server.KafkaServer;
import kafka.utils.TestUtils;
import org.apache.kafka.clients.admin.AdminClient;
Expand Down Expand Up @@ -61,19 +60,13 @@ public EmbeddedKafkaServer(final Properties config) throws IOException {

private Properties effectiveConfigFrom(final Properties initialConfig) throws IOException {
final Properties effectiveConfig = new Properties();
effectiveConfig.put(KafkaConfig$.MODULE$.BrokerIdProp(), 1);
effectiveConfig.put(KafkaConfig$.MODULE$.NumPartitionsProp(), 1);
effectiveConfig.put(KafkaConfig$.MODULE$.AutoCreateTopicsEnableProp(), true);
effectiveConfig.put(KafkaConfig$.MODULE$.MessageMaxBytesProp(), 1000000);
effectiveConfig.put(KafkaConfig$.MODULE$.ControlledShutdownEnableProp(), true);

effectiveConfig.putAll(initialConfig);
effectiveConfig.setProperty(KafkaConfig$.MODULE$.LogDirProp(), logDir.getAbsolutePath());
return effectiveConfig;
}

public String brokerList() {
return kafka.config().zkConnect();
return "";
}


Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ dependencyResolutionManagement {
library('commons-io', 'commons-io', 'commons-io').version('2.15.1')
library('commons-codec', 'commons-codec', 'commons-codec').version('1.16.0')
library('commons-compress', 'org.apache.commons', 'commons-compress').version('1.24.0')
version('parquet', '1.15.1')
version('parquet', '1.15.2')
library('parquet-common', 'org.apache.parquet', 'parquet-common').versionRef('parquet')
library('parquet-avro', 'org.apache.parquet', 'parquet-avro').versionRef('parquet')
library('parquet-column', 'org.apache.parquet', 'parquet-column').versionRef('parquet')
Expand Down
Loading