Skip to content

Commit 6318708

Browse files
pjfanningpjfanning
authored
HADOOP-15983. Use jersey-json that is built to use jackson2 (apache#3988)
Signed-off-by: Akira Ajisaka <[email protected]>
1 parent b4ff49a commit 6318708

File tree

13 files changed

+147
-131
lines changed
  • LICENSE-binary
  • hadoop-client-modules
  • hadoop-common-project/hadoop-common
  • hadoop-project
  • hadoop-tools/hadoop-resourceestimator
  • hadoop-yarn-project/hadoop-yarn
    • hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp
    • hadoop-yarn-common
    • hadoop-yarn-server
      • hadoop-yarn-server-applicationhistoryservice
      • hadoop-yarn-server-common
      • hadoop-yarn-server-nodemanager
      • hadoop-yarn-server-resourcemanager
      • hadoop-yarn-server-timelineservice-hbase-tests

13 files changed

+147
-131
lines changed

‎LICENSE-binary‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -324,10 +324,6 @@ org.apache.kerby:token-provider:1.0.1
324324
org.apache.solr:solr-solrj:8.8.2
325325
org.apache.yetus:audience-annotations:0.5.0
326326
org.apache.zookeeper:zookeeper:3.6.3
327-
org.codehaus.jackson:jackson-core-asl:1.9.13
328-
org.codehaus.jackson:jackson-jaxrs:1.9.13
329-
org.codehaus.jackson:jackson-mapper-asl:1.9.13
330-
org.codehaus.jackson:jackson-xc:1.9.13
331327
org.codehaus.jettison:jettison:1.1
332328
org.eclipse.jetty:jetty-annotations:9.4.44.v20210927
333329
org.eclipse.jetty:jetty-http:9.4.44.v20210927
@@ -484,12 +480,12 @@ org.slf4j:slf4j-log4j12:1.7.25
484480
CDDL 1.1 + GPLv2 with classpath exception
485481
-----------------------------------------
486482

487-
com.sun.jersey:jersey-client:1.19
488-
com.sun.jersey:jersey-core:1.19
489-
com.sun.jersey:jersey-guice:1.19
490-
com.sun.jersey:jersey-json:1.19
491-
com.sun.jersey:jersey-server:1.19
492-
com.sun.jersey:jersey-servlet:1.19
483+
com.github.pjfanning:jersey-json:1.20
484+
com.sun.jersey:jersey-client:1.19.4
485+
com.sun.jersey:jersey-core:1.19.4
486+
com.sun.jersey:jersey-guice:1.19.4
487+
com.sun.jersey:jersey-server:1.19.4
488+
com.sun.jersey:jersey-servlet:1.19.4
493489
com.sun.xml.bind:jaxb-impl:2.2.3-1
494490
javax.annotation:javax.annotation-api:1.3.2
495491
javax.servlet:javax.servlet-api:3.1.0

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -423,29 +423,25 @@
423423
<optional>true</optional>
424424
</dependency>
425425
<dependency>
426-
<groupId>com.sun.jersey</groupId>
426+
<groupId>com.github.pjfanning</groupId>
427427
<artifactId>jersey-json</artifactId>
428428
<optional>true</optional>
429429
<exclusions>
430430
<exclusion>
431-
<groupId>javax.xml.bind</groupId>
432-
<artifactId>jaxb-api</artifactId>
433-
</exclusion>
434-
<exclusion>
435-
<groupId>org.codehaus.jackson</groupId>
436-
<artifactId>jackson-core-asl</artifactId>
431+
<groupId>com.fasterxml.jackson.core</groupId>
432+
<artifactId>jackson-core</artifactId>
437433
</exclusion>
438434
<exclusion>
439-
<groupId>org.codehaus.jackson</groupId>
440-
<artifactId>jackson-mapper-asl</artifactId>
435+
<groupId>com.fasterxml.jackson.core</groupId>
436+
<artifactId>jackson-databind</artifactId>
441437
</exclusion>
442438
<exclusion>
443-
<groupId>org.codehaus.jackson</groupId>
444-
<artifactId>jackson-jaxrs</artifactId>
439+
<groupId>com.fasterxml.jackson.jaxrs</groupId>
440+
<artifactId>jackson-jaxrs-json-provider</artifactId>
445441
</exclusion>
446442
<exclusion>
447-
<groupId>org.codehaus.jackson</groupId>
448-
<artifactId>jackson-xc</artifactId>
443+
<groupId>com.sun.xml.bind</groupId>
444+
<artifactId>jaxb-impl</artifactId>
449445
</exclusion>
450446
</exclusions>
451447
</dependency>
@@ -467,6 +463,10 @@
467463
<groupId>javax.enterprise</groupId>
468464
<artifactId>cdi-api</artifactId>
469465
</exclusion>
466+
<exclusion>
467+
<groupId>ch.qos.cal10n</groupId>
468+
<artifactId>cal10n-api</artifactId>
469+
</exclusion>
470470
</exclusions>
471471
</dependency>
472472
<!-- skip org.apache.avro:avro-ipc because it doesn't look like hadoop-common actually uses it -->

‎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>
@@ -167,7 +167,7 @@
167167
<artifactId>jersey-core</artifactId>
168168
</exclusion>
169169
<exclusion>
170-
<groupId>com.sun.jersey</groupId>
170+
<groupId>com.github.pjfanning</groupId>
171171
<artifactId>jersey-json</artifactId>
172172
</exclusion>
173173
<exclusion>
@@ -218,7 +218,7 @@
218218
<artifactId>jersey-server</artifactId>
219219
</exclusion>
220220
<exclusion>
221-
<groupId>com.sun.jersey</groupId>
221+
<groupId>com.github.pjfanning</groupId>
222222
<artifactId>jersey-json</artifactId>
223223
</exclusion>
224224
<exclusion>
@@ -275,7 +275,7 @@
275275
<artifactId>guice-servlet</artifactId>
276276
</exclusion>
277277
<exclusion>
278-
<groupId>com.sun.jersey</groupId>
278+
<groupId>com.github.pjfanning</groupId>
279279
<artifactId>jersey-json</artifactId>
280280
</exclusion>
281281
<exclusion>

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

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -150,29 +150,28 @@
150150
<groupId>javax.servlet</groupId>
151151
<artifactId>servlet-api</artifactId>
152152
</exclusion>
153+
<exclusion>
154+
<groupId>ch.qos.cal10n</groupId>
155+
<artifactId>cal10n-api</artifactId>
156+
</exclusion>
153157
</exclusions>
154158
</dependency>
155159
<dependency>
156-
<!-- Used, even though 'mvn dependency:analyze' doesn't find it -->
157-
<groupId>com.sun.jersey</groupId>
160+
<groupId>com.github.pjfanning</groupId>
158161
<artifactId>jersey-json</artifactId>
159162
<scope>compile</scope>
160163
<exclusions>
161164
<exclusion>
162-
<groupId>org.codehaus.jackson</groupId>
163-
<artifactId>jackson-core-asl</artifactId>
164-
</exclusion>
165-
<exclusion>
166-
<groupId>org.codehaus.jackson</groupId>
167-
<artifactId>jackson-mapper-asl</artifactId>
165+
<groupId>com.fasterxml.jackson.core</groupId>
166+
<artifactId>jackson-core</artifactId>
168167
</exclusion>
169168
<exclusion>
170-
<groupId>org.codehaus.jackson</groupId>
171-
<artifactId>jackson-jaxrs</artifactId>
169+
<groupId>com.fasterxml.jackson.core</groupId>
170+
<artifactId>jackson-databind</artifactId>
172171
</exclusion>
173172
<exclusion>
174-
<groupId>org.codehaus.jackson</groupId>
175-
<artifactId>jackson-xc</artifactId>
173+
<groupId>com.fasterxml.jackson.jaxrs</groupId>
174+
<artifactId>jackson-jaxrs-json-provider</artifactId>
176175
</exclusion>
177176
</exclusions>
178177
</dependency>

‎hadoop-project/pom.xml‎

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

6868
<!-- jersey version -->
69-
<jersey.version>1.19</jersey.version>
69+
<jersey.version>1.19.4</jersey.version>
7070

7171
<!-- jackson versions -->
72-
<jackson.version>1.9.13</jackson.version>
7372
<jackson2.version>2.13.2</jackson2.version>
7473
<jackson2.databind.version>2.13.2.2</jackson2.databind.version>
7574

@@ -878,29 +877,21 @@
878877
<version>${jersey.version}</version>
879878
</dependency>
880879
<dependency>
881-
<groupId>com.sun.jersey</groupId>
880+
<groupId>com.github.pjfanning</groupId>
882881
<artifactId>jersey-json</artifactId>
883-
<version>${jersey.version}</version>
882+
<version>1.20</version>
884883
<exclusions>
885884
<exclusion>
886-
<groupId>stax</groupId>
887-
<artifactId>stax-api</artifactId>
885+
<groupId>com.fasterxml.jackson.core</groupId>
886+
<artifactId>jackson-core</artifactId>
888887
</exclusion>
889888
<exclusion>
890-
<groupId>org.codehaus.jackson</groupId>
891-
<artifactId>jackson-core-asl</artifactId>
889+
<groupId>com.fasterxml.jackson.core</groupId>
890+
<artifactId>jackson-databind</artifactId>
892891
</exclusion>
893892
<exclusion>
894-
<groupId>org.codehaus.jackson</groupId>
895-
<artifactId>jackson-mapper-asl</artifactId>
896-
</exclusion>
897-
<exclusion>
898-
<groupId>org.codehaus.jackson</groupId>
899-
<artifactId>jackson-jaxrs</artifactId>
900-
</exclusion>
901-
<exclusion>
902-
<groupId>org.codehaus.jackson</groupId>
903-
<artifactId>jackson-xc</artifactId>
893+
<groupId>com.fasterxml.jackson.jaxrs</groupId>
894+
<artifactId>jackson-jaxrs-json-provider</artifactId>
904895
</exclusion>
905896
</exclusions>
906897
</dependency>
@@ -1182,30 +1173,6 @@
11821173
<artifactId>woodstox-core</artifactId>
11831174
<version>${woodstox.version}</version>
11841175
</dependency>
1185-
<dependency>
1186-
<groupId>org.codehaus.jackson</groupId>
1187-
<artifactId>jackson-mapper-asl</artifactId>
1188-
<version>${jackson.version}</version>
1189-
<scope>runtime</scope>
1190-
</dependency>
1191-
<dependency>
1192-
<groupId>org.codehaus.jackson</groupId>
1193-
<artifactId>jackson-core-asl</artifactId>
1194-
<version>${jackson.version}</version>
1195-
<scope>runtime</scope>
1196-
</dependency>
1197-
<dependency>
1198-
<groupId>org.codehaus.jackson</groupId>
1199-
<artifactId>jackson-jaxrs</artifactId>
1200-
<version>${jackson.version}</version>
1201-
<scope>runtime</scope>
1202-
</dependency>
1203-
<dependency>
1204-
<groupId>org.codehaus.jackson</groupId>
1205-
<artifactId>jackson-xc</artifactId>
1206-
<version>${jackson.version}</version>
1207-
<scope>runtime</scope>
1208-
</dependency>
12091176
<dependency>
12101177
<groupId>com.fasterxml.jackson.core</groupId>
12111178
<artifactId>jackson-core</artifactId>
@@ -2248,16 +2215,16 @@
22482215
<!-- for JDK 8 support -->
22492216
<include>cglib:cglib:3.2.0</include>
22502217
<include>com.google.inject:guice:4.0</include>
2251-
<include>com.sun.jersey:jersey-core:1.19</include>
2252-
<include>com.sun.jersey:jersey-servlet:1.19</include>
2253-
<include>com.sun.jersey:jersey-json:1.19</include>
2254-
<include>com.sun.jersey:jersey-server:1.19</include>
2255-
<include>com.sun.jersey:jersey-client:1.19</include>
2256-
<include>com.sun.jersey:jersey-grizzly2:1.19</include>
2257-
<include>com.sun.jersey:jersey-grizzly2-servlet:1.19</include>
2258-
<include>com.sun.jersey.jersey-test-framework:jersey-test-framework-core:1.19</include>
2259-
<include>com.sun.jersey.jersey-test-framework:jersey-test-framework-grizzly2:1.19</include>
2260-
<include>com.sun.jersey.contribs:jersey-guice:1.19</include>
2218+
<include>com.sun.jersey:jersey-core:1.19.4</include>
2219+
<include>com.sun.jersey:jersey-servlet:1.19.4</include>
2220+
<include>com.github.pjfanning:jersey-json:1.20</include>
2221+
<include>com.sun.jersey:jersey-server:1.19.4</include>
2222+
<include>com.sun.jersey:jersey-client:1.19.4</include>
2223+
<include>com.sun.jersey:jersey-grizzly2:1.19.4</include>
2224+
<include>com.sun.jersey:jersey-grizzly2-servlet:1.19.4</include>
2225+
<include>com.sun.jersey.jersey-test-framework:jersey-test-framework-core:1.19.4</include>
2226+
<include>com.sun.jersey.jersey-test-framework:jersey-test-framework-grizzly2:1.19.4</include>
2227+
<include>com.sun.jersey.contribs:jersey-guice:1.19.4</include>
22612228
<include>org.ow2.asm:asm:5.0.0</include>
22622229
</includes>
22632230
</bannedDependencies>
@@ -2520,5 +2487,6 @@
25202487
</profiles>
25212488

25222489
<repositories>
2490+
25232491
</repositories>
25242492
</project>

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

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -79,24 +79,20 @@
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
<exclusions>
8585
<exclusion>
86-
<groupId>org.codehaus.jackson</groupId>
87-
<artifactId>jackson-core-asl</artifactId>
88-
</exclusion>
89-
<exclusion>
90-
<groupId>org.codehaus.jackson</groupId>
91-
<artifactId>jackson-mapper-asl</artifactId>
86+
<groupId>com.fasterxml.jackson.core</groupId>
87+
<artifactId>jackson-core</artifactId>
9288
</exclusion>
9389
<exclusion>
94-
<groupId>org.codehaus.jackson</groupId>
95-
<artifactId>jackson-jaxrs</artifactId>
90+
<groupId>com.fasterxml.jackson.core</groupId>
91+
<artifactId>jackson-databind</artifactId>
9692
</exclusion>
9793
<exclusion>
98-
<groupId>org.codehaus.jackson</groupId>
99-
<artifactId>jackson-xc</artifactId>
94+
<groupId>com.fasterxml.jackson.jaxrs</groupId>
95+
<artifactId>jackson-jaxrs-json-provider</artifactId>
10096
</exclusion>
10197
</exclusions>
10298
</dependency>

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,22 @@
9292
</dependency>
9393

9494
<dependency>
95-
<groupId>com.sun.jersey</groupId>
95+
<groupId>com.github.pjfanning</groupId>
9696
<artifactId>jersey-json</artifactId>
97-
<version>${jersey.version}</version>
97+
<exclusions>
98+
<exclusion>
99+
<groupId>com.fasterxml.jackson.core</groupId>
100+
<artifactId>jackson-core</artifactId>
101+
</exclusion>
102+
<exclusion>
103+
<groupId>com.fasterxml.jackson.core</groupId>
104+
<artifactId>jackson-databind</artifactId>
105+
</exclusion>
106+
<exclusion>
107+
<groupId>com.fasterxml.jackson.jaxrs</groupId>
108+
<artifactId>jackson-jaxrs-json-provider</artifactId>
109+
</exclusion>
110+
</exclusions>
98111
</dependency>
99112

100113
<dependency>

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

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,22 @@
156156
<artifactId>jersey-server</artifactId>
157157
</dependency>
158158
<dependency>
159-
<groupId>com.sun.jersey</groupId>
159+
<groupId>com.github.pjfanning</groupId>
160160
<artifactId>jersey-json</artifactId>
161+
<exclusions>
162+
<exclusion>
163+
<groupId>com.fasterxml.jackson.core</groupId>
164+
<artifactId>jackson-core</artifactId>
165+
</exclusion>
166+
<exclusion>
167+
<groupId>com.fasterxml.jackson.core</groupId>
168+
<artifactId>jackson-databind</artifactId>
169+
</exclusion>
170+
<exclusion>
171+
<groupId>com.fasterxml.jackson.jaxrs</groupId>
172+
<artifactId>jackson-jaxrs-json-provider</artifactId>
173+
</exclusion>
174+
</exclusions>
161175
</dependency>
162176
<dependency>
163177
<groupId>com.sun.jersey.contribs</groupId>

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,26 @@
100100
<artifactId>jersey-client</artifactId>
101101
</dependency>
102102
<dependency>
103-
<groupId>com.sun.jersey.contribs</groupId>
104-
<artifactId>jersey-guice</artifactId>
103+
<groupId>com.github.pjfanning</groupId>
104+
<artifactId>jersey-json</artifactId>
105+
<exclusions>
106+
<exclusion>
107+
<groupId>com.fasterxml.jackson.core</groupId>
108+
<artifactId>jackson-core</artifactId>
109+
</exclusion>
110+
<exclusion>
111+
<groupId>com.fasterxml.jackson.core</groupId>
112+
<artifactId>jackson-databind</artifactId>
113+
</exclusion>
114+
<exclusion>
115+
<groupId>com.fasterxml.jackson.jaxrs</groupId>
116+
<artifactId>jackson-jaxrs-json-provider</artifactId>
117+
</exclusion>
118+
</exclusions>
105119
</dependency>
106120
<dependency>
107-
<groupId>com.sun.jersey</groupId>
108-
<artifactId>jersey-json</artifactId>
121+
<groupId>com.sun.jersey.contribs</groupId>
122+
<artifactId>jersey-guice</artifactId>
109123
</dependency>
110124
<!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
111125
<dependency>

0 commit comments

Comments
 (0)