Skip to content

Commit 1545e6c

Browse files
prabhjyotsinghprabhjyotsingh
committed
YARN-9081. Update jackson from 1.9.13 to 2.x in hadoop-yarn-services-core.
HADOOP-15983. Use jersey-json that is built to use jackson2 (apache#3988)
1 parent d45a329 commit 1545e6c

File tree

19 files changed

+307
-166
lines changed

19 files changed

+307
-166
lines changed

‎hadoop-client-modules/hadoop-client-minicluster/pom.xml‎

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -417,29 +417,25 @@
417417
<optional>true</optional>
418418
</dependency>
419419
<dependency>
420-
<groupId>com.sun.jersey</groupId>
420+
<groupId>com.github.pjfanning</groupId>
421421
<artifactId>jersey-json</artifactId>
422422
<optional>true</optional>
423423
<exclusions>
424424
<exclusion>
425-
<groupId>javax.xml.bind</groupId>
426-
<artifactId>jaxb-api</artifactId>
427-
</exclusion>
428-
<exclusion>
429-
<groupId>org.codehaus.jackson</groupId>
430-
<artifactId>jackson-core-asl</artifactId>
425+
<groupId>com.fasterxml.jackson.core</groupId>
426+
<artifactId>jackson-core</artifactId>
431427
</exclusion>
432428
<exclusion>
433-
<groupId>org.codehaus.jackson</groupId>
434-
<artifactId>jackson-mapper-asl</artifactId>
429+
<groupId>com.fasterxml.jackson.core</groupId>
430+
<artifactId>jackson-databind</artifactId>
435431
</exclusion>
436432
<exclusion>
437-
<groupId>org.codehaus.jackson</groupId>
438-
<artifactId>jackson-jaxrs</artifactId>
433+
<groupId>com.fasterxml.jackson.jaxrs</groupId>
434+
<artifactId>jackson-jaxrs-json-provider</artifactId>
439435
</exclusion>
440436
<exclusion>
441-
<groupId>org.codehaus.jackson</groupId>
442-
<artifactId>jackson-xc</artifactId>
437+
<groupId>com.sun.xml.bind</groupId>
438+
<artifactId>jaxb-impl</artifactId>
443439
</exclusion>
444440
</exclusions>
445441
</dependency>
@@ -449,9 +445,23 @@
449445
<optional>true</optional>
450446
</dependency>
451447
<dependency>
452-
<groupId>com.sun.jersey</groupId>
453-
<artifactId>jersey-servlet</artifactId>
448+
<groupId>com.sun.jersey</groupId>
449+
<artifactId>jersey-servlet</artifactId>
454450
<optional>true</optional>
451+
<exclusions>
452+
<exclusion>
453+
<groupId>javax.servlet</groupId>
454+
<artifactId>servlet-api</artifactId>
455+
</exclusion>
456+
<exclusion>
457+
<groupId>javax.enterprise</groupId>
458+
<artifactId>cdi-api</artifactId>
459+
</exclusion>
460+
<exclusion>
461+
<groupId>ch.qos.cal10n</groupId>
462+
<artifactId>cal10n-api</artifactId>
463+
</exclusion>
464+
</exclusions>
455465
</dependency>
456466
<!-- skip org.apache.avro:avro-ipc because it doesn't look like hadoop-common actually uses it -->
457467
<dependency>

‎hadoop-client-modules/hadoop-client/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<artifactId>jersey-core</artifactId>
6767
</exclusion>
6868
<exclusion>
69-
<groupId>com.sun.jersey</groupId>
69+
<groupId>com.github.pjfanning</groupId>
7070
<artifactId>jersey-json</artifactId>
7171
</exclusion>
7272
<exclusion>
@@ -171,7 +171,7 @@
171171
<artifactId>jersey-core</artifactId>
172172
</exclusion>
173173
<exclusion>
174-
<groupId>com.sun.jersey</groupId>
174+
<groupId>com.github.pjfanning</groupId>
175175
<artifactId>jersey-json</artifactId>
176176
</exclusion>
177177
<exclusion>
@@ -230,7 +230,7 @@
230230
<artifactId>jersey-server</artifactId>
231231
</exclusion>
232232
<exclusion>
233-
<groupId>com.sun.jersey</groupId>
233+
<groupId>com.github.pjfanning</groupId>
234234
<artifactId>jersey-json</artifactId>
235235
</exclusion>
236236
<exclusion>
@@ -287,7 +287,7 @@
287287
<artifactId>guice-servlet</artifactId>
288288
</exclusion>
289289
<exclusion>
290-
<groupId>com.sun.jersey</groupId>
290+
<groupId>com.github.pjfanning</groupId>
291291
<artifactId>jersey-json</artifactId>
292292
</exclusion>
293293
<exclusion>

‎hadoop-common-project/hadoop-common/pom.xml‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,23 @@
133133
<groupId>com.sun.jersey</groupId>
134134
<artifactId>jersey-servlet</artifactId>
135135
<scope>compile</scope>
136+
<exclusions>
137+
<exclusion>
138+
<groupId>javax.enterprise</groupId>
139+
<artifactId>cdi-api</artifactId>
140+
</exclusion>
141+
<exclusion>
142+
<groupId>javax.servlet</groupId>
143+
<artifactId>servlet-api</artifactId>
144+
</exclusion>
145+
<exclusion>
146+
<groupId>ch.qos.cal10n</groupId>
147+
<artifactId>cal10n-api</artifactId>
148+
</exclusion>
149+
</exclusions>
136150
</dependency>
137151
<dependency>
138-
<!-- Used, even though 'mvn dependency:analyze' doesn't find it -->
139-
<groupId>com.sun.jersey</groupId>
152+
<groupId>com.github.pjfanning</groupId>
140153
<artifactId>jersey-json</artifactId>
141154
<scope>compile</scope>
142155
</dependency>
@@ -152,20 +165,16 @@
152165

153166
<exclusions>
154167
<exclusion>
155-
<groupId>org.codehaus.jackson</groupId>
156-
<artifactId>jackson-core-asl</artifactId>
157-
</exclusion>
158-
<exclusion>
159-
<groupId>org.codehaus.jackson</groupId>
160-
<artifactId>jackson-mapper-asl</artifactId>
168+
<groupId>com.fasterxml.jackson.core</groupId>
169+
<artifactId>jackson-core</artifactId>
161170
</exclusion>
162171
<exclusion>
163-
<groupId>org.codehaus.jackson</groupId>
164-
<artifactId>jackson-jaxrs</artifactId>
172+
<groupId>com.fasterxml.jackson.core</groupId>
173+
<artifactId>jackson-databind</artifactId>
165174
</exclusion>
166175
<exclusion>
167-
<groupId>org.codehaus.jackson</groupId>
168-
<artifactId>jackson-xc</artifactId>
176+
<groupId>com.fasterxml.jackson.jaxrs</groupId>
177+
<artifactId>jackson-jaxrs-json-provider</artifactId>
169178
</exclusion>
170179
</exclusions>
171180

‎hadoop-project/pom.xml‎

Lines changed: 34 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,9 @@
6565
<avro.version>1.9.2</avro.version>
6666

6767
<!-- jersey version -->
68-
<jersey.version>1.19</jersey.version>
68+
<jersey.version>1.19.4</jersey.version>
6969

7070
<!-- jackson versions -->
71-
<jackson.version>1.9.13</jackson.version>
7271
<jackson2.version>2.13.2</jackson2.version>
7372
<jackson2.databind.version>2.13.2.2</jackson2.databind.version>
7473

@@ -277,20 +276,18 @@
277276
<exclusion>
278277
<groupId>org.slf4j</groupId>
279278
<artifactId>slf4j-reload4j</artifactId>
280-
281-
</exclusion>
282-
<exclusion>
283-
<groupId>org.codehaus.jackson</groupId>
284-
<artifactId>jackson-mapper-asl</artifactId>
285-
</exclusion>
286-
<exclusion>
287-
<groupId>org.codehaus.jackson</groupId>
288-
<artifactId>jackson-jaxrs</artifactId>
289-
</exclusion>
290-
<exclusion>
291-
<groupId>org.codehaus.jackson</groupId>
292-
<artifactId>jackson-xc</artifactId>
293-
279+
</exclusion>
280+
<exclusion>
281+
<groupId>org.codehaus.jackson</groupId>
282+
<artifactId>jackson-mapper-asl</artifactId>
283+
</exclusion>
284+
<exclusion>
285+
<groupId>org.codehaus.jackson</groupId>
286+
<artifactId>jackson-jaxrs</artifactId>
287+
</exclusion>
288+
<exclusion>
289+
<groupId>org.codehaus.jackson</groupId>
290+
<artifactId>jackson-xc</artifactId>
294291
</exclusion>
295292
</exclusions>
296293
</dependency>
@@ -815,13 +812,17 @@
815812
<version>${jersey.version}</version>
816813
</dependency>
817814
<dependency>
818-
<groupId>com.sun.jersey</groupId>
815+
<groupId>com.github.pjfanning</groupId>
819816
<artifactId>jersey-json</artifactId>
820-
<version>${jersey.version}</version>
817+
<version>1.20</version>
821818
<exclusions>
822819
<exclusion>
823-
<groupId>stax</groupId>
824-
<artifactId>stax-api</artifactId>
820+
<groupId>com.fasterxml.jackson.core</groupId>
821+
<artifactId>jackson-core</artifactId>
822+
</exclusion>
823+
<exclusion>
824+
<groupId>com.fasterxml.jackson.core</groupId>
825+
<artifactId>jackson-databind</artifactId>
825826
</exclusion>
826827
<exclusion>
827828
<groupId>org.codehaus.jackson</groupId>
@@ -836,8 +837,8 @@
836837
<artifactId>jackson-jaxrs</artifactId>
837838
</exclusion>
838839
<exclusion>
839-
<groupId>org.codehaus.jackson</groupId>
840-
<artifactId>jackson-xc</artifactId>
840+
<groupId>com.fasterxml.jackson.jaxrs</groupId>
841+
<artifactId>jackson-jaxrs-json-provider</artifactId>
841842
</exclusion>
842843
</exclusions>
843844
</dependency>
@@ -1096,26 +1097,6 @@
10961097
<artifactId>woodstox-core</artifactId>
10971098
<version>${woodstox.version}</version>
10981099
</dependency>
1099-
<dependency>
1100-
<groupId>org.codehaus.jackson</groupId>
1101-
<artifactId>jackson-mapper-asl</artifactId>
1102-
<version>${jackson.version}</version>
1103-
</dependency>
1104-
<dependency>
1105-
<groupId>org.codehaus.jackson</groupId>
1106-
<artifactId>jackson-core-asl</artifactId>
1107-
<version>${jackson.version}</version>
1108-
</dependency>
1109-
<dependency>
1110-
<groupId>org.codehaus.jackson</groupId>
1111-
<artifactId>jackson-jaxrs</artifactId>
1112-
<version>${jackson.version}</version>
1113-
</dependency>
1114-
<dependency>
1115-
<groupId>org.codehaus.jackson</groupId>
1116-
<artifactId>jackson-xc</artifactId>
1117-
<version>${jackson.version}</version>
1118-
</dependency>
11191100
<dependency>
11201101
<groupId>com.fasterxml.jackson.core</groupId>
11211102
<artifactId>jackson-core</artifactId>
@@ -2029,16 +2010,16 @@
20292010
<!-- for JDK 8 support -->
20302011
<include>cglib:cglib:3.2.0</include>
20312012
<include>com.google.inject:guice:4.0</include>
2032-
<include>com.sun.jersey:jersey-core:1.19</include>
2033-
<include>com.sun.jersey:jersey-servlet:1.19</include>
2034-
<include>com.sun.jersey:jersey-json:1.19</include>
2035-
<include>com.sun.jersey:jersey-server:1.19</include>
2036-
<include>com.sun.jersey:jersey-client:1.19</include>
2037-
<include>com.sun.jersey:jersey-grizzly2:1.19</include>
2038-
<include>com.sun.jersey:jersey-grizzly2-servlet:1.19</include>
2039-
<include>com.sun.jersey.jersey-test-framework:jersey-test-framework-core:1.19</include>
2040-
<include>com.sun.jersey.jersey-test-framework:jersey-test-framework-grizzly2:1.19</include>
2041-
<include>com.sun.jersey.contribs:jersey-guice:1.19</include>
2013+
<include>com.sun.jersey:jersey-core:1.19.4</include>
2014+
<include>com.sun.jersey:jersey-servlet:1.19.4</include>
2015+
<include>com.github.pjfanning:jersey-json:1.20</include>
2016+
<include>com.sun.jersey:jersey-server:1.19.4</include>
2017+
<include>com.sun.jersey:jersey-client:1.19.4</include>
2018+
<include>com.sun.jersey:jersey-grizzly2:1.19.4</include>
2019+
<include>com.sun.jersey:jersey-grizzly2-servlet:1.19.4</include>
2020+
<include>com.sun.jersey.jersey-test-framework:jersey-test-framework-core:1.19.4</include>
2021+
<include>com.sun.jersey.jersey-test-framework:jersey-test-framework-grizzly2:1.19.4</include>
2022+
<include>com.sun.jersey.contribs:jersey-guice:1.19.4</include>
20422023
<include>org.ow2.asm:asm:5.0.0</include>
20432024
</includes>
20442025
</bannedDependencies>
@@ -2272,5 +2253,6 @@
22722253
</profiles>
22732254

22742255
<repositories>
2256+
22752257
</repositories>
22762258
</project>

‎hadoop-tools/hadoop-resourceestimator/pom.xml‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -79,25 +79,21 @@
7979
<artifactId>jersey-server</artifactId>
8080
</dependency>
8181
<dependency>
82-
<groupId>com.sun.jersey</groupId>
82+
<groupId>com.github.pjfanning</groupId>
8383
<artifactId>jersey-json</artifactId>
8484

8585
<exclusions>
8686
<exclusion>
87-
<groupId>org.codehaus.jackson</groupId>
88-
<artifactId>jackson-core-asl</artifactId>
89-
</exclusion>
90-
<exclusion>
91-
<groupId>org.codehaus.jackson</groupId>
92-
<artifactId>jackson-mapper-asl</artifactId>
87+
<groupId>com.fasterxml.jackson.core</groupId>
88+
<artifactId>jackson-core</artifactId>
9389
</exclusion>
9490
<exclusion>
95-
<groupId>org.codehaus.jackson</groupId>
96-
<artifactId>jackson-jaxrs</artifactId>
91+
<groupId>com.fasterxml.jackson.core</groupId>
92+
<artifactId>jackson-databind</artifactId>
9793
</exclusion>
9894
<exclusion>
99-
<groupId>org.codehaus.jackson</groupId>
100-
<artifactId>jackson-xc</artifactId>
95+
<groupId>com.fasterxml.jackson.jaxrs</groupId>
96+
<artifactId>jackson-jaxrs-json-provider</artifactId>
10197
</exclusion>
10298
</exclusions>
10399

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/pom.xml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -118,15 +118,9 @@
118118
</dependency>
119119

120120
<dependency>
121-
<groupId>org.codehaus.jackson</groupId>
122-
<artifactId>jackson-core-asl</artifactId>
123-
</dependency>
124-
125-
<dependency>
126-
<groupId>org.codehaus.jackson</groupId>
127-
<artifactId>jackson-mapper-asl</artifactId>
121+
<groupId>com.fasterxml.jackson.core</groupId>
122+
<artifactId>jackson-databind</artifactId>
128123
</dependency>
129-
130124
<dependency>
131125
<groupId>com.fasterxml.jackson.core</groupId>
132126
<artifactId>jackson-annotations</artifactId>

0 commit comments

Comments
 (0)