Skip to content

Commit 183c257

Browse files
Apache9Apache9
committed
HBASE-27148 Move minimum hadoop 3 support version to 3.2.3
1 parent 9bae50f commit 183c257

File tree

5 files changed

+29
-163
lines changed

5 files changed

+29
-163
lines changed

‎hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -81,38 +81,6 @@
8181
<artifactId>hadoop-common</artifactId>
8282
<scope>provided</scope>
8383
</dependency>
84-
<dependency>
85-
<groupId>org.codehaus.jackson</groupId>
86-
<artifactId>jackson-jaxrs</artifactId>
87-
<version>1.9.13</version>
88-
<scope>provided</scope>
89-
<exclusions>
90-
<exclusion>
91-
<groupId>org.codehaus.jackson</groupId>
92-
<artifactId>jackson-mapper-asl</artifactId>
93-
</exclusion>
94-
<exclusion>
95-
<groupId>org.codehaus.jackson</groupId>
96-
<artifactId>jackson-core-asl</artifactId>
97-
</exclusion>
98-
</exclusions>
99-
</dependency>
100-
<dependency>
101-
<groupId>org.codehaus.jackson</groupId>
102-
<artifactId>jackson-xc</artifactId>
103-
<version>1.9.13</version>
104-
<scope>provided</scope>
105-
<exclusions>
106-
<exclusion>
107-
<groupId>org.codehaus.jackson</groupId>
108-
<artifactId>jackson-mapper-asl</artifactId>
109-
</exclusion>
110-
<exclusion>
111-
<groupId>org.codehaus.jackson</groupId>
112-
<artifactId>jackson-core-asl</artifactId>
113-
</exclusion>
114-
</exclusions>
115-
</dependency>
11684
</dependencies>
11785
</profile>
11886
</profiles>

‎hbase-shaded/hbase-shaded-mapreduce/pom.xml‎

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -203,52 +203,6 @@
203203
<groupId>org.apache.hadoop</groupId>
204204
<artifactId>hadoop-mapreduce-client-core</artifactId>
205205
<scope>provided</scope>
206-
<exclusions>
207-
<exclusion>
208-
<groupId>com.google.guava</groupId>
209-
<artifactId>guava</artifactId>
210-
</exclusion>
211-
<exclusion>
212-
<groupId>javax.xml.bind</groupId>
213-
<artifactId>jaxb-api</artifactId>
214-
</exclusion>
215-
<exclusion>
216-
<groupId>javax.ws.rs</groupId>
217-
<artifactId>jsr311-api</artifactId>
218-
</exclusion>
219-
</exclusions>
220-
</dependency>
221-
<dependency>
222-
<groupId>org.codehaus.jackson</groupId>
223-
<artifactId>jackson-jaxrs</artifactId>
224-
<version>1.9.13</version>
225-
<scope>provided</scope>
226-
<exclusions>
227-
<exclusion>
228-
<groupId>org.codehaus.jackson</groupId>
229-
<artifactId>jackson-mapper-asl</artifactId>
230-
</exclusion>
231-
<exclusion>
232-
<groupId>org.codehaus.jackson</groupId>
233-
<artifactId>jackson-core-asl</artifactId>
234-
</exclusion>
235-
</exclusions>
236-
</dependency>
237-
<dependency>
238-
<groupId>org.codehaus.jackson</groupId>
239-
<artifactId>jackson-xc</artifactId>
240-
<version>1.9.13</version>
241-
<scope>provided</scope>
242-
<exclusions>
243-
<exclusion>
244-
<groupId>org.codehaus.jackson</groupId>
245-
<artifactId>jackson-mapper-asl</artifactId>
246-
</exclusion>
247-
<exclusion>
248-
<groupId>org.codehaus.jackson</groupId>
249-
<artifactId>jackson-core-asl</artifactId>
250-
</exclusion>
251-
</exclusions>
252206
</dependency>
253207
</dependencies>
254208
</profile>

‎hbase-shaded/hbase-shaded-testing-util-tester/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,6 @@
8484
<version>${project.version}</version>
8585
<scope>test</scope>
8686
</dependency>
87-
<dependency>
88-
<groupId>org.codehaus.jackson</groupId>
89-
<artifactId>jackson-mapper-asl</artifactId>
90-
<version>1.9.13</version>
91-
<scope>test</scope>
92-
</dependency>
9387
</dependencies>
9488

9589
</project>

‎hbase-shaded/hbase-shaded-testing-util/pom.xml‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -38,36 +38,6 @@
3838
<version>${hadoop.version}</version>
3939
<type>test-jar</type>
4040
<scope>compile</scope>
41-
<exclusions>
42-
<exclusion>
43-
<groupId>javax.servlet.jsp</groupId>
44-
<artifactId>jsp-api</artifactId>
45-
</exclusion>
46-
<exclusion>
47-
<groupId>org.codehaus.jackson</groupId>
48-
<artifactId>jackson-mapper-asl</artifactId>
49-
</exclusion>
50-
<exclusion>
51-
<groupId>org.codehaus.jackson</groupId>
52-
<artifactId>jackson-core-asl</artifactId>
53-
</exclusion>
54-
<exclusion>
55-
<groupId>org.codehaus.jackson</groupId>
56-
<artifactId>jackson-jaxrs</artifactId>
57-
</exclusion>
58-
<exclusion>
59-
<groupId>org.codehaus.jackson</groupId>
60-
<artifactId>jackson-xc</artifactId>
61-
</exclusion>
62-
<exclusion>
63-
<groupId>javax.xml.bind</groupId>
64-
<artifactId>jaxb-api</artifactId>
65-
</exclusion>
66-
<exclusion>
67-
<groupId>javax.ws.rs</groupId>
68-
<artifactId>jsr311-api</artifactId>
69-
</exclusion>
70-
</exclusions>
7141
</dependency>
7242
<dependency>
7343
<groupId>org.apache.hadoop</groupId>
@@ -123,12 +93,6 @@
12393
<type>test-jar</type>
12494
<scope>compile</scope>
12595
</dependency>
126-
<dependency>
127-
<groupId>org.codehaus.jackson</groupId>
128-
<artifactId>jackson-jaxrs</artifactId>
129-
<version>1.9.13</version>
130-
<scope>compile</scope>
131-
</dependency>
13296
<dependency>
13397
<groupId>org.apache.hbase</groupId>
13498
<artifactId>hbase-testing-util</artifactId>

‎pom.xml‎

Lines changed: 29 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -771,7 +771,7 @@
771771
<maven.min.version>3.0.4</maven.min.version>
772772
<java.min.version>${compileSource}</java.min.version>
773773
<!-- Dependencies -->
774-
<hadoop-three.version>3.1.2</hadoop-three.version>
774+
<hadoop-three.version>3.2.3</hadoop-three.version>
775775
<!-- These must be defined here for downstream build tools that don't look at profiles.
776776
-->
777777
<hadoop.version>${hadoop-three.version}</hadoop.version>
@@ -3128,8 +3128,6 @@
31283128
--add-opens java.base/java.lang.reflect=ALL-UNNAMED
31293129
--add-exports java.base/jdk.internal.misc=ALL-UNNAMED
31303130
${hbase-surefire.argLine}</argLine>
3131-
<!-- We need a minimum HDFS version of 3.2.0 for HADOOP-12760 -->
3132-
<hadoop-three.version>3.2.0</hadoop-three.version>
31333131
<!--
31343132
Value to use for surefire when running jdk11.
31353133
TODO: replicate logic for windows
@@ -3345,12 +3343,16 @@
33453343
<artifactId>jersey-core</artifactId>
33463344
</exclusion>
33473345
<exclusion>
3348-
<groupId>org.codehaus.jackson</groupId>
3349-
<artifactId>jackson-jaxrs</artifactId>
3346+
<groupId>javax.xml.bind</groupId>
3347+
<artifactId>jaxb-api</artifactId>
3348+
</exclusion>
3349+
<exclusion>
3350+
<groupId>javax.ws.rs</groupId>
3351+
<artifactId>jsr311-api</artifactId>
33503352
</exclusion>
33513353
<exclusion>
33523354
<groupId>org.codehaus.jackson</groupId>
3353-
<artifactId>jackson-xc</artifactId>
3355+
<artifactId>*</artifactId>
33543356
</exclusion>
33553357
<exclusion>
33563358
<groupId>io.netty</groupId>
@@ -3368,14 +3370,6 @@
33683370
<groupId>javax.inject</groupId>
33693371
<artifactId>javax.inject</artifactId>
33703372
</exclusion>
3371-
<exclusion>
3372-
<groupId>org.codehaus.jackson</groupId>
3373-
<artifactId>jackson-core-asl</artifactId>
3374-
</exclusion>
3375-
<exclusion>
3376-
<groupId>org.codehaus.jackson</groupId>
3377-
<artifactId>jackson-mapper-asl</artifactId>
3378-
</exclusion>
33793373
<exclusion>
33803374
<groupId>com.google.guava</groupId>
33813375
<artifactId>guava</artifactId>
@@ -3406,19 +3400,7 @@
34063400
<exclusions>
34073401
<exclusion>
34083402
<groupId>org.codehaus.jackson</groupId>
3409-
<artifactId>jackson-mapper-asl</artifactId>
3410-
</exclusion>
3411-
<exclusion>
3412-
<groupId>org.codehaus.jackson</groupId>
3413-
<artifactId>jackson-core-asl</artifactId>
3414-
</exclusion>
3415-
<exclusion>
3416-
<groupId>org.codehaus.jackson</groupId>
3417-
<artifactId>jackson-jaxrs</artifactId>
3418-
</exclusion>
3419-
<exclusion>
3420-
<groupId>org.codehaus.jackson</groupId>
3421-
<artifactId>jackson-xc</artifactId>
3403+
<artifactId>*</artifactId>
34223404
</exclusion>
34233405
<exclusion>
34243406
<groupId>javax.xml.bind</groupId>
@@ -3549,11 +3531,7 @@
35493531
</exclusion>
35503532
<exclusion>
35513533
<groupId>org.codehaus.jackson</groupId>
3552-
<artifactId>jackson-core-asl</artifactId>
3553-
</exclusion>
3554-
<exclusion>
3555-
<groupId>org.codehaus.jackson</groupId>
3556-
<artifactId>jackson-mapper-asl</artifactId>
3534+
<artifactId>*</artifactId>
35573535
</exclusion>
35583536
<exclusion>
35593537
<groupId>com.google.guava</groupId>
@@ -3610,11 +3588,7 @@
36103588
</exclusion>
36113589
<exclusion>
36123590
<groupId>org.codehaus.jackson</groupId>
3613-
<artifactId>jackson-core-asl</artifactId>
3614-
</exclusion>
3615-
<exclusion>
3616-
<groupId>org.codehaus.jackson</groupId>
3617-
<artifactId>jackson-mapper-asl</artifactId>
3591+
<artifactId>*</artifactId>
36183592
</exclusion>
36193593
<exclusion>
36203594
<groupId>com.google.guava</groupId>
@@ -3756,12 +3730,8 @@
37563730
<artifactId>junit</artifactId>
37573731
</exclusion>
37583732
<exclusion>
3759-
<groupId>org.codehause.jackson</groupId>
3760-
<artifactId>jackson-core-asl</artifactId>
3761-
</exclusion>
3762-
<exclusion>
3763-
<groupId>org.codehause.jackson</groupId>
3764-
<artifactId>jackson-mapper-asl</artifactId>
3733+
<groupId>org.codehaus.jackson</groupId>
3734+
<artifactId>*</artifactId>
37653735
</exclusion>
37663736
<exclusion>
37673737
<groupId>org.slf4j</groupId>
@@ -3836,6 +3806,22 @@
38363806
<artifactId>netty-all</artifactId>
38373807
</exclusion>
38383808
-->
3809+
<exclusion>
3810+
<groupId>org.codehaus.jackson</groupId>
3811+
<artifactId>*</artifactId>
3812+
</exclusion>
3813+
<exclusion>
3814+
<groupId>javax.servlet.jsp</groupId>
3815+
<artifactId>jsp-api</artifactId>
3816+
</exclusion>
3817+
<exclusion>
3818+
<groupId>javax.xml.bind</groupId>
3819+
<artifactId>jaxb-api</artifactId>
3820+
</exclusion>
3821+
<exclusion>
3822+
<groupId>javax.ws.rs</groupId>
3823+
<artifactId>jsr311-api</artifactId>
3824+
</exclusion>
38393825
</exclusions>
38403826
</dependency>
38413827
<dependency>

0 commit comments

Comments
 (0)