Skip to content

Commit 025ad17

Browse files
pjfanningpjfanning
committed
HADOOP-19014. Jackson 2.14.3 requiring jsr311-compat
1 parent 95ea31f commit 025ad17

File tree

11 files changed

+72
-8
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-nodemanager
      • hadoop-yarn-server-resourcemanager

11 files changed

+72
-8
lines changed

‎LICENSE-binary

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -218,12 +218,12 @@ com.aliyun.oss:aliyun-sdk-oss:3.13.2
218218
com.amazonaws:aws-java-sdk-bundle:1.12.565
219219
com.cedarsoftware:java-util:1.9.0
220220
com.cedarsoftware:json-io:2.5.1
221-
com.fasterxml.jackson.core:jackson-annotations:2.12.7
222-
com.fasterxml.jackson.core:jackson-core:2.12.7
223-
com.fasterxml.jackson.core:jackson-databind:2.12.7.1
224-
com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.12.7
225-
com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.12.7
226-
com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.12.7
221+
com.fasterxml.jackson.core:jackson-annotations:2.14.3
222+
com.fasterxml.jackson.core:jackson-core:2.14.3
223+
com.fasterxml.jackson.core:jackson-databind:2.14.3
224+
com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.14.3
225+
com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.14.3
226+
com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.14.3
227227
com.fasterxml.uuid:java-uuid-generator:3.1.4
228228
com.fasterxml.woodstox:woodstox-core:5.4.0
229229
com.github.davidmoten:rxjava-extras:0.8.0.17
@@ -496,6 +496,7 @@ CDDL 1.1 + GPLv2 with classpath exception
496496
-----------------------------------------
497497

498498
com.github.pjfanning:jersey-json:1.20
499+
com.github.pjfanning:jsr311-compat:0.1.0
499500
com.sun.jersey:jersey-client:1.19.4
500501
com.sun.jersey:jersey-core:1.19.4
501502
com.sun.jersey:jersey-guice:1.19.4

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -449,6 +449,11 @@
449449
</exclusion>
450450
</exclusions>
451451
</dependency>
452+
<dependency>
453+
<groupId>com.github.pjfanning</groupId>
454+
<artifactId>jsr311-compat</artifactId>
455+
<optional>true</optional>
456+
</dependency>
452457
<dependency>
453458
<groupId>com.sun.jersey</groupId>
454459
<artifactId>jersey-server</artifactId>

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,10 @@
6969
<groupId>com.github.pjfanning</groupId>
7070
<artifactId>jersey-json</artifactId>
7171
</exclusion>
72+
<exclusion>
73+
<groupId>com.github.pjfanning</groupId>
74+
<artifactId>jsr311-compat</artifactId>
75+
</exclusion>
7276
<exclusion>
7377
<groupId>org.codehaus.jettison</groupId>
7478
<artifactId>jettison</artifactId>
@@ -174,6 +178,10 @@
174178
<groupId>com.github.pjfanning</groupId>
175179
<artifactId>jersey-json</artifactId>
176180
</exclusion>
181+
<exclusion>
182+
<groupId>com.github.pjfanning</groupId>
183+
<artifactId>jsr311-compat</artifactId>
184+
</exclusion>
177185
<exclusion>
178186
<groupId>org.codehaus.jettison</groupId>
179187
<artifactId>jettison</artifactId>
@@ -229,6 +237,10 @@
229237
<groupId>com.github.pjfanning</groupId>
230238
<artifactId>jersey-json</artifactId>
231239
</exclusion>
240+
<exclusion>
241+
<groupId>com.github.pjfanning</groupId>
242+
<artifactId>jsr311-compat</artifactId>
243+
</exclusion>
232244
<exclusion>
233245
<groupId>org.codehaus.jettison</groupId>
234246
<artifactId>jettison</artifactId>
@@ -290,6 +302,10 @@
290302
<groupId>com.github.pjfanning</groupId>
291303
<artifactId>jersey-json</artifactId>
292304
</exclusion>
305+
<exclusion>
306+
<groupId>com.github.pjfanning</groupId>
307+
<artifactId>jsr311-compat</artifactId>
308+
</exclusion>
293309
<exclusion>
294310
<groupId>org.codehaus.jettison</groupId>
295311
<artifactId>jettison</artifactId>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,11 @@
179179
</exclusion>
180180
</exclusions>
181181
</dependency>
182+
<dependency>
183+
<groupId>com.github.pjfanning</groupId>
184+
<artifactId>jsr311-compat</artifactId>
185+
<scope>runtime</scope>
186+
</dependency>
182187
<dependency>
183188
<!--
184189
adding jettison as direct dependency (as jersey-json's jettison dependency is vulnerable with verison 1.1),

‎hadoop-project/pom.xml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@
6969
<jersey.version>1.19.4</jersey.version>
7070

7171
<!-- jackson versions -->
72-
<jackson2.version>2.12.7</jackson2.version>
73-
<jackson2.databind.version>2.12.7.1</jackson2.databind.version>
72+
<jackson2.version>2.14.3</jackson2.version>
73+
<jackson2.databind.version>2.14.3</jackson2.databind.version>
7474

7575
<!-- httpcomponents versions -->
7676
<httpclient.version>4.5.13</httpclient.version>
@@ -921,6 +921,11 @@
921921
</exclusion>
922922
</exclusions>
923923
</dependency>
924+
<dependency>
925+
<groupId>com.github.pjfanning</groupId>
926+
<artifactId>jsr311-compat</artifactId>
927+
<version>0.1.0</version>
928+
</dependency>
924929
<dependency>
925930
<groupId>com.sun.jersey</groupId>
926931
<artifactId>jersey-server</artifactId>
@@ -2367,6 +2372,7 @@
23672372
<include>com.sun.jersey:jersey-core:1.19.4</include>
23682373
<include>com.sun.jersey:jersey-servlet:1.19.4</include>
23692374
<include>com.github.pjfanning:jersey-json:1.20</include>
2375+
<include>com.github.pjfanning:jsr311-compat:0.1.0</include>
23702376
<include>com.sun.jersey:jersey-server:1.19.4</include>
23712377
<include>com.sun.jersey:jersey-client:1.19.4</include>
23722378
<include>com.sun.jersey:jersey-grizzly2:1.19.4</include>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,11 @@
100100
</exclusion>
101101
</exclusions>
102102
</dependency>
103+
<dependency>
104+
<groupId>com.github.pjfanning</groupId>
105+
<artifactId>jsr311-compat</artifactId>
106+
<scope>runtime</scope>
107+
</dependency>
103108
<dependency>
104109
<groupId>junit</groupId>
105110
<artifactId>junit</artifactId>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,12 @@
130130
</exclusions>
131131
</dependency>
132132

133+
<dependency>
134+
<groupId>com.github.pjfanning</groupId>
135+
<artifactId>jsr311-compat</artifactId>
136+
<scope>runtime</scope>
137+
</dependency>
138+
133139
<dependency>
134140
<groupId>org.apache.solr</groupId>
135141
<artifactId>solr-solrj</artifactId>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,11 @@
198198
</exclusion>
199199
</exclusions>
200200
</dependency>
201+
<dependency>
202+
<groupId>com.github.pjfanning</groupId>
203+
<artifactId>jsr311-compat</artifactId>
204+
<scope>runtime</scope>
205+
</dependency>
201206
<dependency>
202207
<groupId>com.sun.jersey.contribs</groupId>
203208
<artifactId>jersey-guice</artifactId>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,11 @@
123123
</exclusion>
124124
</exclusions>
125125
</dependency>
126+
<dependency>
127+
<groupId>com.github.pjfanning</groupId>
128+
<artifactId>jsr311-compat</artifactId>
129+
<scope>runtime</scope>
130+
</dependency>
126131
<dependency>
127132
<groupId>com.sun.jersey.contribs</groupId>
128133
<artifactId>jersey-guice</artifactId>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,11 @@
172172
</exclusion>
173173
</exclusions>
174174
</dependency>
175+
<dependency>
176+
<groupId>com.github.pjfanning</groupId>
177+
<artifactId>jsr311-compat</artifactId>
178+
<scope>runtime</scope>
179+
</dependency>
175180
<dependency>
176181
<groupId>com.sun.jersey.contribs</groupId>
177182
<artifactId>jersey-guice</artifactId>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,11 @@
129129
</exclusion>
130130
</exclusions>
131131
</dependency>
132+
<dependency>
133+
<groupId>com.github.pjfanning</groupId>
134+
<artifactId>jsr311-compat</artifactId>
135+
<scope>runtime</scope>
136+
</dependency>
132137
<dependency>
133138
<groupId>com.sun.jersey.contribs</groupId>
134139
<artifactId>jersey-guice</artifactId>

0 commit comments

Comments
 (0)