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 e27501f66 ATLAS-5200: updated HBase version to 2.6.4; replaced hbase
library dependencies with shaded version (#514)
e27501f66 is described below
commit e27501f66f607011e848af2372d7fe1de9adfcb3
Author: Madhan Neethiraj <[email protected]>
AuthorDate: Fri Feb 6 14:58:28 2026 -0800
ATLAS-5200: updated HBase version to 2.6.4; replaced hbase library
dependencies with shaded version (#514)
(cherry picked from commit bb56d99b10ed558fb1523361ddd3cfb898aa2d53)
---
dev-support/atlas-docker/.env | 2 +-
graphdb/janus/pom.xml | 18 ++++++++++
pom.xml | 2 +-
repository/pom.xml | 40 ++--------------------
.../audit/CassandraBasedAuditRepository.java | 3 +-
.../audit/rdbms/RdbmsBasedAuditRepository.java | 1 -
.../atlas/web/service/AtlasDebugMetricsSink.java | 2 +-
7 files changed, 24 insertions(+), 44 deletions(-)
diff --git a/dev-support/atlas-docker/.env b/dev-support/atlas-docker/.env
index 5d9454fc6..4e4d2c8f8 100644
--- a/dev-support/atlas-docker/.env
+++ b/dev-support/atlas-docker/.env
@@ -20,7 +20,7 @@ ATLAS_SERVER_JAVA_VERSION=8
ATLAS_VERSION=2.5.0-SNAPSHOT
UBUNTU_VERSION=20.04
HADOOP_VERSION=3.4.2
-HBASE_VERSION=2.6.0
+HBASE_VERSION=2.6.4
KAFKA_VERSION=2.8.2
HIVE_VERSION=3.1.3
HIVE_HADOOP_VERSION=3.1.1
diff --git a/graphdb/janus/pom.xml b/graphdb/janus/pom.xml
index c88734005..e8bbc2869 100644
--- a/graphdb/janus/pom.xml
+++ b/graphdb/janus/pom.xml
@@ -79,6 +79,16 @@
<artifactId>commons-text</artifactId>
<version>${commons-text.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-shaded-client</artifactId>
+ <version>${hbase.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-shaded-mapreduce</artifactId>
+ <version>${hbase.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-analyzers-common</artifactId>
@@ -218,6 +228,14 @@
<groupId>ch.qos.logback</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-shaded-client</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-shaded-mapreduce</artifactId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/pom.xml b/pom.xml
index 1f8ad1977..68dea329c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,7 +122,7 @@
<guice.version>4.1.0</guice.version>
<hadoop.hdfs-client.version>${hadoop.version}</hadoop.hdfs-client.version>
<hadoop.version>3.4.2</hadoop.version>
- <hbase.version>2.6.0</hbase.version>
+ <hbase.version>2.6.4</hbase.version>
<hive.version>3.1.3</hive.version>
<hppc.version>0.8.1</hppc.version>
<httpcomponents-httpclient.version>4.5.13</httpcomponents-httpclient.version>
diff --git a/repository/pom.xml b/repository/pom.xml
index 6cc12ef9e..25b3b46fd 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -152,44 +152,8 @@
<dependency>
<groupId>org.apache.hbase</groupId>
- <artifactId>hbase-client</artifactId>
- <exclusions>
- <exclusion>
- <groupId>com.github.stephenc.findbugs</groupId>
- <artifactId>findbugs-annotations</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-handler</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-native-epoll</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-server</artifactId>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.ws.rs</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>servlet-api-2.5</artifactId>
- </exclusion>
- </exclusions>
+ <artifactId>hbase-shaded-client</artifactId>
+ <version>${hbase.version}</version>
</dependency>
<dependency>
diff --git
a/repository/src/main/java/org/apache/atlas/repository/audit/CassandraBasedAuditRepository.java
b/repository/src/main/java/org/apache/atlas/repository/audit/CassandraBasedAuditRepository.java
index 979fec798..0bab165f4 100644
---
a/repository/src/main/java/org/apache/atlas/repository/audit/CassandraBasedAuditRepository.java
+++
b/repository/src/main/java/org/apache/atlas/repository/audit/CassandraBasedAuditRepository.java
@@ -208,8 +208,7 @@ public class CassandraBasedAuditRepository extends
AbstractStorageBasedAuditRepo
@Override
public List<EntityAuditEventV2> deleteEventsV2(String entityId,
Set<EntityAuditEventV2.EntityAuditActionV2> entityAuditActions, short
auditCount, int ttlInDays, boolean createEventsAgeoutAllowed,
Constants.AtlasAuditAgingType auditAgingType)
- throws AtlasBaseException, AtlasException
- {
+ throws AtlasBaseException, AtlasException {
return Collections.emptyList();
}
diff --git
a/repository/src/main/java/org/apache/atlas/repository/audit/rdbms/RdbmsBasedAuditRepository.java
b/repository/src/main/java/org/apache/atlas/repository/audit/rdbms/RdbmsBasedAuditRepository.java
index 77d145834..523da3d61 100644
---
a/repository/src/main/java/org/apache/atlas/repository/audit/rdbms/RdbmsBasedAuditRepository.java
+++
b/repository/src/main/java/org/apache/atlas/repository/audit/rdbms/RdbmsBasedAuditRepository.java
@@ -229,7 +229,6 @@ public class RdbmsBasedAuditRepository extends
AbstractStorageBasedAuditReposito
private void splitEventsToKeepAndAgeoutByAuditCount(List<DbEntityAudit>
dbEvents, boolean allowAgeoutByAuditCount, int allowedAuditCount,
List<DbEntityAudit> eventsToKeep, List<DbEntityAudit>
eventsEligibleForAgeout) {
-
if (CollectionUtils.isEmpty(dbEvents)) {
return;
}
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 8052428d7..3531fbf69 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.configuration2.SubsetConfiguration;
+import
org.apache.hadoop.hbase.shaded.org.apache.commons.configuration.SubsetConfiguration;
import org.apache.hadoop.metrics2.AbstractMetric;
import org.apache.hadoop.metrics2.MetricsRecord;
import org.apache.hadoop.metrics2.MetricsSink;
