diff --git a/errors/versions.lock b/errors/versions.lock index 4f403f6b2..15b3a2f16 100644 --- a/errors/versions.lock +++ b/errors/versions.lock @@ -1,25 +1,25 @@ { "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.core:jackson-databind": { - "locked": "2.6.7" + "locked": "2.9.5" }, "com.google.code.findbugs:jsr305": { "locked": "3.0.1" }, "com.palantir.safe-logging:safe-logging": { - "locked": "1.3.0" + "locked": "1.5.0" }, "javax.ws.rs:javax.ws.rs-api": { "locked": "2.0.1" @@ -27,25 +27,25 @@ }, "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.core:jackson-databind": { - "locked": "2.6.7" + "locked": "2.9.5" }, "com.google.code.findbugs:jsr305": { "locked": "3.0.1" }, "com.palantir.safe-logging:safe-logging": { - "locked": "1.3.0" + "locked": "1.5.0" }, "javax.ws.rs:javax.ws.rs-api": { "locked": "2.0.1" diff --git a/extras/jackson-support/versions.lock b/extras/jackson-support/versions.lock index d9cec3682..a3f497bd7 100644 --- a/extras/jackson-support/versions.lock +++ b/extras/jackson-support/versions.lock @@ -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", @@ -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", @@ -27,22 +28,22 @@ ] }, "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": "15.0", + "locked": "18.0", "transitive": [ "com.fasterxml.jackson.datatype:jackson-datatype-guava" ] @@ -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", @@ -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", @@ -76,22 +78,22 @@ ] }, "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": "15.0", + "locked": "18.0", "transitive": [ "com.fasterxml.jackson.datatype:jackson-datatype-guava" ] diff --git a/service-config/src/main/java/com/palantir/conjure/java/api/config/service/PartialServiceConfiguration.java b/service-config/src/main/java/com/palantir/conjure/java/api/config/service/PartialServiceConfiguration.java index 7bf13b130..1309e9083 100644 --- a/service-config/src/main/java/com/palantir/conjure/java/api/config/service/PartialServiceConfiguration.java +++ b/service-config/src/main/java/com/palantir/conjure/java/api/config/service/PartialServiceConfiguration.java @@ -16,7 +16,7 @@ package com.palantir.conjure.java.api.config.service; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonAlias; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.palantir.conjure.java.api.config.ssl.SslConfiguration; @@ -32,6 +32,7 @@ public interface PartialServiceConfiguration { /** The API token to be used to interact with the service. */ + @JsonAlias("api-token") Optional apiToken(); /** The SSL configuration needed to interact with the service. */ @@ -41,27 +42,34 @@ public interface PartialServiceConfiguration { List uris(); /** Connect timeout for requests. */ + @JsonAlias("connect-timeout") Optional connectTimeout(); /** Read timeout for requests. */ + @JsonAlias("read-timeout") Optional readTimeout(); /** Write timeout for requests. */ + @JsonAlias("write-timeout") Optional writeTimeout(); /** The maximum number of times a failed RPC call should be retried. */ + @JsonAlias("max-num-retries") Optional maxNumRetries(); /** * The size of one backoff time slot for call retries. For example, an exponential backoff retry algorithm may * choose a backoff time in {@code [0, backoffSlotSize * 2^c]} for the c-th retry. */ + @JsonAlias("backoff-slot-size") Optional backoffSlotSize(); /** Enables slower, but more standard cipher suite support, defaults to false. */ + @JsonAlias("enable-gcm-cipher-suites") Optional enableGcmCipherSuites(); /** Proxy configuration for connecting to the service. If absent, uses system proxy configuration. */ + @JsonAlias("proxy-configuration") Optional proxyConfiguration(); static PartialServiceConfiguration of(List uris, Optional sslConfig) { @@ -75,47 +83,5 @@ static Builder builder() { return new Builder(); } - // TODO(jnewman): #317 - remove kebab-case methods when Jackson 2.7 is picked up - class Builder extends ImmutablePartialServiceConfiguration.Builder { - - @JsonProperty("api-token") - Builder apiTokenKebabCase(Optional apiToken) { - return apiToken(apiToken); - } - - @JsonProperty("connect-timeout") - Builder connectTimeoutKebabCase(Optional connectTimeout) { - return connectTimeout(connectTimeout); - } - - @JsonProperty("read-timeout") - Builder readTimeoutKebabCase(Optional readTimeout) { - return readTimeout(readTimeout); - } - - @JsonProperty("write-timeout") - Builder writeTimeoutKebabCase(Optional writeTimeout) { - return writeTimeout(writeTimeout); - } - - @JsonProperty("max-num-retries") - Builder maxNumRetriesKebabCase(Optional maxNumRetries) { - return maxNumRetries(maxNumRetries); - } - - @JsonProperty("backoff-slot-size") - Builder backoffSlotSizeKebabCase(Optional backoffSlotSize) { - return backoffSlotSize(backoffSlotSize); - } - - @JsonProperty("proxy-configuration") - Builder proxyConfigurationKebabCase(Optional proxyConfiguration) { - return proxyConfiguration(proxyConfiguration); - } - - @JsonProperty("enable-gcm-cipher-suites") - Builder enableGcmCipherSuitesKebabCase(Optional enableGcmCipherSuites) { - return enableGcmCipherSuites(enableGcmCipherSuites); - } - } + class Builder extends ImmutablePartialServiceConfiguration.Builder { } } diff --git a/service-config/src/main/java/com/palantir/conjure/java/api/config/service/ProxyConfiguration.java b/service-config/src/main/java/com/palantir/conjure/java/api/config/service/ProxyConfiguration.java index 1285127a9..3b9786623 100644 --- a/service-config/src/main/java/com/palantir/conjure/java/api/config/service/ProxyConfiguration.java +++ b/service-config/src/main/java/com/palantir/conjure/java/api/config/service/ProxyConfiguration.java @@ -16,6 +16,7 @@ package com.palantir.conjure.java.api.config.service; +import com.fasterxml.jackson.annotation.JsonAlias; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -56,6 +57,7 @@ public enum Type { * com.google.common.net.HostAndPort}, for instance {@code foo.com:80}, {@code 192.168.3.100:8080}, etc. */ @JsonProperty("hostAndPort") + @JsonAlias("host-and-port") public abstract Optional hostAndPort(); /** @@ -115,12 +117,5 @@ public static Builder builder() { return new Builder(); } - // TODO(jnewman): #317 - remove kebab-case methods when Jackson 2.7 is picked up - static final class Builder extends ImmutableProxyConfiguration.Builder { - - @JsonProperty("host-and-port") - Builder hostAndPortKebabCase(String hostAndPort) { - return hostAndPort(hostAndPort); - } - } + static final class Builder extends ImmutableProxyConfiguration.Builder {} } diff --git a/service-config/src/main/java/com/palantir/conjure/java/api/config/service/ServicesConfigBlock.java b/service-config/src/main/java/com/palantir/conjure/java/api/config/service/ServicesConfigBlock.java index 2e5d5fcae..cf3930e8e 100644 --- a/service-config/src/main/java/com/palantir/conjure/java/api/config/service/ServicesConfigBlock.java +++ b/service-config/src/main/java/com/palantir/conjure/java/api/config/service/ServicesConfigBlock.java @@ -16,6 +16,7 @@ package com.palantir.conjure.java.api.config.service; +import com.fasterxml.jackson.annotation.JsonAlias; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -42,6 +43,7 @@ public abstract class ServicesConfigBlock { * PartialServiceConfiguration}. */ @JsonProperty("apiToken") + @JsonAlias("api-token") public abstract Optional defaultApiToken(); /** @@ -58,78 +60,47 @@ public abstract class ServicesConfigBlock { * Default global proxy configuration for connecting to the services. */ @JsonProperty("proxyConfiguration") + @JsonAlias("proxy-configuration") public abstract Optional defaultProxyConfiguration(); /** * Default global connect timeout. */ @JsonProperty("connectTimeout") + @JsonAlias("connect-timeout") public abstract Optional defaultConnectTimeout(); /** * Default global read timeout. */ @JsonProperty("readTimeout") + @JsonAlias("read-timeout") public abstract Optional defaultReadTimeout(); /** * Default global write timeout. */ @JsonProperty("writeTimeout") + @JsonAlias("write-timeout") public abstract Optional defaultWriteTimeout(); /** * Default global backoff slot size, see {@link PartialServiceConfiguration#backoffSlotSize()}. */ @JsonProperty("backoffSlotSize") + @JsonAlias("backoff-slot-size") public abstract Optional defaultBackoffSlotSize(); /** * Default enablement of gcm cipher suites, defaults to false. */ @JsonProperty("enableGcmCipherSuites") + @JsonAlias("enable-gcm-cipher-suites") public abstract Optional defaultEnableGcmCipherSuites(); public static Builder builder() { return new Builder(); } - // TODO(jnewman): #317 - remove kebab-case methods when Jackson 2.7 is picked up - public static final class Builder extends ImmutableServicesConfigBlock.Builder { - - @JsonProperty("api-token") - Builder defaultApiTokenKebabCase(Optional defaultApiToken) { - return defaultApiToken(defaultApiToken); - } - - @JsonProperty("proxy-configuration") - Builder defaultProxyConfigurationKebabCase(Optional defaultProxyConfiguration) { - return defaultProxyConfiguration(defaultProxyConfiguration); - } - - @JsonProperty("connect-timeout") - Builder defaultConnectTimeoutKebabCase(Optional defaultConnectTimeout) { - return defaultConnectTimeout(defaultConnectTimeout); - } - - @JsonProperty("read-timeout") - Builder defaultReadTimeoutKebabCase(Optional defaultReadTimeout) { - return defaultReadTimeout(defaultReadTimeout); - } - - @JsonProperty("write-timeout") - Builder defaultWriteTimeoutKebabCase(Optional defaultWriteTimeout) { - return defaultWriteTimeout(defaultWriteTimeout); - } - - @JsonProperty("backoff-slot-size") - Builder defaultBackoffSlotSizeKebabCase(Optional defaultBackoffSlotSize) { - return defaultBackoffSlotSize(defaultBackoffSlotSize); - } - - @JsonProperty("enable-gcm-cipher-suites") - Builder defaultEnableGcmCipherSuitesKebabCase(Optional defaultEnableGcmCipherSuites) { - return defaultEnableGcmCipherSuites(defaultEnableGcmCipherSuites); - } - } + public static final class Builder extends ImmutableServicesConfigBlock.Builder {} } diff --git a/service-config/versions.lock b/service-config/versions.lock index cb75b0e9b..71df20d65 100644 --- a/service-config/versions.lock +++ b/service-config/versions.lock @@ -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.conjure.java.api:ssl-config", @@ -22,7 +22,7 @@ ] }, "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { - "locked": "2.6.7", + "locked": "2.9.5", "transitive": [ "com.palantir.tokens:auth-tokens" ] @@ -37,10 +37,10 @@ "project": true }, "com.palantir.safe-logging:preconditions": { - "locked": "1.3.0" + "locked": "1.5.0" }, "com.palantir.safe-logging:safe-logging": { - "locked": "1.3.0", + "locked": "1.5.0", "transitive": [ "com.palantir.safe-logging:preconditions" ] @@ -57,20 +57,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.conjure.java.api:ssl-config", @@ -78,7 +78,7 @@ ] }, "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { - "locked": "2.6.7", + "locked": "2.9.5", "transitive": [ "com.palantir.tokens:auth-tokens" ] @@ -93,10 +93,10 @@ "project": true }, "com.palantir.safe-logging:preconditions": { - "locked": "1.3.0" + "locked": "1.5.0" }, "com.palantir.safe-logging:safe-logging": { - "locked": "1.3.0", + "locked": "1.5.0", "transitive": [ "com.palantir.safe-logging:preconditions" ] diff --git a/ssl-config/src/main/java/com/palantir/conjure/java/api/config/ssl/SslConfiguration.java b/ssl-config/src/main/java/com/palantir/conjure/java/api/config/ssl/SslConfiguration.java index a231dcf18..bd30d15dd 100644 --- a/ssl-config/src/main/java/com/palantir/conjure/java/api/config/ssl/SslConfiguration.java +++ b/ssl-config/src/main/java/com/palantir/conjure/java/api/config/ssl/SslConfiguration.java @@ -16,7 +16,7 @@ package com.palantir.conjure.java.api.config.ssl; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonAlias; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.nio.file.Path; import java.util.Optional; @@ -36,24 +36,30 @@ public enum StoreType { private static final StoreType DEFAULT_STORE_TYPE = StoreType.JKS; + @JsonAlias("trust-store-path") public abstract Path trustStorePath(); @SuppressWarnings("checkstyle:designforextension") @Value.Default + @JsonAlias("trust-store-type") public StoreType trustStoreType() { return DEFAULT_STORE_TYPE; } + @JsonAlias("key-store-path") public abstract Optional keyStorePath(); + @JsonAlias("key-store-password") public abstract Optional keyStorePassword(); @SuppressWarnings("checkstyle:designforextension") @Value.Default + @JsonAlias("key-store-type") public StoreType keyStoreType() { return DEFAULT_STORE_TYPE; } + @JsonAlias("key-store-key-alias") /** Alias of the key that should be used in the key store. If absent, first entry returned by key store is used. */ public abstract Optional keyStoreKeyAlias(); @@ -85,38 +91,5 @@ public static Builder builder() { return new Builder(); } - // TODO(jnewman): #317 - remove kebab-case methods when Jackson 2.7 is picked up - public static final class Builder extends ImmutableSslConfiguration.Builder { - - @JsonProperty("trust-store-path") - Builder trustStorePathKebabCase(Path trustStorePath) { - return trustStorePath(trustStorePath); - } - - @JsonProperty("trust-store-type") - Builder trustStoreTypeKebabCase(StoreType storeType) { - return trustStoreType(storeType); - } - - @JsonProperty("key-store-path") - Builder keyStorePathKebabCase(Optional keyStorePath) { - return keyStorePath(keyStorePath); - } - - @JsonProperty("key-store-password") - Builder keyStorePasswordKebabCase(Optional keyStorePassword) { - return keyStorePassword(keyStorePassword); - } - - @JsonProperty("key-store-type") - Builder keyStoretypeKebabCase(StoreType keyStoreType) { - return keyStoreType(keyStoreType); - } - - @JsonProperty("key-store-key-alias") - Builder keyStoreKeyAliasKebabCase(Optional keyStoreKeyAlias) { - return keyStoreKeyAlias(keyStoreKeyAlias); - } - - } + public static final class Builder extends ImmutableSslConfiguration.Builder {} } diff --git a/ssl-config/versions.lock b/ssl-config/versions.lock index e412077d5..e579ddc20 100644 --- a/ssl-config/versions.lock +++ b/ssl-config/versions.lock @@ -1,36 +1,36 @@ { "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.core:jackson-databind": { - "locked": "2.6.7" + "locked": "2.9.5" } }, "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.core:jackson-databind": { - "locked": "2.6.7" + "locked": "2.9.5" } } } \ No newline at end of file diff --git a/test-utils/versions.lock b/test-utils/versions.lock index b32940bf5..17e316c36 100644 --- a/test-utils/versions.lock +++ b/test-utils/versions.lock @@ -1,19 +1,19 @@ { "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.core:jackson-databind": { - "locked": "2.6.7", + "locked": "2.9.5", "transitive": [ "com.palantir.conjure.java.api:errors" ] @@ -28,7 +28,7 @@ "project": true }, "com.palantir.safe-logging:safe-logging": { - "locked": "1.3.0", + "locked": "1.5.0", "transitive": [ "com.palantir.conjure.java.api:errors" ] @@ -64,19 +64,19 @@ }, "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.core:jackson-databind": { - "locked": "2.6.7", + "locked": "2.9.5", "transitive": [ "com.palantir.conjure.java.api:errors" ] @@ -91,7 +91,7 @@ "project": true }, "com.palantir.safe-logging:safe-logging": { - "locked": "1.3.0", + "locked": "1.5.0", "transitive": [ "com.palantir.conjure.java.api:errors" ] diff --git a/tracing/versions.lock b/tracing/versions.lock index e412077d5..e579ddc20 100644 --- a/tracing/versions.lock +++ b/tracing/versions.lock @@ -1,36 +1,36 @@ { "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.core:jackson-databind": { - "locked": "2.6.7" + "locked": "2.9.5" } }, "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.core:jackson-databind": { - "locked": "2.6.7" + "locked": "2.9.5" } } } \ No newline at end of file diff --git a/versions.props b/versions.props index f253e3654..2b54f4de1 100644 --- a/versions.props +++ b/versions.props @@ -1,4 +1,4 @@ -com.fasterxml.jackson.*:jackson-* = 2.6.7 +com.fasterxml.jackson.*:jackson-* = 2.9.5 com.google.code.findbugs:jsr305 = 3.0.1 com.palantir.safe-logging:* = 1.5.0 com.palantir.tokens:auth-tokens = 3.0.0