Skip to content

Commit 263b8f7

Browse files
linghengqianlinghengqian
committed
Completely fixes the class conflict between apache/hive:4.0.0 and apache/hadoop:3.3.6
1 parent a4b54f2 commit 263b8f7

File tree

3 files changed

+344
-5
lines changed

3 files changed

+344
-5
lines changed

‎hive-server2-jdbc-driver-thin/pom.xml

+213
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,38 @@
107107
<groupId>commons-cli</groupId>
108108
<artifactId>*</artifactId>
109109
</exclusion>
110+
<!--
111+
TODO Fix class conflicts in master branch of apache/hive .
112+
Refer to https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
113+
-->
114+
<exclusion>
115+
<groupId>org.apache.thrift</groupId>
116+
<artifactId>libthrift</artifactId>
117+
</exclusion>
110118
</exclusions>
111119
</dependency>
112120
<dependency>
113121
<groupId>org.apache.httpcomponents</groupId>
114122
<artifactId>httpclient</artifactId>
115123
<version>${httpcomponents.client.version}</version>
124+
<exclusions>
125+
<!--
126+
TODO Fix class conflicts in master branch of apache/hive .
127+
Refer to https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
128+
-->
129+
<exclusion>
130+
<groupId>commons-codec</groupId>
131+
<artifactId>commons-codec</artifactId>
132+
</exclusion>
133+
<!--
134+
TODO Fix class conflicts in master branch of apache/hive .
135+
Refer to https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
136+
-->
137+
<exclusion>
138+
<groupId>commons-logging</groupId>
139+
<artifactId>commons-logging</artifactId>
140+
</exclusion>
141+
</exclusions>
116142
</dependency>
117143
<dependency>
118144
<groupId>org.apache.httpcomponents</groupId>
@@ -123,6 +149,24 @@
123149
<groupId>org.apache.thrift</groupId>
124150
<artifactId>libthrift</artifactId>
125151
<version>${libthrift.version}</version>
152+
<exclusions>
153+
<!--
154+
TODO Fix class conflicts in master branch of apache/hive .
155+
Refer to https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
156+
-->
157+
<exclusion>
158+
<groupId>org.apache.httpcomponents</groupId>
159+
<artifactId>httpcore</artifactId>
160+
</exclusion>
161+
<!--
162+
TODO Fix class conflicts in master branch of apache/hive .
163+
Refer to https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
164+
-->
165+
<exclusion>
166+
<groupId>org.slf4j</groupId>
167+
<artifactId>slf4j-api</artifactId>
168+
</exclusion>
169+
</exclusions>
126170
</dependency>
127171
<dependency>
128172
<groupId>org.apache.zookeeper</groupId>
@@ -151,6 +195,32 @@
151195
<groupId>org.apache.curator</groupId>
152196
<artifactId>curator-framework</artifactId>
153197
<version>${curator.version}</version>
198+
<exclusions>
199+
<!--
200+
TODO Fix class conflicts in master branch of apache/hive .
201+
Refer to https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
202+
-->
203+
<exclusion>
204+
<groupId>com.google.guava</groupId>
205+
<artifactId>guava</artifactId>
206+
</exclusion>
207+
<!--
208+
TODO Fix class conflicts in master branch of apache/hive .
209+
Refer to https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
210+
-->
211+
<exclusion>
212+
<groupId>org.apache.zookeeper</groupId>
213+
<artifactId>zookeeper</artifactId>
214+
</exclusion>
215+
<!--
216+
TODO Fix class conflicts in master branch of apache/hive .
217+
Refer to https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
218+
-->
219+
<exclusion>
220+
<groupId>org.slf4j</groupId>
221+
<artifactId>slf4j-api</artifactId>
222+
</exclusion>
223+
</exclusions>
154224
</dependency>
155225
<dependency>
156226
<groupId>org.apache.hive.shims</groupId>
@@ -161,6 +231,14 @@
161231
<groupId>com.google.code.findbugs</groupId>
162232
<artifactId>*</artifactId>
163233
</exclusion>
234+
<!--
235+
TODO Fix class conflicts in master branch of apache/hive .
236+
Refer to https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
237+
-->
238+
<exclusion>
239+
<groupId>org.apache.zookeeper</groupId>
240+
<artifactId>zookeeper</artifactId>
241+
</exclusion>
164242
</exclusions>
165243
</dependency>
166244
<dependency>
@@ -384,6 +462,54 @@
384462
<groupId>org.xerial.snappy</groupId>
385463
<artifactId>*</artifactId>
386464
</exclusion>
465+
<!--
466+
TODO Fix class conflicts in master branch of apache/hive .
467+
Refer to https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
468+
-->
469+
<exclusion>
470+
<groupId>com.google.guava</groupId>
471+
<artifactId>guava</artifactId>
472+
</exclusion>
473+
<!--
474+
TODO Fix class conflicts in master branch of apache/hive .
475+
Refer to https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
476+
-->
477+
<exclusion>
478+
<groupId>commons-logging</groupId>
479+
<artifactId>commons-logging</artifactId>
480+
</exclusion>
481+
<!--
482+
TODO Fix class conflicts in master branch of apache/hive .
483+
Refer to https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
484+
-->
485+
<exclusion>
486+
<groupId>org.apache.commons</groupId>
487+
<artifactId>commons-text</artifactId>
488+
</exclusion>
489+
<!--
490+
TODO Fix class conflicts in master branch of apache/hive .
491+
Refer to https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
492+
-->
493+
<exclusion>
494+
<groupId>org.apache.zookeeper</groupId>
495+
<artifactId>zookeeper</artifactId>
496+
</exclusion>
497+
<!--
498+
TODO Fix class conflicts in master branch of apache/hadoop .
499+
Refer to https://github.com/apache/hadoop/blob/release-3.3.6-RC1/hadoop-project/pom.xml#L1244 .
500+
-->
501+
<exclusion>
502+
<groupId>org.codehaus.woodstox</groupId>
503+
<artifactId>stax2-api</artifactId>
504+
</exclusion>
505+
<!--
506+
TODO Fix class conflicts in master branch of apache/hive .
507+
Refer to https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
508+
-->
509+
<exclusion>
510+
<groupId>org.slf4j</groupId>
511+
<artifactId>slf4j-api</artifactId>
512+
</exclusion>
387513
</exclusions>
388514
</dependency>
389515
<dependency>
@@ -415,6 +541,22 @@
415541
<groupId>org.slf4j</groupId>
416542
<artifactId>slf4j-reload4j</artifactId>
417543
</exclusion>
544+
<!--
545+
TODO Fix class conflicts in master branch of apache/hive .
546+
Refer to https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
547+
-->
548+
<exclusion>
549+
<groupId>org.apache.zookeeper</groupId>
550+
<artifactId>zookeeper</artifactId>
551+
</exclusion>
552+
<!--
553+
TODO Fix class conflicts in master branch of apache/hive .
554+
Refer to https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
555+
-->
556+
<exclusion>
557+
<groupId>org.slf4j</groupId>
558+
<artifactId>slf4j-api</artifactId>
559+
</exclusion>
418560
</exclusions>
419561
</dependency>
420562
<dependency>
@@ -450,6 +592,22 @@
450592
<groupId>org.apache.hadoop</groupId>
451593
<artifactId>hadoop-annotations</artifactId>
452594
</exclusion>
595+
<!--
596+
TODO Fix class conflicts in master branch of apache/hive .
597+
Refer to https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
598+
-->
599+
<exclusion>
600+
<groupId>org.apache.zookeeper</groupId>
601+
<artifactId>zookeeper</artifactId>
602+
</exclusion>
603+
<!--
604+
TODO Fix class conflicts in master branch of apache/hive .
605+
Refer to https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
606+
-->
607+
<exclusion>
608+
<groupId>org.slf4j</groupId>
609+
<artifactId>slf4j-api</artifactId>
610+
</exclusion>
453611
</exclusions>
454612
</dependency>
455613
<dependency>
@@ -479,6 +637,61 @@
479637
</exclusion>
480638
</exclusions>
481639
</dependency>
640+
641+
<!--
642+
TODO Fix class conflicts in master branch of apache/hive .
643+
Refer to https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
644+
-->
645+
<dependency>
646+
<groupId>commons-codec</groupId>
647+
<artifactId>commons-codec</artifactId>
648+
<version>${commons-codec.version}</version>
649+
</dependency>
650+
<!--
651+
TODO Fix class conflicts in master branch of apache/hive .
652+
Refer to https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
653+
-->
654+
<dependency>
655+
<groupId>com.google.guava</groupId>
656+
<artifactId>guava</artifactId>
657+
<version>${guava.version}</version>
658+
</dependency>
659+
<!--
660+
TODO Fix class conflicts in master branch of apache/hive .
661+
Refer to https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
662+
-->
663+
<dependency>
664+
<groupId>commons-logging</groupId>
665+
<artifactId>commons-logging</artifactId>
666+
<version>${commons-logging.version}</version>
667+
</dependency>
668+
<!--
669+
TODO Fix class conflicts in master branch of apache/hive .
670+
Refer to https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
671+
-->
672+
<dependency>
673+
<groupId>org.apache.commons</groupId>
674+
<artifactId>commons-text</artifactId>
675+
<version>${commons-text.version}</version>
676+
</dependency>
677+
<!--
678+
TODO Fix class conflicts in master branch of apache/hadoop .
679+
Refer to https://github.com/apache/hadoop/blob/release-3.3.6-RC1/hadoop-project/pom.xml#L1244 .
680+
-->
681+
<dependency>
682+
<groupId>org.codehaus.woodstox</groupId>
683+
<artifactId>stax2-api</artifactId>
684+
<version>4.2.1</version>
685+
</dependency>
686+
<!--
687+
TODO Fix class conflicts in master branch of apache/hive .
688+
Refer to https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
689+
-->
690+
<dependency>
691+
<groupId>org.slf4j</groupId>
692+
<artifactId>slf4j-api</artifactId>
693+
<version>${slf4j.version}</version>
694+
</dependency>
482695
</dependencies>
483696

484697
<build>

‎hive-server2-jdbc-driver-uber/pom.xml

+94
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,46 @@
139139
<groupId>org.slf4j</groupId>
140140
<artifactId>slf4j-log4j12</artifactId>
141141
</exclusion>
142+
<!--
143+
TODO This has been fixed at https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
144+
This exclusion can be removed once we update to `apache/hive:4.1.0`.
145+
-->
146+
<exclusion>
147+
<groupId>commons-codec</groupId>
148+
<artifactId>commons-codec</artifactId>
149+
</exclusion>
150+
<!--
151+
TODO This has been fixed at https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
152+
This exclusion can be removed once we update to `apache/hive:4.1.0`.
153+
-->
154+
<exclusion>
155+
<groupId>commons-logging</groupId>
156+
<artifactId>commons-logging</artifactId>
157+
</exclusion>
158+
<!--
159+
TODO This has been fixed at https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
160+
This exclusion can be removed once we update to `apache/hive:4.1.0`.
161+
-->
162+
<exclusion>
163+
<groupId>org.apache.commons</groupId>
164+
<artifactId>commons-text</artifactId>
165+
</exclusion>
166+
<!--
167+
TODO This has been fixed at https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
168+
This exclusion can be removed once we update to `apache/hive:4.1.0`.
169+
-->
170+
<exclusion>
171+
<groupId>org.codehaus.woodstox</groupId>
172+
<artifactId>stax2-api</artifactId>
173+
</exclusion>
174+
<!--
175+
TODO This has been fixed at https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
176+
This exclusion can be removed once we update to `apache/hive:4.1.0`.
177+
-->
178+
<exclusion>
179+
<groupId>org.slf4j</groupId>
180+
<artifactId>slf4j-api</artifactId>
181+
</exclusion>
142182
</exclusions>
143183
</dependency>
144184
<dependency>
@@ -170,8 +210,62 @@
170210
<groupId>org.slf4j</groupId>
171211
<artifactId>slf4j-reload4j</artifactId>
172212
</exclusion>
213+
<!--
214+
TODO This has been fixed at https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
215+
This exclusion can be removed once we update to `apache/hive:4.1.0`.
216+
-->
217+
<exclusion>
218+
<groupId>org.slf4j</groupId>
219+
<artifactId>slf4j-api</artifactId>
220+
</exclusion>
173221
</exclusions>
174222
</dependency>
223+
224+
<!--
225+
TODO Fix class conflicts in master branch of apache/hive .
226+
Refer to https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
227+
-->
228+
<dependency>
229+
<groupId>commons-codec</groupId>
230+
<artifactId>commons-codec</artifactId>
231+
<version>${commons-codec.version}</version>
232+
</dependency>
233+
<!--
234+
TODO Fix class conflicts in master branch of apache/hive .
235+
Refer to https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
236+
-->
237+
<dependency>
238+
<groupId>commons-logging</groupId>
239+
<artifactId>commons-logging</artifactId>
240+
<version>${commons-logging.version}</version>
241+
</dependency>
242+
<!--
243+
TODO Fix class conflicts in master branch of apache/hive .
244+
Refer to https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
245+
-->
246+
<dependency>
247+
<groupId>org.apache.commons</groupId>
248+
<artifactId>commons-text</artifactId>
249+
<version>${commons-text.version}</version>
250+
</dependency>
251+
<!--
252+
TODO Fix class conflicts in master branch of apache/hadoop .
253+
Refer to https://github.com/apache/hadoop/blob/release-3.3.6-RC1/hadoop-project/pom.xml#L1244 .
254+
-->
255+
<dependency>
256+
<groupId>org.codehaus.woodstox</groupId>
257+
<artifactId>stax2-api</artifactId>
258+
<version>4.2.1</version>
259+
</dependency>
260+
<!--
261+
TODO Fix class conflicts in master branch of apache/hive .
262+
Refer to https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
263+
-->
264+
<dependency>
265+
<groupId>org.slf4j</groupId>
266+
<artifactId>slf4j-api</artifactId>
267+
<version>${slf4j.version}</version>
268+
</dependency>
175269
</dependencies>
176270

177271
<build>

0 commit comments

Comments
 (0)