Excavator: Upgrades Baseline to the latest version (#800)

build.gradle

@@ -25,7 +25,7 @@ buildscript {
         classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.9.0'
         classpath 'com.palantir.gradle.revapi:gradle-revapi:1.5.0'
         classpath 'gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0'
-        classpath 'com.palantir.baseline:gradle-baseline-java:4.38.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:4.46.0'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.3'
         classpath 'gradle.plugin.org.inferred:gradle-processors:3.6.0'
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.3.0'

tracing/src/test/java/com/palantir/tracing/TracerTest.java

@@ -80,28 +80,28 @@ public void testIdsMustBeNonNullAndNotEmpty() throws Exception {
         assertThatLoggableExceptionThrownBy(
                         () -> Tracer.initTraceWithSpan(Observability.UNDECIDED, null, "op", SpanType.LOCAL))
                 .hasLogMessage("traceId must be non-empty")
-                .hasExactlyArgs();
+                .hasNoArgs();
 
         assertThatLoggableExceptionThrownBy(
                         () -> Tracer.initTraceWithSpan(Observability.UNDECIDED, "", "op", SpanType.LOCAL))
                 .hasLogMessage("traceId must be non-empty")
-                .hasExactlyArgs();
+                .hasNoArgs();
 
         assertThatLoggableExceptionThrownBy(() -> Tracer.startSpan("op", null, null))
                 .hasLogMessage("parentSpanId must be non-empty")
-                .hasExactlyArgs();
+                .hasNoArgs();
 
         assertThatLoggableExceptionThrownBy(() -> Tracer.startSpan("op", "", null))
                 .hasLogMessage("parentSpanId must be non-empty")
-                .hasExactlyArgs();
+                .hasNoArgs();
 
         assertThatLoggableExceptionThrownBy(() -> Tracer.fastStartSpan("op", null, null))
                 .hasLogMessage("parentSpanId must be non-empty")
-                .hasExactlyArgs();
+                .hasNoArgs();
 
         assertThatLoggableExceptionThrownBy(() -> Tracer.fastStartSpan("op", "", null))
                 .hasLogMessage("parentSpanId must be non-empty")
-                .hasExactlyArgs();
+                .hasNoArgs();
     }
 
     @Test

versions.lock

@@ -5,11 +5,11 @@ com.google.guava:failureaccess:1.0.1 (1 constraints: 140ae1b4)
 com.google.guava:guava:28.2-jre (6 constraints: 5d5b5723)
 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.palantir.safe-logging:logger:1.18.0 (1 constraints: 3c05413b)
-com.palantir.safe-logging:logger-slf4j:1.18.0 (1 constraints: 350e9350)
-com.palantir.safe-logging:logger-spi:1.18.0 (2 constraints: 791e0cb1)
-com.palantir.safe-logging:preconditions:1.18.0 (3 constraints: 19364d74)
-com.palantir.safe-logging:safe-logging:1.18.0 (5 constraints: b0485624)
+com.palantir.safe-logging:logger:1.20.0 (1 constraints: 3c05413b)
+com.palantir.safe-logging:logger-slf4j:1.20.0 (1 constraints: 2e0e7f50)
+com.palantir.safe-logging:logger-spi:1.20.0 (2 constraints: 6b1e94af)
+com.palantir.safe-logging:preconditions:1.20.0 (3 constraints: 0b369672)
+com.palantir.safe-logging:safe-logging:1.20.0 (5 constraints: 9448691b)
 com.squareup.okhttp3:okhttp:3.9.0 (1 constraints: 0e051536)
 com.squareup.okio:okio:1.13.0 (1 constraints: 7f0cb509)
 io.undertow:undertow-core:2.0.17.Final (1 constraints: 54072861)
@@ -39,28 +39,28 @@ ch.qos.logback:logback-access:1.2.3 (1 constraints: b41148e2)
 ch.qos.logback:logback-classic:1.2.7 (6 constraints: c8519390)
 ch.qos.logback:logback-core:1.2.7 (4 constraints: d1395b10)
 com.fasterxml:classmate:1.5.1 (3 constraints: 8630e25a)
-com.fasterxml.jackson:jackson-bom:2.12.3 (13 constraints: d21fde18)
-com.fasterxml.jackson.core:jackson-annotations:2.12.3 (17 constraints: c11b6b42)
-com.fasterxml.jackson.core:jackson-core:2.12.3 (17 constraints: bc5c1da5)
-com.fasterxml.jackson.core:jackson-databind:2.12.3 (25 constraints: 53ef3f17)
-com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.12.3 (2 constraints: 352b4987)
-com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.12.3 (2 constraints: 352b4987)
-com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.12.3 (3 constraints: 30251c0e)
-com.fasterxml.jackson.datatype:jackson-datatype-guava:2.12.3 (4 constraints: aa4867dc)
-com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.12.3 (3 constraints: e53993fc)
-com.fasterxml.jackson.datatype:jackson-datatype-joda:2.12.3 (3 constraints: e53993fc)
-com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.12.3 (3 constraints: e53993fc)
-com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.12.3 (2 constraints: 2e26b860)
-com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.12.3 (3 constraints: d62b4635)
-com.fasterxml.jackson.module:jackson-module-afterburner:2.12.3 (3 constraints: 013a3503)
-com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.12.3 (2 constraints: 2e26b860)
-com.fasterxml.jackson.module:jackson-module-parameter-names:2.12.3 (2 constraints: 681d2f2f)
+com.fasterxml.jackson:jackson-bom:2.12.5 (13 constraints: ec1f3e40)
+com.fasterxml.jackson.core:jackson-annotations:2.12.5 (17 constraints: cb1b915b)
+com.fasterxml.jackson.core:jackson-core:2.12.5 (17 constraints: d65c1fde)
+com.fasterxml.jackson.core:jackson-databind:2.12.5 (25 constraints: 6fefaf7c)
+com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.12.5 (2 constraints: 392be987)
+com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.12.5 (2 constraints: 392be987)
+com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.12.5 (3 constraints: 32257e0e)
+com.fasterxml.jackson.datatype:jackson-datatype-guava:2.12.5 (4 constraints: ae4857de)
+com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.12.5 (3 constraints: e939dbfd)
+com.fasterxml.jackson.datatype:jackson-datatype-joda:2.12.5 (3 constraints: e939dbfd)
+com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.12.5 (3 constraints: e939dbfd)
+com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.12.5 (2 constraints: 32263e61)
+com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.12.5 (3 constraints: d82bee35)
+com.fasterxml.jackson.module:jackson-module-afterburner:2.12.5 (3 constraints: 053a7d04)
+com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.12.5 (2 constraints: 32263e61)
+com.fasterxml.jackson.module:jackson-module-parameter-names:2.12.5 (2 constraints: 6a1d852f)
 com.github.ben-manes.caffeine:caffeine:2.8.4 (4 constraints: 633c8aa1)
 com.google.code.findbugs:annotations:3.0.1 (1 constraints: 9e0aafc3)
 com.helger:profiler:1.1.1 (1 constraints: e21053b8)
-com.palantir.conjure.java.runtime:conjure-java-jackson-optimizations:7.11.0 (1 constraints: 7f1cb1a4)
-com.palantir.conjure.java.runtime:conjure-java-jackson-serialization:7.11.0 (1 constraints: 3b05503b)
-com.palantir.safe-logging:preconditions-assertj:1.18.0 (1 constraints: 3c05413b)
+com.palantir.conjure.java.runtime:conjure-java-jackson-optimizations:7.20.0 (1 constraints: 7f1cb2a4)
+com.palantir.conjure.java.runtime:conjure-java-jackson-serialization:7.20.0 (1 constraints: 3b05513b)
+com.palantir.safe-logging:preconditions-assertj:1.20.0 (1 constraints: 3c05413b)
 com.spotify.dataenum:dataenum:1.4.1 (1 constraints: 0805fd35)
 io.dropwizard:dropwizard-configuration:2.0.10 (2 constraints: 2e1c3dc0)
 io.dropwizard:dropwizard-core:2.0.10 (1 constraints: c20ece5f)
@@ -99,7 +99,7 @@ net.sourceforge.argparse4j:argparse4j:0.8.1 (2 constraints: da1b0490)
 org.apache-extras.beanshell:bsh:2.0b6 (1 constraints: ac07626b)
 org.apache.commons:commons-lang3:3.10 (4 constraints: 4b373a47)
 org.apache.commons:commons-text:1.8 (1 constraints: b4102e9b)
-org.assertj:assertj-core:3.21.0 (2 constraints: 9319f4dd)
+org.assertj:assertj-core:3.21.0 (2 constraints: 9219f5dd)
 org.eclipse.jetty:jetty-continuation:9.4.29.v20200521 (1 constraints: d81018f8)
 org.eclipse.jetty:jetty-http:9.4.29.v20200521 (4 constraints: 2b459ddb)
 org.eclipse.jetty:jetty-io:9.4.29.v20200521 (6 constraints: c5611794)

versions.props

@@ -12,7 +12,6 @@ jakarta.servlet:jakarta.servlet-api = 4.0.4
 jakarta.ws.rs:jakarta.ws.rs-api = 2.1.6
 org.glassfish.jersey.*:* = 2.22.2
 org.slf4j:slf4j-api = 1.7.12
-com.palantir.conjure.java.runtime:* = 7.11.0
 
 # dependency-upgrader:ON
 junit:junit = 4.13.2
@@ -28,3 +27,4 @@ org.junit.jupiter:* = 5.8.2
 org.junit.vintage:* = 5.8.2
 com.uber.nullaway:nullaway = 0.9.2
 com.spotify.dataenum:* = 1.4.1
+com.palantir.conjure.java.runtime:* = 7.20.0