Revert "HBASE-25908 Exclude jakarta.activation-api (#3299)"

This reverts commit 9d18d77.

Author: saintstack

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

@@ -20,7 +20,6 @@
        * limitations under the License.
        */
       -->
-<<<<<<< HEAD
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>hbase-shaded</artifactId>
@@ -60,7 +59,6 @@
                                          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>
@@ -95,80 +93,4 @@
         </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>