Skip to content

Commit 401b6f0

Browse files
kevinjqliuCopilot
andcommitted
Kafka Connect: Resolve main distribution consistently with hive
Keeps the hive distribution a superset of main. Main picks up the newer commons-logging, jaxb-api and jakarta.activation-api that hive already ships, and no longer bundles stax-api, which the JDK provides. Generated-by: GitHub Copilot (Claude Opus 5.5) Co-authored-by: Copilot App <[email protected]>
1 parent 85dd7fe commit 401b6f0

3 files changed

Lines changed: 5 additions & 8 deletions

File tree

‎kafka-connect/build.gradle‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,10 @@ project(':iceberg-kafka-connect:iceberg-kafka-connect-runtime') {
7474
hive {
7575
extendsFrom runtimeClasspath
7676
}
77+
runtimeClasspath {
78+
// keep the hive distribution a superset of main by resolving shared jars to the same versions
79+
shouldResolveConsistentlyWith(hive)
80+
}
7781
all {
7882
exclude group: 'javax.activation', module: 'activation'
7983
exclude group: 'org.jspecify', module: 'jspecify'

‎kafka-connect/kafka-connect-runtime/main/LICENSE‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1425,12 +1425,6 @@ License: CDDL 1.1 - https://github.com/javaee/javaee-jsp-api/blob/master/LICENSE
14251425

14261426
--------------------------------------------------------------------------------
14271427

1428-
This product bundles Stax API.
1429-
1430-
License: CDDL 1.0 - http://www.sun.com/cddl/cddl.html
1431-
1432-
--------------------------------------------------------------------------------
1433-
14341428
This product bundles JNA.
14351429

14361430
Project URL: https://github.com/java-native-access/jna

‎kafka-connect/kafka-connect-runtime/main/runtime-deps.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ com.sun.xml.bind:jaxb-impl:2.2
8080
commons-cli:commons-cli:1.9
8181
commons-codec:commons-codec:1.19
8282
commons-io:commons-io:2.20
83-
commons-logging:commons-logging:1.2
83+
commons-logging:commons-logging:1.3
8484
commons-net:commons-net:3.9
8585
commons-pool:commons-pool:1.6
8686
dev.cel:common:0.13
@@ -156,7 +156,6 @@ javax.annotation:javax.annotation-api:1.3
156156
javax.servlet.jsp:jsp-api:2.1
157157
javax.servlet:javax.servlet-api:3.1
158158
javax.xml.bind:jaxb-api:2.2
159-
javax.xml.stream:stax-api:1.0-2
160159
net.java.dev.jna:jna-platform:5.17
161160
net.java.dev.jna:jna:5.17
162161
org.apache.arrow:arrow-format:17.0

0 commit comments

Comments
 (0)