This is an automated email from the ASF dual-hosted git repository.
madhan pushed a commit to branch atlas-2.5
in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/atlas-2.5 by this push:
new b2ece6c86 ATLAS-5210: replace hbase-shaded-* dependencies with
hbase-shaded-*-hadoop3 (#530)
b2ece6c86 is described below
commit b2ece6c869ac793582340f8686c426027ac58879
Author: Madhan Neethiraj <[email protected]>
AuthorDate: Wed Feb 18 13:48:24 2026 -0800
ATLAS-5210: replace hbase-shaded-* dependencies with hbase-shaded-*-hadoop3
(#530)
(cherry picked from commit 14246fe23f92a38a66ba1f81bf113a17978a0071)
---
graphdb/janus/pom.xml | 19 +++-
hbase-shaded-client-fixed/pom.xml | 101 +++++++++++++++++++++
pom.xml | 1 +
repository/pom.xml | 11 +--
webapp/pom.xml | 2 +-
.../atlas/web/service/AtlasDebugMetricsSink.java | 2 +-
6 files changed, 124 insertions(+), 12 deletions(-)
diff --git a/graphdb/janus/pom.xml b/graphdb/janus/pom.xml
index e8bbc2869..5660ea21e 100644
--- a/graphdb/janus/pom.xml
+++ b/graphdb/janus/pom.xml
@@ -51,6 +51,11 @@
<artifactId>atlas-graphdb-common</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.atlas</groupId>
+ <artifactId>hbase-shaded-client-fixed</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.atlas</groupId>
<artifactId>janusgraph-rdbms</artifactId>
@@ -80,14 +85,20 @@
<version>${commons-text.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-shaded-client</artifactId>
- <version>${hbase.version}</version>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-distcp</artifactId>
+ <version>${hadoop.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-shaded-mapreduce</artifactId>
- <version>${hbase.version}</version>
+ <version>${hbase.version}-hadoop3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-distcp</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
diff --git a/hbase-shaded-client-fixed/pom.xml
b/hbase-shaded-client-fixed/pom.xml
new file mode 100644
index 000000000..5292f4718
--- /dev/null
+++ b/hbase-shaded-client-fixed/pom.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.atlas</groupId>
+ <artifactId>apache-atlas</artifactId>
+ <version>2.5.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>hbase-shaded-client-fixed</artifactId>
+ <packaging>jar</packaging>
+
+ <name>HBase shaded client with fix</name>
+ <description>HBase shaded client with fix to remove 2 entries in
META-INF/services</description>
+
+ <properties>
+ <checkstyle.failOnViolation>true</checkstyle.failOnViolation>
+ <checkstyle.skip>false</checkstyle.skip>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-shaded-client</artifactId>
+ <version>${hbase.version}-hadoop3</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <!-- Unpack hbase-shaded-client jar, skipping 2 entries in
META-INF/services -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-hbase-shaded-client</id>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <phase>process-resources</phase>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.hbase</groupId>
+
<artifactId>hbase-shaded-client</artifactId>
+ <version>${hbase.version}-hadoop3</version>
+
<excludes>META-INF/services/javax.ws.rs.ext.MessageBodyWriter,META-INF/services/javax.ws.rs.ext.MessageBodyReader</excludes>
+
<outputDirectory>${project.build.directory}/unpacked</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- Repack the jar -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.4</version>
+ <executions>
+ <execution>
+ <id>default-jar</id>
+ <phase>none</phase>
+ </execution>
+ <execution>
+ <id>repack-fixed-hbase-shaded-client</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+
<classesDirectory>${project.build.directory}/unpacked</classesDirectory>
+
<finalName>hbase-shaded-client-${hbase.version}-hadoop3-fixed</finalName>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/pom.xml b/pom.xml
index 72c6336a4..8e53b516b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,6 +65,7 @@
<module>docs</module>
<module>graphdb</module>
+ <module>hbase-shaded-client-fixed</module>
<module>intg</module>
<module>notification</module>
<module>plugin-classloader</module>
diff --git a/repository/pom.xml b/repository/pom.xml
index 135ac4af1..a9b71c302 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -123,6 +123,11 @@
<groupId>org.apache.atlas</groupId>
<artifactId>atlas-server-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.atlas</groupId>
+ <artifactId>hbase-shaded-client-fixed</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.atlas</groupId>
<artifactId>janusgraph-rdbms</artifactId>
@@ -150,12 +155,6 @@
<artifactId>commons-lang3</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-shaded-client</artifactId>
- <version>${hbase.version}</version>
- </dependency>
-
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
diff --git a/webapp/pom.xml b/webapp/pom.xml
index 97c8a6f83..3598309dd 100755
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -520,7 +520,7 @@
<addClasspath>true</addClasspath>
</manifest>
</archive>
-
<packagingExcludes>WEB-INF/lib/dom4j-*.jar,WEB-INF/lib/jsp-api*.jar,${packages.to.exclude}</packagingExcludes>
+
<packagingExcludes>WEB-INF/lib/hbase-shaded-client-${hbase.version}-hadoop3.jar,WEB-INF/lib/dom4j-*.jar,WEB-INF/lib/jsp-api*.jar,${packages.to.exclude}</packagingExcludes>
</configuration>
</plugin>
diff --git
a/webapp/src/main/java/org/apache/atlas/web/service/AtlasDebugMetricsSink.java
b/webapp/src/main/java/org/apache/atlas/web/service/AtlasDebugMetricsSink.java
index 3531fbf69..8052428d7 100644
---
a/webapp/src/main/java/org/apache/atlas/web/service/AtlasDebugMetricsSink.java
+++
b/webapp/src/main/java/org/apache/atlas/web/service/AtlasDebugMetricsSink.java
@@ -19,7 +19,7 @@ package org.apache.atlas.web.service;
import org.apache.atlas.web.model.DebugMetrics;
import org.apache.commons.lang3.StringUtils;
-import
org.apache.hadoop.hbase.shaded.org.apache.commons.configuration.SubsetConfiguration;
+import
org.apache.hadoop.hbase.shaded.org.apache.commons.configuration2.SubsetConfiguration;
import org.apache.hadoop.metrics2.AbstractMetric;
import org.apache.hadoop.metrics2.MetricsRecord;
import org.apache.hadoop.metrics2.MetricsSink;
