Skip to content

Commit 67ad712

Browse files
pjfanningsteveloughran
authored andcommitted
HADOOP-18332. Remove rs-api dependency by downgrading jackson to 2.12.7. (apache#4552)
This downgrades jackson from the version switched to in HADOOP-18033 (2.13.0), to Jackson 2.12.7. This removes the dependency on javax.ws.rs-api, so avoiding runtime problems with applications using jersey-core v1 and/or jsr311-api. The 2.12.7 release still contains the fix for CVE-2020-36518. Contributed by PJ Fanning
1 parent 744f0bd commit 67ad712

File tree

19 files changed

+8
-86
lines changed
  • hadoop-client-modules
  • hadoop-mapreduce-project/hadoop-mapreduce-client
  • hadoop-project
  • hadoop-yarn-project/hadoop-yarn
    • hadoop-yarn-api
    • hadoop-yarn-applications
      • hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp
      • hadoop-yarn-applications-distributedshell
      • hadoop-yarn-services/hadoop-yarn-services-core
    • hadoop-yarn-common
    • hadoop-yarn-server
      • hadoop-yarn-server-applicationhistoryservice
      • hadoop-yarn-server-nodemanager
      • hadoop-yarn-server-resourcemanager
      • hadoop-yarn-server-router
      • hadoop-yarn-server-tests
      • hadoop-yarn-server-timeline-pluginstorage
      • hadoop-yarn-server-timelineservice-hbase-tests
      • hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-common
      • hadoop-yarn-server-timelineservice

19 files changed

+8
-86
lines changed

LICENSE-binary

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -217,12 +217,12 @@ com.aliyun.oss:aliyun-sdk-oss:3.13.0
217217
com.amazonaws:aws-java-sdk-bundle:1.11.901
218218
com.cedarsoftware:java-util:1.9.0
219219
com.cedarsoftware:json-io:2.5.1
220-
com.fasterxml.jackson.core:jackson-annotations:2.13.2
221-
com.fasterxml.jackson.core:jackson-core:2.13.2
222-
com.fasterxml.jackson.core:jackson-databind:2.13.2.2
223-
com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.13.2
224-
com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.13.2
225-
com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.13.2
220+
com.fasterxml.jackson.core:jackson-annotations:2.12.7
221+
com.fasterxml.jackson.core:jackson-core:2.12.7
222+
com.fasterxml.jackson.core:jackson-databind:2.12.7
223+
com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.12.7
224+
com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.12.7
225+
com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.12.7
226226
com.fasterxml.uuid:java-uuid-generator:3.1.4
227227
com.fasterxml.woodstox:woodstox-core:5.3.0
228228
com.github.davidmoten:rxjava-extras:0.8.0.17

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,6 @@
694694
<exclude>org.bouncycastle:*</exclude>
695695
<!-- Leave snappy that includes native methods which cannot be relocated. -->
696696
<exclude>org.xerial.snappy:*</exclude>
697-
<exclude>javax.ws.rs:javax.ws.rs-api</exclude>
698697
</excludes>
699698
</artifactSet>
700699
<filters>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,6 @@
163163
<exclude>org.bouncycastle:*</exclude>
164164
<!-- Leave snappy that includes native methods which cannot be relocated. -->
165165
<exclude>org.xerial.snappy:*</exclude>
166-
<exclude>javax.ws.rs:javax.ws.rs-api</exclude>
167166
</excludes>
168167
</artifactSet>
169168
<filters>

hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,6 @@
7070
</exclusion>
7171
</exclusions>
7272
</dependency>
73-
<dependency>
74-
<groupId>javax.ws.rs</groupId>
75-
<artifactId>javax.ws.rs-api</artifactId>
76-
</dependency>
7773
<dependency>
7874
<groupId>org.apache.hadoop</groupId>
7975
<artifactId>hadoop-common</artifactId>

hadoop-project/pom.xml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,8 @@
7070

7171
<!-- jackson versions -->
7272
<jackson.version>1.9.13</jackson.version>
73-
<jackson2.version>2.13.2</jackson2.version>
74-
<jackson2.databind.version>2.13.2.2</jackson2.databind.version>
75-
76-
<!-- javax ws rs api version -->
77-
<javax.ws.rs-api.version>2.1.1</javax.ws.rs-api.version>
73+
<jackson2.version>2.12.7</jackson2.version>
74+
<jackson2.databind.version>2.12.7</jackson2.databind.version>
7875

7976
<!-- httpcomponents versions -->
8077
<httpclient.version>4.5.13</httpclient.version>
@@ -797,11 +794,6 @@
797794
<artifactId>jsr311-api</artifactId>
798795
<version>1.1.1</version>
799796
</dependency>
800-
<dependency>
801-
<groupId>javax.ws.rs</groupId>
802-
<artifactId>javax.ws.rs-api</artifactId>
803-
<version>${javax.ws.rs-api.version}</version>
804-
</dependency>
805797
<dependency>
806798
<groupId>org.eclipse.jetty</groupId>
807799
<artifactId>jetty-server</artifactId>

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,6 @@
115115
<groupId>com.fasterxml.jackson.core</groupId>
116116
<artifactId>jackson-annotations</artifactId>
117117
</dependency>
118-
<dependency>
119-
<groupId>javax.ws.rs</groupId>
120-
<artifactId>javax.ws.rs-api</artifactId>
121-
</dependency>
122118
</dependencies>
123119

124120
<build>

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -248,11 +248,6 @@
248248
<artifactId>jackson-jaxrs-base</artifactId>
249249
<version>${jackson2.version}</version>
250250
</dependency>
251-
252-
<dependency>
253-
<groupId>javax.ws.rs</groupId>
254-
<artifactId>javax.ws.rs-api</artifactId>
255-
</dependency>
256251
</dependencies>
257252
<build>
258253
<finalName>${artifact.name}</finalName>

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,10 +154,6 @@
154154
<scope>test</scope>
155155
<type>test-jar</type>
156156
</dependency>
157-
<dependency>
158-
<groupId>javax.ws.rs</groupId>
159-
<artifactId>javax.ws.rs-api</artifactId>
160-
</dependency>
161157
</dependencies>
162158

163159
<build>

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,11 +137,6 @@
137137
<artifactId>jackson-annotations</artifactId>
138138
</dependency>
139139

140-
<dependency>
141-
<groupId>javax.ws.rs</groupId>
142-
<artifactId>javax.ws.rs-api</artifactId>
143-
</dependency>
144-
145140
<dependency>
146141
<groupId>org.apache.hadoop</groupId>
147142
<artifactId>hadoop-hdfs-client</artifactId>

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,10 +183,6 @@
183183
<groupId>com.fasterxml.jackson.jaxrs</groupId>
184184
<artifactId>jackson-jaxrs-json-provider</artifactId>
185185
</dependency>
186-
<dependency>
187-
<groupId>javax.ws.rs</groupId>
188-
<artifactId>javax.ws.rs-api</artifactId>
189-
</dependency>
190186
</dependencies>
191187

192188
<build>

0 commit comments

Comments
 (0)