Skip to content

Commit 3802a18

Browse files
committed
[improve][client] Reduce unshaded dependencies and shading warnings in shaded Java client modules (#23647)
(cherry picked from commit 429f7de)
1 parent 5d44eba commit 3802a18

File tree

23 files changed

+580
-381
lines changed

23 files changed

+580
-381
lines changed

Diff for: distribution/server/src/assemble/LICENSE.bin.txt

-2
Original file line numberDiff line numberDiff line change
@@ -570,10 +570,8 @@ Protocol Buffers License
570570
CDDL-1.1 -- ../licenses/LICENSE-CDDL-1.1.txt
571571
* Java Annotations API
572572
- com.sun.activation-javax.activation-1.2.0.jar
573-
- javax.xml.bind-jaxb-api-2.3.1.jar
574573
* Java Servlet API -- javax.servlet-javax.servlet-api-3.1.0.jar
575574
* WebSocket Server API -- javax.websocket-javax.websocket-client-api-1.0.jar
576-
* Java Web Service REST API -- javax.ws.rs-javax.ws.rs-api-2.1.jar
577575
* HK2 - Dependency Injection Kernel
578576
- org.glassfish.hk2-hk2-api-2.6.1.jar
579577
- org.glassfish.hk2-hk2-locator-2.6.1.jar

Diff for: distribution/shell/src/assemble/LICENSE.bin.txt

-3
Original file line numberDiff line numberDiff line change
@@ -430,11 +430,8 @@ MIT License
430430

431431
CDDL-1.1 -- ../licenses/LICENSE-CDDL-1.1.txt
432432
* Java Annotations API
433-
- javax.annotation-api-1.3.2.jar
434433
- javax.activation-1.2.0.jar
435-
- jaxb-api-2.3.1.jar
436434
* WebSocket Server API -- javax.websocket-client-api-1.0.jar
437-
* Java Web Service REST API -- javax.ws.rs-api-2.1.jar
438435
* HK2 - Dependency Injection Kernel
439436
- hk2-api-2.6.1.jar
440437
- hk2-locator-2.6.1.jar

Diff for: jetcd-core-shaded/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@
4545
<groupId>io.netty</groupId>
4646
<artifactId>*</artifactId>
4747
</exclusion>
48+
<exclusion>
49+
<groupId>javax.annotation</groupId>
50+
<artifactId>javax.annotation-api</artifactId>
51+
</exclusion>
4852
</exclusions>
4953
</dependency>
5054
<dependency>

Diff for: pom.xml

+17-13
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ flexible messaging model and an intuitive client API.</description>
216216
<commons-configuration.version>1.10</commons-configuration.version>
217217
<commons-io.version>2.14.0</commons-io.version>
218218
<commons-codec.version>1.15</commons-codec.version>
219-
<javax.ws.rs-api.version>2.1</javax.ws.rs-api.version>
219+
<jakarta.ws.rs-api.version>2.1.6</jakarta.ws.rs-api.version>
220220
<hdrHistogram.version>2.1.9</hdrHistogram.version>
221221
<javax.servlet-api>3.1.0</javax.servlet-api>
222222
<caffeine.version>2.9.1</caffeine.version>
@@ -227,7 +227,7 @@ flexible messaging model and an intuitive client API.</description>
227227
<spark-streaming_2.10.version>2.1.0</spark-streaming_2.10.version>
228228
<assertj-core.version>3.24.2</assertj-core.version>
229229
<lombok.version>1.18.32</lombok.version>
230-
<javax.annotation-api.version>1.3.2</javax.annotation-api.version>
230+
<jakarta.annotation-api.version>1.3.5</jakarta.annotation-api.version>
231231
<jaxb-api>2.3.1</jaxb-api>
232232
<javax.activation.version>1.2.0</javax.activation.version>
233233
<jakarta.activation.version>1.2.2</jakarta.activation.version>
@@ -843,9 +843,9 @@ flexible messaging model and an intuitive client API.</description>
843843
</dependency>
844844

845845
<dependency>
846-
<groupId>javax.ws.rs</groupId>
847-
<artifactId>javax.ws.rs-api</artifactId>
848-
<version>${javax.ws.rs-api.version}</version>
846+
<groupId>jakarta.ws.rs</groupId>
847+
<artifactId>jakarta.ws.rs-api</artifactId>
848+
<version>${jakarta.ws.rs-api.version}</version>
849849
</dependency>
850850

851851
<dependency>
@@ -973,6 +973,12 @@ flexible messaging model and an intuitive client API.</description>
973973
<groupId>com.yahoo.athenz</groupId>
974974
<artifactId>athenz-zts-java-client-core</artifactId>
975975
<version>${athenz.version}</version>
976+
<exclusions>
977+
<exclusion>
978+
<groupId>javax.ws.rs</groupId>
979+
<artifactId>javax.ws.rs-api</artifactId>
980+
</exclusion>
981+
</exclusions>
976982
</dependency>
977983

978984
<dependency>
@@ -1401,9 +1407,9 @@ flexible messaging model and an intuitive client API.</description>
14011407
</dependency>
14021408

14031409
<dependency>
1404-
<groupId>javax.annotation</groupId>
1405-
<artifactId>javax.annotation-api</artifactId>
1406-
<version>${javax.annotation-api.version}</version>
1410+
<groupId>jakarta.annotation</groupId>
1411+
<artifactId>jakarta.annotation-api</artifactId>
1412+
<version>${jakarta.annotation-api.version}</version>
14071413
</dependency>
14081414

14091415
<dependency>
@@ -1706,11 +1712,6 @@ flexible messaging model and an intuitive client API.</description>
17061712
<artifactId>lombok</artifactId>
17071713
<scope>provided</scope>
17081714
</dependency>
1709-
<dependency>
1710-
<groupId>javax.annotation</groupId>
1711-
<artifactId>javax.annotation-api</artifactId>
1712-
<scope>provided</scope>
1713-
</dependency>
17141715

17151716
<dependency>
17161717
<!-- We use MockedBookKeeper in many unit tests -->
@@ -1986,6 +1987,9 @@ flexible messaging model and an intuitive client API.</description>
19861987
<exclude>src/assemble/LICENSE.bin.txt</exclude>
19871988
<exclude>src/assemble/NOTICE.bin.txt</exclude>
19881989

1990+
<!-- exclude services files -->
1991+
<exclude>**/META-INF/services/*</exclude>
1992+
19891993
<!-- These files are generated automatically by the Protobuf compiler
19901994
and are included in source tree for convenience -->
19911995
<exclude>src/main/java/org/apache/bookkeeper/mledger/proto/MLDataFormats.java</exclude>

Diff for: pulsar-broker-auth-oidc/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,10 @@
9595
<artifactId>bcprov-jdk18on</artifactId>
9696
<groupId>org.bouncycastle</groupId>
9797
</exclusion>
98+
<exclusion>
99+
<groupId>javax.annotation</groupId>
100+
<artifactId>javax.annotation-api</artifactId>
101+
</exclusion>
98102
</exclusions>
99103
</dependency>
100104

Diff for: pulsar-broker-common/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@
5555
</dependency>
5656

5757
<dependency>
58-
<groupId>javax.ws.rs</groupId>
59-
<artifactId>javax.ws.rs-api</artifactId>
58+
<groupId>jakarta.ws.rs</groupId>
59+
<artifactId>jakarta.ws.rs-api</artifactId>
6060
</dependency>
6161

6262
<dependency>

Diff for: pulsar-broker/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -442,8 +442,8 @@
442442
</dependency>
443443

444444
<dependency>
445-
<groupId>javax.xml.bind</groupId>
446-
<artifactId>jaxb-api</artifactId>
445+
<groupId>jakarta.xml.bind</groupId>
446+
<artifactId>jakarta.xml.bind-api</artifactId>
447447
<exclusions>
448448
<exclusion>
449449
<groupId>javax.activation</groupId>

0 commit comments

Comments
 (0)