diff --git a/tracing-api/build.gradle b/tracing-api/build.gradle index 77e4f7b40..d41bc29da 100644 --- a/tracing-api/build.gradle +++ b/tracing-api/build.gradle @@ -9,4 +9,5 @@ dependencies { annotationProcessor "org.immutables:value" compileOnly "org.immutables:value::annotations" + testImplementation 'org.junit.jupiter:junit-jupiter' } diff --git a/tracing-jaxrs/build.gradle b/tracing-jaxrs/build.gradle index cfed5dc6d..a459bdf2e 100644 --- a/tracing-jaxrs/build.gradle +++ b/tracing-jaxrs/build.gradle @@ -28,4 +28,8 @@ dependencies { testImplementation "org.assertj:assertj-core" testImplementation "org.jmock:jmock" testImplementation "org.mockito:mockito-core" + testImplementation 'org.junit.jupiter:junit-jupiter' + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine', { + because 'allows JUnit 3 and JUnit 4 tests to run' + } } diff --git a/tracing-jaxrs/src/test/java/com/palantir/tracing/jaxrs/JaxRsTracersTest.java b/tracing-jaxrs/src/test/java/com/palantir/tracing/jaxrs/JaxRsTracersTest.java index d524674ad..244b51a65 100644 --- a/tracing-jaxrs/src/test/java/com/palantir/tracing/jaxrs/JaxRsTracersTest.java +++ b/tracing-jaxrs/src/test/java/com/palantir/tracing/jaxrs/JaxRsTracersTest.java @@ -22,7 +22,7 @@ import com.palantir.tracing.Tracer; import java.io.ByteArrayOutputStream; import javax.ws.rs.core.StreamingOutput; -import org.junit.Test; +import org.junit.jupiter.api.Test; public final class JaxRsTracersTest { diff --git a/tracing-jersey/build.gradle b/tracing-jersey/build.gradle index f30c08f89..357f2ae4f 100644 --- a/tracing-jersey/build.gradle +++ b/tracing-jersey/build.gradle @@ -30,4 +30,9 @@ dependencies { testImplementation "org.assertj:assertj-core" testImplementation "org.hamcrest:hamcrest-all" testImplementation "org.mockito:mockito-core" + testImplementation 'org.junit.jupiter:junit-jupiter' + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine', { + because 'allows JUnit 3 and JUnit 4 tests to run' + } + testImplementation 'org.mockito:mockito-junit-jupiter' } diff --git a/tracing-jersey/src/test/java/com/palantir/tracing/jersey/TraceEnrichingFilterTest.java b/tracing-jersey/src/test/java/com/palantir/tracing/jersey/TraceEnrichingFilterTest.java index 33fde0729..a2817fb35 100644 --- a/tracing-jersey/src/test/java/com/palantir/tracing/jersey/TraceEnrichingFilterTest.java +++ b/tracing-jersey/src/test/java/com/palantir/tracing/jersey/TraceEnrichingFilterTest.java @@ -52,18 +52,21 @@ import javax.ws.rs.core.StreamingOutput; import javax.ws.rs.core.UriInfo; import org.glassfish.jersey.client.JerseyClientBuilder; -import org.junit.After; -import org.junit.Before; import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; import org.slf4j.MDC; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) public final class TraceEnrichingFilterTest { @ClassRule @@ -89,7 +92,7 @@ public final class TraceEnrichingFilterTest { private WebTarget target; - @Before + @BeforeEach public void before() { String endpointUri = "http://localhost:" + APP.getLocalPort(); JerseyClientBuilder builder = new JerseyClientBuilder(); @@ -104,7 +107,7 @@ public void before() { when(traceSampler.sample()).thenReturn(true); } - @After + @AfterEach public void after() { Tracer.unsubscribe(""); } diff --git a/tracing-okhttp3/build.gradle b/tracing-okhttp3/build.gradle index 00c13e245..0eb226ca3 100644 --- a/tracing-okhttp3/build.gradle +++ b/tracing-okhttp3/build.gradle @@ -26,4 +26,9 @@ dependencies { testImplementation "junit:junit" testImplementation "org.assertj:assertj-core" testImplementation "org.mockito:mockito-core" + testImplementation 'org.junit.jupiter:junit-jupiter' + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine', { + because 'allows JUnit 3 and JUnit 4 tests to run' + } + testImplementation 'org.mockito:mockito-junit-jupiter' } diff --git a/tracing-okhttp3/src/test/java/com/palantir/tracing/okhttp3/OkhttpTraceInterceptorTest.java b/tracing-okhttp3/src/test/java/com/palantir/tracing/okhttp3/OkhttpTraceInterceptorTest.java index 889825a39..ca3c976ff 100644 --- a/tracing-okhttp3/src/test/java/com/palantir/tracing/okhttp3/OkhttpTraceInterceptorTest.java +++ b/tracing-okhttp3/src/test/java/com/palantir/tracing/okhttp3/OkhttpTraceInterceptorTest.java @@ -34,16 +34,19 @@ import java.util.Optional; import okhttp3.Interceptor; import okhttp3.Request; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) @SuppressWarnings("deprecation") public final class OkhttpTraceInterceptorTest { @@ -59,14 +62,14 @@ public final class OkhttpTraceInterceptorTest { @Captor private ArgumentCaptor spanCaptor; - @Before + @BeforeEach public void before() { Request request = new Request.Builder().url("http://localhost").build(); when(chain.request()).thenReturn(request); Tracer.subscribe("", observer); } - @After + @AfterEach public void after() { Tracer.initTraceWithSpan(Observability.SAMPLE, Tracers.randomId(), "op", SpanType.LOCAL); Tracer.unsubscribe(""); diff --git a/tracing-servlet/build.gradle b/tracing-servlet/build.gradle index 5621f7380..a41bb41ca 100644 --- a/tracing-servlet/build.gradle +++ b/tracing-servlet/build.gradle @@ -29,4 +29,8 @@ dependencies { testImplementation "io.dropwizard:dropwizard-testing" testImplementation "junit:junit" testImplementation 'org.assertj:assertj-core' + testImplementation 'org.junit.jupiter:junit-jupiter' + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine', { + because 'allows JUnit 3 and JUnit 4 tests to run' + } } diff --git a/tracing-servlet/src/test/java/com/palantir/tracing/servlet/LeakedTraceFilterTest.java b/tracing-servlet/src/test/java/com/palantir/tracing/servlet/LeakedTraceFilterTest.java index f3eac12dd..29343f57d 100644 --- a/tracing-servlet/src/test/java/com/palantir/tracing/servlet/LeakedTraceFilterTest.java +++ b/tracing-servlet/src/test/java/com/palantir/tracing/servlet/LeakedTraceFilterTest.java @@ -39,9 +39,9 @@ import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.Response; import org.glassfish.jersey.client.JerseyClientBuilder; -import org.junit.Before; import org.junit.ClassRule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class LeakedTraceFilterTest { @ClassRule @@ -52,7 +52,7 @@ public class LeakedTraceFilterTest { private WebTarget target; - @Before + @BeforeEach public void before() { String endpointUri = "http://localhost:" + APP.getLocalPort(); JerseyClientBuilder builder = new JerseyClientBuilder(); diff --git a/tracing-test-utils/src/test/java/com/palantir/tracing/RenderTracingRuleDemo.java b/tracing-test-utils/src/test/java/com/palantir/tracing/RenderTracingRuleDemo.java index 088eee221..ba19b3f92 100644 --- a/tracing-test-utils/src/test/java/com/palantir/tracing/RenderTracingRuleDemo.java +++ b/tracing-test-utils/src/test/java/com/palantir/tracing/RenderTracingRuleDemo.java @@ -17,7 +17,7 @@ package com.palantir.tracing; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class RenderTracingRuleDemo { diff --git a/tracing-undertow/build.gradle b/tracing-undertow/build.gradle index 380f135c4..d0589dbf9 100644 --- a/tracing-undertow/build.gradle +++ b/tracing-undertow/build.gradle @@ -32,4 +32,9 @@ dependencies { testImplementation 'junit:junit' testImplementation 'org.assertj:assertj-core' testImplementation 'org.mockito:mockito-core' + testImplementation 'org.junit.jupiter:junit-jupiter' + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine', { + because 'allows JUnit 3 and JUnit 4 tests to run' + } + testImplementation 'org.mockito:mockito-junit-jupiter' } diff --git a/tracing-undertow/src/test/java/com/palantir/tracing/undertow/TracedOperationHandlerTest.java b/tracing-undertow/src/test/java/com/palantir/tracing/undertow/TracedOperationHandlerTest.java index 330bf0c3a..bac2bac60 100644 --- a/tracing-undertow/src/test/java/com/palantir/tracing/undertow/TracedOperationHandlerTest.java +++ b/tracing-undertow/src/test/java/com/palantir/tracing/undertow/TracedOperationHandlerTest.java @@ -39,17 +39,20 @@ import io.undertow.util.HttpString; import java.util.List; import java.util.concurrent.atomic.AtomicReference; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; import org.slf4j.MDC; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) public class TracedOperationHandlerTest { @Captor @@ -69,7 +72,7 @@ public class TracedOperationHandlerTest { private TracedOperationHandler handler; - @Before + @BeforeEach public void before() { Tracer.subscribe("TEST_OBSERVER", observer); Tracer.setSampler(traceSampler); @@ -83,7 +86,7 @@ public void before() { handler = new TracedOperationHandler(delegate, "GET /foo"); } - @After + @AfterEach public void after() { Tracer.unsubscribe("TEST_OBSERVER"); } diff --git a/tracing-undertow/src/test/java/com/palantir/tracing/undertow/TracedRequestHandlerTest.java b/tracing-undertow/src/test/java/com/palantir/tracing/undertow/TracedRequestHandlerTest.java index b284398d5..06dbb76e0 100644 --- a/tracing-undertow/src/test/java/com/palantir/tracing/undertow/TracedRequestHandlerTest.java +++ b/tracing-undertow/src/test/java/com/palantir/tracing/undertow/TracedRequestHandlerTest.java @@ -38,16 +38,19 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) public class TracedRequestHandlerTest { private static final AtomicInteger portSelector = new AtomicInteger(4439); @@ -68,7 +71,7 @@ public class TracedRequestHandlerTest { private volatile TagTranslator translator; - @Before + @BeforeEach public void before() { Tracer.subscribe("TracedRequestHandlerTest", observer); Tracer.setSampler(traceSampler); @@ -101,7 +104,7 @@ public void translate(TagAdapter adapter, T target, HttpServerExchange da server.start(); } - @After + @AfterEach public void after() { Tracer.unsubscribe("TracedRequestHandlerTest"); server.stop(); diff --git a/tracing-undertow/src/test/java/com/palantir/tracing/undertow/TracedStateHandlerTest.java b/tracing-undertow/src/test/java/com/palantir/tracing/undertow/TracedStateHandlerTest.java index d614bf2b5..0540f3a6e 100644 --- a/tracing-undertow/src/test/java/com/palantir/tracing/undertow/TracedStateHandlerTest.java +++ b/tracing-undertow/src/test/java/com/palantir/tracing/undertow/TracedStateHandlerTest.java @@ -33,15 +33,18 @@ import io.undertow.util.HeaderMap; import io.undertow.util.HttpString; import java.util.concurrent.atomic.AtomicReference; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; import org.slf4j.MDC; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) public class TracedStateHandlerTest { @Mock @@ -58,7 +61,7 @@ public class TracedStateHandlerTest { private HttpHandler handler; - @Before + @BeforeEach public void before() { Tracer.subscribe("TEST_OBSERVER", observer); Tracer.setSampler(traceSampler); @@ -72,7 +75,7 @@ public void before() { handler = new TracedStateHandler(delegate); } - @After + @AfterEach public void after() { Tracer.unsubscribe("TEST_OBSERVER"); } diff --git a/tracing/build.gradle b/tracing/build.gradle index 294828549..6a1e35fcc 100644 --- a/tracing/build.gradle +++ b/tracing/build.gradle @@ -38,4 +38,9 @@ dependencies { annotationProcessor "org.immutables:value" compileOnly "org.immutables:value::annotations" + testImplementation 'org.junit.jupiter:junit-jupiter' + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine', { + because 'allows JUnit 3 and JUnit 4 tests to run' + } + testImplementation 'org.mockito:mockito-junit-jupiter' } diff --git a/tracing/src/test/java/com/palantir/tracing/CloseableTracerTest.java b/tracing/src/test/java/com/palantir/tracing/CloseableTracerTest.java index 7ecd70620..801eb60d8 100644 --- a/tracing/src/test/java/com/palantir/tracing/CloseableTracerTest.java +++ b/tracing/src/test/java/com/palantir/tracing/CloseableTracerTest.java @@ -23,17 +23,20 @@ import com.palantir.tracing.api.Span; import com.palantir.tracing.api.SpanObserver; import com.palantir.tracing.api.SpanType; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) public final class CloseableTracerTest { - @Before + @BeforeEach public void before() { Tracer.setSampler(AlwaysSampler.INSTANCE); Tracer.getAndClearTrace(); diff --git a/tracing/src/test/java/com/palantir/tracing/DeferredTracerTest.java b/tracing/src/test/java/com/palantir/tracing/DeferredTracerTest.java index 9bcc71ccc..3fb8b7374 100644 --- a/tracing/src/test/java/com/palantir/tracing/DeferredTracerTest.java +++ b/tracing/src/test/java/com/palantir/tracing/DeferredTracerTest.java @@ -24,7 +24,7 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class DeferredTracerTest { diff --git a/tracing/src/test/java/com/palantir/tracing/DetachedSpanTest.java b/tracing/src/test/java/com/palantir/tracing/DetachedSpanTest.java index 088b8ec30..4e0aa78a8 100644 --- a/tracing/src/test/java/com/palantir/tracing/DetachedSpanTest.java +++ b/tracing/src/test/java/com/palantir/tracing/DetachedSpanTest.java @@ -22,20 +22,20 @@ import java.util.List; import java.util.UUID; import java.util.concurrent.CopyOnWriteArrayList; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.slf4j.MDC; public final class DetachedSpanTest { - @Before + @BeforeEach public void before() { MDC.clear(); Tracer.clearCurrentTrace(); } - @After + @AfterEach public void after() { // Clear out the old trace from each test Tracer.clearCurrentTrace(); diff --git a/tracing/src/test/java/com/palantir/tracing/TagTranslatorTest.java b/tracing/src/test/java/com/palantir/tracing/TagTranslatorTest.java index bed116b92..53b476f07 100644 --- a/tracing/src/test/java/com/palantir/tracing/TagTranslatorTest.java +++ b/tracing/src/test/java/com/palantir/tracing/TagTranslatorTest.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TagTranslatorTest { diff --git a/tracing/src/test/java/com/palantir/tracing/TraceTest.java b/tracing/src/test/java/com/palantir/tracing/TraceTest.java index 6ae26bd0f..2dd833563 100644 --- a/tracing/src/test/java/com/palantir/tracing/TraceTest.java +++ b/tracing/src/test/java/com/palantir/tracing/TraceTest.java @@ -22,7 +22,7 @@ import com.palantir.tracing.api.OpenSpan; import com.palantir.tracing.api.SpanType; import java.util.Optional; -import org.junit.Test; +import org.junit.jupiter.api.Test; public final class TraceTest { diff --git a/tracing/src/test/java/com/palantir/tracing/TracerTest.java b/tracing/src/test/java/com/palantir/tracing/TracerTest.java index a9a57de7c..79221cb2a 100644 --- a/tracing/src/test/java/com/palantir/tracing/TracerTest.java +++ b/tracing/src/test/java/com/palantir/tracing/TracerTest.java @@ -33,17 +33,20 @@ import java.util.Optional; import java.util.Set; import org.assertj.core.util.Sets; -import org.junit.After; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; import org.slf4j.MDC; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) public final class TracerTest { @Mock @@ -58,13 +61,13 @@ public final class TracerTest { @Captor private ArgumentCaptor spanCaptor; - @After + @AfterEach public void before() { Tracer.getAndClearTraceIfPresent(); Tracer.setSampler(AlwaysSampler.INSTANCE); } - @After + @AfterEach public void after() { Tracer.initTraceWithSpan(Observability.SAMPLE, Tracers.randomId(), "op", SpanType.LOCAL); Tracer.setSampler(AlwaysSampler.INSTANCE); diff --git a/tracing/src/test/java/com/palantir/tracing/TracersTest.java b/tracing/src/test/java/com/palantir/tracing/TracersTest.java index fcb01adb0..97721b8f1 100644 --- a/tracing/src/test/java/com/palantir/tracing/TracersTest.java +++ b/tracing/src/test/java/com/palantir/tracing/TracersTest.java @@ -49,15 +49,15 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Supplier; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.slf4j.MDC; @SuppressWarnings("deprecation") public final class TracersTest { - @Before + @BeforeEach public void before() { MDC.clear(); @@ -67,7 +67,7 @@ public void before() { Observability.SAMPLE, "defaultTraceId", Optional.of("forUserAgent"), "rootOperation", SpanType.LOCAL); } - @After + @AfterEach public void after() { // Clear out the old trace from each test Tracer.clearCurrentTrace(); diff --git a/versions.lock b/versions.lock index fa86ba41c..88aad6f96 100644 --- a/versions.lock +++ b/versions.lock @@ -130,13 +130,14 @@ org.javassist:javassist:3.27.0-GA (2 constraints: 3d20076d) org.jmock:jmock:2.12.0 (1 constraints: 3705353b) org.jmock:jmock-testjar:2.12.0 (1 constraints: a507a272) org.junit.jupiter:junit-jupiter:5.8.2 (1 constraints: 11051e36) -org.junit.jupiter:junit-jupiter-api:5.8.2 (4 constraints: 863422ba) +org.junit.jupiter:junit-jupiter-api:5.8.2 (5 constraints: 4f4318b4) org.junit.jupiter:junit-jupiter-engine:5.8.2 (1 constraints: 0c0edf3b) org.junit.jupiter:junit-jupiter-params:5.8.2 (1 constraints: 0c0edf3b) org.junit.platform:junit-platform-commons:1.8.2 (2 constraints: dd200b4b) org.junit.platform:junit-platform-engine:1.8.2 (2 constraints: 2b21d273) org.junit.vintage:junit-vintage-engine:5.8.2 (1 constraints: 11051e36) -org.mockito:mockito-core:4.6.1 (1 constraints: 0d051236) +org.mockito:mockito-core:4.6.1 (2 constraints: d213aa65) +org.mockito:mockito-junit-jupiter:4.6.1 (1 constraints: 0d051236) org.objenesis:objenesis:3.2 (1 constraints: b10a13bd) org.opentest4j:opentest4j:1.2.0 (2 constraints: cd205b49) org.ow2.asm:asm:7.1 (1 constraints: 1a07505c) diff --git a/versions.props b/versions.props index 6004ddb75..f6a15dfed 100644 --- a/versions.props +++ b/versions.props @@ -21,7 +21,7 @@ org.hamcrest:hamcrest-* = 1.3 org.immutables:value = 2.8.8 org.openjdk.jmh:* = 1.35 org.jmock:jmock = 2.12.0 -org.mockito:mockito-core = 4.6.1 +org.mockito:* = 4.6.1 ch.qos.logback:logback-classic = 1.2.11 org.apache.logging.log4j:log4j-slf4j-impl = 2.18.0 org.junit.jupiter:* = 5.8.2