Skip to content

Commit c973247

Browse files
robert3005Robert Fink
robert3005
authored and
Robert Fink
committed
Upgrade jackson to 2.9.5 (#713)
1 parent 61d6338 commit c973247

File tree

28 files changed

+325
-240
lines changed

28 files changed

+325
-240
lines changed

‎error-handling/src/test/java/com/palantir/remoting3/errors/SerializableErrorErrorDecoderTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public void testExceptionInErrorParsing() {
121121
assertThat(decode.getMessage()).isEqualTo(
122122
"Error 42. Failed to parse error body and deserialize exception: "
123123
+ "Unrecognized token 'notjsonifiable': was expecting 'null', 'true', 'false' or NaN\n "
124-
+ "at [Source: notjsonifiable!; line: 1, column: 15]. Body:\n"
124+
+ "at [Source: (String)\"notjsonifiable!\"; line: 1, column: 15]. Body:\n"
125125
+ "notjsonifiable!");
126126
}
127127

‎error-handling/versions.lock

+20-18
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
{
22
"compileClasspath": {
33
"com.fasterxml.jackson.core:jackson-annotations": {
4-
"locked": "2.6.7",
4+
"locked": "2.9.5",
55
"transitive": [
6-
"com.fasterxml.jackson.core:jackson-databind"
6+
"com.fasterxml.jackson.core:jackson-databind",
7+
"com.fasterxml.jackson.datatype:jackson-datatype-jsr310"
78
]
89
},
910
"com.fasterxml.jackson.core:jackson-core": {
10-
"locked": "2.6.7",
11+
"locked": "2.9.5",
1112
"transitive": [
1213
"com.fasterxml.jackson.core:jackson-databind",
1314
"com.fasterxml.jackson.dataformat:jackson-dataformat-cbor",
@@ -18,7 +19,7 @@
1819
]
1920
},
2021
"com.fasterxml.jackson.core:jackson-databind": {
21-
"locked": "2.6.7",
22+
"locked": "2.9.5",
2223
"transitive": [
2324
"com.fasterxml.jackson.datatype:jackson-datatype-guava",
2425
"com.fasterxml.jackson.datatype:jackson-datatype-jdk8",
@@ -29,31 +30,31 @@
2930
]
3031
},
3132
"com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": {
32-
"locked": "2.6.7",
33+
"locked": "2.9.5",
3334
"transitive": [
3435
"com.palantir.remoting3:jackson-support"
3536
]
3637
},
3738
"com.fasterxml.jackson.datatype:jackson-datatype-guava": {
38-
"locked": "2.6.7",
39+
"locked": "2.9.5",
3940
"transitive": [
4041
"com.palantir.remoting3:jackson-support"
4142
]
4243
},
4344
"com.fasterxml.jackson.datatype:jackson-datatype-jdk8": {
44-
"locked": "2.6.7",
45+
"locked": "2.9.5",
4546
"transitive": [
4647
"com.palantir.remoting3:jackson-support"
4748
]
4849
},
4950
"com.fasterxml.jackson.datatype:jackson-datatype-jsr310": {
50-
"locked": "2.6.7",
51+
"locked": "2.9.5",
5152
"transitive": [
5253
"com.palantir.remoting3:jackson-support"
5354
]
5455
},
5556
"com.fasterxml.jackson.module:jackson-module-afterburner": {
56-
"locked": "2.6.7",
57+
"locked": "2.9.5",
5758
"transitive": [
5859
"com.palantir.remoting3:jackson-support"
5960
]
@@ -94,13 +95,14 @@
9495
},
9596
"runtime": {
9697
"com.fasterxml.jackson.core:jackson-annotations": {
97-
"locked": "2.6.7",
98+
"locked": "2.9.5",
9899
"transitive": [
99-
"com.fasterxml.jackson.core:jackson-databind"
100+
"com.fasterxml.jackson.core:jackson-databind",
101+
"com.fasterxml.jackson.datatype:jackson-datatype-jsr310"
100102
]
101103
},
102104
"com.fasterxml.jackson.core:jackson-core": {
103-
"locked": "2.6.7",
105+
"locked": "2.9.5",
104106
"transitive": [
105107
"com.fasterxml.jackson.core:jackson-databind",
106108
"com.fasterxml.jackson.dataformat:jackson-dataformat-cbor",
@@ -111,7 +113,7 @@
111113
]
112114
},
113115
"com.fasterxml.jackson.core:jackson-databind": {
114-
"locked": "2.6.7",
116+
"locked": "2.9.5",
115117
"transitive": [
116118
"com.fasterxml.jackson.datatype:jackson-datatype-guava",
117119
"com.fasterxml.jackson.datatype:jackson-datatype-jdk8",
@@ -122,31 +124,31 @@
122124
]
123125
},
124126
"com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": {
125-
"locked": "2.6.7",
127+
"locked": "2.9.5",
126128
"transitive": [
127129
"com.palantir.remoting3:jackson-support"
128130
]
129131
},
130132
"com.fasterxml.jackson.datatype:jackson-datatype-guava": {
131-
"locked": "2.6.7",
133+
"locked": "2.9.5",
132134
"transitive": [
133135
"com.palantir.remoting3:jackson-support"
134136
]
135137
},
136138
"com.fasterxml.jackson.datatype:jackson-datatype-jdk8": {
137-
"locked": "2.6.7",
139+
"locked": "2.9.5",
138140
"transitive": [
139141
"com.palantir.remoting3:jackson-support"
140142
]
141143
},
142144
"com.fasterxml.jackson.datatype:jackson-datatype-jsr310": {
143-
"locked": "2.6.7",
145+
"locked": "2.9.5",
144146
"transitive": [
145147
"com.palantir.remoting3:jackson-support"
146148
]
147149
},
148150
"com.fasterxml.jackson.module:jackson-module-afterburner": {
149-
"locked": "2.6.7",
151+
"locked": "2.9.5",
150152
"transitive": [
151153
"com.palantir.remoting3:jackson-support"
152154
]

‎extras/jackson-support/versions.lock

+20-18
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
{
22
"compileClasspath": {
33
"com.fasterxml.jackson.core:jackson-annotations": {
4-
"locked": "2.6.7",
4+
"locked": "2.9.5",
55
"transitive": [
6-
"com.fasterxml.jackson.core:jackson-databind"
6+
"com.fasterxml.jackson.core:jackson-databind",
7+
"com.fasterxml.jackson.datatype:jackson-datatype-jsr310"
78
]
89
},
910
"com.fasterxml.jackson.core:jackson-core": {
10-
"locked": "2.6.7",
11+
"locked": "2.9.5",
1112
"transitive": [
1213
"com.fasterxml.jackson.core:jackson-databind",
1314
"com.fasterxml.jackson.dataformat:jackson-dataformat-cbor",
@@ -18,7 +19,7 @@
1819
]
1920
},
2021
"com.fasterxml.jackson.core:jackson-databind": {
21-
"locked": "2.6.7",
22+
"locked": "2.9.5",
2223
"transitive": [
2324
"com.fasterxml.jackson.datatype:jackson-datatype-guava",
2425
"com.fasterxml.jackson.datatype:jackson-datatype-jdk8",
@@ -27,19 +28,19 @@
2728
]
2829
},
2930
"com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": {
30-
"locked": "2.6.7"
31+
"locked": "2.9.5"
3132
},
3233
"com.fasterxml.jackson.datatype:jackson-datatype-guava": {
33-
"locked": "2.6.7"
34+
"locked": "2.9.5"
3435
},
3536
"com.fasterxml.jackson.datatype:jackson-datatype-jdk8": {
36-
"locked": "2.6.7"
37+
"locked": "2.9.5"
3738
},
3839
"com.fasterxml.jackson.datatype:jackson-datatype-jsr310": {
39-
"locked": "2.6.7"
40+
"locked": "2.9.5"
4041
},
4142
"com.fasterxml.jackson.module:jackson-module-afterburner": {
42-
"locked": "2.6.7"
43+
"locked": "2.9.5"
4344
},
4445
"com.google.guava:guava": {
4546
"locked": "20.0",
@@ -50,13 +51,14 @@
5051
},
5152
"runtime": {
5253
"com.fasterxml.jackson.core:jackson-annotations": {
53-
"locked": "2.6.7",
54+
"locked": "2.9.5",
5455
"transitive": [
55-
"com.fasterxml.jackson.core:jackson-databind"
56+
"com.fasterxml.jackson.core:jackson-databind",
57+
"com.fasterxml.jackson.datatype:jackson-datatype-jsr310"
5658
]
5759
},
5860
"com.fasterxml.jackson.core:jackson-core": {
59-
"locked": "2.6.7",
61+
"locked": "2.9.5",
6062
"transitive": [
6163
"com.fasterxml.jackson.core:jackson-databind",
6264
"com.fasterxml.jackson.dataformat:jackson-dataformat-cbor",
@@ -67,7 +69,7 @@
6769
]
6870
},
6971
"com.fasterxml.jackson.core:jackson-databind": {
70-
"locked": "2.6.7",
72+
"locked": "2.9.5",
7173
"transitive": [
7274
"com.fasterxml.jackson.datatype:jackson-datatype-guava",
7375
"com.fasterxml.jackson.datatype:jackson-datatype-jdk8",
@@ -76,19 +78,19 @@
7678
]
7779
},
7880
"com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": {
79-
"locked": "2.6.7"
81+
"locked": "2.9.5"
8082
},
8183
"com.fasterxml.jackson.datatype:jackson-datatype-guava": {
82-
"locked": "2.6.7"
84+
"locked": "2.9.5"
8385
},
8486
"com.fasterxml.jackson.datatype:jackson-datatype-jdk8": {
85-
"locked": "2.6.7"
87+
"locked": "2.9.5"
8688
},
8789
"com.fasterxml.jackson.datatype:jackson-datatype-jsr310": {
88-
"locked": "2.6.7"
90+
"locked": "2.9.5"
8991
},
9092
"com.fasterxml.jackson.module:jackson-module-afterburner": {
91-
"locked": "2.6.7"
93+
"locked": "2.9.5"
9294
},
9395
"com.google.guava:guava": {
9496
"locked": "20.0",

‎http-clients/versions.lock

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
{
22
"compileClasspath": {
33
"com.fasterxml.jackson.core:jackson-annotations": {
4-
"locked": "2.6.7",
4+
"locked": "2.9.5",
55
"transitive": [
66
"com.fasterxml.jackson.core:jackson-databind"
77
]
88
},
99
"com.fasterxml.jackson.core:jackson-core": {
10-
"locked": "2.6.7",
10+
"locked": "2.9.5",
1111
"transitive": [
1212
"com.fasterxml.jackson.core:jackson-databind",
1313
"com.fasterxml.jackson.datatype:jackson-datatype-jdk8"
1414
]
1515
},
1616
"com.fasterxml.jackson.core:jackson-databind": {
17-
"locked": "2.6.7",
17+
"locked": "2.9.5",
1818
"transitive": [
1919
"com.fasterxml.jackson.datatype:jackson-datatype-jdk8",
2020
"com.palantir.remoting-api:ssl-config",
@@ -23,7 +23,7 @@
2323
]
2424
},
2525
"com.fasterxml.jackson.datatype:jackson-datatype-jdk8": {
26-
"locked": "2.6.7",
26+
"locked": "2.9.5",
2727
"transitive": [
2828
"com.palantir.tokens:auth-tokens"
2929
]
@@ -65,20 +65,20 @@
6565
},
6666
"runtime": {
6767
"com.fasterxml.jackson.core:jackson-annotations": {
68-
"locked": "2.6.7",
68+
"locked": "2.9.5",
6969
"transitive": [
7070
"com.fasterxml.jackson.core:jackson-databind"
7171
]
7272
},
7373
"com.fasterxml.jackson.core:jackson-core": {
74-
"locked": "2.6.7",
74+
"locked": "2.9.5",
7575
"transitive": [
7676
"com.fasterxml.jackson.core:jackson-databind",
7777
"com.fasterxml.jackson.datatype:jackson-datatype-jdk8"
7878
]
7979
},
8080
"com.fasterxml.jackson.core:jackson-databind": {
81-
"locked": "2.6.7",
81+
"locked": "2.9.5",
8282
"transitive": [
8383
"com.fasterxml.jackson.datatype:jackson-datatype-jdk8",
8484
"com.palantir.remoting-api:ssl-config",
@@ -87,7 +87,7 @@
8787
]
8888
},
8989
"com.fasterxml.jackson.datatype:jackson-datatype-jdk8": {
90-
"locked": "2.6.7",
90+
"locked": "2.9.5",
9191
"transitive": [
9292
"com.palantir.tokens:auth-tokens"
9393
]

‎jaxrs-clients/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,5 @@ dependencies {
2727
testCompile "io.dropwizard:dropwizard-testing"
2828
testCompile "junit:junit"
2929
testCompile "org.hamcrest:hamcrest-all"
30+
testCompile "org.mockito:mockito-core"
3031
}

‎jaxrs-clients/src/test/java/com/palantir/remoting3/jaxrs/feignimpl/GuavaOptionalComplexType.java

+10
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import com.fasterxml.jackson.annotation.JsonCreator;
2020
import com.fasterxml.jackson.annotation.JsonProperty;
21+
import com.google.common.base.MoreObjects;
2122
import com.google.common.base.Optional;
2223
import java.nio.file.Path;
2324

@@ -49,6 +50,15 @@ public Path getPath() {
4950
return path;
5051
}
5152

53+
@Override
54+
public String toString() {
55+
return MoreObjects.toStringHelper(this)
56+
.add("nested", nested)
57+
.add("string", string)
58+
.add("path", path)
59+
.toString();
60+
}
61+
5262
@Override
5363
public boolean equals(Object other) {
5464
if (this == other) {

‎jaxrs-clients/src/test/java/com/palantir/remoting3/jaxrs/feignimpl/GuavaTestServer.java

+3
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@
1818

1919
import com.google.common.base.Optional;
2020
import com.google.common.collect.ImmutableMap;
21+
import com.palantir.remoting3.ext.jackson.ObjectMappers;
2122
import com.palantir.remoting3.servers.jersey.HttpRemotingJerseyFeature;
2223
import feign.Util;
2324
import io.dropwizard.Application;
2425
import io.dropwizard.Configuration;
26+
import io.dropwizard.jersey.jackson.JacksonMessageBodyProvider;
2527
import io.dropwizard.setup.Environment;
2628
import java.io.ByteArrayInputStream;
2729
import java.io.IOException;
@@ -44,6 +46,7 @@ public class GuavaTestServer extends Application<Configuration> {
4446
@Override
4547
public final void run(Configuration config, final Environment env) throws Exception {
4648
env.jersey().register(HttpRemotingJerseyFeature.INSTANCE);
49+
env.jersey().register(new JacksonMessageBodyProvider(ObjectMappers.newServerObjectMapper()));
4750
env.jersey().register(new TestResource());
4851
}
4952

0 commit comments

Comments
 (0)