Excavator: Upgrade dependencies (#1317)

conjure-java-jackson-serialization/src/test/java/com/palantir/conjure/java/serialization/ObjectMappersTest.java

@@ -21,6 +21,7 @@
 
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.exc.InputCoercionException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.exc.InvalidFormatException;
@@ -162,7 +163,7 @@ public void testOptionalLongDeserializationFromJsonNull() throws IOException {
     public void testLongOverflowDeserialization() {
         BigInteger large = BigInteger.valueOf(Long.MAX_VALUE).add(BigInteger.ONE);
         assertThatThrownBy(() -> MAPPER.readValue("" + large, Long.TYPE))
-                .isInstanceOf(JsonParseException.class)
+                .isInstanceOf(InputCoercionException.class)
                 .hasMessageContaining("out of range of long");
     }
 
@@ -178,7 +179,7 @@ public void testLongAsStringOverflowDeserialization() {
     public void testOptionalLongOverflowDeserialization() {
         BigInteger large = BigInteger.valueOf(Long.MAX_VALUE).add(BigInteger.ONE);
         assertThatThrownBy(() -> MAPPER.readValue("" + large, OptionalLong.class))
-                .isInstanceOf(JsonParseException.class)
+                .isInstanceOf(InputCoercionException.class)
                 .hasMessageContaining("out of range of long");
     }
 
@@ -193,14 +194,14 @@ public void testOptionalLongAsStringOverflowDeserialization() {
     @Test
     public void testIntegerOverflowDeserialization() {
         assertThatThrownBy(() -> MAPPER.readValue("" + Long.MAX_VALUE, Integer.TYPE))
-                .isInstanceOf(JsonParseException.class)
+                .isInstanceOf(InputCoercionException.class)
                 .hasMessageContaining("out of range of int");
     }
 
     @Test
     public void testOptionalIntOverflowDeserialization() {
         assertThatThrownBy(() -> MAPPER.readValue("" + Long.MAX_VALUE, OptionalInt.class))
-                .isInstanceOf(JsonParseException.class)
+                .isInstanceOf(InputCoercionException.class)
                 .hasMessageContaining("out of range of int");
     }
 

conjure-java-jaxrs-client/src/test/java/com/palantir/conjure/java/client/jaxrs/feignimpl/TextDelegateDecoderTest.java

@@ -86,10 +86,11 @@ public void testUsesStringDecoderWithTextPlain() throws Exception {
     }
 
     @Test
-    public void testCannotReturnStringWithMediaTypeJson() throws Exception {
+    public void testCannotReturnStringWithMediaTypeJson() {
         assertThatThrownBy(() -> service.getJsonString("foo"))
                 .isInstanceOf(FeignException.class)
-                .hasMessageStartingWith("Unrecognized token 'foo': was expecting 'null', 'true', 'false' or NaN");
+                .hasMessageStartingWith("Unrecognized token 'foo': was expecting "
+                        + "(JSON String, Number, Array, Object or token 'null', 'true' or 'false')");
     }
 
     @Test

versions.lock

@@ -1,23 +1,23 @@
 # Run ./gradlew --write-locks to regenerate this file
 com.fasterxml:classmate:1.3.1 (1 constraints: a40e4f58)
-com.fasterxml.jackson.core:jackson-annotations:2.9.9 (9 constraints: 99a529ef)
-com.fasterxml.jackson.core:jackson-core:2.9.9 (14 constraints: 6428e70f)
-com.fasterxml.jackson.core:jackson-databind:2.9.9.3 (19 constraints: a160006c)
-com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.9.9 (2 constraints: 541cbb9f)
-com.fasterxml.jackson.datatype:jackson-datatype-guava:2.9.9 (3 constraints: 4a200b23)
+com.fasterxml.jackson.core:jackson-annotations:2.10.1 (9 constraints: 34a6d7a3)
+com.fasterxml.jackson.core:jackson-core:2.10.1 (14 constraints: a42963d5)
+com.fasterxml.jackson.core:jackson-databind:2.10.1 (19 constraints: 60615739)
+com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.10.1 (2 constraints: 741c10bc)
+com.fasterxml.jackson.datatype:jackson-datatype-guava:2.10.1 (3 constraints: 6a20e231)
 com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.9 (3 constraints: 4a200b23)
 com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.9 (2 constraints: a0134956)
-com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.9.9 (2 constraints: 912e331a)
-com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider:2.9.9 (1 constraints: 16051936)
-com.fasterxml.jackson.module:jackson-module-afterburner:2.9.9 (3 constraints: 4a200b23)
-com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.9.9 (2 constraints: 912e331a)
-com.fasterxml.jackson.module:jackson-module-paranamer:2.9.9 (1 constraints: e2154800)
-com.fasterxml.jackson.module:jackson-module-scala_2.11:2.9.9 (1 constraints: 16051936)
+com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.10.1 (2 constraints: d12e2568)
+com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider:2.10.1 (1 constraints: 3605303b)
+com.fasterxml.jackson.module:jackson-module-afterburner:2.10.1 (3 constraints: 6a20e231)
+com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.10.1 (2 constraints: d12e2568)
+com.fasterxml.jackson.module:jackson-module-paranamer:2.10.1 (1 constraints: 02162b16)
+com.fasterxml.jackson.module:jackson-module-scala_2.11:2.10.1 (1 constraints: 3605303b)
 com.github.ben-manes.caffeine:caffeine:2.8.0 (1 constraints: 0c050d36)
 com.google.code.findbugs:jsr305:3.0.2 (7 constraints: 75559e39)
 com.google.errorprone:error_prone_annotations:2.3.3 (4 constraints: b737a42c)
 com.google.guava:failureaccess:1.0.1 (1 constraints: 140ae1b4)
-com.google.guava:guava:28.0-jre (8 constraints: 7c7c5e01)
+com.google.guava:guava:28.0-jre (8 constraints: 757ce0f9)
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (1 constraints: bd17c918)
 com.google.j2objc:j2objc-annotations:1.3 (1 constraints: b809eda0)
 com.jcraft:jzlib:1.1.3 (1 constraints: 0705f635)
@@ -30,13 +30,13 @@ com.netflix.feign:feign-slf4j:8.18.0 (1 constraints: 43056b3b)
 com.palantir.conjure.java.api:errors:2.9.0 (2 constraints: ff14ccb7)
 com.palantir.conjure.java.api:service-config:2.9.0 (1 constraints: 0d051036)
 com.palantir.conjure.java.api:ssl-config:2.9.0 (2 constraints: a1179a5f)
-com.palantir.safe-logging:preconditions:1.11.0 (8 constraints: be777613)
-com.palantir.safe-logging:safe-logging:1.11.0 (7 constraints: 6e6a04ee)
+com.palantir.safe-logging:preconditions:1.12.0 (8 constraints: c0771415)
+com.palantir.safe-logging:safe-logging:1.12.0 (7 constraints: 716a0df0)
 com.palantir.tokens:auth-tokens:3.6.1 (2 constraints: 85229f04)
-com.palantir.tracing:tracing:3.4.0 (4 constraints: 1836b903)
-com.palantir.tracing:tracing-api:3.4.0 (3 constraints: 942b5d22)
-com.palantir.tracing:tracing-jersey:3.4.0 (1 constraints: 09050636)
-com.palantir.tracing:tracing-okhttp3:3.4.0 (1 constraints: 09050636)
+com.palantir.tracing:tracing:3.4.1 (4 constraints: 1b36de04)
+com.palantir.tracing:tracing-api:3.4.1 (3 constraints: 972be622)
+com.palantir.tracing:tracing-jersey:3.4.1 (1 constraints: 0a050736)
+com.palantir.tracing:tracing-okhttp3:3.4.1 (1 constraints: 0a050736)
 com.palantir.tritium:tritium-registry:0.11.2 (1 constraints: 3605283b)
 com.squareup.okhttp3:logging-interceptor:3.13.1 (1 constraints: 3a053f3b)
 com.squareup.okhttp3:okhttp:3.13.1 (6 constraints: 8459d8f9)
@@ -45,6 +45,8 @@ com.squareup.retrofit2:converter-jackson:2.4.0 (1 constraints: 08050136)
 com.squareup.retrofit2:retrofit:2.4.0 (2 constraints: 4b1d8704)
 com.thoughtworks.paranamer:paranamer:2.8 (1 constraints: 0c1627c6)
 io.dropwizard.metrics:metrics-core:3.2.6 (2 constraints: e31c7ecf)
+jakarta.activation:jakarta.activation-api:1.2.1 (2 constraints: b928fbbd)
+jakarta.xml.bind:jakarta.xml.bind-api:2.3.2 (1 constraints: 30198ba6)
 javax.annotation:javax.annotation-api:1.3.2 (3 constraints: 1a310f90)
 javax.el:javax.el-api:2.2.4 (2 constraints: 981f620b)
 javax.inject:javax.inject:1 (2 constraints: d614a0ab)
@@ -79,14 +81,14 @@ org.slf4j:slf4j-api:1.7.26 (16 constraints: 04e0db13)
 ch.qos.logback:logback-access:1.2.3 (1 constraints: b41148e2)
 ch.qos.logback:logback-classic:1.2.3 (3 constraints: 962295eb)
 ch.qos.logback:logback-core:1.2.3 (3 constraints: 1a28577f)
-com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.9.9 (2 constraints: 2f1633e2)
-com.fasterxml.jackson.datatype:jackson-datatype-joda:2.9.9 (1 constraints: 8b0ec44f)
-com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.9.9 (1 constraints: 340e2840)
-com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.9 (1 constraints: 8b0ec44f)
+com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.10.1 (2 constraints: 4f162aed)
+com.fasterxml.jackson.datatype:jackson-datatype-joda:2.10.1 (1 constraints: 8b0ec44f)
+com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.10.1 (1 constraints: 340e2840)
+com.fasterxml.jackson.module:jackson-module-parameter-names:2.10.1 (1 constraints: 8b0ec44f)
 com.google.code.findbugs:annotations:3.0.1 (1 constraints: 9e0aafc3)
 com.palantir.conjure.java:conjure-lib:4.8.1 (1 constraints: 0f051836)
 com.palantir.ri:resource-identifier:1.0.1 (1 constraints: ea0f6699)
-com.palantir.safe-logging:preconditions-assertj:1.11.0 (1 constraints: 35052c3b)
+com.palantir.safe-logging:preconditions-assertj:1.12.0 (1 constraints: 36052f3b)
 com.palantir.tracing:tracing-test-utils:3.2.0-rc1 (1 constraints: 3a061d4d)
 com.papertrail:profiler:1.0.2 (1 constraints: e21051b8)
 com.spotify.dataenum:dataenum:1.3.2 (1 constraints: e91058c1)
@@ -116,7 +118,7 @@ io.dropwizard.metrics:metrics-servlets:4.0.2 (1 constraints: 400d371f)
 io.leangen.geantyref:geantyref:1.3.4 (1 constraints: 0a05fd35)
 io.reactivex.rxjava2:rxjava:2.2.14 (1 constraints: 3b05373b)
 javax.servlet:javax.servlet-api:3.1.0 (1 constraints: 830dcc28)
-joda-time:joda-time:2.9.9 (3 constraints: e12d801f)
+joda-time:joda-time:2.9.9 (3 constraints: 4a2e0d68)
 junit:junit:4.12 (5 constraints: 6e5ff878)
 net.bytebuddy:byte-buddy:1.9.10 (1 constraints: 450b52de)
 net.bytebuddy:byte-buddy-agent:1.9.10 (1 constraints: 450b52de)
@@ -125,7 +127,7 @@ net.sourceforge.argparse4j:argparse4j:0.8.1 (1 constraints: 430d3a1f)
 org.apache-extras.beanshell:bsh:2.0b6 (1 constraints: ac07626b)
 org.apache.commons:commons-lang3:3.9 (4 constraints: 9f30e53d)
 org.apache.commons:commons-text:1.2 (1 constraints: ae10289b)
-org.assertj:assertj-core:3.14.0 (3 constraints: 3228ed48)
+org.assertj:assertj-core:3.14.0 (3 constraints: 3128c548)
 org.eclipse.jetty:jetty-continuation:9.4.11.v20180605 (2 constraints: 74211443)
 org.eclipse.jetty:jetty-http:9.4.11.v20180605 (3 constraints: 0931f051)
 org.eclipse.jetty:jetty-io:9.4.11.v20180605 (3 constraints: f02f89af)
@@ -156,4 +158,4 @@ org.reactivestreams:reactive-streams:1.0.3 (1 constraints: 1f0c60f9)
 org.slf4j:jcl-over-slf4j:1.7.25 (1 constraints: b70e995e)
 org.slf4j:jul-to-slf4j:1.7.25 (1 constraints: b70e995e)
 org.slf4j:log4j-over-slf4j:1.7.25 (1 constraints: b70e995e)
-org.yaml:snakeyaml:1.23 (1 constraints: 6e17f627)
+org.yaml:snakeyaml:1.24 (1 constraints: 6f17f727)

versions.props

@@ -1,17 +1,17 @@
 ch.qos.logback:logback-classic = 1.1.7
 # catch-all jackson version
-com.fasterxml.jackson.*:jackson-* = 2.9.9
+com.fasterxml.jackson.*:jackson-* = 2.10.1
 # individual components are sometimes updated out of band to fix vulnerabilities
 # https://github.com/FasterXML/jackson-databind/issues/2387
 # https://github.com/FasterXML/jackson-databind/issues/2389
-com.fasterxml.jackson.core:jackson-databind = 2.9.9.3
-com.fasterxml.jackson.datatype:jackson-datatype-guava = 2.9.9
-com.fasterxml.jackson.module:jackson-module-afterburner = 2.9.9
+com.fasterxml.jackson.core:jackson-databind = 2.10.1
+com.fasterxml.jackson.datatype:jackson-datatype-guava = 2.10.1
+com.fasterxml.jackson.module:jackson-module-afterburner = 2.10.1
 com.fasterxml.jackson.datatype:jackson-datatype-jdk8 = 2.9.9
 com.fasterxml.jackson.datatype:jackson-datatype-jsr310 = 2.9.9
-com.fasterxml.jackson.dataformat:jackson-dataformat-yaml = 2.9.9
+com.fasterxml.jackson.dataformat:jackson-dataformat-yaml = 2.10.1
 com.fasterxml.jackson.dataformat:jackson-dataformat-cbor = 2.9.9
-com.fasterxml.jackson.module:jackson-module-scala_2.11 = 2.9.9
+com.fasterxml.jackson.module:jackson-module-scala_2.11 = 2.10.1
 com.github.ben-manes.caffeine:caffeine = 2.8.0
 com.google.code.findbugs:jsr305 = 3.0.2
 com.google.guava:guava = 23.6.1-jre
@@ -22,8 +22,8 @@ com.palantir.conjure.java:conjure-java = 4.8.1
 com.palantir.conjure.java:conjure-lib = 4.8.1
 com.palantir.conjure.java.api:* = 2.9.0
 com.palantir.conjure.verification:* = 0.16.7
-com.palantir.safe-logging:* = 1.11.0
-com.palantir.tracing:* = 3.4.0
+com.palantir.safe-logging:* = 1.12.0
+com.palantir.tracing:* = 3.4.1
 com.palantir.tritium:tritium-registry = 0.11.2
 io.dropwizard:dropwizard-* = 1.3.7
 io.reactivex.rxjava2:rxjava = 2.2.14