diff --git a/buildSrc/gradle/dependency-locks/testCompile.lockfile b/buildSrc/gradle/dependency-locks/testCompile.lockfile index fae7ebd34..c6e74f1a6 100644 --- a/buildSrc/gradle/dependency-locks/testCompile.lockfile +++ b/buildSrc/gradle/dependency-locks/testCompile.lockfile @@ -50,8 +50,8 @@ javax.inject:javax.inject:1 javax.validation:validation-api:1.0.0.GA joda-time:joda-time:2.9.2 junit:junit:4.13 -net.bytebuddy:byte-buddy-agent:1.9.7 -net.bytebuddy:byte-buddy:1.9.7 +net.bytebuddy:byte-buddy-agent:1.10.5 +net.bytebuddy:byte-buddy:1.10.5 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.6 org.apache.httpcomponents:httpclient:4.5.8 @@ -67,7 +67,7 @@ org.junit.platform:junit-platform-commons:1.6.1 org.junit.platform:junit-platform-engine:1.6.1 org.junit.vintage:junit-vintage-engine:5.6.1 org.junit:junit-bom:5.6.1 -org.mockito:mockito-core:2.25.0 +org.mockito:mockito-core:3.3.3 org.objenesis:objenesis:2.6 org.opentest4j:opentest4j:1.2.0 org.ow2.asm:asm-analysis:6.0 diff --git a/buildSrc/gradle/dependency-locks/testCompileClasspath.lockfile b/buildSrc/gradle/dependency-locks/testCompileClasspath.lockfile index fae7ebd34..c6e74f1a6 100644 --- a/buildSrc/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/buildSrc/gradle/dependency-locks/testCompileClasspath.lockfile @@ -50,8 +50,8 @@ javax.inject:javax.inject:1 javax.validation:validation-api:1.0.0.GA joda-time:joda-time:2.9.2 junit:junit:4.13 -net.bytebuddy:byte-buddy-agent:1.9.7 -net.bytebuddy:byte-buddy:1.9.7 +net.bytebuddy:byte-buddy-agent:1.10.5 +net.bytebuddy:byte-buddy:1.10.5 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.6 org.apache.httpcomponents:httpclient:4.5.8 @@ -67,7 +67,7 @@ org.junit.platform:junit-platform-commons:1.6.1 org.junit.platform:junit-platform-engine:1.6.1 org.junit.vintage:junit-vintage-engine:5.6.1 org.junit:junit-bom:5.6.1 -org.mockito:mockito-core:2.25.0 +org.mockito:mockito-core:3.3.3 org.objenesis:objenesis:2.6 org.opentest4j:opentest4j:1.2.0 org.ow2.asm:asm-analysis:6.0 diff --git a/buildSrc/gradle/dependency-locks/testRuntime.lockfile b/buildSrc/gradle/dependency-locks/testRuntime.lockfile index fae7ebd34..c6e74f1a6 100644 --- a/buildSrc/gradle/dependency-locks/testRuntime.lockfile +++ b/buildSrc/gradle/dependency-locks/testRuntime.lockfile @@ -50,8 +50,8 @@ javax.inject:javax.inject:1 javax.validation:validation-api:1.0.0.GA joda-time:joda-time:2.9.2 junit:junit:4.13 -net.bytebuddy:byte-buddy-agent:1.9.7 -net.bytebuddy:byte-buddy:1.9.7 +net.bytebuddy:byte-buddy-agent:1.10.5 +net.bytebuddy:byte-buddy:1.10.5 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.6 org.apache.httpcomponents:httpclient:4.5.8 @@ -67,7 +67,7 @@ org.junit.platform:junit-platform-commons:1.6.1 org.junit.platform:junit-platform-engine:1.6.1 org.junit.vintage:junit-vintage-engine:5.6.1 org.junit:junit-bom:5.6.1 -org.mockito:mockito-core:2.25.0 +org.mockito:mockito-core:3.3.3 org.objenesis:objenesis:2.6 org.opentest4j:opentest4j:1.2.0 org.ow2.asm:asm-analysis:6.0 diff --git a/buildSrc/gradle/dependency-locks/testRuntimeClasspath.lockfile b/buildSrc/gradle/dependency-locks/testRuntimeClasspath.lockfile index fae7ebd34..c6e74f1a6 100644 --- a/buildSrc/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/buildSrc/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -50,8 +50,8 @@ javax.inject:javax.inject:1 javax.validation:validation-api:1.0.0.GA joda-time:joda-time:2.9.2 junit:junit:4.13 -net.bytebuddy:byte-buddy-agent:1.9.7 -net.bytebuddy:byte-buddy:1.9.7 +net.bytebuddy:byte-buddy-agent:1.10.5 +net.bytebuddy:byte-buddy:1.10.5 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.6 org.apache.httpcomponents:httpclient:4.5.8 @@ -67,7 +67,7 @@ org.junit.platform:junit-platform-commons:1.6.1 org.junit.platform:junit-platform-engine:1.6.1 org.junit.vintage:junit-vintage-engine:5.6.1 org.junit:junit-bom:5.6.1 -org.mockito:mockito-core:2.25.0 +org.mockito:mockito-core:3.3.3 org.objenesis:objenesis:2.6 org.opentest4j:opentest4j:1.2.0 org.ow2.asm:asm-analysis:6.0 diff --git a/core/build.gradle b/core/build.gradle index d80000394..c839c9209 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -316,6 +316,7 @@ dependencies { testCompile deps['org.junit.platform:junit-platform-suite-api'] testCompile deps['org.junit.vintage:junit-vintage-engine'] testCompile deps['org.mockito:mockito-core'] + testCompile deps['org.mockito:mockito-junit-jupiter'] runtime deps['org.postgresql:postgresql'] // Indirect dependency found by undeclared-dependency check. Such diff --git a/core/gradle/dependency-locks/testCompile.lockfile b/core/gradle/dependency-locks/testCompile.lockfile index 49a325ae0..c35e72428 100644 --- a/core/gradle/dependency-locks/testCompile.lockfile +++ b/core/gradle/dependency-locks/testCompile.lockfile @@ -186,7 +186,7 @@ javax.xml.bind:jaxb-api:2.3.1 jline:jline:1.0 joda-time:joda-time:2.10.3 junit:junit:4.13 -net.bytebuddy:byte-buddy-agent:1.9.7 +net.bytebuddy:byte-buddy-agent:1.10.5 net.bytebuddy:byte-buddy:1.10.10 net.java.dev.jna:jna-platform:5.5.0 net.java.dev.jna:jna:5.5.0 @@ -254,7 +254,8 @@ org.junit.platform:junit-platform-suite-api:1.6.2 org.junit.vintage:junit-vintage-engine:5.6.2 org.junit:junit-bom:5.6.2 org.jvnet.staxex:stax-ex:1.8 -org.mockito:mockito-core:2.25.0 +org.mockito:mockito-core:3.3.3 +org.mockito:mockito-junit-jupiter:3.3.3 org.mortbay.jetty:jetty-util:6.1.26 org.mortbay.jetty:jetty:6.1.26 org.objenesis:objenesis:2.6 diff --git a/core/gradle/dependency-locks/testCompileClasspath.lockfile b/core/gradle/dependency-locks/testCompileClasspath.lockfile index c82cd7c2d..dd0ba56fa 100644 --- a/core/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/core/gradle/dependency-locks/testCompileClasspath.lockfile @@ -184,7 +184,7 @@ javax.xml.bind:jaxb-api:2.3.1 jline:jline:1.0 joda-time:joda-time:2.10.3 junit:junit:4.13 -net.bytebuddy:byte-buddy-agent:1.9.7 +net.bytebuddy:byte-buddy-agent:1.10.5 net.bytebuddy:byte-buddy:1.10.10 net.java.dev.jna:jna-platform:5.5.0 net.java.dev.jna:jna:5.5.0 @@ -252,7 +252,8 @@ org.junit.platform:junit-platform-suite-api:1.6.2 org.junit.vintage:junit-vintage-engine:5.6.2 org.junit:junit-bom:5.6.2 org.jvnet.staxex:stax-ex:1.8 -org.mockito:mockito-core:2.25.0 +org.mockito:mockito-core:3.3.3 +org.mockito:mockito-junit-jupiter:3.3.3 org.mortbay.jetty:jetty-util:6.1.26 org.mortbay.jetty:jetty:6.1.26 org.objenesis:objenesis:2.6 diff --git a/core/gradle/dependency-locks/testRuntime.lockfile b/core/gradle/dependency-locks/testRuntime.lockfile index e2ffe7d29..03066a262 100644 --- a/core/gradle/dependency-locks/testRuntime.lockfile +++ b/core/gradle/dependency-locks/testRuntime.lockfile @@ -188,7 +188,7 @@ javax.xml.bind:jaxb-api:2.3.1 jline:jline:1.0 joda-time:joda-time:2.10.3 junit:junit:4.13 -net.bytebuddy:byte-buddy-agent:1.9.7 +net.bytebuddy:byte-buddy-agent:1.10.5 net.bytebuddy:byte-buddy:1.10.10 net.java.dev.jna:jna-platform:5.5.0 net.java.dev.jna:jna:5.5.0 @@ -257,7 +257,8 @@ org.junit.platform:junit-platform-suite-api:1.6.2 org.junit.vintage:junit-vintage-engine:5.6.2 org.junit:junit-bom:5.6.2 org.jvnet.staxex:stax-ex:1.8 -org.mockito:mockito-core:2.25.0 +org.mockito:mockito-core:3.3.3 +org.mockito:mockito-junit-jupiter:3.3.3 org.mortbay.jetty:jetty-util:6.1.26 org.mortbay.jetty:jetty:6.1.26 org.objenesis:objenesis:2.6 diff --git a/core/gradle/dependency-locks/testRuntimeClasspath.lockfile b/core/gradle/dependency-locks/testRuntimeClasspath.lockfile index 921b8c721..32eed45c3 100644 --- a/core/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/core/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -188,7 +188,7 @@ javax.xml.bind:jaxb-api:2.3.1 jline:jline:1.0 joda-time:joda-time:2.10.3 junit:junit:4.13 -net.bytebuddy:byte-buddy-agent:1.9.7 +net.bytebuddy:byte-buddy-agent:1.10.5 net.bytebuddy:byte-buddy:1.10.10 net.java.dev.jna:jna-platform:5.5.0 net.java.dev.jna:jna:5.5.0 @@ -257,7 +257,8 @@ org.junit.platform:junit-platform-suite-api:1.6.2 org.junit.vintage:junit-vintage-engine:5.6.2 org.junit:junit-bom:5.6.2 org.jvnet.staxex:stax-ex:1.8 -org.mockito:mockito-core:2.25.0 +org.mockito:mockito-core:3.3.3 +org.mockito:mockito-junit-jupiter:3.3.3 org.mortbay.jetty:jetty-util:6.1.26 org.mortbay.jetty:jetty:6.1.26 org.objenesis:objenesis:2.6 diff --git a/core/src/test/java/google/registry/testing/SystemPropertyRule.java b/core/src/test/java/google/registry/testing/SystemPropertyRule.java index 71fb09392..562900f9e 100644 --- a/core/src/test/java/google/registry/testing/SystemPropertyRule.java +++ b/core/src/test/java/google/registry/testing/SystemPropertyRule.java @@ -24,10 +24,19 @@ import java.util.List; import java.util.Map; import java.util.Optional; import javax.annotation.Nullable; +import org.junit.jupiter.api.extension.AfterEachCallback; +import org.junit.jupiter.api.extension.BeforeEachCallback; +import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.rules.ExternalResource; -/** JUnit Rule for overriding the values Java system properties during tests. */ -public final class SystemPropertyRule extends ExternalResource implements SystemPropertySetter { +/** + * JUnit Rule for overriding the values Java system properties during tests. + * + *

In most scenarios this class should be the last rule/extension to apply. In JUnit 5, apply + * {@code @Order(value = Integer.MAX_VALUE)} to the extension. + */ +public final class SystemPropertyRule extends ExternalResource + implements SystemPropertySetter, BeforeEachCallback, AfterEachCallback { /** Class representing a system property key value pair. */ private static class Property { @@ -90,4 +99,14 @@ public final class SystemPropertyRule extends ExternalResource implements System original.set(); } } + + @Override + public void beforeEach(ExtensionContext context) { + before(); + } + + @Override + public void afterEach(ExtensionContext context) { + after(); + } } diff --git a/core/src/test/java/google/registry/ui/server/registrar/ConsoleOteSetupActionTest.java b/core/src/test/java/google/registry/ui/server/registrar/ConsoleOteSetupActionTest.java index 0213d21e6..b9b1107e0 100644 --- a/core/src/test/java/google/registry/ui/server/registrar/ConsoleOteSetupActionTest.java +++ b/core/src/test/java/google/registry/ui/server/registrar/ConsoleOteSetupActionTest.java @@ -48,26 +48,25 @@ import google.registry.util.SendEmailService; import java.util.Optional; import javax.mail.internet.InternetAddress; import javax.servlet.http.HttpServletRequest; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Order; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.api.extension.RegisterExtension; import org.mockito.ArgumentCaptor; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnit; -import org.mockito.junit.MockitoRule; +import org.mockito.junit.jupiter.MockitoExtension; -@RunWith(JUnit4.class) +/** Unit tests for {@link ConsoleOteSetupAction}. */ +@ExtendWith(MockitoExtension.class) public final class ConsoleOteSetupActionTest { - @Rule + @RegisterExtension public final AppEngineRule appEngineRule = AppEngineRule.builder().withDatastoreAndCloudSql().build(); - @Rule public final MockitoRule mocks = MockitoJUnit.rule(); - - @Rule + @RegisterExtension + @Order(value = Integer.MAX_VALUE) public final SystemPropertyRule systemPropertyRule = new SystemPropertyRule(); private final FakeResponse response = new FakeResponse(); @@ -77,7 +76,7 @@ public final class ConsoleOteSetupActionTest { @Mock HttpServletRequest request; @Mock SendEmailService emailService; - @Before + @BeforeEach public void setUp() throws Exception { persistPremiumList("default_sandbox_list", "sandbox,USD 1000"); diff --git a/core/src/test/java/google/registry/ui/server/registrar/ConsoleRegistrarCreatorActionTest.java b/core/src/test/java/google/registry/ui/server/registrar/ConsoleRegistrarCreatorActionTest.java index 5e009cfcb..bb586d4cc 100644 --- a/core/src/test/java/google/registry/ui/server/registrar/ConsoleRegistrarCreatorActionTest.java +++ b/core/src/test/java/google/registry/ui/server/registrar/ConsoleRegistrarCreatorActionTest.java @@ -50,26 +50,24 @@ import java.util.Optional; import javax.mail.internet.InternetAddress; import javax.servlet.http.HttpServletRequest; import org.joda.money.CurrencyUnit; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Order; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.api.extension.RegisterExtension; import org.mockito.ArgumentCaptor; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnit; -import org.mockito.junit.MockitoRule; +import org.mockito.junit.jupiter.MockitoExtension; -@RunWith(JUnit4.class) +@ExtendWith(MockitoExtension.class) public final class ConsoleRegistrarCreatorActionTest { - @Rule + @RegisterExtension public final AppEngineRule appEngineRule = AppEngineRule.builder().withDatastoreAndCloudSql().build(); - @Rule public final MockitoRule mocks = MockitoJUnit.rule(); - - @Rule + @RegisterExtension + @Order(value = Integer.MAX_VALUE) public final SystemPropertyRule systemPropertyRule = new SystemPropertyRule(); private final FakeResponse response = new FakeResponse(); @@ -79,7 +77,7 @@ public final class ConsoleRegistrarCreatorActionTest { @Mock HttpServletRequest request; @Mock SendEmailService emailService; - @Before + @BeforeEach public void setUp() throws Exception { persistPremiumList("default_sandbox_list", "sandbox,USD 1000"); diff --git a/dependencies.gradle b/dependencies.gradle index 99eb02b40..209b962fb 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -138,7 +138,8 @@ ext { 'org.hibernate:hibernate-hikaricp:5.4.17.Final', 'org.joda:joda-money:1.0.1', 'org.json:json:20160810', - 'org.mockito:mockito-core:2.25.0', + 'org.mockito:mockito-core:3.3.3', + 'org.mockito:mockito-junit-jupiter:3.3.3', 'org.mortbay.jetty:jetty:6.1.26', 'org.postgresql:postgresql:42.2.14', 'org.seleniumhq.selenium:selenium-api:3.141.59', diff --git a/prober/gradle/dependency-locks/testCompile.lockfile b/prober/gradle/dependency-locks/testCompile.lockfile index 773b7d3f2..13779676c 100644 --- a/prober/gradle/dependency-locks/testCompile.lockfile +++ b/prober/gradle/dependency-locks/testCompile.lockfile @@ -48,8 +48,8 @@ javax.mail:mail:1.4 javax.xml.bind:jaxb-api:2.3.0 joda-time:joda-time:2.9.2 junit:junit:4.13 -net.bytebuddy:byte-buddy-agent:1.9.7 -net.bytebuddy:byte-buddy:1.9.7 +net.bytebuddy:byte-buddy-agent:1.10.5 +net.bytebuddy:byte-buddy:1.10.5 org.apache.httpcomponents:httpclient:4.5.11 org.apache.httpcomponents:httpcore:4.4.13 org.apiguardian:apiguardian-api:1.1.0 @@ -64,7 +64,7 @@ org.junit.platform:junit-platform-commons:1.6.1 org.junit.platform:junit-platform-engine:1.6.1 org.junit.vintage:junit-vintage-engine:5.6.1 org.junit:junit-bom:5.6.1 -org.mockito:mockito-core:2.25.0 +org.mockito:mockito-core:3.3.3 org.objenesis:objenesis:2.6 org.opentest4j:opentest4j:1.2.0 org.yaml:snakeyaml:1.17 diff --git a/prober/gradle/dependency-locks/testCompileClasspath.lockfile b/prober/gradle/dependency-locks/testCompileClasspath.lockfile index 773b7d3f2..13779676c 100644 --- a/prober/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/prober/gradle/dependency-locks/testCompileClasspath.lockfile @@ -48,8 +48,8 @@ javax.mail:mail:1.4 javax.xml.bind:jaxb-api:2.3.0 joda-time:joda-time:2.9.2 junit:junit:4.13 -net.bytebuddy:byte-buddy-agent:1.9.7 -net.bytebuddy:byte-buddy:1.9.7 +net.bytebuddy:byte-buddy-agent:1.10.5 +net.bytebuddy:byte-buddy:1.10.5 org.apache.httpcomponents:httpclient:4.5.11 org.apache.httpcomponents:httpcore:4.4.13 org.apiguardian:apiguardian-api:1.1.0 @@ -64,7 +64,7 @@ org.junit.platform:junit-platform-commons:1.6.1 org.junit.platform:junit-platform-engine:1.6.1 org.junit.vintage:junit-vintage-engine:5.6.1 org.junit:junit-bom:5.6.1 -org.mockito:mockito-core:2.25.0 +org.mockito:mockito-core:3.3.3 org.objenesis:objenesis:2.6 org.opentest4j:opentest4j:1.2.0 org.yaml:snakeyaml:1.17 diff --git a/prober/gradle/dependency-locks/testRuntime.lockfile b/prober/gradle/dependency-locks/testRuntime.lockfile index 773b7d3f2..13779676c 100644 --- a/prober/gradle/dependency-locks/testRuntime.lockfile +++ b/prober/gradle/dependency-locks/testRuntime.lockfile @@ -48,8 +48,8 @@ javax.mail:mail:1.4 javax.xml.bind:jaxb-api:2.3.0 joda-time:joda-time:2.9.2 junit:junit:4.13 -net.bytebuddy:byte-buddy-agent:1.9.7 -net.bytebuddy:byte-buddy:1.9.7 +net.bytebuddy:byte-buddy-agent:1.10.5 +net.bytebuddy:byte-buddy:1.10.5 org.apache.httpcomponents:httpclient:4.5.11 org.apache.httpcomponents:httpcore:4.4.13 org.apiguardian:apiguardian-api:1.1.0 @@ -64,7 +64,7 @@ org.junit.platform:junit-platform-commons:1.6.1 org.junit.platform:junit-platform-engine:1.6.1 org.junit.vintage:junit-vintage-engine:5.6.1 org.junit:junit-bom:5.6.1 -org.mockito:mockito-core:2.25.0 +org.mockito:mockito-core:3.3.3 org.objenesis:objenesis:2.6 org.opentest4j:opentest4j:1.2.0 org.yaml:snakeyaml:1.17 diff --git a/prober/gradle/dependency-locks/testRuntimeClasspath.lockfile b/prober/gradle/dependency-locks/testRuntimeClasspath.lockfile index 773b7d3f2..13779676c 100644 --- a/prober/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/prober/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -48,8 +48,8 @@ javax.mail:mail:1.4 javax.xml.bind:jaxb-api:2.3.0 joda-time:joda-time:2.9.2 junit:junit:4.13 -net.bytebuddy:byte-buddy-agent:1.9.7 -net.bytebuddy:byte-buddy:1.9.7 +net.bytebuddy:byte-buddy-agent:1.10.5 +net.bytebuddy:byte-buddy:1.10.5 org.apache.httpcomponents:httpclient:4.5.11 org.apache.httpcomponents:httpcore:4.4.13 org.apiguardian:apiguardian-api:1.1.0 @@ -64,7 +64,7 @@ org.junit.platform:junit-platform-commons:1.6.1 org.junit.platform:junit-platform-engine:1.6.1 org.junit.vintage:junit-vintage-engine:5.6.1 org.junit:junit-bom:5.6.1 -org.mockito:mockito-core:2.25.0 +org.mockito:mockito-core:3.3.3 org.objenesis:objenesis:2.6 org.opentest4j:opentest4j:1.2.0 org.yaml:snakeyaml:1.17 diff --git a/proxy/gradle/dependency-locks/testCompile.lockfile b/proxy/gradle/dependency-locks/testCompile.lockfile index b65c7960f..72b17ec35 100644 --- a/proxy/gradle/dependency-locks/testCompile.lockfile +++ b/proxy/gradle/dependency-locks/testCompile.lockfile @@ -53,8 +53,8 @@ javax.mail:mail:1.4 javax.xml.bind:jaxb-api:2.3.0 joda-time:joda-time:2.9.2 junit:junit:4.13 -net.bytebuddy:byte-buddy-agent:1.9.7 -net.bytebuddy:byte-buddy:1.9.7 +net.bytebuddy:byte-buddy-agent:1.10.5 +net.bytebuddy:byte-buddy:1.10.5 org.apache.httpcomponents:httpclient:4.5.11 org.apache.httpcomponents:httpcore:4.4.13 org.apiguardian:apiguardian-api:1.1.0 @@ -69,7 +69,7 @@ org.junit.platform:junit-platform-commons:1.6.1 org.junit.platform:junit-platform-engine:1.6.1 org.junit.vintage:junit-vintage-engine:5.6.1 org.junit:junit-bom:5.6.1 -org.mockito:mockito-core:2.25.0 +org.mockito:mockito-core:3.3.3 org.objenesis:objenesis:2.6 org.opentest4j:opentest4j:1.2.0 org.yaml:snakeyaml:1.17 diff --git a/proxy/gradle/dependency-locks/testCompileClasspath.lockfile b/proxy/gradle/dependency-locks/testCompileClasspath.lockfile index b65c7960f..72b17ec35 100644 --- a/proxy/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/proxy/gradle/dependency-locks/testCompileClasspath.lockfile @@ -53,8 +53,8 @@ javax.mail:mail:1.4 javax.xml.bind:jaxb-api:2.3.0 joda-time:joda-time:2.9.2 junit:junit:4.13 -net.bytebuddy:byte-buddy-agent:1.9.7 -net.bytebuddy:byte-buddy:1.9.7 +net.bytebuddy:byte-buddy-agent:1.10.5 +net.bytebuddy:byte-buddy:1.10.5 org.apache.httpcomponents:httpclient:4.5.11 org.apache.httpcomponents:httpcore:4.4.13 org.apiguardian:apiguardian-api:1.1.0 @@ -69,7 +69,7 @@ org.junit.platform:junit-platform-commons:1.6.1 org.junit.platform:junit-platform-engine:1.6.1 org.junit.vintage:junit-vintage-engine:5.6.1 org.junit:junit-bom:5.6.1 -org.mockito:mockito-core:2.25.0 +org.mockito:mockito-core:3.3.3 org.objenesis:objenesis:2.6 org.opentest4j:opentest4j:1.2.0 org.yaml:snakeyaml:1.17 diff --git a/proxy/gradle/dependency-locks/testRuntime.lockfile b/proxy/gradle/dependency-locks/testRuntime.lockfile index b65c7960f..72b17ec35 100644 --- a/proxy/gradle/dependency-locks/testRuntime.lockfile +++ b/proxy/gradle/dependency-locks/testRuntime.lockfile @@ -53,8 +53,8 @@ javax.mail:mail:1.4 javax.xml.bind:jaxb-api:2.3.0 joda-time:joda-time:2.9.2 junit:junit:4.13 -net.bytebuddy:byte-buddy-agent:1.9.7 -net.bytebuddy:byte-buddy:1.9.7 +net.bytebuddy:byte-buddy-agent:1.10.5 +net.bytebuddy:byte-buddy:1.10.5 org.apache.httpcomponents:httpclient:4.5.11 org.apache.httpcomponents:httpcore:4.4.13 org.apiguardian:apiguardian-api:1.1.0 @@ -69,7 +69,7 @@ org.junit.platform:junit-platform-commons:1.6.1 org.junit.platform:junit-platform-engine:1.6.1 org.junit.vintage:junit-vintage-engine:5.6.1 org.junit:junit-bom:5.6.1 -org.mockito:mockito-core:2.25.0 +org.mockito:mockito-core:3.3.3 org.objenesis:objenesis:2.6 org.opentest4j:opentest4j:1.2.0 org.yaml:snakeyaml:1.17 diff --git a/proxy/gradle/dependency-locks/testRuntimeClasspath.lockfile b/proxy/gradle/dependency-locks/testRuntimeClasspath.lockfile index b65c7960f..72b17ec35 100644 --- a/proxy/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/proxy/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -53,8 +53,8 @@ javax.mail:mail:1.4 javax.xml.bind:jaxb-api:2.3.0 joda-time:joda-time:2.9.2 junit:junit:4.13 -net.bytebuddy:byte-buddy-agent:1.9.7 -net.bytebuddy:byte-buddy:1.9.7 +net.bytebuddy:byte-buddy-agent:1.10.5 +net.bytebuddy:byte-buddy:1.10.5 org.apache.httpcomponents:httpclient:4.5.11 org.apache.httpcomponents:httpcore:4.4.13 org.apiguardian:apiguardian-api:1.1.0 @@ -69,7 +69,7 @@ org.junit.platform:junit-platform-commons:1.6.1 org.junit.platform:junit-platform-engine:1.6.1 org.junit.vintage:junit-vintage-engine:5.6.1 org.junit:junit-bom:5.6.1 -org.mockito:mockito-core:2.25.0 +org.mockito:mockito-core:3.3.3 org.objenesis:objenesis:2.6 org.opentest4j:opentest4j:1.2.0 org.yaml:snakeyaml:1.17 diff --git a/util/gradle/dependency-locks/testCompile.lockfile b/util/gradle/dependency-locks/testCompile.lockfile index 3b9cad09d..ef1e7427c 100644 --- a/util/gradle/dependency-locks/testCompile.lockfile +++ b/util/gradle/dependency-locks/testCompile.lockfile @@ -37,8 +37,8 @@ javax.mail:mail:1.4 javax.xml.bind:jaxb-api:2.3.0 joda-time:joda-time:2.9.2 junit:junit:4.13 -net.bytebuddy:byte-buddy-agent:1.9.7 -net.bytebuddy:byte-buddy:1.9.7 +net.bytebuddy:byte-buddy-agent:1.10.5 +net.bytebuddy:byte-buddy:1.10.5 org.apache.httpcomponents:httpclient:4.5.11 org.apache.httpcomponents:httpcore:4.4.13 org.apiguardian:apiguardian-api:1.1.0 @@ -52,7 +52,7 @@ org.junit.platform:junit-platform-commons:1.6.1 org.junit.platform:junit-platform-engine:1.6.1 org.junit.vintage:junit-vintage-engine:5.6.1 org.junit:junit-bom:5.6.1 -org.mockito:mockito-core:2.25.0 +org.mockito:mockito-core:3.3.3 org.objenesis:objenesis:2.6 org.opentest4j:opentest4j:1.2.0 org.yaml:snakeyaml:1.17 diff --git a/util/gradle/dependency-locks/testCompileClasspath.lockfile b/util/gradle/dependency-locks/testCompileClasspath.lockfile index 3b9cad09d..ef1e7427c 100644 --- a/util/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/util/gradle/dependency-locks/testCompileClasspath.lockfile @@ -37,8 +37,8 @@ javax.mail:mail:1.4 javax.xml.bind:jaxb-api:2.3.0 joda-time:joda-time:2.9.2 junit:junit:4.13 -net.bytebuddy:byte-buddy-agent:1.9.7 -net.bytebuddy:byte-buddy:1.9.7 +net.bytebuddy:byte-buddy-agent:1.10.5 +net.bytebuddy:byte-buddy:1.10.5 org.apache.httpcomponents:httpclient:4.5.11 org.apache.httpcomponents:httpcore:4.4.13 org.apiguardian:apiguardian-api:1.1.0 @@ -52,7 +52,7 @@ org.junit.platform:junit-platform-commons:1.6.1 org.junit.platform:junit-platform-engine:1.6.1 org.junit.vintage:junit-vintage-engine:5.6.1 org.junit:junit-bom:5.6.1 -org.mockito:mockito-core:2.25.0 +org.mockito:mockito-core:3.3.3 org.objenesis:objenesis:2.6 org.opentest4j:opentest4j:1.2.0 org.yaml:snakeyaml:1.17 diff --git a/util/gradle/dependency-locks/testRuntime.lockfile b/util/gradle/dependency-locks/testRuntime.lockfile index dea8fac59..5460c090a 100644 --- a/util/gradle/dependency-locks/testRuntime.lockfile +++ b/util/gradle/dependency-locks/testRuntime.lockfile @@ -39,8 +39,8 @@ javax.mail:mail:1.4 javax.xml.bind:jaxb-api:2.3.0 joda-time:joda-time:2.9.2 junit:junit:4.13 -net.bytebuddy:byte-buddy-agent:1.9.7 -net.bytebuddy:byte-buddy:1.9.7 +net.bytebuddy:byte-buddy-agent:1.10.5 +net.bytebuddy:byte-buddy:1.10.5 org.apache.httpcomponents:httpclient:4.5.11 org.apache.httpcomponents:httpcore:4.4.13 org.apiguardian:apiguardian-api:1.1.0 @@ -54,7 +54,7 @@ org.junit.platform:junit-platform-commons:1.6.1 org.junit.platform:junit-platform-engine:1.6.1 org.junit.vintage:junit-vintage-engine:5.6.1 org.junit:junit-bom:5.6.1 -org.mockito:mockito-core:2.25.0 +org.mockito:mockito-core:3.3.3 org.objenesis:objenesis:2.6 org.opentest4j:opentest4j:1.2.0 org.yaml:snakeyaml:1.17 diff --git a/util/gradle/dependency-locks/testRuntimeClasspath.lockfile b/util/gradle/dependency-locks/testRuntimeClasspath.lockfile index dea8fac59..5460c090a 100644 --- a/util/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/util/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -39,8 +39,8 @@ javax.mail:mail:1.4 javax.xml.bind:jaxb-api:2.3.0 joda-time:joda-time:2.9.2 junit:junit:4.13 -net.bytebuddy:byte-buddy-agent:1.9.7 -net.bytebuddy:byte-buddy:1.9.7 +net.bytebuddy:byte-buddy-agent:1.10.5 +net.bytebuddy:byte-buddy:1.10.5 org.apache.httpcomponents:httpclient:4.5.11 org.apache.httpcomponents:httpcore:4.4.13 org.apiguardian:apiguardian-api:1.1.0 @@ -54,7 +54,7 @@ org.junit.platform:junit-platform-commons:1.6.1 org.junit.platform:junit-platform-engine:1.6.1 org.junit.vintage:junit-vintage-engine:5.6.1 org.junit:junit-bom:5.6.1 -org.mockito:mockito-core:2.25.0 +org.mockito:mockito-core:3.3.3 org.objenesis:objenesis:2.6 org.opentest4j:opentest4j:1.2.0 org.yaml:snakeyaml:1.17