Skip to content

Commit 4690479

Browse files
stotystoty
committed
YARN-11881. Use hbase-shaded-client-byo-hadoop in hadoop-yarn-server-timelineservice-hbase
Replaces the unshaded maven dpendencies with hbase-shaded-client-byo-hadoop in hadoop-yarn-server-timelineservice-hbase-common and hadoop-yarn-server-timelineservice-hbase-client. Building the HBase coprocessor requires the hbase-server dependency, so we keep using the unshaded dependencies for hadoop-yarn-server-timelineservice-hbase-server-2. We're also using the unshaded HBase dependencies in hadoop-yarn-server-timelineservice-hbase-tests because that does not affect the production classpath, and I'm not sure we can even test coprocessors with hbase-shaded-testing-util.
1 parent 4f9efcb commit 4690479

File tree

5 files changed

+36
-109
lines changed
  • hadoop-project
  • hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server
    • hadoop-yarn-server-timelineservice-hbase-tests
    • hadoop-yarn-server-timelineservice-hbase
      • hadoop-yarn-server-timelineservice-hbase-client
      • hadoop-yarn-server-timelineservice-hbase-common
      • hadoop-yarn-server-timelineservice-hbase-server/hadoop-yarn-server-timelineservice-hbase-server-2

5 files changed

+36
-109
lines changed

‎hadoop-project/pom.xml‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@
227227
<swagger-annotations-version>1.5.4</swagger-annotations-version>
228228
<snakeyaml.version>2.0</snakeyaml.version>
229229
<sshd.version>2.11.0</sshd.version>
230-
<hbase.version>2.6.1-hadoop3</hbase.version>
230+
<hbase.version>2.6.3-hadoop3</hbase.version>
231231
<junit.jupiter.version>5.13.3</junit.jupiter.version>
232232
<junit.platform.version>1.13.3</junit.platform.version>
233233
<assertj.version>3.12.2</assertj.version>
@@ -1820,6 +1820,17 @@
18201820
</exclusion>
18211821
</exclusions>
18221822
</dependency>
1823+
<dependency>
1824+
<groupId>org.apache.hbase</groupId>
1825+
<artifactId>hbase-shaded-client-byo-hadoop</artifactId>
1826+
<version>${hbase.version}</version>
1827+
<exclusions>
1828+
<exclusion>
1829+
<groupId>org.apache.yetus</groupId>
1830+
<artifactId>audience-annotations</artifactId>
1831+
</exclusion>
1832+
</exclusions>
1833+
</dependency>
18231834
<dependency>
18241835
<groupId>org.apache.hbase</groupId>
18251836
<artifactId>hbase-client</artifactId>

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,10 @@
6666
<groupId>org.apache.hadoop</groupId>
6767
<artifactId>hadoop-common</artifactId>
6868
</exclusion>
69+
<exclusion>
70+
<groupId>org.apache.hbase</groupId>
71+
<artifactId>hbase-shaded-client-byo-hadoop</artifactId>
72+
</exclusion>
6973
</exclusions>
7074
</dependency>
7175

@@ -78,6 +82,10 @@
7882
<groupId>org.apache.hadoop</groupId>
7983
<artifactId>hadoop-common</artifactId>
8084
</exclusion>
85+
<exclusion>
86+
<groupId>org.apache.hbase</groupId>
87+
<artifactId>hbase-shaded-client-byo-hadoop</artifactId>
88+
</exclusion>
8189
</exclusions>
8290
</dependency>
8391

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-client/pom.xml‎

Lines changed: 5 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@
4949
</exclusions>
5050
</dependency>
5151

52+
<dependency>
53+
<groupId>org.apache.hbase</groupId>
54+
<artifactId>hbase-shaded-client-byo-hadoop</artifactId>
55+
</dependency>
56+
5257
<dependency>
5358
<groupId>org.slf4j</groupId>
5459
<artifactId>slf4j-api</artifactId>
@@ -169,95 +174,6 @@
169174
<scope>test</scope>
170175
</dependency>
171176

172-
<dependency>
173-
<groupId>org.apache.hbase</groupId>
174-
<artifactId>hbase-common</artifactId>
175-
<exclusions>
176-
<exclusion>
177-
<groupId>org.apache.hadoop</groupId>
178-
<artifactId>hadoop-mapreduce-client-core</artifactId>
179-
</exclusion>
180-
<exclusion>
181-
<groupId>org.mortbay.jetty</groupId>
182-
<artifactId>jetty-util</artifactId>
183-
</exclusion>
184-
<exclusion>
185-
<groupId>com.google.guava</groupId>
186-
<artifactId>guava</artifactId>
187-
</exclusion>
188-
</exclusions>
189-
</dependency>
190-
191-
<dependency>
192-
<groupId>org.apache.hbase</groupId>
193-
<artifactId>hbase-client</artifactId>
194-
<exclusions>
195-
<exclusion>
196-
<groupId>org.apache.hadoop</groupId>
197-
<artifactId>hadoop-mapreduce-client-core</artifactId>
198-
</exclusion>
199-
<exclusion>
200-
<groupId>com.google.guava</groupId>
201-
<artifactId>guava</artifactId>
202-
</exclusion>
203-
</exclusions>
204-
</dependency>
205-
206-
<dependency>
207-
<groupId>org.apache.hbase</groupId>
208-
<artifactId>hbase-server</artifactId>
209-
<scope>provided</scope>
210-
<exclusions>
211-
<exclusion>
212-
<groupId>org.apache.hadoop</groupId>
213-
<artifactId>hadoop-hdfs</artifactId>
214-
</exclusion>
215-
<exclusion>
216-
<groupId>org.apache.hadoop</groupId>
217-
<artifactId>hadoop-hdfs-client</artifactId>
218-
</exclusion>
219-
<exclusion>
220-
<groupId>org.apache.hadoop</groupId>
221-
<artifactId>hadoop-client</artifactId>
222-
</exclusion>
223-
<exclusion>
224-
<groupId>org.apache.hadoop</groupId>
225-
<artifactId>hadoop-mapreduce-client-core</artifactId>
226-
</exclusion>
227-
<exclusion>
228-
<groupId>org.apache.hadoop</groupId>
229-
<artifactId>hadoop-distcp</artifactId>
230-
</exclusion>
231-
<exclusion>
232-
<groupId>org.mortbay.jetty</groupId>
233-
<artifactId>jetty</artifactId>
234-
</exclusion>
235-
<exclusion>
236-
<groupId>org.mortbay.jetty</groupId>
237-
<artifactId>jetty-util</artifactId>
238-
</exclusion>
239-
<exclusion>
240-
<groupId>org.mortbay.jetty</groupId>
241-
<artifactId>jetty-sslengine</artifactId>
242-
</exclusion>
243-
<exclusion>
244-
<groupId>org.eclipse.jetty</groupId>
245-
<artifactId>jetty-security</artifactId>
246-
</exclusion>
247-
<exclusion>
248-
<groupId>org.eclipse.jetty</groupId>
249-
<artifactId>jetty-http</artifactId>
250-
</exclusion>
251-
<exclusion>
252-
<groupId>com.google.guava</groupId>
253-
<artifactId>guava</artifactId>
254-
</exclusion>
255-
<exclusion>
256-
<groupId>javax.servlet</groupId>
257-
<artifactId>javax.servlet-api</artifactId>
258-
</exclusion>
259-
</exclusions>
260-
</dependency>
261177
</dependencies>
262178

263179
<build>

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-common/pom.xml‎

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,11 @@
7373
</exclusions>
7474
</dependency>
7575

76+
<dependency>
77+
<groupId>org.apache.hbase</groupId>
78+
<artifactId>hbase-shaded-client-byo-hadoop</artifactId>
79+
</dependency>
80+
7681
<!-- This is needed for GenericObjectMapper in GenericConverter -->
7782
<dependency>
7883
<groupId>org.apache.hadoop</groupId>
@@ -101,25 +106,6 @@
101106
</exclusions>
102107
</dependency>
103108

104-
<dependency>
105-
<groupId>org.apache.hbase</groupId>
106-
<artifactId>hbase-common</artifactId>
107-
<exclusions>
108-
<exclusion>
109-
<groupId>org.apache.hadoop</groupId>
110-
<artifactId>hadoop-mapreduce-client-core</artifactId>
111-
</exclusion>
112-
<exclusion>
113-
<groupId>org.mortbay.jetty</groupId>
114-
<artifactId>jetty-util</artifactId>
115-
</exclusion>
116-
<exclusion>
117-
<groupId>com.google.guava</groupId>
118-
<artifactId>guava</artifactId>
119-
</exclusion>
120-
</exclusions>
121-
</dependency>
122-
123109
<dependency>
124110
<groupId>org.apache.hadoop.thirdparty</groupId>
125111
<artifactId>hadoop-shaded-guava</artifactId>

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-server/hadoop-yarn-server-timelineservice-hbase-server-2/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@
4848
<groupId>com.google.inject</groupId>
4949
<artifactId>guice</artifactId>
5050
</exclusion>
51+
<exclusion>
52+
<groupId>org.apache.hbase</groupId>
53+
<artifactId>hbase-shaded-client-byo-hadoop</artifactId>
54+
</exclusion>
5155
</exclusions>
5256
</dependency>
5357

@@ -88,6 +92,7 @@
8892
<dependency>
8993
<groupId>org.apache.hbase</groupId>
9094
<artifactId>hbase-common</artifactId>
95+
<scope>provided</scope>
9196
<exclusions>
9297
<exclusion>
9398
<groupId>org.apache.hadoop</groupId>
@@ -107,6 +112,7 @@
107112
<dependency>
108113
<groupId>org.apache.hbase</groupId>
109114
<artifactId>hbase-client</artifactId>
115+
<scope>provided</scope>
110116
<exclusions>
111117
<exclusion>
112118
<groupId>org.apache.hadoop</groupId>

0 commit comments

Comments
 (0)