diff --git a/docs/build.gradle b/docs/build.gradle index a49722885..ac564c7c0 100644 --- a/docs/build.gradle +++ b/docs/build.gradle @@ -25,8 +25,16 @@ dependencies { testCompile deps['com.google.truth:truth'] testCompile deps['com.thoughtworks.qdox:qdox'] + testCompile deps['junit:junit'] testCompile deps['org.junit.jupiter:junit-jupiter-api'] testCompile deps['org.junit.jupiter:junit-jupiter-engine'] + testCompile deps['org.junit.platform:junit-platform-runner'] + testCompile deps['org.junit.platform:junit-platform-suite-api'] + testCompile deps['org.testcontainers:junit-jupiter'] +} + +test { + useJUnitPlatform() } sourceCompatibility = '11' diff --git a/docs/gradle/dependency-locks/testCompile.lockfile b/docs/gradle/dependency-locks/testCompile.lockfile index c056a1fce..6204f4439 100644 --- a/docs/gradle/dependency-locks/testCompile.lockfile +++ b/docs/gradle/dependency-locks/testCompile.lockfile @@ -260,11 +260,14 @@ org.jboss:jandex:2.1.3.Final org.joda:joda-money:1.0.1 org.json:json:20200518 org.jsoup:jsoup:1.13.1 -org.junit.jupiter:junit-jupiter-api:5.6.2 -org.junit.jupiter:junit-jupiter-engine:5.6.2 -org.junit.platform:junit-platform-commons:1.6.2 -org.junit.platform:junit-platform-engine:1.6.2 -org.junit:junit-bom:5.6.2 +org.junit.jupiter:junit-jupiter-api:5.7.0 +org.junit.jupiter:junit-jupiter-engine:5.7.0 +org.junit.platform:junit-platform-commons:1.7.0 +org.junit.platform:junit-platform-engine:1.7.0 +org.junit.platform:junit-platform-launcher:1.7.0 +org.junit.platform:junit-platform-runner:1.7.0 +org.junit.platform:junit-platform-suite-api:1.7.0 +org.junit:junit-bom:5.7.0 org.jvnet.staxex:stax-ex:1.8 org.objenesis:objenesis:1.2 org.opentest4j:opentest4j:1.2.0 @@ -282,6 +285,7 @@ org.slf4j:slf4j-api:1.7.30 org.slf4j:slf4j-jdk14:1.7.28 org.testcontainers:database-commons:1.15.2 org.testcontainers:jdbc:1.15.2 +org.testcontainers:junit-jupiter:1.15.2 org.testcontainers:postgresql:1.15.2 org.testcontainers:testcontainers:1.15.2 org.threeten:threetenbp:1.5.1 diff --git a/docs/gradle/dependency-locks/testCompileClasspath.lockfile b/docs/gradle/dependency-locks/testCompileClasspath.lockfile index 4aa2c4d30..9412e7877 100644 --- a/docs/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/docs/gradle/dependency-locks/testCompileClasspath.lockfile @@ -250,11 +250,14 @@ org.jboss:jandex:2.1.3.Final org.joda:joda-money:1.0.1 org.json:json:20200518 org.jsoup:jsoup:1.13.1 -org.junit.jupiter:junit-jupiter-api:5.6.2 -org.junit.jupiter:junit-jupiter-engine:5.6.2 -org.junit.platform:junit-platform-commons:1.6.2 -org.junit.platform:junit-platform-engine:1.6.2 -org.junit:junit-bom:5.6.2 +org.junit.jupiter:junit-jupiter-api:5.7.0 +org.junit.jupiter:junit-jupiter-engine:5.7.0 +org.junit.platform:junit-platform-commons:1.7.0 +org.junit.platform:junit-platform-engine:1.7.0 +org.junit.platform:junit-platform-launcher:1.7.0 +org.junit.platform:junit-platform-runner:1.7.0 +org.junit.platform:junit-platform-suite-api:1.7.0 +org.junit:junit-bom:5.7.0 org.jvnet.staxex:stax-ex:1.8 org.objenesis:objenesis:1.2 org.opentest4j:opentest4j:1.2.0 @@ -271,6 +274,7 @@ org.slf4j:jul-to-slf4j:1.7.30 org.slf4j:slf4j-api:1.7.30 org.testcontainers:database-commons:1.15.2 org.testcontainers:jdbc:1.15.2 +org.testcontainers:junit-jupiter:1.15.2 org.testcontainers:postgresql:1.15.2 org.testcontainers:testcontainers:1.15.2 org.threeten:threetenbp:1.5.1 diff --git a/docs/gradle/dependency-locks/testRuntime.lockfile b/docs/gradle/dependency-locks/testRuntime.lockfile index c056a1fce..6204f4439 100644 --- a/docs/gradle/dependency-locks/testRuntime.lockfile +++ b/docs/gradle/dependency-locks/testRuntime.lockfile @@ -260,11 +260,14 @@ org.jboss:jandex:2.1.3.Final org.joda:joda-money:1.0.1 org.json:json:20200518 org.jsoup:jsoup:1.13.1 -org.junit.jupiter:junit-jupiter-api:5.6.2 -org.junit.jupiter:junit-jupiter-engine:5.6.2 -org.junit.platform:junit-platform-commons:1.6.2 -org.junit.platform:junit-platform-engine:1.6.2 -org.junit:junit-bom:5.6.2 +org.junit.jupiter:junit-jupiter-api:5.7.0 +org.junit.jupiter:junit-jupiter-engine:5.7.0 +org.junit.platform:junit-platform-commons:1.7.0 +org.junit.platform:junit-platform-engine:1.7.0 +org.junit.platform:junit-platform-launcher:1.7.0 +org.junit.platform:junit-platform-runner:1.7.0 +org.junit.platform:junit-platform-suite-api:1.7.0 +org.junit:junit-bom:5.7.0 org.jvnet.staxex:stax-ex:1.8 org.objenesis:objenesis:1.2 org.opentest4j:opentest4j:1.2.0 @@ -282,6 +285,7 @@ org.slf4j:slf4j-api:1.7.30 org.slf4j:slf4j-jdk14:1.7.28 org.testcontainers:database-commons:1.15.2 org.testcontainers:jdbc:1.15.2 +org.testcontainers:junit-jupiter:1.15.2 org.testcontainers:postgresql:1.15.2 org.testcontainers:testcontainers:1.15.2 org.threeten:threetenbp:1.5.1 diff --git a/docs/gradle/dependency-locks/testRuntimeClasspath.lockfile b/docs/gradle/dependency-locks/testRuntimeClasspath.lockfile index c056a1fce..6204f4439 100644 --- a/docs/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/docs/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -260,11 +260,14 @@ org.jboss:jandex:2.1.3.Final org.joda:joda-money:1.0.1 org.json:json:20200518 org.jsoup:jsoup:1.13.1 -org.junit.jupiter:junit-jupiter-api:5.6.2 -org.junit.jupiter:junit-jupiter-engine:5.6.2 -org.junit.platform:junit-platform-commons:1.6.2 -org.junit.platform:junit-platform-engine:1.6.2 -org.junit:junit-bom:5.6.2 +org.junit.jupiter:junit-jupiter-api:5.7.0 +org.junit.jupiter:junit-jupiter-engine:5.7.0 +org.junit.platform:junit-platform-commons:1.7.0 +org.junit.platform:junit-platform-engine:1.7.0 +org.junit.platform:junit-platform-launcher:1.7.0 +org.junit.platform:junit-platform-runner:1.7.0 +org.junit.platform:junit-platform-suite-api:1.7.0 +org.junit:junit-bom:5.7.0 org.jvnet.staxex:stax-ex:1.8 org.objenesis:objenesis:1.2 org.opentest4j:opentest4j:1.2.0 @@ -282,6 +285,7 @@ org.slf4j:slf4j-api:1.7.30 org.slf4j:slf4j-jdk14:1.7.28 org.testcontainers:database-commons:1.15.2 org.testcontainers:jdbc:1.15.2 +org.testcontainers:junit-jupiter:1.15.2 org.testcontainers:postgresql:1.15.2 org.testcontainers:testcontainers:1.15.2 org.threeten:threetenbp:1.5.1 diff --git a/networking/build.gradle b/networking/build.gradle index b970ec4d9..d3801904b 100644 --- a/networking/build.gradle +++ b/networking/build.gradle @@ -34,17 +34,25 @@ dependencies { runtime deps['io.netty:netty-tcnative-boringssl-static'] testCompile deps['com.google.truth:truth'] + testCompile deps['junit:junit'] + testCompile deps['org.bouncycastle:bcpkix-jdk15on'] + testCompile deps['org.bouncycastle:bcprov-jdk15on'] testCompile deps['org.junit.jupiter:junit-jupiter-api'] testCompile deps['org.junit.jupiter:junit-jupiter-engine'] testCompile deps['org.junit.jupiter:junit-jupiter-params'] - testCompile deps['org.bouncycastle:bcpkix-jdk15on'] - testCompile deps['org.bouncycastle:bcprov-jdk15on'] + testCompile deps['org.junit.platform:junit-platform-runner'] + testCompile deps['org.junit.platform:junit-platform-suite-api'] + testCompile deps['org.testcontainers:junit-jupiter'] testCompile project(path: ':common', configuration: 'testing') annotationProcessor deps['com.google.dagger:dagger-compiler'] testAnnotationProcessor deps['com.google.dagger:dagger-compiler'] } +test { + useJUnitPlatform() +} + // Make testing artifacts available to be depended up on by other projects. task testJar(type: Jar) { classifier = 'test' diff --git a/networking/gradle/dependency-locks/testCompile.lockfile b/networking/gradle/dependency-locks/testCompile.lockfile index c977428fc..634285fbb 100644 --- a/networking/gradle/dependency-locks/testCompile.lockfile +++ b/networking/gradle/dependency-locks/testCompile.lockfile @@ -1,6 +1,10 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +com.fasterxml.jackson.core:jackson-annotations:2.10.3 +com.github.docker-java:docker-java-api:3.2.7 +com.github.docker-java:docker-java-transport-zerodep:3.2.7 +com.github.docker-java:docker-java-transport:3.2.7 com.google.android:annotations:4.1.1.4 com.google.api-client:google-api-client:1.31.3 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2 @@ -65,6 +69,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.1 +net.java.dev.jna:jna:5.5.0 +org.apache.commons:commons-compress:1.20 org.apache.httpcomponents:httpclient:4.5.13 org.apache.httpcomponents:httpcore:4.4.14 org.apiguardian:apiguardian-api:1.1.0 @@ -75,13 +81,21 @@ org.checkerframework:checker-qual:3.9.1 org.codehaus.mojo:animal-sniffer-annotations:1.20 org.conscrypt:conscrypt-openjdk-uber:2.5.1 org.hamcrest:hamcrest-core:1.3 -org.junit.jupiter:junit-jupiter-api:5.6.2 -org.junit.jupiter:junit-jupiter-engine:5.6.2 -org.junit.jupiter:junit-jupiter-params:5.6.2 -org.junit.platform:junit-platform-commons:1.6.2 -org.junit.platform:junit-platform-engine:1.6.2 -org.junit:junit-bom:5.6.2 +org.junit.jupiter:junit-jupiter-api:5.7.0 +org.junit.jupiter:junit-jupiter-engine:5.7.0 +org.junit.jupiter:junit-jupiter-params:5.7.0 +org.junit.platform:junit-platform-commons:1.7.0 +org.junit.platform:junit-platform-engine:1.7.0 +org.junit.platform:junit-platform-launcher:1.7.0 +org.junit.platform:junit-platform-runner:1.7.0 +org.junit.platform:junit-platform-suite-api:1.7.0 +org.junit:junit-bom:5.7.0 org.opentest4j:opentest4j:1.2.0 org.ow2.asm:asm:9.0 +org.rnorth.duct-tape:duct-tape:1.0.8 +org.rnorth.visible-assertions:visible-assertions:2.1.2 +org.slf4j:slf4j-api:1.7.30 +org.testcontainers:junit-jupiter:1.15.2 +org.testcontainers:testcontainers:1.15.2 org.threeten:threetenbp:1.5.1 org.yaml:snakeyaml:1.17 diff --git a/networking/gradle/dependency-locks/testCompileClasspath.lockfile b/networking/gradle/dependency-locks/testCompileClasspath.lockfile index 04a640ebd..e5c870b14 100644 --- a/networking/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/networking/gradle/dependency-locks/testCompileClasspath.lockfile @@ -1,6 +1,10 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +com.fasterxml.jackson.core:jackson-annotations:2.10.3 +com.github.docker-java:docker-java-api:3.2.7 +com.github.docker-java:docker-java-transport-zerodep:3.2.7 +com.github.docker-java:docker-java-transport:3.2.7 com.google.api-client:google-api-client:1.31.3 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2 com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.89.2 @@ -62,6 +66,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.1 +net.java.dev.jna:jna:5.5.0 +org.apache.commons:commons-compress:1.20 org.apache.httpcomponents:httpclient:4.5.13 org.apache.httpcomponents:httpcore:4.4.14 org.apiguardian:apiguardian-api:1.1.0 @@ -71,13 +77,21 @@ org.checkerframework:checker-compat-qual:2.5.5 org.checkerframework:checker-qual:3.9.1 org.conscrypt:conscrypt-openjdk-uber:2.5.1 org.hamcrest:hamcrest-core:1.3 -org.junit.jupiter:junit-jupiter-api:5.6.2 -org.junit.jupiter:junit-jupiter-engine:5.6.2 -org.junit.jupiter:junit-jupiter-params:5.6.2 -org.junit.platform:junit-platform-commons:1.6.2 -org.junit.platform:junit-platform-engine:1.6.2 -org.junit:junit-bom:5.6.2 +org.junit.jupiter:junit-jupiter-api:5.7.0 +org.junit.jupiter:junit-jupiter-engine:5.7.0 +org.junit.jupiter:junit-jupiter-params:5.7.0 +org.junit.platform:junit-platform-commons:1.7.0 +org.junit.platform:junit-platform-engine:1.7.0 +org.junit.platform:junit-platform-launcher:1.7.0 +org.junit.platform:junit-platform-runner:1.7.0 +org.junit.platform:junit-platform-suite-api:1.7.0 +org.junit:junit-bom:5.7.0 org.opentest4j:opentest4j:1.2.0 org.ow2.asm:asm:9.0 +org.rnorth.duct-tape:duct-tape:1.0.8 +org.rnorth.visible-assertions:visible-assertions:2.1.2 +org.slf4j:slf4j-api:1.7.30 +org.testcontainers:junit-jupiter:1.15.2 +org.testcontainers:testcontainers:1.15.2 org.threeten:threetenbp:1.5.1 org.yaml:snakeyaml:1.17 diff --git a/networking/gradle/dependency-locks/testRuntime.lockfile b/networking/gradle/dependency-locks/testRuntime.lockfile index 864e0b916..a928f6d4f 100644 --- a/networking/gradle/dependency-locks/testRuntime.lockfile +++ b/networking/gradle/dependency-locks/testRuntime.lockfile @@ -1,6 +1,10 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +com.fasterxml.jackson.core:jackson-annotations:2.10.3 +com.github.docker-java:docker-java-api:3.2.7 +com.github.docker-java:docker-java-transport-zerodep:3.2.7 +com.github.docker-java:docker-java-transport:3.2.7 com.google.android:annotations:4.1.1.4 com.google.api-client:google-api-client:1.31.3 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2 @@ -67,6 +71,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.1 +net.java.dev.jna:jna:5.5.0 +org.apache.commons:commons-compress:1.20 org.apache.httpcomponents:httpclient:4.5.13 org.apache.httpcomponents:httpcore:4.4.14 org.apiguardian:apiguardian-api:1.1.0 @@ -77,13 +83,21 @@ org.checkerframework:checker-qual:3.9.1 org.codehaus.mojo:animal-sniffer-annotations:1.20 org.conscrypt:conscrypt-openjdk-uber:2.5.1 org.hamcrest:hamcrest-core:1.3 -org.junit.jupiter:junit-jupiter-api:5.6.2 -org.junit.jupiter:junit-jupiter-engine:5.6.2 -org.junit.jupiter:junit-jupiter-params:5.6.2 -org.junit.platform:junit-platform-commons:1.6.2 -org.junit.platform:junit-platform-engine:1.6.2 -org.junit:junit-bom:5.6.2 +org.junit.jupiter:junit-jupiter-api:5.7.0 +org.junit.jupiter:junit-jupiter-engine:5.7.0 +org.junit.jupiter:junit-jupiter-params:5.7.0 +org.junit.platform:junit-platform-commons:1.7.0 +org.junit.platform:junit-platform-engine:1.7.0 +org.junit.platform:junit-platform-launcher:1.7.0 +org.junit.platform:junit-platform-runner:1.7.0 +org.junit.platform:junit-platform-suite-api:1.7.0 +org.junit:junit-bom:5.7.0 org.opentest4j:opentest4j:1.2.0 org.ow2.asm:asm:9.0 +org.rnorth.duct-tape:duct-tape:1.0.8 +org.rnorth.visible-assertions:visible-assertions:2.1.2 +org.slf4j:slf4j-api:1.7.30 +org.testcontainers:junit-jupiter:1.15.2 +org.testcontainers:testcontainers:1.15.2 org.threeten:threetenbp:1.5.1 org.yaml:snakeyaml:1.17 diff --git a/networking/gradle/dependency-locks/testRuntimeClasspath.lockfile b/networking/gradle/dependency-locks/testRuntimeClasspath.lockfile index 864e0b916..a928f6d4f 100644 --- a/networking/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/networking/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -1,6 +1,10 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +com.fasterxml.jackson.core:jackson-annotations:2.10.3 +com.github.docker-java:docker-java-api:3.2.7 +com.github.docker-java:docker-java-transport-zerodep:3.2.7 +com.github.docker-java:docker-java-transport:3.2.7 com.google.android:annotations:4.1.1.4 com.google.api-client:google-api-client:1.31.3 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2 @@ -67,6 +71,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.1 +net.java.dev.jna:jna:5.5.0 +org.apache.commons:commons-compress:1.20 org.apache.httpcomponents:httpclient:4.5.13 org.apache.httpcomponents:httpcore:4.4.14 org.apiguardian:apiguardian-api:1.1.0 @@ -77,13 +83,21 @@ org.checkerframework:checker-qual:3.9.1 org.codehaus.mojo:animal-sniffer-annotations:1.20 org.conscrypt:conscrypt-openjdk-uber:2.5.1 org.hamcrest:hamcrest-core:1.3 -org.junit.jupiter:junit-jupiter-api:5.6.2 -org.junit.jupiter:junit-jupiter-engine:5.6.2 -org.junit.jupiter:junit-jupiter-params:5.6.2 -org.junit.platform:junit-platform-commons:1.6.2 -org.junit.platform:junit-platform-engine:1.6.2 -org.junit:junit-bom:5.6.2 +org.junit.jupiter:junit-jupiter-api:5.7.0 +org.junit.jupiter:junit-jupiter-engine:5.7.0 +org.junit.jupiter:junit-jupiter-params:5.7.0 +org.junit.platform:junit-platform-commons:1.7.0 +org.junit.platform:junit-platform-engine:1.7.0 +org.junit.platform:junit-platform-launcher:1.7.0 +org.junit.platform:junit-platform-runner:1.7.0 +org.junit.platform:junit-platform-suite-api:1.7.0 +org.junit:junit-bom:5.7.0 org.opentest4j:opentest4j:1.2.0 org.ow2.asm:asm:9.0 +org.rnorth.duct-tape:duct-tape:1.0.8 +org.rnorth.visible-assertions:visible-assertions:2.1.2 +org.slf4j:slf4j-api:1.7.30 +org.testcontainers:junit-jupiter:1.15.2 +org.testcontainers:testcontainers:1.15.2 org.threeten:threetenbp:1.5.1 org.yaml:snakeyaml:1.17 diff --git a/prober/build.gradle b/prober/build.gradle index b5ca41962..579a6b662 100644 --- a/prober/build.gradle +++ b/prober/build.gradle @@ -17,48 +17,56 @@ apply plugin: 'java' createUberJar('deployJar', 'prober', 'google.registry.monitoring.blackbox.Prober') dependencies { - def deps = rootProject.dependencyMap + def deps = rootProject.dependencyMap - compile deps['com.google.auto.value:auto-value-annotations'] - compile deps['com.google.code.findbugs:jsr305'] - compile deps['com.google.code.gson:gson'] - compile deps['com.google.dagger:dagger'] - compile deps['com.google.flogger:flogger'] - compile deps['com.google.guava:guava'] - compile deps['com.google.monitoring-client:metrics'] - compile deps['io.netty:netty-buffer'] - compile deps['io.netty:netty-codec'] - compile deps['io.netty:netty-codec-http'] - compile deps['io.netty:netty-common'] - compile deps['io.netty:netty-handler'] - compile deps['io.netty:netty-transport'] - compile deps['javax.inject:javax.inject'] - compile deps['joda-time:joda-time'] - compile deps['org.bouncycastle:bcpkix-jdk15on'] - compile deps['org.bouncycastle:bcprov-jdk15on'] - compile deps['xerces:xmlParserAPIs'] - compile deps['xpp3:xpp3'] - compile project(':common') - compile project(':util') - compile project(':networking') + compile deps['com.google.auto.value:auto-value-annotations'] + compile deps['com.google.code.findbugs:jsr305'] + compile deps['com.google.code.gson:gson'] + compile deps['com.google.dagger:dagger'] + compile deps['com.google.flogger:flogger'] + compile deps['com.google.guava:guava'] + compile deps['com.google.monitoring-client:metrics'] + compile deps['io.netty:netty-buffer'] + compile deps['io.netty:netty-codec'] + compile deps['io.netty:netty-codec-http'] + compile deps['io.netty:netty-common'] + compile deps['io.netty:netty-handler'] + compile deps['io.netty:netty-transport'] + compile deps['javax.inject:javax.inject'] + compile deps['joda-time:joda-time'] + compile deps['org.bouncycastle:bcpkix-jdk15on'] + compile deps['org.bouncycastle:bcprov-jdk15on'] + compile deps['xerces:xmlParserAPIs'] + compile deps['xpp3:xpp3'] + compile project(':common') + compile project(':util') + compile project(':networking') - runtime deps['com.google.flogger:flogger-system-backend'] - runtime deps['com.google.auto.value:auto-value'] - runtime deps['io.netty:netty-tcnative-boringssl-static'] + runtime deps['com.google.flogger:flogger-system-backend'] + runtime deps['com.google.auto.value:auto-value'] + runtime deps['io.netty:netty-tcnative-boringssl-static'] - testCompile deps['com.google.monitoring-client:contrib'] - testCompile deps['com.google.truth:truth'] - testCompile deps['org.junit.jupiter:junit-jupiter-api'] - testCompile deps['org.junit.jupiter:junit-jupiter-engine'] - testCompile deps['org.junit.jupiter:junit-jupiter-params'] - testCompile deps['org.mockito:mockito-core'] - testCompile project(path: ':common', configuration: 'testing') - testCompile project(path: ':networking', configuration: 'testRuntime') + testCompile deps['com.google.monitoring-client:contrib'] + testCompile deps['com.google.truth:truth'] + testCompile deps['junit:junit'] + testCompile deps['org.junit.jupiter:junit-jupiter-api'] + testCompile deps['org.junit.jupiter:junit-jupiter-engine'] + testCompile deps['org.junit.jupiter:junit-jupiter-params'] + testCompile deps['org.junit.platform:junit-platform-runner'] + testCompile deps['org.junit.platform:junit-platform-suite-api'] + testCompile deps['org.mockito:mockito-core'] + testCompile deps['org.testcontainers:junit-jupiter'] + testCompile project(path: ':common', configuration: 'testing') + testCompile project(path: ':networking', configuration: 'testRuntime') - // Include auto-value in compile until nebula-lint understands - // annotationProcessor - annotationProcessor deps['com.google.auto.value:auto-value'] - testAnnotationProcessor deps['com.google.auto.value:auto-value'] - annotationProcessor deps['com.google.dagger:dagger-compiler'] - testAnnotationProcessor deps['com.google.dagger:dagger-compiler'] + // Include auto-value in compile until nebula-lint understands + // annotationProcessor + annotationProcessor deps['com.google.auto.value:auto-value'] + testAnnotationProcessor deps['com.google.auto.value:auto-value'] + annotationProcessor deps['com.google.dagger:dagger-compiler'] + testAnnotationProcessor deps['com.google.dagger:dagger-compiler'] +} + +test { + useJUnitPlatform() } diff --git a/prober/gradle/dependency-locks/testCompile.lockfile b/prober/gradle/dependency-locks/testCompile.lockfile index 8d01fb6d4..b3a6b513b 100644 --- a/prober/gradle/dependency-locks/testCompile.lockfile +++ b/prober/gradle/dependency-locks/testCompile.lockfile @@ -1,6 +1,10 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +com.fasterxml.jackson.core:jackson-annotations:2.10.3 +com.github.docker-java:docker-java-api:3.2.7 +com.github.docker-java:docker-java-transport-zerodep:3.2.7 +com.github.docker-java:docker-java-transport:3.2.7 com.google.android:annotations:4.1.1.4 com.google.api-client:google-api-client:1.31.3 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2 @@ -71,6 +75,8 @@ joda-time:joda-time:2.9.2 junit:junit:4.13.1 net.bytebuddy:byte-buddy-agent:1.10.19 net.bytebuddy:byte-buddy:1.10.19 +net.java.dev.jna:jna:5.5.0 +org.apache.commons:commons-compress:1.20 org.apache.httpcomponents:httpclient:4.5.13 org.apache.httpcomponents:httpcore:4.4.14 org.apiguardian:apiguardian-api:1.1.0 @@ -81,16 +87,24 @@ org.checkerframework:checker-qual:3.9.1 org.codehaus.mojo:animal-sniffer-annotations:1.20 org.conscrypt:conscrypt-openjdk-uber:2.5.1 org.hamcrest:hamcrest-core:1.3 -org.junit.jupiter:junit-jupiter-api:5.6.2 -org.junit.jupiter:junit-jupiter-engine:5.6.2 -org.junit.jupiter:junit-jupiter-params:5.6.2 -org.junit.platform:junit-platform-commons:1.6.2 -org.junit.platform:junit-platform-engine:1.6.2 -org.junit:junit-bom:5.6.2 +org.junit.jupiter:junit-jupiter-api:5.7.0 +org.junit.jupiter:junit-jupiter-engine:5.7.0 +org.junit.jupiter:junit-jupiter-params:5.7.0 +org.junit.platform:junit-platform-commons:1.7.0 +org.junit.platform:junit-platform-engine:1.7.0 +org.junit.platform:junit-platform-launcher:1.7.0 +org.junit.platform:junit-platform-runner:1.7.0 +org.junit.platform:junit-platform-suite-api:1.7.0 +org.junit:junit-bom:5.7.0 org.mockito:mockito-core:3.7.7 org.objenesis:objenesis:3.1 org.opentest4j:opentest4j:1.2.0 org.ow2.asm:asm:9.0 +org.rnorth.duct-tape:duct-tape:1.0.8 +org.rnorth.visible-assertions:visible-assertions:2.1.2 +org.slf4j:slf4j-api:1.7.30 +org.testcontainers:junit-jupiter:1.15.2 +org.testcontainers:testcontainers:1.15.2 org.threeten:threetenbp:1.5.1 org.yaml:snakeyaml:1.17 xerces:xmlParserAPIs:2.6.2 diff --git a/prober/gradle/dependency-locks/testCompileClasspath.lockfile b/prober/gradle/dependency-locks/testCompileClasspath.lockfile index 0fd88f373..454890222 100644 --- a/prober/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/prober/gradle/dependency-locks/testCompileClasspath.lockfile @@ -1,6 +1,10 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +com.fasterxml.jackson.core:jackson-annotations:2.10.3 +com.github.docker-java:docker-java-api:3.2.7 +com.github.docker-java:docker-java-transport-zerodep:3.2.7 +com.github.docker-java:docker-java-transport:3.2.7 com.google.api-client:google-api-client:1.31.3 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2 com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.89.2 @@ -68,6 +72,8 @@ joda-time:joda-time:2.9.2 junit:junit:4.13.1 net.bytebuddy:byte-buddy-agent:1.10.19 net.bytebuddy:byte-buddy:1.10.19 +net.java.dev.jna:jna:5.5.0 +org.apache.commons:commons-compress:1.20 org.apache.httpcomponents:httpclient:4.5.13 org.apache.httpcomponents:httpcore:4.4.14 org.apiguardian:apiguardian-api:1.1.0 @@ -77,16 +83,24 @@ org.checkerframework:checker-compat-qual:2.5.5 org.checkerframework:checker-qual:3.9.1 org.conscrypt:conscrypt-openjdk-uber:2.5.1 org.hamcrest:hamcrest-core:1.3 -org.junit.jupiter:junit-jupiter-api:5.6.2 -org.junit.jupiter:junit-jupiter-engine:5.6.2 -org.junit.jupiter:junit-jupiter-params:5.6.2 -org.junit.platform:junit-platform-commons:1.6.2 -org.junit.platform:junit-platform-engine:1.6.2 -org.junit:junit-bom:5.6.2 +org.junit.jupiter:junit-jupiter-api:5.7.0 +org.junit.jupiter:junit-jupiter-engine:5.7.0 +org.junit.jupiter:junit-jupiter-params:5.7.0 +org.junit.platform:junit-platform-commons:1.7.0 +org.junit.platform:junit-platform-engine:1.7.0 +org.junit.platform:junit-platform-launcher:1.7.0 +org.junit.platform:junit-platform-runner:1.7.0 +org.junit.platform:junit-platform-suite-api:1.7.0 +org.junit:junit-bom:5.7.0 org.mockito:mockito-core:3.7.7 org.objenesis:objenesis:3.1 org.opentest4j:opentest4j:1.2.0 org.ow2.asm:asm:9.0 +org.rnorth.duct-tape:duct-tape:1.0.8 +org.rnorth.visible-assertions:visible-assertions:2.1.2 +org.slf4j:slf4j-api:1.7.30 +org.testcontainers:junit-jupiter:1.15.2 +org.testcontainers:testcontainers:1.15.2 org.threeten:threetenbp:1.5.1 org.yaml:snakeyaml:1.17 xerces:xmlParserAPIs:2.6.2 diff --git a/prober/gradle/dependency-locks/testRuntime.lockfile b/prober/gradle/dependency-locks/testRuntime.lockfile index 8d01fb6d4..b3a6b513b 100644 --- a/prober/gradle/dependency-locks/testRuntime.lockfile +++ b/prober/gradle/dependency-locks/testRuntime.lockfile @@ -1,6 +1,10 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +com.fasterxml.jackson.core:jackson-annotations:2.10.3 +com.github.docker-java:docker-java-api:3.2.7 +com.github.docker-java:docker-java-transport-zerodep:3.2.7 +com.github.docker-java:docker-java-transport:3.2.7 com.google.android:annotations:4.1.1.4 com.google.api-client:google-api-client:1.31.3 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2 @@ -71,6 +75,8 @@ joda-time:joda-time:2.9.2 junit:junit:4.13.1 net.bytebuddy:byte-buddy-agent:1.10.19 net.bytebuddy:byte-buddy:1.10.19 +net.java.dev.jna:jna:5.5.0 +org.apache.commons:commons-compress:1.20 org.apache.httpcomponents:httpclient:4.5.13 org.apache.httpcomponents:httpcore:4.4.14 org.apiguardian:apiguardian-api:1.1.0 @@ -81,16 +87,24 @@ org.checkerframework:checker-qual:3.9.1 org.codehaus.mojo:animal-sniffer-annotations:1.20 org.conscrypt:conscrypt-openjdk-uber:2.5.1 org.hamcrest:hamcrest-core:1.3 -org.junit.jupiter:junit-jupiter-api:5.6.2 -org.junit.jupiter:junit-jupiter-engine:5.6.2 -org.junit.jupiter:junit-jupiter-params:5.6.2 -org.junit.platform:junit-platform-commons:1.6.2 -org.junit.platform:junit-platform-engine:1.6.2 -org.junit:junit-bom:5.6.2 +org.junit.jupiter:junit-jupiter-api:5.7.0 +org.junit.jupiter:junit-jupiter-engine:5.7.0 +org.junit.jupiter:junit-jupiter-params:5.7.0 +org.junit.platform:junit-platform-commons:1.7.0 +org.junit.platform:junit-platform-engine:1.7.0 +org.junit.platform:junit-platform-launcher:1.7.0 +org.junit.platform:junit-platform-runner:1.7.0 +org.junit.platform:junit-platform-suite-api:1.7.0 +org.junit:junit-bom:5.7.0 org.mockito:mockito-core:3.7.7 org.objenesis:objenesis:3.1 org.opentest4j:opentest4j:1.2.0 org.ow2.asm:asm:9.0 +org.rnorth.duct-tape:duct-tape:1.0.8 +org.rnorth.visible-assertions:visible-assertions:2.1.2 +org.slf4j:slf4j-api:1.7.30 +org.testcontainers:junit-jupiter:1.15.2 +org.testcontainers:testcontainers:1.15.2 org.threeten:threetenbp:1.5.1 org.yaml:snakeyaml:1.17 xerces:xmlParserAPIs:2.6.2 diff --git a/prober/gradle/dependency-locks/testRuntimeClasspath.lockfile b/prober/gradle/dependency-locks/testRuntimeClasspath.lockfile index 8d01fb6d4..b3a6b513b 100644 --- a/prober/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/prober/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -1,6 +1,10 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +com.fasterxml.jackson.core:jackson-annotations:2.10.3 +com.github.docker-java:docker-java-api:3.2.7 +com.github.docker-java:docker-java-transport-zerodep:3.2.7 +com.github.docker-java:docker-java-transport:3.2.7 com.google.android:annotations:4.1.1.4 com.google.api-client:google-api-client:1.31.3 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2 @@ -71,6 +75,8 @@ joda-time:joda-time:2.9.2 junit:junit:4.13.1 net.bytebuddy:byte-buddy-agent:1.10.19 net.bytebuddy:byte-buddy:1.10.19 +net.java.dev.jna:jna:5.5.0 +org.apache.commons:commons-compress:1.20 org.apache.httpcomponents:httpclient:4.5.13 org.apache.httpcomponents:httpcore:4.4.14 org.apiguardian:apiguardian-api:1.1.0 @@ -81,16 +87,24 @@ org.checkerframework:checker-qual:3.9.1 org.codehaus.mojo:animal-sniffer-annotations:1.20 org.conscrypt:conscrypt-openjdk-uber:2.5.1 org.hamcrest:hamcrest-core:1.3 -org.junit.jupiter:junit-jupiter-api:5.6.2 -org.junit.jupiter:junit-jupiter-engine:5.6.2 -org.junit.jupiter:junit-jupiter-params:5.6.2 -org.junit.platform:junit-platform-commons:1.6.2 -org.junit.platform:junit-platform-engine:1.6.2 -org.junit:junit-bom:5.6.2 +org.junit.jupiter:junit-jupiter-api:5.7.0 +org.junit.jupiter:junit-jupiter-engine:5.7.0 +org.junit.jupiter:junit-jupiter-params:5.7.0 +org.junit.platform:junit-platform-commons:1.7.0 +org.junit.platform:junit-platform-engine:1.7.0 +org.junit.platform:junit-platform-launcher:1.7.0 +org.junit.platform:junit-platform-runner:1.7.0 +org.junit.platform:junit-platform-suite-api:1.7.0 +org.junit:junit-bom:5.7.0 org.mockito:mockito-core:3.7.7 org.objenesis:objenesis:3.1 org.opentest4j:opentest4j:1.2.0 org.ow2.asm:asm:9.0 +org.rnorth.duct-tape:duct-tape:1.0.8 +org.rnorth.visible-assertions:visible-assertions:2.1.2 +org.slf4j:slf4j-api:1.7.30 +org.testcontainers:junit-jupiter:1.15.2 +org.testcontainers:testcontainers:1.15.2 org.threeten:threetenbp:1.5.1 org.yaml:snakeyaml:1.17 xerces:xmlParserAPIs:2.6.2 diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/message/EppRequestMessage.java b/prober/src/main/java/google/registry/monitoring/blackbox/message/EppRequestMessage.java index 5a42079b2..662699484 100644 --- a/prober/src/main/java/google/registry/monitoring/blackbox/message/EppRequestMessage.java +++ b/prober/src/main/java/google/registry/monitoring/blackbox/message/EppRequestMessage.java @@ -14,6 +14,7 @@ package google.registry.monitoring.blackbox.message; +import com.google.common.base.Joiner; import com.google.common.collect.ImmutableMap; import google.registry.monitoring.blackbox.exception.EppClientException; import google.registry.monitoring.blackbox.exception.UndeterminedStateException; @@ -147,4 +148,16 @@ public class EppRequestMessage extends EppMessage implements OutboundMessageType public String responseName() { return expectedResponse.name(); } + + /** + * Returns a String representation using the {@link #name()}, {@link #responseName()}, and {@link + * #message} (if non-null). + * + *

This is primarily for parameterized test case usage, which requires a sensible + * toString for the purposes of test method naming. + */ + @Override + public String toString() { + return Joiner.on('_').skipNulls().join(name(), responseName(), super.toString()); + } } diff --git a/proxy/build.gradle b/proxy/build.gradle index ae7d54b1a..3465b8d95 100644 --- a/proxy/build.gradle +++ b/proxy/build.gradle @@ -76,11 +76,15 @@ dependencies { testCompile deps['com.google.monitoring-client:contrib'] testCompile deps['com.google.truth:truth'] - testCompile deps['org.yaml:snakeyaml'] + testCompile deps['junit:junit'] testCompile deps['org.junit.jupiter:junit-jupiter-api'] testCompile deps['org.junit.jupiter:junit-jupiter-engine'] testCompile deps['org.junit.jupiter:junit-jupiter-params'] + testCompile deps['org.junit.platform:junit-platform-runner'] + testCompile deps['org.junit.platform:junit-platform-suite-api'] testCompile deps['org.mockito:mockito-core'] + testCompile deps['org.testcontainers:junit-jupiter'] + testCompile deps['org.yaml:snakeyaml'] testCompile project(path: ':common', configuration: 'testing') testCompile project(path: ':networking', configuration: 'testRuntime') @@ -91,3 +95,7 @@ dependencies { annotationProcessor deps['com.google.dagger:dagger-compiler'] testAnnotationProcessor deps['com.google.dagger:dagger-compiler'] } + +test { + useJUnitPlatform() +} diff --git a/proxy/gradle/dependency-locks/testCompile.lockfile b/proxy/gradle/dependency-locks/testCompile.lockfile index 5e86fad39..03eefe505 100644 --- a/proxy/gradle/dependency-locks/testCompile.lockfile +++ b/proxy/gradle/dependency-locks/testCompile.lockfile @@ -2,8 +2,12 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. com.beust:jcommander:1.60 +com.fasterxml.jackson.core:jackson-annotations:2.12.1 com.fasterxml.jackson.core:jackson-core:2.12.1 com.fasterxml.jackson:jackson-bom:2.12.1 +com.github.docker-java:docker-java-api:3.2.7 +com.github.docker-java:docker-java-transport-zerodep:3.2.7 +com.github.docker-java:docker-java-transport:3.2.7 com.google.android:annotations:4.1.1.4 com.google.api-client:google-api-client:1.31.3 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2 @@ -84,6 +88,8 @@ joda-time:joda-time:2.9.2 junit:junit:4.13.1 net.bytebuddy:byte-buddy-agent:1.10.19 net.bytebuddy:byte-buddy:1.10.19 +net.java.dev.jna:jna:5.5.0 +org.apache.commons:commons-compress:1.20 org.apache.httpcomponents:httpclient:4.5.13 org.apache.httpcomponents:httpcore:4.4.14 org.apiguardian:apiguardian-api:1.1.0 @@ -94,15 +100,23 @@ org.checkerframework:checker-qual:3.9.1 org.codehaus.mojo:animal-sniffer-annotations:1.20 org.conscrypt:conscrypt-openjdk-uber:2.5.1 org.hamcrest:hamcrest-core:1.3 -org.junit.jupiter:junit-jupiter-api:5.6.2 -org.junit.jupiter:junit-jupiter-engine:5.6.2 -org.junit.jupiter:junit-jupiter-params:5.6.2 -org.junit.platform:junit-platform-commons:1.6.2 -org.junit.platform:junit-platform-engine:1.6.2 -org.junit:junit-bom:5.6.2 +org.junit.jupiter:junit-jupiter-api:5.7.0 +org.junit.jupiter:junit-jupiter-engine:5.7.0 +org.junit.jupiter:junit-jupiter-params:5.7.0 +org.junit.platform:junit-platform-commons:1.7.0 +org.junit.platform:junit-platform-engine:1.7.0 +org.junit.platform:junit-platform-launcher:1.7.0 +org.junit.platform:junit-platform-runner:1.7.0 +org.junit.platform:junit-platform-suite-api:1.7.0 +org.junit:junit-bom:5.7.0 org.mockito:mockito-core:3.7.7 org.objenesis:objenesis:3.1 org.opentest4j:opentest4j:1.2.0 org.ow2.asm:asm:9.0 +org.rnorth.duct-tape:duct-tape:1.0.8 +org.rnorth.visible-assertions:visible-assertions:2.1.2 +org.slf4j:slf4j-api:1.7.30 +org.testcontainers:junit-jupiter:1.15.2 +org.testcontainers:testcontainers:1.15.2 org.threeten:threetenbp:1.5.1 org.yaml:snakeyaml:1.17 diff --git a/proxy/gradle/dependency-locks/testCompileClasspath.lockfile b/proxy/gradle/dependency-locks/testCompileClasspath.lockfile index f992bb886..db1cb4d5b 100644 --- a/proxy/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/proxy/gradle/dependency-locks/testCompileClasspath.lockfile @@ -2,8 +2,12 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. com.beust:jcommander:1.60 +com.fasterxml.jackson.core:jackson-annotations:2.12.1 com.fasterxml.jackson.core:jackson-core:2.12.1 com.fasterxml.jackson:jackson-bom:2.12.1 +com.github.docker-java:docker-java-api:3.2.7 +com.github.docker-java:docker-java-transport-zerodep:3.2.7 +com.github.docker-java:docker-java-transport:3.2.7 com.google.api-client:google-api-client:1.31.3 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2 com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.89.2 @@ -82,6 +86,8 @@ joda-time:joda-time:2.9.2 junit:junit:4.13.1 net.bytebuddy:byte-buddy-agent:1.10.19 net.bytebuddy:byte-buddy:1.10.19 +net.java.dev.jna:jna:5.5.0 +org.apache.commons:commons-compress:1.20 org.apache.httpcomponents:httpclient:4.5.13 org.apache.httpcomponents:httpcore:4.4.14 org.apiguardian:apiguardian-api:1.1.0 @@ -91,15 +97,23 @@ org.checkerframework:checker-compat-qual:2.5.5 org.checkerframework:checker-qual:3.9.1 org.conscrypt:conscrypt-openjdk-uber:2.5.1 org.hamcrest:hamcrest-core:1.3 -org.junit.jupiter:junit-jupiter-api:5.6.2 -org.junit.jupiter:junit-jupiter-engine:5.6.2 -org.junit.jupiter:junit-jupiter-params:5.6.2 -org.junit.platform:junit-platform-commons:1.6.2 -org.junit.platform:junit-platform-engine:1.6.2 -org.junit:junit-bom:5.6.2 +org.junit.jupiter:junit-jupiter-api:5.7.0 +org.junit.jupiter:junit-jupiter-engine:5.7.0 +org.junit.jupiter:junit-jupiter-params:5.7.0 +org.junit.platform:junit-platform-commons:1.7.0 +org.junit.platform:junit-platform-engine:1.7.0 +org.junit.platform:junit-platform-launcher:1.7.0 +org.junit.platform:junit-platform-runner:1.7.0 +org.junit.platform:junit-platform-suite-api:1.7.0 +org.junit:junit-bom:5.7.0 org.mockito:mockito-core:3.7.7 org.objenesis:objenesis:3.1 org.opentest4j:opentest4j:1.2.0 org.ow2.asm:asm:9.0 +org.rnorth.duct-tape:duct-tape:1.0.8 +org.rnorth.visible-assertions:visible-assertions:2.1.2 +org.slf4j:slf4j-api:1.7.30 +org.testcontainers:junit-jupiter:1.15.2 +org.testcontainers:testcontainers:1.15.2 org.threeten:threetenbp:1.5.1 org.yaml:snakeyaml:1.17 diff --git a/proxy/gradle/dependency-locks/testRuntime.lockfile b/proxy/gradle/dependency-locks/testRuntime.lockfile index 5e86fad39..03eefe505 100644 --- a/proxy/gradle/dependency-locks/testRuntime.lockfile +++ b/proxy/gradle/dependency-locks/testRuntime.lockfile @@ -2,8 +2,12 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. com.beust:jcommander:1.60 +com.fasterxml.jackson.core:jackson-annotations:2.12.1 com.fasterxml.jackson.core:jackson-core:2.12.1 com.fasterxml.jackson:jackson-bom:2.12.1 +com.github.docker-java:docker-java-api:3.2.7 +com.github.docker-java:docker-java-transport-zerodep:3.2.7 +com.github.docker-java:docker-java-transport:3.2.7 com.google.android:annotations:4.1.1.4 com.google.api-client:google-api-client:1.31.3 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2 @@ -84,6 +88,8 @@ joda-time:joda-time:2.9.2 junit:junit:4.13.1 net.bytebuddy:byte-buddy-agent:1.10.19 net.bytebuddy:byte-buddy:1.10.19 +net.java.dev.jna:jna:5.5.0 +org.apache.commons:commons-compress:1.20 org.apache.httpcomponents:httpclient:4.5.13 org.apache.httpcomponents:httpcore:4.4.14 org.apiguardian:apiguardian-api:1.1.0 @@ -94,15 +100,23 @@ org.checkerframework:checker-qual:3.9.1 org.codehaus.mojo:animal-sniffer-annotations:1.20 org.conscrypt:conscrypt-openjdk-uber:2.5.1 org.hamcrest:hamcrest-core:1.3 -org.junit.jupiter:junit-jupiter-api:5.6.2 -org.junit.jupiter:junit-jupiter-engine:5.6.2 -org.junit.jupiter:junit-jupiter-params:5.6.2 -org.junit.platform:junit-platform-commons:1.6.2 -org.junit.platform:junit-platform-engine:1.6.2 -org.junit:junit-bom:5.6.2 +org.junit.jupiter:junit-jupiter-api:5.7.0 +org.junit.jupiter:junit-jupiter-engine:5.7.0 +org.junit.jupiter:junit-jupiter-params:5.7.0 +org.junit.platform:junit-platform-commons:1.7.0 +org.junit.platform:junit-platform-engine:1.7.0 +org.junit.platform:junit-platform-launcher:1.7.0 +org.junit.platform:junit-platform-runner:1.7.0 +org.junit.platform:junit-platform-suite-api:1.7.0 +org.junit:junit-bom:5.7.0 org.mockito:mockito-core:3.7.7 org.objenesis:objenesis:3.1 org.opentest4j:opentest4j:1.2.0 org.ow2.asm:asm:9.0 +org.rnorth.duct-tape:duct-tape:1.0.8 +org.rnorth.visible-assertions:visible-assertions:2.1.2 +org.slf4j:slf4j-api:1.7.30 +org.testcontainers:junit-jupiter:1.15.2 +org.testcontainers:testcontainers:1.15.2 org.threeten:threetenbp:1.5.1 org.yaml:snakeyaml:1.17 diff --git a/proxy/gradle/dependency-locks/testRuntimeClasspath.lockfile b/proxy/gradle/dependency-locks/testRuntimeClasspath.lockfile index 5e86fad39..03eefe505 100644 --- a/proxy/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/proxy/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -2,8 +2,12 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. com.beust:jcommander:1.60 +com.fasterxml.jackson.core:jackson-annotations:2.12.1 com.fasterxml.jackson.core:jackson-core:2.12.1 com.fasterxml.jackson:jackson-bom:2.12.1 +com.github.docker-java:docker-java-api:3.2.7 +com.github.docker-java:docker-java-transport-zerodep:3.2.7 +com.github.docker-java:docker-java-transport:3.2.7 com.google.android:annotations:4.1.1.4 com.google.api-client:google-api-client:1.31.3 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2 @@ -84,6 +88,8 @@ joda-time:joda-time:2.9.2 junit:junit:4.13.1 net.bytebuddy:byte-buddy-agent:1.10.19 net.bytebuddy:byte-buddy:1.10.19 +net.java.dev.jna:jna:5.5.0 +org.apache.commons:commons-compress:1.20 org.apache.httpcomponents:httpclient:4.5.13 org.apache.httpcomponents:httpcore:4.4.14 org.apiguardian:apiguardian-api:1.1.0 @@ -94,15 +100,23 @@ org.checkerframework:checker-qual:3.9.1 org.codehaus.mojo:animal-sniffer-annotations:1.20 org.conscrypt:conscrypt-openjdk-uber:2.5.1 org.hamcrest:hamcrest-core:1.3 -org.junit.jupiter:junit-jupiter-api:5.6.2 -org.junit.jupiter:junit-jupiter-engine:5.6.2 -org.junit.jupiter:junit-jupiter-params:5.6.2 -org.junit.platform:junit-platform-commons:1.6.2 -org.junit.platform:junit-platform-engine:1.6.2 -org.junit:junit-bom:5.6.2 +org.junit.jupiter:junit-jupiter-api:5.7.0 +org.junit.jupiter:junit-jupiter-engine:5.7.0 +org.junit.jupiter:junit-jupiter-params:5.7.0 +org.junit.platform:junit-platform-commons:1.7.0 +org.junit.platform:junit-platform-engine:1.7.0 +org.junit.platform:junit-platform-launcher:1.7.0 +org.junit.platform:junit-platform-runner:1.7.0 +org.junit.platform:junit-platform-suite-api:1.7.0 +org.junit:junit-bom:5.7.0 org.mockito:mockito-core:3.7.7 org.objenesis:objenesis:3.1 org.opentest4j:opentest4j:1.2.0 org.ow2.asm:asm:9.0 +org.rnorth.duct-tape:duct-tape:1.0.8 +org.rnorth.visible-assertions:visible-assertions:2.1.2 +org.slf4j:slf4j-api:1.7.30 +org.testcontainers:junit-jupiter:1.15.2 +org.testcontainers:testcontainers:1.15.2 org.threeten:threetenbp:1.5.1 org.yaml:snakeyaml:1.17