Skip to content

Commit 9d18d77

Browse files
jojochuangsaintstack
authored andcommitted
HBASE-25908 Exclude jakarta.activation-api (#3299)
Signed-off-by: stack <[email protected]>
1 parent fa577ad commit 9d18d77

File tree

2 files changed

+507
-0
lines changed

2 files changed

+507
-0
lines changed

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

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
* limitations under the License.
2121
*/
2222
-->
23+
<<<<<<< HEAD
2324
<modelVersion>4.0.0</modelVersion>
2425
<parent>
2526
<artifactId>hbase-shaded</artifactId>
@@ -59,6 +60,7 @@
5960
need not be included -->
6061
<exclude>javax.annotation:javax.annotation-api</exclude>
6162
<exclude>javax.activation:javax.activation-api</exclude>
63+
<exclude>jakarta.activation:jakarta.activation-api</exclude> <!-- Hadoop 3.3.1 -->
6264
<exclude>jakarta.ws.rs:jakarta.ws.rs-api</exclude>
6365
<exclude>jakarta.annotation:jakarta.annotation-api</exclude>
6466
<exclude>jakarta.validation:jakarta.validation-api</exclude>
@@ -93,4 +95,80 @@
9395
</dependency>
9496
</dependencies>
9597

98+
=======
99+
<modelVersion>4.0.0</modelVersion>
100+
<parent>
101+
<artifactId>hbase-shaded</artifactId>
102+
<groupId>org.apache.hbase</groupId>
103+
<version>3.0.0-SNAPSHOT</version>
104+
<relativePath>..</relativePath>
105+
</parent>
106+
<artifactId>hbase-shaded-client</artifactId>
107+
<name>Apache HBase - Shaded - Client (with Hadoop bundled)</name>
108+
<build>
109+
<plugins>
110+
<plugin>
111+
<groupId>org.apache.maven.plugins</groupId>
112+
<artifactId>maven-site-plugin</artifactId>
113+
<configuration>
114+
<skip>true</skip>
115+
</configuration>
116+
</plugin>
117+
<plugin>
118+
<!--Make it so assembly:single does nothing in here-->
119+
<artifactId>maven-assembly-plugin</artifactId>
120+
<configuration>
121+
<skipAssembly>true</skipAssembly>
122+
</configuration>
123+
</plugin>
124+
<plugin>
125+
<groupId>org.apache.maven.plugins</groupId>
126+
<artifactId>maven-shade-plugin</artifactId>
127+
<executions>
128+
<execution>
129+
<id>aggregate-into-a-jar-with-relocated-third-parties</id>
130+
<configuration>
131+
<artifactSet>
132+
<excludes>
133+
<!-- exclude J2EE modules that come in for JDK11+ (since
134+
hadoop-3.2.0) or modules that come in for JDK8+ but
135+
need not be included -->
136+
<exclude>javax.annotation:javax.annotation-api</exclude>
137+
<exclude>javax.activation:javax.activation-api</exclude>
138+
<exclude>jakarta.activation:jakarta.activation-api</exclude> <!-- Hadoop 3.3.1 -->
139+
<exclude>jakarta.ws.rs:jakarta.ws.rs-api</exclude>
140+
<exclude>jakarta.annotation:jakarta.annotation-api</exclude>
141+
<exclude>jakarta.validation:jakarta.validation-api</exclude>
142+
<exclude>org.glassfish.hk2.external:jakarta.inject</exclude>
143+
<!--
144+
Tell the shade plugin that in this case we want to include hadoop
145+
by leaving out the exclude.
146+
-->
147+
<!-- The rest of these should be kept in sync with the parent pom -->
148+
<exclude>org.apache.hbase:hbase-resource-bundle</exclude>
149+
<exclude>org.slf4j:*</exclude>
150+
<exclude>com.google.code.findbugs:*</exclude>
151+
<exclude>com.github.stephenc.findbugs:*</exclude>
152+
<exclude>com.github.spotbugs:*</exclude>
153+
<exclude>org.apache.htrace:*</exclude>
154+
<exclude>org.apache.yetus:*</exclude>
155+
<exclude>org.apache.logging.log4j:*</exclude>
156+
<exclude>commons-logging:*</exclude>
157+
<exclude>org.javassist:*</exclude>
158+
<exclude>io.opentelemetry:*</exclude>
159+
</excludes>
160+
</artifactSet>
161+
</configuration>
162+
</execution>
163+
</executions>
164+
</plugin>
165+
</plugins>
166+
</build>
167+
<dependencies>
168+
<dependency>
169+
<groupId>org.apache.hbase</groupId>
170+
<artifactId>hbase-client</artifactId>
171+
</dependency>
172+
</dependencies>
173+
>>>>>>> c88ae3add8... HBASE-25908 Exclude jakarta.activation-api (#3299)
96174
</project>

0 commit comments

Comments
 (0)