Skip to content

Commit 4ec3eb4

Browse files
apurtellapurtell
committed
HBASE-26717 [hbase-thirdparty] hbase-shaded-jersey packages unshaded classes
1 parent 3da23c2 commit 4ec3eb4

File tree

6 files changed

+45
-13
lines changed

6 files changed

+45
-13
lines changed

‎hbase-http/pom.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,14 @@
272272
<groupId>javax.xml.bind</groupId>
273273
<artifactId>jaxb-api</artifactId>
274274
</dependency>
275+
<dependency>
276+
<groupId>jakarta.xml.bind</groupId>
277+
<artifactId>jakarta.xml.bind-api</artifactId>
278+
</dependency>
279+
<dependency>
280+
<groupId>jakarta.activation</groupId>
281+
<artifactId>jakarta.activation-api</artifactId>
282+
</dependency>
275283
</dependencies>
276284
</profile>
277285
<!-- Needs to make the profile in apache parent pom -->

‎hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1343,7 +1343,7 @@ You can redistribute it and/or modify it under either the terms of the
13431343
## See this FAQ link for justifications: https://www.apache.org/legal/resolved.html
13441344
##
13451345
## NB: This list is later compared as lower-case. New entries must also be all lower-case
1346-
#set($non_aggregate_fine = [ 'public domain', 'new bsd license', 'bsd license', 'bsd', 'bsd 2-clause license', 'mozilla public license version 1.1', 'mozilla public license version 2.0', 'creative commons attribution license, version 2.5', 'apache-2.0' ])
1346+
#set($non_aggregate_fine = [ 'public domain', 'new bsd license', 'bsd license', 'bsd', 'bsd 2-clause license', 'mozilla public license version 1.1', 'mozilla public license version 2.0', 'creative commons attribution license, version 2.5', 'apache-2.0', 'edl 1.0' ])
13471347
## include LICENSE sections for anything not under ASL2.0
13481348
#foreach( ${dep} in ${projects} )
13491349
## if there are no licenses we'll fail the build later, so

‎hbase-shaded/hbase-shaded-client/pom.xml‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,18 @@
5454
<configuration>
5555
<artifactSet>
5656
<excludes>
57-
<!-- exclude J2EE modules that come in for JDK11+ (since
57+
<!-- Exclude J2EE modules that come in for JDK11+ (since
5858
hadoop-3.2.0) or modules that come in for JDK8+ but
5959
need not be included -->
60-
<exclude>javax.annotation:javax.annotation-api</exclude>
61-
<exclude>javax.activation:javax.activation-api</exclude>
62-
<exclude>jakarta.activation:jakarta.activation-api</exclude> <!-- Hadoop 3.3.1 -->
63-
<exclude>jakarta.ws.rs:jakarta.ws.rs-api</exclude>
60+
<exclude>com.sun.activation:jakarta.activation</exclude>
61+
<exclude>com.sun.xml.bind:jaxb-osgi</exclude>
62+
<exclude>jakarta.activation:jakarta.activation-api</exclude>
6463
<exclude>jakarta.annotation:jakarta.annotation-api</exclude>
6564
<exclude>jakarta.validation:jakarta.validation-api</exclude>
65+
<exclude>jakarta.ws.rs:jakarta.ws.rs-api</exclude>
66+
<exclude>jakarta.xml.bind:jakarta.xml.bind-api</exclude>
67+
<exclude>javax.activation:javax.activation-api</exclude>
68+
<exclude>javax.annotation:javax.annotation-api</exclude>
6669
<exclude>org.glassfish.hk2.external:jakarta.inject</exclude>
6770
<!--
6871
Tell the shade plugin that in this case we want to include hadoop

‎hbase-shaded/hbase-shaded-testing-util/pom.xml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,11 +170,15 @@
170170
<!-- exclude J2EE modules that come in for JDK11+ (since
171171
hadoop-3.2.0) or modules that come in for JDK8+ but
172172
need not be included -->
173-
<exclude>javax.annotation:javax.annotation-api</exclude>
174-
<exclude>javax.activation:javax.activation-api</exclude>
175-
<exclude>jakarta.ws.rs:jakarta.ws.rs-api</exclude>
173+
<exclude>com.sun.activation:jakarta.activation</exclude>
174+
<exclude>com.sun.xml.bind:jaxb-osgi</exclude>
175+
<exclude>jakarta.activation:jakarta.activation-api</exclude>
176176
<exclude>jakarta.annotation:jakarta.annotation-api</exclude>
177177
<exclude>jakarta.validation:jakarta.validation-api</exclude>
178+
<exclude>jakarta.ws.rs:jakarta.ws.rs-api</exclude>
179+
<exclude>jakarta.xml.bind:jakarta.xml.bind-api</exclude>
180+
<exclude>javax.activation:javax.activation-api</exclude>
181+
<exclude>javax.annotation:javax.annotation-api</exclude>
178182
<exclude>org.glassfish.hk2.external:jakarta.inject</exclude>
179183
<!--
180184
Tell the shade plugin that in this case we want to include hadoop

‎hbase-shaded/pom.xml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,12 +144,15 @@
144144
<!-- exclude J2EE modules that come in for JDK11+ (since
145145
hadoop-3.2.0) or modules that come in for JDK8+ but
146146
need not be included -->
147-
<exclude>javax.annotation:javax.annotation-api</exclude>
148-
<exclude>javax.activation:javax.activation-api</exclude>
149-
<exclude>jakarta.activation:jakarta.activation-api</exclude> <!-- Hadoop 3.3.1 -->
150-
<exclude>jakarta.ws.rs:jakarta.ws.rs-api</exclude>
147+
<exclude>com.sun.activation:jakarta.activation</exclude>
148+
<exclude>com.sun.xml.bind:jaxb-osgi</exclude>
149+
<exclude>jakarta.activation:jakarta.activation-api</exclude>
151150
<exclude>jakarta.annotation:jakarta.annotation-api</exclude>
152151
<exclude>jakarta.validation:jakarta.validation-api</exclude>
152+
<exclude>jakarta.ws.rs:jakarta.ws.rs-api</exclude>
153+
<exclude>jakarta.xml.bind:jakarta.xml.bind-api</exclude>
154+
<exclude>javax.activation:javax.activation-api</exclude>
155+
<exclude>javax.annotation:javax.annotation-api</exclude>
153156
<exclude>org.glassfish.hk2.external:jakarta.inject</exclude>
154157
<!-- default to excluding Hadoop, have module that want
155158
to include it redefine the exclude list -->

‎pom.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1829,6 +1829,9 @@
18291829
<xz.version>1.9</xz.version>
18301830
<zstd-jni.version>1.5.0-4</zstd-jni.version>
18311831
<hbase-thirdparty.version>4.0.1</hbase-thirdparty.version>
1832+
<!-- jdk11 dependencies for hbase-http -->
1833+
<jakarta-activation.version>2.0.1</jakarta-activation.version>
1834+
<jakarta-xml-bind.version>3.0.1</jakarta-xml-bind.version>
18321835
<!-- Intraproject jar naming properties -->
18331836
<!-- TODO this is pretty ugly, but works for the moment.
18341837
Modules are pretty heavy-weight things, so doing this work isn't too bad. -->
@@ -2620,6 +2623,17 @@
26202623
<artifactId>zstd-jni</artifactId>
26212624
<version>${zstd-jni.version}</version>
26222625
</dependency>
2626+
<!-- jdk11 dependencies for hbase-http -->
2627+
<dependency>
2628+
<groupId>jakarta.activation</groupId>
2629+
<artifactId>jakarta.activation-api</artifactId>
2630+
<version>${jakarta-activation.version}</version>
2631+
</dependency>
2632+
<dependency>
2633+
<groupId>jakarta.xml.bind</groupId>
2634+
<artifactId>jakarta.xml.bind-api</artifactId>
2635+
<version>${jakarta-xml-bind.version}</version>
2636+
</dependency>
26232637
<!-- shaded thirdparty -->
26242638
<dependency>
26252639
<groupId>org.apache.hbase.thirdparty</groupId>

0 commit comments

Comments
 (0)