File tree Expand file tree Collapse file tree 6 files changed +24
-42
lines changed
main/java/org/apache/atlas/web/service
test/java/org/apache/atlas/web/service Expand file tree Collapse file tree 6 files changed +24
-42
lines changed Original file line number Diff line number Diff line change @@ -20,7 +20,7 @@ ATLAS_SERVER_JAVA_VERSION=8
2020ATLAS_VERSION = 3.0.0-SNAPSHOT
2121UBUNTU_VERSION = 20.04
2222HADOOP_VERSION = 3.4.2
23- HBASE_VERSION = 2.6.0
23+ HBASE_VERSION = 2.6.4
2424KAFKA_VERSION = 2.8.2
2525HIVE_VERSION = 3.1.3
2626HIVE_HADOOP_VERSION = 3.1.1
Original file line number Diff line number Diff line change 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 >
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
Original file line number Diff line number Diff line change 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>
Original file line number Diff line number Diff line change 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 >
Original file line number Diff line number Diff line change 1919
2020import org .apache .atlas .web .model .DebugMetrics ;
2121import 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 ;
2323import org .apache .hadoop .metrics2 .AbstractMetric ;
2424import org .apache .hadoop .metrics2 .MetricsRecord ;
2525import org .apache .hadoop .metrics2 .MetricsSink ;
Original file line number Diff line number Diff line change 1919package org .apache .atlas .web .service ;
2020
2121import 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 ;
2323import org .apache .hadoop .metrics2 .AbstractMetric ;
2424import org .apache .hadoop .metrics2 .MetricsRecord ;
2525import org .mockito .Mock ;
You can’t perform that action at this time.
0 commit comments