Skip to content

Commit

Permalink
HBASE-26717 [hbase-thirdparty] hbase-shaded-jersey packages unshaded …
Browse files Browse the repository at this point in the history
…classes
  • Loading branch information
apurtell committed Feb 2, 2022
1 parent 3da23c2 commit 93344c9
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 12 deletions.
8 changes: 8 additions & 0 deletions hbase-http/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,14 @@
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
</dependency>
</dependencies>
</profile>
<!-- Needs to make the profile in apache parent pom -->
Expand Down
12 changes: 7 additions & 5 deletions hbase-shaded/hbase-shaded-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,17 @@
<configuration>
<artifactSet>
<excludes>
<!-- exclude J2EE modules that come in for JDK11+ (since
<!-- Exclude J2EE modules that come in for JDK11+ (since
hadoop-3.2.0) or modules that come in for JDK8+ but
need not be included -->
<exclude>javax.annotation:javax.annotation-api</exclude>
<exclude>javax.activation:javax.activation-api</exclude>
<exclude>jakarta.activation:jakarta.activation-api</exclude> <!-- Hadoop 3.3.1 -->
<exclude>jakarta.ws.rs:jakarta.ws.rs-api</exclude>
<exclude>com.sun.activation:jakarta.activation</exclude>
<exclude>com.sun.xml.bind:jaxb-osgi</exclude>
<exclude>jakarta.annotation:jakarta.annotation-api</exclude>
<exclude>jakarta.validation:jakarta.validation-api</exclude>
<exclude>jakarta.ws.rs:jakarta.ws.rs-api</exclude>
<exclude>jakarta.xml.bind:jakarta.xml.bind-api</exclude>
<exclude>javax.activation:javax.activation-api</exclude>
<exclude>javax.annotation:javax.annotation-api</exclude>
<exclude>org.glassfish.hk2.external:jakarta.inject</exclude>
<!--
Tell the shade plugin that in this case we want to include hadoop
Expand Down
9 changes: 6 additions & 3 deletions hbase-shaded/hbase-shaded-testing-util/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -170,11 +170,14 @@
<!-- exclude J2EE modules that come in for JDK11+ (since
hadoop-3.2.0) or modules that come in for JDK8+ but
need not be included -->
<exclude>javax.annotation:javax.annotation-api</exclude>
<exclude>javax.activation:javax.activation-api</exclude>
<exclude>jakarta.ws.rs:jakarta.ws.rs-api</exclude>
<exclude>com.sun.activation:jakarta.activation</exclude>
<exclude>com.sun.xml.bind:jaxb-osgi</exclude>
<exclude>jakarta.annotation:jakarta.annotation-api</exclude>
<exclude>jakarta.validation:jakarta.validation-api</exclude>
<exclude>jakarta.ws.rs:jakarta.ws.rs-api</exclude>
<exclude>jakarta.xml.bind:jakarta.xml.bind-api</exclude>
<exclude>javax.activation:javax.activation-api</exclude>
<exclude>javax.annotation:javax.annotation-api</exclude>
<exclude>org.glassfish.hk2.external:jakarta.inject</exclude>
<!--
Tell the shade plugin that in this case we want to include hadoop
Expand Down
10 changes: 6 additions & 4 deletions hbase-shaded/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,14 @@
<!-- exclude J2EE modules that come in for JDK11+ (since
hadoop-3.2.0) or modules that come in for JDK8+ but
need not be included -->
<exclude>javax.annotation:javax.annotation-api</exclude>
<exclude>javax.activation:javax.activation-api</exclude>
<exclude>jakarta.activation:jakarta.activation-api</exclude> <!-- Hadoop 3.3.1 -->
<exclude>jakarta.ws.rs:jakarta.ws.rs-api</exclude>
<exclude>com.sun.activation:jakarta.activation</exclude>
<exclude>com.sun.xml.bind:jaxb-osgi</exclude>
<exclude>jakarta.annotation:jakarta.annotation-api</exclude>
<exclude>jakarta.validation:jakarta.validation-api</exclude>
<exclude>jakarta.ws.rs:jakarta.ws.rs-api</exclude>
<exclude>jakarta.xml.bind:jakarta.xml.bind-api</exclude>
<exclude>javax.activation:javax.activation-api</exclude>
<exclude>javax.annotation:javax.annotation-api</exclude>
<exclude>org.glassfish.hk2.external:jakarta.inject</exclude>
<!-- default to excluding Hadoop, have module that want
to include it redefine the exclude list -->
Expand Down
14 changes: 14 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1829,6 +1829,9 @@
<xz.version>1.9</xz.version>
<zstd-jni.version>1.5.0-4</zstd-jni.version>
<hbase-thirdparty.version>4.0.1</hbase-thirdparty.version>
<!-- jdk11 dependencies for hbase-http -->
<jakarta-activation.version>2.0.1</jakarta-activation.version>
<jakarta-xml-bind.version>3.0.1</jakarta-xml-bind.version>
<!-- Intraproject jar naming properties -->
<!-- TODO this is pretty ugly, but works for the moment.
Modules are pretty heavy-weight things, so doing this work isn't too bad. -->
Expand Down Expand Up @@ -2620,6 +2623,17 @@
<artifactId>zstd-jni</artifactId>
<version>${zstd-jni.version}</version>
</dependency>
<!-- jdk11 dependencies for hbase-http -->
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<version>${jakarta-activation.version}</version>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>${jakarta-xml-bind.version}</version>
</dependency>
<!-- shaded thirdparty -->
<dependency>
<groupId>org.apache.hbase.thirdparty</groupId>
Expand Down

0 comments on commit 93344c9

Please sign in to comment.