Skip to content

Commit bb56d99

Browse files
authored
ATLAS-5200: updated HBase version to 2.6.4; replaced hbase library dependencies with shaded version (#514)
1 parent c567667 commit bb56d99

File tree

6 files changed

+24
-42
lines changed

6 files changed

+24
-42
lines changed

dev-support/atlas-docker/.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ATLAS_SERVER_JAVA_VERSION=8
2020
ATLAS_VERSION=3.0.0-SNAPSHOT
2121
UBUNTU_VERSION=20.04
2222
HADOOP_VERSION=3.4.2
23-
HBASE_VERSION=2.6.0
23+
HBASE_VERSION=2.6.4
2424
KAFKA_VERSION=2.8.2
2525
HIVE_VERSION=3.1.3
2626
HIVE_HADOOP_VERSION=3.1.1

graphdb/janus/pom.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,16 @@
7979
<artifactId>commons-text</artifactId>
8080
<version>${commons-text.version}</version>
8181
</dependency>
82+
<dependency>
83+
<groupId>org.apache.hbase</groupId>
84+
<artifactId>hbase-shaded-client</artifactId>
85+
<version>${hbase.version}</version>
86+
</dependency>
87+
<dependency>
88+
<groupId>org.apache.hbase</groupId>
89+
<artifactId>hbase-shaded-mapreduce</artifactId>
90+
<version>${hbase.version}</version>
91+
</dependency>
8292
<dependency>
8393
<groupId>org.apache.lucene</groupId>
8494
<artifactId>lucene-analyzers-common</artifactId>
@@ -218,6 +228,14 @@
218228
<groupId>ch.qos.logback</groupId>
219229
<artifactId>*</artifactId>
220230
</exclusion>
231+
<exclusion>
232+
<groupId>org.apache.hbase</groupId>
233+
<artifactId>hbase-shaded-client</artifactId>
234+
</exclusion>
235+
<exclusion>
236+
<groupId>org.apache.hbase</groupId>
237+
<artifactId>hbase-shaded-mapreduce</artifactId>
238+
</exclusion>
221239
</exclusions>
222240
</dependency>
223241

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
<guice.version>4.1.0</guice.version>
123123
<hadoop.hdfs-client.version>${hadoop.version}</hadoop.hdfs-client.version>
124124
<hadoop.version>3.4.2</hadoop.version>
125-
<hbase.version>2.6.0</hbase.version>
125+
<hbase.version>2.6.4</hbase.version>
126126
<hive.version>3.1.3</hive.version>
127127
<hppc.version>0.8.1</hppc.version>
128128
<httpcomponents-httpclient.version>4.5.13</httpcomponents-httpclient.version>

repository/pom.xml

Lines changed: 2 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -152,44 +152,8 @@
152152

153153
<dependency>
154154
<groupId>org.apache.hbase</groupId>
155-
<artifactId>hbase-client</artifactId>
156-
<exclusions>
157-
<exclusion>
158-
<groupId>com.github.stephenc.findbugs</groupId>
159-
<artifactId>findbugs-annotations</artifactId>
160-
</exclusion>
161-
<exclusion>
162-
<groupId>io.netty</groupId>
163-
<artifactId>netty-handler</artifactId>
164-
</exclusion>
165-
<exclusion>
166-
<groupId>io.netty</groupId>
167-
<artifactId>netty-transport-native-epoll</artifactId>
168-
</exclusion>
169-
</exclusions>
170-
</dependency>
171-
172-
<dependency>
173-
<groupId>org.apache.hbase</groupId>
174-
<artifactId>hbase-server</artifactId>
175-
<exclusions>
176-
<exclusion>
177-
<groupId>javax.servlet</groupId>
178-
<artifactId>*</artifactId>
179-
</exclusion>
180-
<exclusion>
181-
<groupId>javax.ws.rs</groupId>
182-
<artifactId>*</artifactId>
183-
</exclusion>
184-
<exclusion>
185-
<groupId>org.eclipse.jetty</groupId>
186-
<artifactId>*</artifactId>
187-
</exclusion>
188-
<exclusion>
189-
<groupId>org.mortbay.jetty</groupId>
190-
<artifactId>servlet-api-2.5</artifactId>
191-
</exclusion>
192-
</exclusions>
155+
<artifactId>hbase-shaded-client</artifactId>
156+
<version>${hbase.version}</version>
193157
</dependency>
194158

195159
<dependency>

webapp/src/main/java/org/apache/atlas/web/service/AtlasDebugMetricsSink.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import org.apache.atlas.web.model.DebugMetrics;
2121
import org.apache.commons.lang3.StringUtils;
22-
import org.apache.hadoop.hbase.shaded.org.apache.commons.configuration2.SubsetConfiguration;
22+
import org.apache.hadoop.hbase.shaded.org.apache.commons.configuration.SubsetConfiguration;
2323
import org.apache.hadoop.metrics2.AbstractMetric;
2424
import org.apache.hadoop.metrics2.MetricsRecord;
2525
import org.apache.hadoop.metrics2.MetricsSink;

webapp/src/test/java/org/apache/atlas/web/service/AtlasDebugMetricsSinkTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
package org.apache.atlas.web.service;
2020

2121
import org.apache.atlas.web.model.DebugMetrics;
22-
import org.apache.hadoop.hbase.shaded.org.apache.commons.configuration2.SubsetConfiguration;
22+
import org.apache.hadoop.hbase.shaded.org.apache.commons.configuration.SubsetConfiguration;
2323
import org.apache.hadoop.metrics2.AbstractMetric;
2424
import org.apache.hadoop.metrics2.MetricsRecord;
2525
import org.mockito.Mock;

0 commit comments

Comments
 (0)