Skip to content

Upgrade jackson to 2.9.5 #713

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 21 commits into from
May 23, 2018
Merged

Upgrade jackson to 2.9.5 #713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
9a7fa90
jackson
Apr 9, 2018
0559a9f
jackson
Apr 9, 2018
90433a2
less
Apr 9, 2018
899387c
disable dropwizards gzip
Apr 9, 2018
3ab55e5
no register
May 17, 2018
3b43cab
mockito
May 18, 2018
5187ec5
remove mockito
May 18, 2018
559514b
trim down
May 18, 2018
39014b4
remove more
May 18, 2018
16dda72
no empty line
May 18, 2018
0ae20b8
imports
May 21, 2018
6e4a688
constants
May 21, 2018
88a34bd
castore password
May 21, 2018
a99404b
absolute
May 21, 2018
202eef6
compilation
May 21, 2018
8ddfb85
imports
May 21, 2018
0031ca6
absolute path configuration test
May 21, 2018
c2c5aa1
leave jdk7 things in
May 22, 2018
aa8b20f
relative paths
May 23, 2018
d8a9527
fix jacksons
May 23, 2018
8dd61ef
checkstyle
May 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...dling/src/test/java/com/palantir/remoting3/errors/SerializableErrorErrorDecoderTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public void testExceptionInErrorParsing() {
assertThat(decode.getMessage()).isEqualTo(
"Error 42. Failed to parse error body and deserialize exception: "
+ "Unrecognized token 'notjsonifiable': was expecting 'null', 'true', 'false' or NaN\n "
+ "at [Source: notjsonifiable!; line: 1, column: 15]. Body:\n"
+ "at [Source: (String)\"notjsonifiable!\"; line: 1, column: 15]. Body:\n"
+ "notjsonifiable!");
}

Expand Down
38 changes: 20 additions & 18 deletions error-handling/versions.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
{
"compileClasspath": {
"com.fasterxml.jackson.core:jackson-annotations": {
"locked": "2.6.7",
"locked": "2.9.5",
"transitive": [
"com.fasterxml.jackson.core:jackson-databind"
"com.fasterxml.jackson.core:jackson-databind",
"com.fasterxml.jackson.datatype:jackson-datatype-jsr310"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in 2.8 or 2.9 a lot of this stuff got renamed, no? specifically, why don't we have to update extras/jackson-support/build.gradle to reflect the new maven coordinates of the Guava and Java8 data formats?

]
},
"com.fasterxml.jackson.core:jackson-core": {
"locked": "2.6.7",
"locked": "2.9.5",
"transitive": [
"com.fasterxml.jackson.core:jackson-databind",
"com.fasterxml.jackson.dataformat:jackson-dataformat-cbor",
Expand All @@ -18,7 +19,7 @@
]
},
"com.fasterxml.jackson.core:jackson-databind": {
"locked": "2.6.7",
"locked": "2.9.5",
"transitive": [
"com.fasterxml.jackson.datatype:jackson-datatype-guava",
"com.fasterxml.jackson.datatype:jackson-datatype-jdk8",
Expand All @@ -29,31 +30,31 @@
]
},
"com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": {
"locked": "2.6.7",
"locked": "2.9.5",
"transitive": [
"com.palantir.remoting3:jackson-support"
]
},
"com.fasterxml.jackson.datatype:jackson-datatype-guava": {
"locked": "2.6.7",
"locked": "2.9.5",
"transitive": [
"com.palantir.remoting3:jackson-support"
]
},
"com.fasterxml.jackson.datatype:jackson-datatype-jdk8": {
"locked": "2.6.7",
"locked": "2.9.5",
"transitive": [
"com.palantir.remoting3:jackson-support"
]
},
"com.fasterxml.jackson.datatype:jackson-datatype-jsr310": {
"locked": "2.6.7",
"locked": "2.9.5",
"transitive": [
"com.palantir.remoting3:jackson-support"
]
},
"com.fasterxml.jackson.module:jackson-module-afterburner": {
"locked": "2.6.7",
"locked": "2.9.5",
"transitive": [
"com.palantir.remoting3:jackson-support"
]
Expand Down Expand Up @@ -94,13 +95,14 @@
},
"runtime": {
"com.fasterxml.jackson.core:jackson-annotations": {
"locked": "2.6.7",
"locked": "2.9.5",
"transitive": [
"com.fasterxml.jackson.core:jackson-databind"
"com.fasterxml.jackson.core:jackson-databind",
"com.fasterxml.jackson.datatype:jackson-datatype-jsr310"
]
},
"com.fasterxml.jackson.core:jackson-core": {
"locked": "2.6.7",
"locked": "2.9.5",
"transitive": [
"com.fasterxml.jackson.core:jackson-databind",
"com.fasterxml.jackson.dataformat:jackson-dataformat-cbor",
Expand All @@ -111,7 +113,7 @@
]
},
"com.fasterxml.jackson.core:jackson-databind": {
"locked": "2.6.7",
"locked": "2.9.5",
"transitive": [
"com.fasterxml.jackson.datatype:jackson-datatype-guava",
"com.fasterxml.jackson.datatype:jackson-datatype-jdk8",
Expand All @@ -122,31 +124,31 @@
]
},
"com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": {
"locked": "2.6.7",
"locked": "2.9.5",
"transitive": [
"com.palantir.remoting3:jackson-support"
]
},
"com.fasterxml.jackson.datatype:jackson-datatype-guava": {
"locked": "2.6.7",
"locked": "2.9.5",
"transitive": [
"com.palantir.remoting3:jackson-support"
]
},
"com.fasterxml.jackson.datatype:jackson-datatype-jdk8": {
"locked": "2.6.7",
"locked": "2.9.5",
"transitive": [
"com.palantir.remoting3:jackson-support"
]
},
"com.fasterxml.jackson.datatype:jackson-datatype-jsr310": {
"locked": "2.6.7",
"locked": "2.9.5",
"transitive": [
"com.palantir.remoting3:jackson-support"
]
},
"com.fasterxml.jackson.module:jackson-module-afterburner": {
"locked": "2.6.7",
"locked": "2.9.5",
"transitive": [
"com.palantir.remoting3:jackson-support"
]
Expand Down
38 changes: 20 additions & 18 deletions extras/jackson-support/versions.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
{
"compileClasspath": {
"com.fasterxml.jackson.core:jackson-annotations": {
"locked": "2.6.7",
"locked": "2.9.5",
"transitive": [
"com.fasterxml.jackson.core:jackson-databind"
"com.fasterxml.jackson.core:jackson-databind",
"com.fasterxml.jackson.datatype:jackson-datatype-jsr310"
]
},
"com.fasterxml.jackson.core:jackson-core": {
"locked": "2.6.7",
"locked": "2.9.5",
"transitive": [
"com.fasterxml.jackson.core:jackson-databind",
"com.fasterxml.jackson.dataformat:jackson-dataformat-cbor",
Expand All @@ -18,7 +19,7 @@
]
},
"com.fasterxml.jackson.core:jackson-databind": {
"locked": "2.6.7",
"locked": "2.9.5",
"transitive": [
"com.fasterxml.jackson.datatype:jackson-datatype-guava",
"com.fasterxml.jackson.datatype:jackson-datatype-jdk8",
Expand All @@ -27,19 +28,19 @@
]
},
"com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": {
"locked": "2.6.7"
"locked": "2.9.5"
},
"com.fasterxml.jackson.datatype:jackson-datatype-guava": {
"locked": "2.6.7"
"locked": "2.9.5"
},
"com.fasterxml.jackson.datatype:jackson-datatype-jdk8": {
"locked": "2.6.7"
"locked": "2.9.5"
},
"com.fasterxml.jackson.datatype:jackson-datatype-jsr310": {
"locked": "2.6.7"
"locked": "2.9.5"
},
"com.fasterxml.jackson.module:jackson-module-afterburner": {
"locked": "2.6.7"
"locked": "2.9.5"
},
"com.google.guava:guava": {
"locked": "20.0",
Expand All @@ -50,13 +51,14 @@
},
"runtime": {
"com.fasterxml.jackson.core:jackson-annotations": {
"locked": "2.6.7",
"locked": "2.9.5",
"transitive": [
"com.fasterxml.jackson.core:jackson-databind"
"com.fasterxml.jackson.core:jackson-databind",
"com.fasterxml.jackson.datatype:jackson-datatype-jsr310"
]
},
"com.fasterxml.jackson.core:jackson-core": {
"locked": "2.6.7",
"locked": "2.9.5",
"transitive": [
"com.fasterxml.jackson.core:jackson-databind",
"com.fasterxml.jackson.dataformat:jackson-dataformat-cbor",
Expand All @@ -67,7 +69,7 @@
]
},
"com.fasterxml.jackson.core:jackson-databind": {
"locked": "2.6.7",
"locked": "2.9.5",
"transitive": [
"com.fasterxml.jackson.datatype:jackson-datatype-guava",
"com.fasterxml.jackson.datatype:jackson-datatype-jdk8",
Expand All @@ -76,19 +78,19 @@
]
},
"com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": {
"locked": "2.6.7"
"locked": "2.9.5"
},
"com.fasterxml.jackson.datatype:jackson-datatype-guava": {
"locked": "2.6.7"
"locked": "2.9.5"
},
"com.fasterxml.jackson.datatype:jackson-datatype-jdk8": {
"locked": "2.6.7"
"locked": "2.9.5"
},
"com.fasterxml.jackson.datatype:jackson-datatype-jsr310": {
"locked": "2.6.7"
"locked": "2.9.5"
},
"com.fasterxml.jackson.module:jackson-module-afterburner": {
"locked": "2.6.7"
"locked": "2.9.5"
},
"com.google.guava:guava": {
"locked": "20.0",
Expand Down
16 changes: 8 additions & 8 deletions http-clients/versions.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{
"compileClasspath": {
"com.fasterxml.jackson.core:jackson-annotations": {
"locked": "2.6.7",
"locked": "2.9.5",
"transitive": [
"com.fasterxml.jackson.core:jackson-databind"
]
},
"com.fasterxml.jackson.core:jackson-core": {
"locked": "2.6.7",
"locked": "2.9.5",
"transitive": [
"com.fasterxml.jackson.core:jackson-databind",
"com.fasterxml.jackson.datatype:jackson-datatype-jdk8"
]
},
"com.fasterxml.jackson.core:jackson-databind": {
"locked": "2.6.7",
"locked": "2.9.5",
"transitive": [
"com.fasterxml.jackson.datatype:jackson-datatype-jdk8",
"com.palantir.remoting-api:ssl-config",
Expand All @@ -23,7 +23,7 @@
]
},
"com.fasterxml.jackson.datatype:jackson-datatype-jdk8": {
"locked": "2.6.7",
"locked": "2.9.5",
"transitive": [
"com.palantir.tokens:auth-tokens"
]
Expand Down Expand Up @@ -65,20 +65,20 @@
},
"runtime": {
"com.fasterxml.jackson.core:jackson-annotations": {
"locked": "2.6.7",
"locked": "2.9.5",
"transitive": [
"com.fasterxml.jackson.core:jackson-databind"
]
},
"com.fasterxml.jackson.core:jackson-core": {
"locked": "2.6.7",
"locked": "2.9.5",
"transitive": [
"com.fasterxml.jackson.core:jackson-databind",
"com.fasterxml.jackson.datatype:jackson-datatype-jdk8"
]
},
"com.fasterxml.jackson.core:jackson-databind": {
"locked": "2.6.7",
"locked": "2.9.5",
"transitive": [
"com.fasterxml.jackson.datatype:jackson-datatype-jdk8",
"com.palantir.remoting-api:ssl-config",
Expand All @@ -87,7 +87,7 @@
]
},
"com.fasterxml.jackson.datatype:jackson-datatype-jdk8": {
"locked": "2.6.7",
"locked": "2.9.5",
"transitive": [
"com.palantir.tokens:auth-tokens"
]
Expand Down
1 change: 1 addition & 0 deletions jaxrs-clients/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,5 @@ dependencies {
testCompile "io.dropwizard:dropwizard-testing"
testCompile "junit:junit"
testCompile "org.hamcrest:hamcrest-all"
testCompile "org.mockito:mockito-core"
}
10 changes: 10 additions & 0 deletions ...lients/src/test/java/com/palantir/remoting3/jaxrs/feignimpl/GuavaOptionalComplexType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.MoreObjects;
import com.google.common.base.Optional;
import java.nio.file.Path;

Expand Down Expand Up @@ -49,6 +50,15 @@ public Path getPath() {
return path;
}

@Override
public String toString() {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added for ease of debugging - you get useful assertions errors with this

return MoreObjects.toStringHelper(this)
.add("nested", nested)
.add("string", string)
.add("path", path)
.toString();
}

@Override
public boolean equals(Object other) {
if (this == other) {
Expand Down
3 changes: 3 additions & 0 deletions jaxrs-clients/src/test/java/com/palantir/remoting3/jaxrs/feignimpl/GuavaTestServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,12 @@

import com.google.common.base.Optional;
import com.google.common.collect.ImmutableMap;
import com.palantir.remoting3.ext.jackson.ObjectMappers;
import com.palantir.remoting3.servers.jersey.HttpRemotingJerseyFeature;
import feign.Util;
import io.dropwizard.Application;
import io.dropwizard.Configuration;
import io.dropwizard.jersey.jackson.JacksonMessageBodyProvider;
import io.dropwizard.setup.Environment;
import java.io.ByteArrayInputStream;
import java.io.IOException;
Expand All @@ -44,6 +46,7 @@ public class GuavaTestServer extends Application<Configuration> {
@Override
public final void run(Configuration config, final Environment env) throws Exception {
env.jersey().register(HttpRemotingJerseyFeature.INSTANCE);
env.jersey().register(new JacksonMessageBodyProvider(ObjectMappers.newServerObjectMapper()));
env.jersey().register(new TestResource());
}

Expand Down
Loading