Excavator: Upgrade dependencies (#588)

* Excavator: Upgrade dependencies

* remove jackson-datatype-guava module

* fix deprecations

Co-authored-by: svc-excavator-bot <[email protected]>
Co-authored-by: Carter Kozak <[email protected]>

Author: svc-excavator-bot

tracing-jersey/src/test/java/com/palantir/tracing/jersey/TraceEnrichingFilterTest.java

@@ -53,12 +53,14 @@
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.slf4j.MDC;
 
+@RunWith(MockitoJUnitRunner.class)
 public final class TraceEnrichingFilterTest {
 
     @ClassRule
@@ -86,7 +88,6 @@ public final class TraceEnrichingFilterTest {
 
     @Before
     public void before() {
-        MockitoAnnotations.initMocks(this);
         String endpointUri = "http://localhost:" + APP.getLocalPort();
         JerseyClientBuilder builder = new JerseyClientBuilder();
         Client client = builder.build();
@@ -97,8 +98,6 @@ public void before() {
         MDC.clear();
 
         when(request.getMethod()).thenReturn("GET");
-        when(uriInfo.getPath()).thenReturn("/foo");
-        when(request.getUriInfo()).thenReturn(uriInfo);
         when(traceSampler.sample()).thenReturn(true);
     }
 

tracing-test-utils/src/test/java/com/palantir/tracing/HtmlFormatterTest.java

@@ -58,6 +58,6 @@ void should_render_sensible_html(LayoutStrategy strategy) throws IOException {
                 .layoutStrategy(strategy)
                 .build());
 
-        assertThat(file).hasSameContentAs(output);
+        assertThat(file).hasSameTextualContentAs(output);
     }
 }

tracing/build.gradle

@@ -20,7 +20,6 @@ apply plugin: 'com.palantir.revapi'
 dependencies {
     compile project(":tracing-api")
     compile "com.fasterxml.jackson.core:jackson-databind"
-    compile "com.fasterxml.jackson.datatype:jackson-datatype-guava"
     compile "com.fasterxml.jackson.datatype:jackson-datatype-jdk8"
     compile "com.fasterxml.jackson.module:jackson-module-afterburner"
     compile "com.google.guava:guava"

tracing/src/main/java/com/palantir/tracing/AsyncSlf4jSpanObserver.java

@@ -22,7 +22,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.guava.GuavaModule;
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
 import com.fasterxml.jackson.module.afterburner.AfterburnerModule;
 import com.palantir.logsafe.UnsafeArg;
@@ -45,7 +44,6 @@
  */
 public final class AsyncSlf4jSpanObserver extends AsyncSpanObserver {
     private static final ObjectMapper mapper = new ObjectMapper()
-            .registerModule(new GuavaModule())
             .registerModule(new Jdk8Module().configureAbsentsAsNulls(true))
             .registerModule(new AfterburnerModule())
             .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)

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

@@ -23,7 +23,6 @@
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
 
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.Logger;
@@ -45,10 +44,11 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.slf4j.LoggerFactory;
 import zipkin.Annotation;
 import zipkin.BinaryAnnotation;
@@ -57,6 +57,7 @@
 
 // CHECKSTYLE:ON
 
+@RunWith(MockitoJUnitRunner.class)
 public final class AsyncSlf4jSpanObserverTest {
 
     private static final String TEST_OBSERVER = "test";
@@ -77,11 +78,8 @@ public final class AsyncSlf4jSpanObserverTest {
 
     @Before
     public void before() {
-        MockitoAnnotations.initMocks(this);
-
         Tracer.setSampler(AlwaysSampler.INSTANCE);
 
-        when(appender.getName()).thenReturn("MOCK");
         logger = (ch.qos.logback.classic.Logger) LoggerFactory.getLogger(AsyncSlf4jSpanObserver.class);
         logger.addAppender(appender);
 

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

@@ -27,9 +27,11 @@
 import org.jmock.lib.concurrent.DeterministicScheduler;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 
+@RunWith(MockitoJUnitRunner.class)
 public final class AsyncSpanObserverTest {
 
     @Mock
@@ -39,7 +41,6 @@ public final class AsyncSpanObserverTest {
 
     @Before
     public void before() {
-        MockitoAnnotations.initMocks(this);
         scheduler = new DeterministicScheduler();
     }
 

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

@@ -34,15 +34,16 @@
 import java.util.Set;
 import org.assertj.core.util.Sets;
 import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.slf4j.MDC;
 
+@RunWith(MockitoJUnitRunner.class)
 public final class TracerTest {
 
     @Mock
@@ -57,11 +58,6 @@ public final class TracerTest {
     @Captor
     private ArgumentCaptor<Span> spanCaptor;
 
-    @Before
-    public void before() {
-        MockitoAnnotations.initMocks(this);
-    }
-
     @After
     public void after() {
         Tracer.initTraceWithSpan(Observability.SAMPLE, Tracers.randomId(), "op", SpanType.LOCAL);

versions.lock

@@ -2,7 +2,6 @@
 com.fasterxml.jackson.core:jackson-annotations:2.10.4 (17 constraints: 3e129ac7)
 com.fasterxml.jackson.core:jackson-core:2.10.4 (16 constraints: fe3a68dc)
 com.fasterxml.jackson.core:jackson-databind:2.10.4 (22 constraints: 19998e7a)
-com.fasterxml.jackson.datatype:jackson-datatype-guava:2.10.4 (4 constraints: 063f7f80)
 com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.10.4 (3 constraints: 4130b135)
 com.fasterxml.jackson.module:jackson-module-afterburner:2.10.4 (3 constraints: 4130b135)
 com.google.code.findbugs:jsr305:3.0.2 (16 constraints: 50e8dc30)
@@ -29,7 +28,7 @@ org.glassfish.jersey.core:jersey-client:2.31 (4 constraints: 78509cb2)
 org.glassfish.jersey.core:jersey-common:2.31 (11 constraints: dfc64234)
 org.glassfish.jersey.core:jersey-server:2.31 (9 constraints: dab3c81c)
 org.glassfish.jersey.media:jersey-media-jaxb:2.31 (1 constraints: d110c2b2)
-org.immutables:value:2.8.3 (1 constraints: 0f051036)
+org.immutables:value:2.8.8 (1 constraints: 14051536)
 org.jboss.logging:jboss-logging:3.3.2.Final (2 constraints: 7022d9d6)
 org.jboss.xnio:xnio-api:3.3.8.Final (2 constraints: 6f1a4d45)
 org.jboss.xnio:xnio-nio:3.3.8.Final (1 constraints: c40da530)
@@ -44,6 +43,7 @@ ch.qos.logback:logback-core:1.2.3 (4 constraints: cd39ef0e)
 com.fasterxml:classmate:1.5.1 (3 constraints: 8630e25a)
 com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.10.4 (1 constraints: 591c3588)
 com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.10.4 (2 constraints: 78162504)
+com.fasterxml.jackson.datatype:jackson-datatype-guava:2.10.4 (3 constraints: ce39d8fc)
 com.fasterxml.jackson.datatype:jackson-datatype-joda:2.10.4 (1 constraints: b10e595e)
 com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.10.4 (2 constraints: 092b498d)
 com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.10.4 (1 constraints: 76175d3d)
@@ -86,15 +86,15 @@ jakarta.xml.bind:jakarta.xml.bind-api:2.3.3 (2 constraints: c6277400)
 javax.servlet:javax.servlet-api:3.1.0 (1 constraints: 830dcc28)
 joda-time:joda-time:2.10.6 (2 constraints: 622437b1)
 junit:junit:4.13 (4 constraints: 50522eb0)
-net.bytebuddy:byte-buddy:1.10.5 (1 constraints: 410b37de)
-net.bytebuddy:byte-buddy-agent:1.10.5 (1 constraints: 410b37de)
+net.bytebuddy:byte-buddy:1.10.13 (1 constraints: 700ba3e9)
+net.bytebuddy:byte-buddy-agent:1.10.13 (1 constraints: 700ba3e9)
 net.jcip:jcip-annotations:1.0 (1 constraints: 560ff165)
 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.apiguardian:apiguardian-api:1.1.0 (6 constraints: 7d64a5c6)
-org.assertj:assertj-core:3.14.0 (2 constraints: 94196bde)
+org.assertj:assertj-core:3.16.1 (2 constraints: 97191ddf)
 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)
@@ -132,7 +132,7 @@ org.junit.jupiter:junit-jupiter-params:5.6.0 (2 constraints: 1917223c)
 org.junit.platform:junit-platform-commons:1.6.0 (3 constraints: e2299d29)
 org.junit.platform:junit-platform-engine:1.6.0 (3 constraints: 302a795b)
 org.junit.vintage:junit-vintage-engine:5.6.0 (2 constraints: 1e0ef858)
-org.mockito:mockito-core:3.2.4 (1 constraints: 0b050436)
+org.mockito:mockito-core:3.4.6 (1 constraints: 0f050c36)
 org.objenesis:objenesis:2.6 (1 constraints: b40a14bd)
 org.opentest4j:opentest4j:1.2.0 (2 constraints: cd205b49)
 org.ow2.asm:asm:7.1 (1 constraints: 1a07505c)

versions.props

@@ -17,14 +17,14 @@ com.palantir.conjure.java.runtime:* = 4.19.0
 
 # dependency-upgrader:ON
 junit:junit = 4.13
-org.assertj:assertj-core = 3.14.0
+org.assertj:assertj-core = 3.16.1
 org.hamcrest:hamcrest-* = 1.3
-org.immutables:value = 2.8.3
+org.immutables:value = 2.8.8
 org.openjdk.jmh:* = 1.22
 org.jmock:jmock = 2.12.0
-org.mockito:mockito-core = 3.2.4
+org.mockito:mockito-core = 3.4.6
 ch.qos.logback:logback-classic = 1.2.3
-org.apache.logging.log4j:log4j-slf4j-impl = 2.13.0
+org.apache.logging.log4j:log4j-slf4j-impl = 2.13.3
 org.junit.jupiter:* = 5.6.0
 org.junit.vintage:* = 5.5.1
-com.uber.nullaway:nullaway = 0.7.9
+com.uber.nullaway:nullaway = 0.8.0