From 6995f57e508ac308c039523d09e3e42032a0d70a Mon Sep 17 00:00:00 2001 From: averemee Date: Tue, 31 Mar 2026 14:26:44 +0200 Subject: [PATCH 1/3] exclude plexus-utils-* from runtime jar's --- LICENSE-binary | 1 - build.gradle | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/LICENSE-binary b/LICENSE-binary index 7a4efd4782f02..b53a6c7427f9c 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -245,7 +245,6 @@ License Version 2.0: - maven-artifact-3.9.11 - metrics-core-2.2.0 - opentelemetry-proto-1.3.2-alpha -- plexus-utils-3.6.0 - rocksdbjni-10.1.3 - scala-library-2.13.18 - scala-logging_2.13-3.9.6 diff --git a/build.gradle b/build.gradle index 5c9d580f8becf..c9c5db27f997c 100644 --- a/build.gradle +++ b/build.gradle @@ -1155,6 +1155,7 @@ project(':core') { tasks.create(name: "copyDependantLibs", type: Copy) { from (configurations.runtimeClasspath) { exclude('kafka-clients*') + exclude('plexus-utils-*') } into "${layout.buildDirectory.get().asFile.path}/dependant-libs-${versions.scala}" duplicatesStrategy 'exclude' @@ -2570,6 +2571,7 @@ project(':tools') { tasks.create(name: "copyDependantLibs", type: Copy) { from (configurations.runtimeClasspath) { exclude('kafka-clients*') + exclude('plexus-utils-*') } from (configurations.releaseOnly) into "${layout.buildDirectory.get().asFile.path}/dependant-libs-${versions.scala}" @@ -2629,6 +2631,7 @@ project(':trogdor') { tasks.create(name: "copyDependantLibs", type: Copy) { from (configurations.runtimeClasspath) { exclude('kafka-clients*') + exclude('plexus-utils-*') } into "${layout.buildDirectory.get().asFile.path}/dependant-libs-${versions.scala}" duplicatesStrategy 'exclude' @@ -2679,6 +2682,7 @@ project(':shell') { tasks.create(name: "copyDependantLibs", type: Copy) { from (configurations.runtimeClasspath) { include('jline-*jar') + exclude('plexus-utils-*') } into "${layout.buildDirectory.get().asFile.path}/dependant-libs-${versions.scala}" duplicatesStrategy 'exclude' @@ -2768,6 +2772,7 @@ project(':streams') { tasks.create(name: "copyDependantLibs", type: Copy) { from (configurations.runtimeClasspath) { exclude('kafka-clients*') + exclude('plexus-utils-*') } into "${layout.buildDirectory.get().asFile.path}/dependant-libs-${versions.scala}" duplicatesStrategy 'exclude' @@ -2878,6 +2883,7 @@ project(':streams:streams-scala') { tasks.create(name: "copyDependantLibs", type: Copy) { from (configurations.runtimeClasspath) { exclude('kafka-streams*') + exclude('plexus-utils-*') } into "${layout.buildDirectory.get().asFile.path}/dependant-libs-${versions.scala}" duplicatesStrategy 'exclude' @@ -2975,6 +2981,7 @@ project(':streams:test-utils') { tasks.create(name: "copyDependantLibs", type: Copy) { from (configurations.runtimeClasspath) { exclude('kafka-streams*') + exclude('plexus-utils-*') } into "${layout.buildDirectory.get().asFile.path}/dependant-libs-${versions.scala}" duplicatesStrategy 'exclude' @@ -3013,6 +3020,7 @@ project(':streams:examples') { tasks.create(name: "copyDependantLibs", type: Copy) { from (configurations.runtimeClasspath) { exclude('kafka-streams*') + exclude('plexus-utils-*') } into "${layout.buildDirectory.get().asFile.path}/dependant-libs-${versions.scala}" duplicatesStrategy 'exclude' @@ -3508,6 +3516,7 @@ project(':connect:api') { from (configurations.runtimeClasspath) { exclude('kafka-clients*') exclude('connect-*') + exclude('plexus-utils-*') } into "${layout.buildDirectory.get().asFile.path}/dependant-libs" duplicatesStrategy 'exclude' @@ -3543,6 +3552,7 @@ project(':connect:transforms') { from (configurations.runtimeClasspath) { exclude('kafka-clients*') exclude('connect-*') + exclude('plexus-utils-*') } into "${layout.buildDirectory.get().asFile.path}/dependant-libs" duplicatesStrategy 'exclude' @@ -3582,6 +3592,7 @@ project(':connect:json') { from (configurations.runtimeClasspath) { exclude('kafka-clients*') exclude('connect-*') + exclude('plexus-utils-*') } into "${layout.buildDirectory.get().asFile.path}/dependant-libs" duplicatesStrategy 'exclude' @@ -3680,6 +3691,7 @@ project(':connect:runtime') { from (configurations.runtimeClasspath) { exclude('kafka-clients*') exclude('connect-*') + exclude('plexus-utils-*') } into "${layout.buildDirectory.get().asFile.path}/dependant-libs" duplicatesStrategy 'exclude' @@ -3789,6 +3801,7 @@ project(':connect:file') { from (configurations.runtimeClasspath) { exclude('kafka-clients*') exclude('connect-*') + exclude('plexus-utils-*') } into "${layout.buildDirectory.get().asFile.path}/dependant-libs" duplicatesStrategy 'exclude' @@ -3829,6 +3842,7 @@ project(':connect:basic-auth-extension') { from (configurations.runtimeClasspath) { exclude('kafka-clients*') exclude('connect-*') + exclude('plexus-utils-*') } into "${layout.buildDirectory.get().asFile.path}/dependant-libs" duplicatesStrategy 'exclude' @@ -3898,6 +3912,7 @@ project(':connect:mirror') { from (configurations.runtimeClasspath) { exclude('kafka-clients*') exclude('connect-*') + exclude('plexus-utils-*') } into "${layout.buildDirectory.get().asFile.path}/dependant-libs" duplicatesStrategy 'exclude' @@ -3960,6 +3975,7 @@ project(':connect:mirror-client') { from (configurations.runtimeClasspath) { exclude('kafka-clients*') exclude('connect-*') + exclude('plexus-utils-*') } into "${layout.buildDirectory.get().asFile.path}/dependant-libs" duplicatesStrategy 'exclude' From f27d84043a8e10fb3d398fc6f0caf7f5bff69ae3 Mon Sep 17 00:00:00 2001 From: averemee Date: Fri, 17 Apr 2026 17:20:38 +0200 Subject: [PATCH 2/3] restore build.gradle (remove plex-utils exclusion) --- build.gradle | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/build.gradle b/build.gradle index c9c5db27f997c..5c9d580f8becf 100644 --- a/build.gradle +++ b/build.gradle @@ -1155,7 +1155,6 @@ project(':core') { tasks.create(name: "copyDependantLibs", type: Copy) { from (configurations.runtimeClasspath) { exclude('kafka-clients*') - exclude('plexus-utils-*') } into "${layout.buildDirectory.get().asFile.path}/dependant-libs-${versions.scala}" duplicatesStrategy 'exclude' @@ -2571,7 +2570,6 @@ project(':tools') { tasks.create(name: "copyDependantLibs", type: Copy) { from (configurations.runtimeClasspath) { exclude('kafka-clients*') - exclude('plexus-utils-*') } from (configurations.releaseOnly) into "${layout.buildDirectory.get().asFile.path}/dependant-libs-${versions.scala}" @@ -2631,7 +2629,6 @@ project(':trogdor') { tasks.create(name: "copyDependantLibs", type: Copy) { from (configurations.runtimeClasspath) { exclude('kafka-clients*') - exclude('plexus-utils-*') } into "${layout.buildDirectory.get().asFile.path}/dependant-libs-${versions.scala}" duplicatesStrategy 'exclude' @@ -2682,7 +2679,6 @@ project(':shell') { tasks.create(name: "copyDependantLibs", type: Copy) { from (configurations.runtimeClasspath) { include('jline-*jar') - exclude('plexus-utils-*') } into "${layout.buildDirectory.get().asFile.path}/dependant-libs-${versions.scala}" duplicatesStrategy 'exclude' @@ -2772,7 +2768,6 @@ project(':streams') { tasks.create(name: "copyDependantLibs", type: Copy) { from (configurations.runtimeClasspath) { exclude('kafka-clients*') - exclude('plexus-utils-*') } into "${layout.buildDirectory.get().asFile.path}/dependant-libs-${versions.scala}" duplicatesStrategy 'exclude' @@ -2883,7 +2878,6 @@ project(':streams:streams-scala') { tasks.create(name: "copyDependantLibs", type: Copy) { from (configurations.runtimeClasspath) { exclude('kafka-streams*') - exclude('plexus-utils-*') } into "${layout.buildDirectory.get().asFile.path}/dependant-libs-${versions.scala}" duplicatesStrategy 'exclude' @@ -2981,7 +2975,6 @@ project(':streams:test-utils') { tasks.create(name: "copyDependantLibs", type: Copy) { from (configurations.runtimeClasspath) { exclude('kafka-streams*') - exclude('plexus-utils-*') } into "${layout.buildDirectory.get().asFile.path}/dependant-libs-${versions.scala}" duplicatesStrategy 'exclude' @@ -3020,7 +3013,6 @@ project(':streams:examples') { tasks.create(name: "copyDependantLibs", type: Copy) { from (configurations.runtimeClasspath) { exclude('kafka-streams*') - exclude('plexus-utils-*') } into "${layout.buildDirectory.get().asFile.path}/dependant-libs-${versions.scala}" duplicatesStrategy 'exclude' @@ -3516,7 +3508,6 @@ project(':connect:api') { from (configurations.runtimeClasspath) { exclude('kafka-clients*') exclude('connect-*') - exclude('plexus-utils-*') } into "${layout.buildDirectory.get().asFile.path}/dependant-libs" duplicatesStrategy 'exclude' @@ -3552,7 +3543,6 @@ project(':connect:transforms') { from (configurations.runtimeClasspath) { exclude('kafka-clients*') exclude('connect-*') - exclude('plexus-utils-*') } into "${layout.buildDirectory.get().asFile.path}/dependant-libs" duplicatesStrategy 'exclude' @@ -3592,7 +3582,6 @@ project(':connect:json') { from (configurations.runtimeClasspath) { exclude('kafka-clients*') exclude('connect-*') - exclude('plexus-utils-*') } into "${layout.buildDirectory.get().asFile.path}/dependant-libs" duplicatesStrategy 'exclude' @@ -3691,7 +3680,6 @@ project(':connect:runtime') { from (configurations.runtimeClasspath) { exclude('kafka-clients*') exclude('connect-*') - exclude('plexus-utils-*') } into "${layout.buildDirectory.get().asFile.path}/dependant-libs" duplicatesStrategy 'exclude' @@ -3801,7 +3789,6 @@ project(':connect:file') { from (configurations.runtimeClasspath) { exclude('kafka-clients*') exclude('connect-*') - exclude('plexus-utils-*') } into "${layout.buildDirectory.get().asFile.path}/dependant-libs" duplicatesStrategy 'exclude' @@ -3842,7 +3829,6 @@ project(':connect:basic-auth-extension') { from (configurations.runtimeClasspath) { exclude('kafka-clients*') exclude('connect-*') - exclude('plexus-utils-*') } into "${layout.buildDirectory.get().asFile.path}/dependant-libs" duplicatesStrategy 'exclude' @@ -3912,7 +3898,6 @@ project(':connect:mirror') { from (configurations.runtimeClasspath) { exclude('kafka-clients*') exclude('connect-*') - exclude('plexus-utils-*') } into "${layout.buildDirectory.get().asFile.path}/dependant-libs" duplicatesStrategy 'exclude' @@ -3975,7 +3960,6 @@ project(':connect:mirror-client') { from (configurations.runtimeClasspath) { exclude('kafka-clients*') exclude('connect-*') - exclude('plexus-utils-*') } into "${layout.buildDirectory.get().asFile.path}/dependant-libs" duplicatesStrategy 'exclude' From 47036d6f651702ca14cdd31d84d01bbf998ec4a6 Mon Sep 17 00:00:00 2001 From: averemee Date: Fri, 17 Apr 2026 17:42:35 +0200 Subject: [PATCH 3/3] bump mavenArtifact from 3.9.11 to 3.9.15 --- LICENSE-binary | 3 ++- gradle/dependencies.gradle | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/LICENSE-binary b/LICENSE-binary index b53a6c7427f9c..2c3e40c07cf69 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -242,9 +242,10 @@ License Version 2.0: - log4j-slf4j-impl-2.25.3 - log4j-1.2-api-2.25.3 - lz4-java-1.10.2 -- maven-artifact-3.9.11 +- maven-artifact-3.9.15 - metrics-core-2.2.0 - opentelemetry-proto-1.3.2-alpha +- plexus-utils-3.6.1 - rocksdbjni-10.1.3 - scala-library-2.13.18 - scala-logging_2.13-3.9.6 diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 50dddc17c049c..e53c2d3216726 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -116,7 +116,7 @@ versions += [ // https://github.com/apache/kafka/blob/trunk/clients/src/main/java/org/apache/kafka/common/record/internal/CompressionType.java#L73-L74 // https://github.com/yawkat/lz4-java/blob/main/src/java/net/jpountz/lz4/LZ4Constants.java#L23-L24 lz4: "1.10.2", - mavenArtifact: "3.9.11", + mavenArtifact: "3.9.15", metrics: "2.2.0", mockito: "5.20.0", opentelemetryProto: "1.3.2-alpha",