Skip to content

Commit 5eb67fd

Browse files
prabhjyotsinghprabhjyotsingh
committed
ODP-1098: Upgrade jackson from 2.10.5 to 2.13.2.2
1 parent 60d566d commit 5eb67fd

File tree

20 files changed

+254
-87
lines changed

20 files changed

+254
-87
lines changed

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,26 @@
149149
<groupId>commons-logging</groupId>
150150
<artifactId>commons-logging</artifactId>
151151
<scope>compile</scope>
152+
153+
<exclusions>
154+
<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>
161+
</exclusion>
162+
<exclusion>
163+
<groupId>org.codehaus.jackson</groupId>
164+
<artifactId>jackson-jaxrs</artifactId>
165+
</exclusion>
166+
<exclusion>
167+
<groupId>org.codehaus.jackson</groupId>
168+
<artifactId>jackson-xc</artifactId>
169+
</exclusion>
170+
</exclusions>
171+
152172
</dependency>
153173
<dependency>
154174
<groupId>ch.qos.reload4j</groupId>
@@ -323,6 +343,10 @@
323343
<groupId>org.apache.kerby</groupId>
324344
<artifactId>kerb-simplekdc</artifactId>
325345
</dependency>
346+
<dependency>
347+
<groupId>com.fasterxml.jackson.core</groupId>
348+
<artifactId>jackson-core</artifactId>
349+
</dependency>
326350
<dependency>
327351
<groupId>com.fasterxml.jackson.core</groupId>
328352
<artifactId>jackson-databind</artifactId>

‎hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsJsonBuilder.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@
2121
import org.apache.commons.lang3.exception.ExceptionUtils;
2222
import org.apache.hadoop.classification.InterfaceAudience;
2323
import org.apache.hadoop.classification.InterfaceStability;
24-
import org.codehaus.jackson.map.ObjectMapper;
25-
import org.codehaus.jackson.map.ObjectWriter;
24+
25+
import com.fasterxml.jackson.databind.ObjectMapper;
26+
import com.fasterxml.jackson.databind.ObjectWriter;
27+
2628
import org.slf4j.Logger;
2729
import org.slf4j.LoggerFactory;
2830

‎hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterClientRejectOverload.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
import org.junit.Test;
4949
import org.slf4j.Logger;
5050
import org.slf4j.LoggerFactory;
51-
51+
import com.fasterxml.jackson.databind.ObjectMapper;
5252

5353
/**
5454
* Test the Router overload control which rejects requests when the RPC client

‎hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/ProvidedVolumeImpl.java‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@
5858
import org.apache.hadoop.util.ReflectionUtils;
5959
import org.apache.hadoop.util.Time;
6060
import org.apache.hadoop.util.Timer;
61-
import org.codehaus.jackson.annotate.JsonProperty;
62-
import org.codehaus.jackson.map.ObjectMapper;
63-
import org.codehaus.jackson.map.ObjectReader;
64-
import org.codehaus.jackson.map.ObjectWriter;
61+
62+
import com.fasterxml.jackson.annotation.JsonProperty;
63+
import com.fasterxml.jackson.databind.ObjectMapper;
64+
import com.fasterxml.jackson.databind.ObjectWriter;
6565

6666
import com.google.common.annotations.VisibleForTesting;
6767

@@ -373,14 +373,11 @@ public void releaseReservedSpace(long bytesToRelease) {
373373

374374
private static final ObjectWriter WRITER =
375375
new ObjectMapper().writerWithDefaultPrettyPrinter();
376-
private static final ObjectReader READER =
377-
new ObjectMapper().reader(ProvidedBlockIteratorState.class);
378376

379377
private static class ProvidedBlockIteratorState {
380378
ProvidedBlockIteratorState() {
381379
iterStartMs = Time.now();
382380
lastSavedMs = iterStartMs;
383-
atEnd = false;
384381
lastBlockId = -1;
385382
}
386383

@@ -392,9 +389,6 @@ private static class ProvidedBlockIteratorState {
392389
@JsonProperty
393390
private long iterStartMs;
394391

395-
@JsonProperty
396-
private boolean atEnd;
397-
398392
// The id of the last block read when the state of the iterator is saved.
399393
// This implementation assumes that provided blocks are returned
400394
// in sorted order of the block ids.

‎hadoop-project/pom.xml‎

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@
6969

7070
<!-- jackson versions -->
7171
<jackson.version>1.9.13</jackson.version>
72-
<jackson2.version>2.10.5</jackson2.version>
73-
<jackson2.databind.version>2.10.5.1</jackson2.databind.version>
72+
<jackson2.version>2.13.2</jackson2.version>
73+
<jackson2.databind.version>2.13.2.2</jackson2.databind.version>
7474

7575
<!-- httpcomponents versions -->
7676
<httpclient.version>4.5.13</httpclient.version>
@@ -265,6 +265,20 @@
265265
<exclusion>
266266
<groupId>org.slf4j</groupId>
267267
<artifactId>slf4j-reload4j</artifactId>
268+
269+
</exclusion>
270+
<exclusion>
271+
<groupId>org.codehaus.jackson</groupId>
272+
<artifactId>jackson-mapper-asl</artifactId>
273+
</exclusion>
274+
<exclusion>
275+
<groupId>org.codehaus.jackson</groupId>
276+
<artifactId>jackson-jaxrs</artifactId>
277+
</exclusion>
278+
<exclusion>
279+
<groupId>org.codehaus.jackson</groupId>
280+
<artifactId>jackson-xc</artifactId>
281+
268282
</exclusion>
269283
</exclusions>
270284
</dependency>
@@ -797,6 +811,22 @@
797811
<groupId>stax</groupId>
798812
<artifactId>stax-api</artifactId>
799813
</exclusion>
814+
<exclusion>
815+
<groupId>org.codehaus.jackson</groupId>
816+
<artifactId>jackson-core-asl</artifactId>
817+
</exclusion>
818+
<exclusion>
819+
<groupId>org.codehaus.jackson</groupId>
820+
<artifactId>jackson-mapper-asl</artifactId>
821+
</exclusion>
822+
<exclusion>
823+
<groupId>org.codehaus.jackson</groupId>
824+
<artifactId>jackson-jaxrs</artifactId>
825+
</exclusion>
826+
<exclusion>
827+
<groupId>org.codehaus.jackson</groupId>
828+
<artifactId>jackson-xc</artifactId>
829+
</exclusion>
800830
</exclusions>
801831
</dependency>
802832
<dependency>

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -178,18 +178,6 @@
178178
<scope>compile</scope>
179179
</dependency>
180180

181-
<dependency>
182-
<groupId>org.codehaus.jackson</groupId>
183-
<artifactId>jackson-mapper-asl</artifactId>
184-
<scope>compile</scope>
185-
</dependency>
186-
187-
<dependency>
188-
<groupId>org.codehaus.jackson</groupId>
189-
<artifactId>jackson-core-asl</artifactId>
190-
<scope>compile</scope>
191-
</dependency>
192-
193181
<dependency>
194182
<groupId>org.wildfly.openssl</groupId>
195183
<artifactId>wildfly-openssl</artifactId>

‎hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/contracts/services/ListResultEntrySchema.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818

1919
package org.apache.hadoop.fs.azurebfs.contracts.services;
2020

21-
import org.codehaus.jackson.annotate.JsonProperty;
21+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
22+
import com.fasterxml.jackson.annotation.JsonProperty;
23+
2224

2325
import org.apache.hadoop.classification.InterfaceStability;
2426

@@ -236,4 +238,4 @@ public ListResultEntrySchema withPermissions(final String permissions) {
236238
return this;
237239
}
238240

239-
}
241+
}

‎hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/contracts/services/ListResultSchema.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
package org.apache.hadoop.fs.azurebfs.contracts.services;
2020

2121
import java.util.List;
22-
23-
import org.codehaus.jackson.annotate.JsonProperty;
22+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
23+
import com.fasterxml.jackson.annotation.JsonProperty;
2424

2525
import org.apache.hadoop.classification.InterfaceStability;
2626

‎hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/oauth2/AzureADAuthenticator.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,11 @@
2828
import java.util.Map;
2929

3030
import com.google.common.base.Preconditions;
31-
import org.codehaus.jackson.JsonFactory;
32-
import org.codehaus.jackson.JsonParser;
33-
import org.codehaus.jackson.JsonToken;
31+
32+
import com.fasterxml.jackson.core.JsonFactory;
33+
import com.fasterxml.jackson.core.JsonParser;
34+
import com.fasterxml.jackson.core.JsonToken;
35+
3436
import org.slf4j.Logger;
3537
import org.slf4j.LoggerFactory;
3638

@@ -304,7 +306,7 @@ private static AzureADToken parseTokenFromStream(InputStream httpResponseStream)
304306
int expiryPeriod = 0;
305307

306308
JsonFactory jf = new JsonFactory();
307-
JsonParser jp = jf.createJsonParser(httpResponseStream);
309+
JsonParser jp = jf.createParser(httpResponseStream);
308310
String fieldName, fieldValue;
309311
jp.nextToken();
310312
while (jp.hasCurrentToken()) {

‎hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsHttpOperation.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,11 @@
3232
import javax.net.ssl.SSLSocketFactory;
3333

3434
import org.apache.hadoop.fs.azurebfs.utils.SSLSocketFactoryEx;
35-
import org.codehaus.jackson.JsonFactory;
36-
import org.codehaus.jackson.JsonParser;
37-
import org.codehaus.jackson.JsonToken;
38-
import org.codehaus.jackson.map.ObjectMapper;
35+
36+
import com.fasterxml.jackson.core.JsonFactory;
37+
import com.fasterxml.jackson.core.JsonParser;
38+
import com.fasterxml.jackson.core.JsonToken;
39+
import com.fasterxml.jackson.databind.ObjectMapper;
3940

4041
import org.slf4j.Logger;
4142
import org.slf4j.LoggerFactory;
@@ -415,7 +416,7 @@ private void processStorageErrorResponse() {
415416
return;
416417
}
417418
JsonFactory jf = new JsonFactory();
418-
try (JsonParser jp = jf.createJsonParser(stream)) {
419+
try (JsonParser jp = jf.createParser(stream)) {
419420
String fieldName, fieldValue;
420421
jp.nextToken(); // START_OBJECT - {
421422
jp.nextToken(); // FIELD_NAME - "error":

0 commit comments

Comments
 (0)