From 9d18d770b9f76926eed8cb4cad148e8c3239751e Mon Sep 17 00:00:00 2001
From: Wei-Chiu Chuang <weichiu@apache.org>
Date: Thu, 27 May 2021 18:05:52 -0700
Subject: [PATCH] HBASE-25908 Exclude jakarta.activation-api (#3299)

Signed-off-by: stack <stack@apache.org>
---
 hbase-shaded/hbase-shaded-client/pom.xml |  78 +++++
 hbase-shaded/pom.xml                     | 429 +++++++++++++++++++++++
 2 files changed, 507 insertions(+)

diff --git a/hbase-shaded/hbase-shaded-client/pom.xml b/hbase-shaded/hbase-shaded-client/pom.xml
index 1fed563714b..6ce4b89e9f1 100644
--- a/hbase-shaded/hbase-shaded-client/pom.xml
+++ b/hbase-shaded/hbase-shaded-client/pom.xml
@@ -20,6 +20,7 @@
        * limitations under the License.
        */
       -->
+<<<<<<< HEAD
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>hbase-shaded</artifactId>
@@ -59,6 +60,7 @@
                                          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>jakarta.annotation:jakarta.annotation-api</exclude>
                                     <exclude>jakarta.validation:jakarta.validation-api</exclude>
@@ -93,4 +95,80 @@
         </dependency>
     </dependencies>
 
+=======
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>hbase-shaded</artifactId>
+    <groupId>org.apache.hbase</groupId>
+    <version>3.0.0-SNAPSHOT</version>
+    <relativePath>..</relativePath>
+  </parent>
+  <artifactId>hbase-shaded-client</artifactId>
+  <name>Apache HBase - Shaded - Client (with Hadoop bundled)</name>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+      <plugin>
+        <!--Make it so assembly:single does nothing in here-->
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <skipAssembly>true</skipAssembly>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>aggregate-into-a-jar-with-relocated-third-parties</id>
+            <configuration>
+              <artifactSet>
+                <excludes>
+                  <!-- 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>jakarta.annotation:jakarta.annotation-api</exclude>
+                  <exclude>jakarta.validation:jakarta.validation-api</exclude>
+                  <exclude>org.glassfish.hk2.external:jakarta.inject</exclude>
+                  <!--
+                    Tell the shade plugin that in this case we want to include hadoop
+                    by leaving out the exclude.
+                  -->
+                  <!-- The rest of these should be kept in sync with the parent pom -->
+                  <exclude>org.apache.hbase:hbase-resource-bundle</exclude>
+                  <exclude>org.slf4j:*</exclude>
+                  <exclude>com.google.code.findbugs:*</exclude>
+                  <exclude>com.github.stephenc.findbugs:*</exclude>
+                  <exclude>com.github.spotbugs:*</exclude>
+                  <exclude>org.apache.htrace:*</exclude>
+                  <exclude>org.apache.yetus:*</exclude>
+                  <exclude>org.apache.logging.log4j:*</exclude>
+                  <exclude>commons-logging:*</exclude>
+                  <exclude>org.javassist:*</exclude>
+                  <exclude>io.opentelemetry:*</exclude>
+                </excludes>
+              </artifactSet>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.hbase</groupId>
+      <artifactId>hbase-client</artifactId>
+    </dependency>
+  </dependencies>
+>>>>>>> c88ae3add8... HBASE-25908 Exclude jakarta.activation-api (#3299)
 </project>
diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml
index fd0365b5388..b6dc395fd20 100644
--- a/hbase-shaded/pom.xml
+++ b/hbase-shaded/pom.xml
@@ -34,6 +34,7 @@
       <!-- Don't make a test-jar -->
       <maven.test.skip>true</maven.test.skip>
       <!-- Don't make a source-jar -->
+<<<<<<< HEAD
       <source.skip>true</source.skip>
       <license.bundles.dependencies>true</license.bundles.dependencies>
       <shaded.prefix>org.apache.hadoop.hbase.shaded</shaded.prefix>
@@ -139,6 +140,7 @@
                                              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>jakarta.annotation:jakarta.annotation-api</exclude>
                                         <exclude>jakarta.validation:jakarta.validation-api</exclude>
@@ -456,6 +458,433 @@
                                     <resources>
                                       <resource>LICENSE.txt</resource>
                                       <resource>ASL2.0</resource>
+=======
+    <source.skip>true</source.skip>
+    <license.bundles.dependencies>true</license.bundles.dependencies>
+    <shaded.prefix>org.apache.hadoop.hbase.shaded</shaded.prefix>
+  </properties>
+  <modules>
+    <module>hbase-shaded-client-byo-hadoop</module>
+    <module>hbase-shaded-client</module>
+    <module>hbase-shaded-mapreduce</module>
+    <module>hbase-shaded-testing-util</module>
+    <module>hbase-shaded-testing-util-tester</module>
+    <module>hbase-shaded-check-invariants</module>
+    <module>hbase-shaded-with-hadoop-check-invariants</module>
+  </modules>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.hbase</groupId>
+      <artifactId>hbase-resource-bundle</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <!-- put the log implementations to optional -->
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-api</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-core</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-slf4j-impl</artifactId>
+      <optional>true</optional>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <!--Make it so assembly:single does nothing in here-->
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <skipAssembly>true</skipAssembly>
+        </configuration>
+      </plugin>
+      <!-- licensing info from our dependencies -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>aggregate-licenses</id>
+            <goals>
+              <goal>process</goal>
+            </goals>
+            <configuration>
+              <properties>
+                <copyright-end-year>${build.year}</copyright-end-year>
+                <debug-print-included-work-info>${license.debug.print.included}</debug-print-included-work-info>
+                <bundled-dependencies>${license.bundles.dependencies}</bundled-dependencies>
+                <bundled-jquery>${license.bundles.jquery}</bundled-jquery>
+                <bundled-logo>${license.bundles.logo}</bundled-logo>
+                <bundled-bootstrap>${license.bundles.bootstrap}</bundled-bootstrap>
+              </properties>
+              <resourceBundles>
+                <resourceBundle>${project.groupId}:hbase-resource-bundle:${project.version}</resourceBundle>
+              </resourceBundles>
+              <supplementalModelArtifacts>
+                <supplementalModelArtifact>${project.groupId}:hbase-resource-bundle:${project.version}</supplementalModelArtifact>
+              </supplementalModelArtifacts>
+              <supplementalModels>
+                <supplementalModel>supplemental-models.xml</supplementalModel>
+              </supplementalModels>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <!--Make it so assembly:single does nothing in here-->
+          <artifactId>maven-assembly-plugin</artifactId>
+          <configuration>
+            <skipAssembly>true</skipAssembly>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-shade-plugin</artifactId>
+          <version>3.2.4</version>
+          <executions>
+            <execution>
+              <id>aggregate-into-a-jar-with-relocated-third-parties</id>
+              <phase>package</phase>
+              <goals>
+                <goal>shade</goal>
+              </goals>
+              <configuration>
+                <createSourcesJar>false</createSourcesJar>
+                <shadedArtifactAttached>false</shadedArtifactAttached>
+                <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                <shadeTestJar>false</shadeTestJar>
+                <artifactSet>
+                  <excludes>
+                    <!-- 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>jakarta.annotation:jakarta.annotation-api</exclude>
+                    <exclude>jakarta.validation:jakarta.validation-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 -->
+                    <exclude>org.apache.hadoop:*</exclude>
+                    <!-- the rest of this needs to be kept in sync with any
+                         hadoop-including module -->
+                    <exclude>org.apache.hbase:hbase-resource-bundle</exclude>
+                    <exclude>org.slf4j:*</exclude>
+                    <exclude>com.google.code.findbugs:*</exclude>
+                    <exclude>com.github.stephenc.findbugs:*</exclude>
+                    <exclude>com.github.spotbugs:*</exclude>
+                    <exclude>org.apache.htrace:*</exclude>
+                    <exclude>org.apache.yetus:*</exclude>
+                    <exclude>org.apache.logging.log4j:*</exclude>
+                    <exclude>commons-logging:*</exclude>
+                    <exclude>org.javassist:*</exclude>
+                    <exclude>io.opentelemetry:*</exclude>
+                  </excludes>
+                </artifactSet>
+                <relocations>
+                  <!-- top level com not including sun-->
+                  <relocation>
+                    <pattern>com.cedarsoftware</pattern>
+                    <shadedPattern>${shaded.prefix}.com.cedarsoftware</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>com.codahale</pattern>
+                    <shadedPattern>${shaded.prefix}.com.codahale</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>com.ctc</pattern>
+                    <shadedPattern>${shaded.prefix}.com.ctc</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>com.dropwizard</pattern>
+                    <shadedPattern>${shaded.prefix}.com.dropwizard</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>com.fasterxml</pattern>
+                    <shadedPattern>${shaded.prefix}.com.fasterxml</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>com.github.benmanes.caffeine</pattern>
+                    <shadedPattern>${shaded.prefix}.com.github.benmanes.caffeine</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>com.google</pattern>
+                    <shadedPattern>${shaded.prefix}.com.google</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>com.jamesmurty</pattern>
+                    <shadedPattern>${shaded.prefix}.com.jamesmurty</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>com.jcraft</pattern>
+                    <shadedPattern>${shaded.prefix}.com.jcraft</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>com.lmax</pattern>
+                    <shadedPattern>${shaded.prefix}.com.lmax</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>com.microsoft</pattern>
+                    <shadedPattern>${shaded.prefix}.com.microsoft</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>com.nimbusds</pattern>
+                    <shadedPattern>${shaded.prefix}.com.nimbusds</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>com.squareup</pattern>
+                    <shadedPattern>${shaded.prefix}.com.squareup</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>com.thoughtworks</pattern>
+                    <shadedPattern>${shaded.prefix}.com.thoughtworks</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>com.zaxxer</pattern>
+                    <shadedPattern>${shaded.prefix}.com.zaxxer</shadedPattern>
+                  </relocation>
+                  <!-- dnsjava -->
+                  <relocation>
+                    <pattern>org.xbill</pattern>
+                    <shadedPattern>${shaded.prefix}.org.xbill</shadedPattern>
+                  </relocation>
+                  <!-- netty family -->
+                  <relocation>
+                    <pattern>org.jboss.netty</pattern>
+                    <shadedPattern>${shaded.prefix}.org.jboss.netty</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>io.netty</pattern>
+                    <shadedPattern>${shaded.prefix}.io.netty</shadedPattern>
+                  </relocation>
+                  <!-- top level okio -->
+                  <relocation>
+                    <pattern>okio</pattern>
+                    <shadedPattern>${shaded.prefix}.okio</shadedPattern>
+                  </relocation>
+                  <!-- top level org -->
+                  <relocation>
+                    <pattern>org.checkerframework</pattern>
+                    <shadedPattern>${shaded.prefix}.org.checkerframework</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>org.codehaus</pattern>
+                    <shadedPattern>${shaded.prefix}.org.codehaus</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>org.eclipse</pattern>
+                    <shadedPattern>${shaded.prefix}.org.eclipse</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>org.ehcache</pattern>
+                    <shadedPattern>${shaded.prefix}.org.ehcache</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>org.jcodings</pattern>
+                    <shadedPattern>${shaded.prefix}.org.jcodings</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>org.joni</pattern>
+                    <shadedPattern>${shaded.prefix}.org.joni</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>org.mortbay</pattern>
+                    <shadedPattern>${shaded.prefix}.org.mortbay</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>org.nustaq</pattern>
+                    <shadedPattern>${shaded.prefix}.org.nustaq</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>org.terracotta</pattern>
+                    <shadedPattern>${shaded.prefix}.org.terracotta</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>org.tukaani</pattern>
+                    <shadedPattern>${shaded.prefix}.org.tukaani</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>org.xerial</pattern>
+                    <shadedPattern>${shaded.prefix}.org.xerial</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>org.znerd</pattern>
+                    <shadedPattern>${shaded.prefix}.org.znerd</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>org.aopalliance</pattern>
+                    <shadedPattern>${shaded.prefix}.org.aopalliance</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>org.fusesource</pattern>
+                    <shadedPattern>${shaded.prefix}.org.fusesource</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>org.iq80</pattern>
+                    <shadedPattern>${shaded.prefix}.org.iq80</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>org.jamon</pattern>
+                    <shadedPattern>${shaded.prefix}.org.jamon</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>org.jets3t</pattern>
+                    <shadedPattern>${shaded.prefix}.org.jets3t</shadedPattern>
+                  </relocation>
+                  <!-- poorly named add-on package from jets3t dependency. TODO can we just exclude these? -->
+                  <relocation>
+                    <pattern>contribs.mx</pattern>
+                    <shadedPattern>${shaded.prefix}.contribs.mx</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>org.objectweb</pattern>
+                    <shadedPattern>${shaded.prefix}.org.objectweb</shadedPattern>
+                  </relocation>
+                  <!-- org.apache relocations not in org.apache.hadoop or org.apache.commons -->
+                  <relocation>
+                    <pattern>org.apache.avro</pattern>
+                    <shadedPattern>${shaded.prefix}.org.apache.avro</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>org.apache.curator</pattern>
+                    <shadedPattern>${shaded.prefix}.org.apache.curator</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>org.apache.directory</pattern>
+                    <shadedPattern>${shaded.prefix}.org.apache.directory</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>org.apache.http</pattern>
+                    <shadedPattern>${shaded.prefix}.org.apache.http</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>org.apache.jasper</pattern>
+                    <shadedPattern>${shaded.prefix}.org.apache.jasper</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>org.apache.jute</pattern>
+                    <shadedPattern>${shaded.prefix}.org.apache.jute</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>org.apache.kerby</pattern>
+                    <shadedPattern>${shaded.prefix}.org.apache.kerby</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>org.apache.taglibs</pattern>
+                    <shadedPattern>${shaded.prefix}.org.apache.taglibs</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>org.apache.zookeeper</pattern>
+                    <shadedPattern>${shaded.prefix}.org.apache.zookeeper</shadedPattern>
+                  </relocation>
+                  <!-- org.apache.commons not including logging -->
+                  <relocation>
+                    <pattern>org.apache.commons.validator</pattern>
+                    <shadedPattern>${shaded.prefix}.org.apache.commons.validator</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>org.apache.commons.beanutils</pattern>
+                    <shadedPattern>${shaded.prefix}.org.apache.commons.beanutils</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>org.apache.commons.cli</pattern>
+                    <shadedPattern>${shaded.prefix}.org.apache.commons.cli</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>org.apache.commons.collections</pattern>
+                    <shadedPattern>${shaded.prefix}.org.apache.commons.collections</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>org.apache.commons.configuration</pattern>
+                    <shadedPattern>${shaded.prefix}.org.apache.commons.configuration</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>org.apache.commons.crypto</pattern>
+                    <shadedPattern>${shaded.prefix}.org.apache.commons.crypto</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>org.apache.commons.csv</pattern>
+                    <shadedPattern>${shaded.prefix}.org.apache.commons.csv</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>org.apache.commons.daemon</pattern>
+                    <shadedPattern>${shaded.prefix}.org.apache.commons.daemon</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>org.apache.commons.io</pattern>
+                    <shadedPattern>${shaded.prefix}.org.apache.commons.io</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>org.apache.commons.math</pattern>
+                    <shadedPattern>${shaded.prefix}.org.apache.commons.math</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>org.apache.commons.math3</pattern>
+                    <shadedPattern>${shaded.prefix}.org.apache.commons.math3</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>org.apache.commons.net</pattern>
+                    <shadedPattern>${shaded.prefix}.org.apache.commons.net</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>org.apache.commons.lang</pattern>
+                    <shadedPattern>${shaded.prefix}.org.apache.commons.lang</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>org.apache.commons.lang3</pattern>
+                    <shadedPattern>${shaded.prefix}.org.apache.commons.lang3</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>org.apache.commons.el</pattern>
+                    <shadedPattern>${shaded.prefix}.org.apache.commons.el</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>org.apache.commons.httpclient</pattern>
+                    <shadedPattern>${shaded.prefix}.org.apache.commons.httpclient</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>org.apache.commons.compress</pattern>
+                    <shadedPattern>${shaded.prefix}.org.apache.commons.compress</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>org.apache.commons.digester</pattern>
+                    <shadedPattern>${shaded.prefix}.org.apache.commons.digester</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>org.apache.commons.codec</pattern>
+                    <shadedPattern>${shaded.prefix}.org.apache.commons.codec</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>org.apache.commons.text</pattern>
+                    <shadedPattern>${shaded.prefix}.org.apache.commons.text</shadedPattern>
+                  </relocation>
+                  <!-- top level net-->
+                  <relocation>
+                    <pattern>net/</pattern>
+                    <shadedPattern>${shaded.prefix}.net.</shadedPattern>
+                  </relocation>
+                </relocations>
+                <transformers>
+                  <!-- Need to filter out some extraneous license files.
+                       Don't use the ApacheLicenseRT because it just removes all
+                       META-INF/LICENSE(.txt)? files, including ours. -->
+                  <transformer
+                    implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
+                    <resources>
+                      <resource>LICENSE.txt</resource>
+                      <resource>ASL2.0</resource>
+>>>>>>> c88ae3add8... HBASE-25908 Exclude jakarta.activation-api (#3299)
                                       <!-- also this unneeded doc -->
                                       <resource>overview.html</resource>
                                     </resources>