From a7f4a885b117a5c075370d7c1aec1534ec6c824e Mon Sep 17 00:00:00 2001 From: Lai Jiang Date: Tue, 2 Mar 2021 21:01:30 -0500 Subject: [PATCH] Update a few plugins for Java 11 compatibility (#966) * Update a few plugins for Java 11 compatibility Guice 5.0.1 is now compatible with Java 11. However we don't directly depend on Guice. Rather Soy depends on Guice. So I added a direct dependency on Guice 5.0 just before Soy in order to frontload Soy and pull in the newer version. Mockito 3.7.7 is now compatible with Java 11. The complication is that we need to use the inline version of Mockito, which among other things also allows mocking for final classes (hooray!). It will eventually become the default Mockito mock maker but for now it needs to be manually activated. Note that the inline version now introduces another warning: ``` OpenJDK 64-Bit Server VM warning: Sharing is only supported for boot loader classes because bootstrap classpath has been appended ``` Which I think is WAI due to how the inline mock maker works. Waiting on the author to confirm. After these to changes the only illegal reflective access is caused by App Engine SDK tools, which we will rid ourselves of when we migrate off of GAE. * Restore package-lock.json --- buildSrc/build.gradle | 7 ++++--- .../gradle/dependency-locks/compile.lockfile | 2 +- .../compileClasspath.lockfile | 2 +- .../dependency-locks/deploy_jar.lockfile | 2 +- .../gradle/dependency-locks/runtime.lockfile | 2 +- .../runtimeClasspath.lockfile | 2 +- .../dependency-locks/testCompile.lockfile | 10 +++++----- .../testCompileClasspath.lockfile | 10 +++++----- .../dependency-locks/testRuntime.lockfile | 10 +++++----- .../testRuntimeClasspath.lockfile | 10 +++++----- .../org.mockito.plugins.MockMaker | 1 + core/build.gradle | 2 ++ core/gradle/dependency-locks/soy.lockfile | 13 ++++++++---- .../dependency-locks/testCompile.lockfile | 10 +++++----- .../testCompileClasspath.lockfile | 10 +++++----- .../dependency-locks/testRuntime.lockfile | 10 +++++----- .../testRuntimeClasspath.lockfile | 10 +++++----- .../org.mockito.plugins.MockMaker | 1 + dependencies.gradle | 5 +++-- .../dependency-locks/testCompile.lockfile | 8 ++++---- .../testCompileClasspath.lockfile | 8 ++++---- .../dependency-locks/testRuntime.lockfile | 8 ++++---- .../testRuntimeClasspath.lockfile | 8 ++++---- .../org.mockito.plugins.MockMaker | 1 + .../dependency-locks/testCompile.lockfile | 8 ++++---- .../testCompileClasspath.lockfile | 8 ++++---- .../dependency-locks/testRuntime.lockfile | 8 ++++---- .../testRuntimeClasspath.lockfile | 8 ++++---- .../org.mockito.plugins.MockMaker | 1 + .../dependency-locks/testCompile.lockfile | 20 +++++++++---------- .../testCompileClasspath.lockfile | 10 +++++----- .../dependency-locks/testRuntime.lockfile | 20 +++++++++---------- .../testRuntimeClasspath.lockfile | 20 +++++++++---------- .../org.mockito.plugins.MockMaker | 1 + 34 files changed, 135 insertions(+), 121 deletions(-) create mode 100644 buildSrc/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker create mode 100644 core/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker create mode 100644 prober/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker create mode 100644 proxy/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker create mode 100644 util/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 86cf4566d..d53634fcb 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -71,12 +71,13 @@ dependencies { def deps = dependencyMap compile deps['com.google.auth:google-auth-library-credentials'] compile deps['com.google.auth:google-auth-library-oauth2-http'] - compile deps['com.google.cloud:google-cloud-core'] - compile deps['com.google.guava:guava'] compile deps['com.google.auto.value:auto-value-annotations'] + compile deps['com.google.cloud:google-cloud-core'] compile deps['com.google.cloud:google-cloud-storage'] - compile deps['org.apache.commons:commons-text'] + compile deps['com.google.guava:guava'] + compile deps['com.google.protobuf:protobuf-java'] compile deps['com.google.template:soy'] + compile deps['org.apache.commons:commons-text'] annotationProcessor deps['com.google.auto.value:auto-value'] testCompile deps['com.google.truth:truth'] testCompile deps['com.google.truth.extensions:truth-java8-extension'] diff --git a/buildSrc/gradle/dependency-locks/compile.lockfile b/buildSrc/gradle/dependency-locks/compile.lockfile index 3580b7a09..2f151b221 100644 --- a/buildSrc/gradle/dependency-locks/compile.lockfile +++ b/buildSrc/gradle/dependency-locks/compile.lockfile @@ -33,7 +33,7 @@ com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.oauth-client:google-oauth-client:1.27.0 com.google.protobuf:protobuf-java-util:3.6.1 -com.google.protobuf:protobuf-java:3.6.1 +com.google.protobuf:protobuf-java:3.13.0 com.google.template:soy:2018-03-14 com.ibm.icu:icu4j:57.1 commons-codec:commons-codec:1.11 diff --git a/buildSrc/gradle/dependency-locks/compileClasspath.lockfile b/buildSrc/gradle/dependency-locks/compileClasspath.lockfile index 3580b7a09..2f151b221 100644 --- a/buildSrc/gradle/dependency-locks/compileClasspath.lockfile +++ b/buildSrc/gradle/dependency-locks/compileClasspath.lockfile @@ -33,7 +33,7 @@ com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.oauth-client:google-oauth-client:1.27.0 com.google.protobuf:protobuf-java-util:3.6.1 -com.google.protobuf:protobuf-java:3.6.1 +com.google.protobuf:protobuf-java:3.13.0 com.google.template:soy:2018-03-14 com.ibm.icu:icu4j:57.1 commons-codec:commons-codec:1.11 diff --git a/buildSrc/gradle/dependency-locks/deploy_jar.lockfile b/buildSrc/gradle/dependency-locks/deploy_jar.lockfile index 3580b7a09..2f151b221 100644 --- a/buildSrc/gradle/dependency-locks/deploy_jar.lockfile +++ b/buildSrc/gradle/dependency-locks/deploy_jar.lockfile @@ -33,7 +33,7 @@ com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.oauth-client:google-oauth-client:1.27.0 com.google.protobuf:protobuf-java-util:3.6.1 -com.google.protobuf:protobuf-java:3.6.1 +com.google.protobuf:protobuf-java:3.13.0 com.google.template:soy:2018-03-14 com.ibm.icu:icu4j:57.1 commons-codec:commons-codec:1.11 diff --git a/buildSrc/gradle/dependency-locks/runtime.lockfile b/buildSrc/gradle/dependency-locks/runtime.lockfile index 3580b7a09..2f151b221 100644 --- a/buildSrc/gradle/dependency-locks/runtime.lockfile +++ b/buildSrc/gradle/dependency-locks/runtime.lockfile @@ -33,7 +33,7 @@ com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.oauth-client:google-oauth-client:1.27.0 com.google.protobuf:protobuf-java-util:3.6.1 -com.google.protobuf:protobuf-java:3.6.1 +com.google.protobuf:protobuf-java:3.13.0 com.google.template:soy:2018-03-14 com.ibm.icu:icu4j:57.1 commons-codec:commons-codec:1.11 diff --git a/buildSrc/gradle/dependency-locks/runtimeClasspath.lockfile b/buildSrc/gradle/dependency-locks/runtimeClasspath.lockfile index 3580b7a09..2f151b221 100644 --- a/buildSrc/gradle/dependency-locks/runtimeClasspath.lockfile +++ b/buildSrc/gradle/dependency-locks/runtimeClasspath.lockfile @@ -33,7 +33,7 @@ com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.oauth-client:google-oauth-client:1.27.0 com.google.protobuf:protobuf-java-util:3.6.1 -com.google.protobuf:protobuf-java:3.6.1 +com.google.protobuf:protobuf-java:3.13.0 com.google.template:soy:2018-03-14 com.ibm.icu:icu4j:57.1 commons-codec:commons-codec:1.11 diff --git a/buildSrc/gradle/dependency-locks/testCompile.lockfile b/buildSrc/gradle/dependency-locks/testCompile.lockfile index 692f1b701..f4f6a7bb8 100644 --- a/buildSrc/gradle/dependency-locks/testCompile.lockfile +++ b/buildSrc/gradle/dependency-locks/testCompile.lockfile @@ -33,7 +33,7 @@ com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.oauth-client:google-oauth-client:1.27.0 com.google.protobuf:protobuf-java-util:3.6.1 -com.google.protobuf:protobuf-java:3.6.1 +com.google.protobuf:protobuf-java:3.13.0 com.google.template:soy:2018-03-14 com.google.truth.extensions:truth-java8-extension:1.0 com.google.truth:truth:1.0 @@ -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.12 -net.bytebuddy:byte-buddy-agent:1.10.5 -net.bytebuddy:byte-buddy:1.10.5 +net.bytebuddy:byte-buddy-agent:1.10.19 +net.bytebuddy:byte-buddy:1.10.19 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.6 org.apache.httpcomponents:httpclient:4.5.8 @@ -66,8 +66,8 @@ 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.mockito:mockito-core:3.3.3 -org.objenesis:objenesis:2.6 +org.mockito:mockito-core:3.7.7 +org.objenesis:objenesis:3.1 org.opentest4j:opentest4j:1.2.0 org.ow2.asm:asm-analysis:6.0 org.ow2.asm:asm-commons:6.0 diff --git a/buildSrc/gradle/dependency-locks/testCompileClasspath.lockfile b/buildSrc/gradle/dependency-locks/testCompileClasspath.lockfile index 692f1b701..f4f6a7bb8 100644 --- a/buildSrc/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/buildSrc/gradle/dependency-locks/testCompileClasspath.lockfile @@ -33,7 +33,7 @@ com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.oauth-client:google-oauth-client:1.27.0 com.google.protobuf:protobuf-java-util:3.6.1 -com.google.protobuf:protobuf-java:3.6.1 +com.google.protobuf:protobuf-java:3.13.0 com.google.template:soy:2018-03-14 com.google.truth.extensions:truth-java8-extension:1.0 com.google.truth:truth:1.0 @@ -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.12 -net.bytebuddy:byte-buddy-agent:1.10.5 -net.bytebuddy:byte-buddy:1.10.5 +net.bytebuddy:byte-buddy-agent:1.10.19 +net.bytebuddy:byte-buddy:1.10.19 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.6 org.apache.httpcomponents:httpclient:4.5.8 @@ -66,8 +66,8 @@ 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.mockito:mockito-core:3.3.3 -org.objenesis:objenesis:2.6 +org.mockito:mockito-core:3.7.7 +org.objenesis:objenesis:3.1 org.opentest4j:opentest4j:1.2.0 org.ow2.asm:asm-analysis:6.0 org.ow2.asm:asm-commons:6.0 diff --git a/buildSrc/gradle/dependency-locks/testRuntime.lockfile b/buildSrc/gradle/dependency-locks/testRuntime.lockfile index 692f1b701..f4f6a7bb8 100644 --- a/buildSrc/gradle/dependency-locks/testRuntime.lockfile +++ b/buildSrc/gradle/dependency-locks/testRuntime.lockfile @@ -33,7 +33,7 @@ com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.oauth-client:google-oauth-client:1.27.0 com.google.protobuf:protobuf-java-util:3.6.1 -com.google.protobuf:protobuf-java:3.6.1 +com.google.protobuf:protobuf-java:3.13.0 com.google.template:soy:2018-03-14 com.google.truth.extensions:truth-java8-extension:1.0 com.google.truth:truth:1.0 @@ -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.12 -net.bytebuddy:byte-buddy-agent:1.10.5 -net.bytebuddy:byte-buddy:1.10.5 +net.bytebuddy:byte-buddy-agent:1.10.19 +net.bytebuddy:byte-buddy:1.10.19 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.6 org.apache.httpcomponents:httpclient:4.5.8 @@ -66,8 +66,8 @@ 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.mockito:mockito-core:3.3.3 -org.objenesis:objenesis:2.6 +org.mockito:mockito-core:3.7.7 +org.objenesis:objenesis:3.1 org.opentest4j:opentest4j:1.2.0 org.ow2.asm:asm-analysis:6.0 org.ow2.asm:asm-commons:6.0 diff --git a/buildSrc/gradle/dependency-locks/testRuntimeClasspath.lockfile b/buildSrc/gradle/dependency-locks/testRuntimeClasspath.lockfile index 692f1b701..f4f6a7bb8 100644 --- a/buildSrc/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/buildSrc/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -33,7 +33,7 @@ com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.oauth-client:google-oauth-client:1.27.0 com.google.protobuf:protobuf-java-util:3.6.1 -com.google.protobuf:protobuf-java:3.6.1 +com.google.protobuf:protobuf-java:3.13.0 com.google.template:soy:2018-03-14 com.google.truth.extensions:truth-java8-extension:1.0 com.google.truth:truth:1.0 @@ -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.12 -net.bytebuddy:byte-buddy-agent:1.10.5 -net.bytebuddy:byte-buddy:1.10.5 +net.bytebuddy:byte-buddy-agent:1.10.19 +net.bytebuddy:byte-buddy:1.10.19 org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.6 org.apache.httpcomponents:httpclient:4.5.8 @@ -66,8 +66,8 @@ 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.mockito:mockito-core:3.3.3 -org.objenesis:objenesis:2.6 +org.mockito:mockito-core:3.7.7 +org.objenesis:objenesis:3.1 org.opentest4j:opentest4j:1.2.0 org.ow2.asm:asm-analysis:6.0 org.ow2.asm:asm-commons:6.0 diff --git a/buildSrc/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/buildSrc/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker new file mode 100644 index 000000000..1f0955d45 --- /dev/null +++ b/buildSrc/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker @@ -0,0 +1 @@ +mock-maker-inline diff --git a/core/build.gradle b/core/build.gradle index 0985d71f0..d2755d8b6 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -344,6 +344,8 @@ dependencies { jaxb deps['com.sun.xml.bind:jaxb-osgi'] // Dependency needed for soy to java compilation. + soy deps['com.google.inject:guice'] + soy deps['com.google.protobuf:protobuf-java'] soy deps['com.google.template:soy'] // Dependencies needed for compiling stylesheets to javascript diff --git a/core/gradle/dependency-locks/soy.lockfile b/core/gradle/dependency-locks/soy.lockfile index d966f6810..4706c74ae 100644 --- a/core/gradle/dependency-locks/soy.lockfile +++ b/core/gradle/dependency-locks/soy.lockfile @@ -3,19 +3,24 @@ # This file is expected to be part of source control. aopalliance:aopalliance:1.0 args4j:args4j:2.0.23 -com.google.code.findbugs:jsr305:2.0.3 +com.google.code.findbugs:jsr305:3.0.2 com.google.code.gson:gson:2.7 com.google.common.html.types:types:1.0.4 -com.google.guava:guava:21.0 +com.google.errorprone:error_prone_annotations:2.3.4 +com.google.guava:failureaccess:1.0.1 +com.google.guava:guava:30.1-jre +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.0-beta1 com.google.inject.extensions:guice-multibindings:4.1.0 -com.google.inject:guice:4.1.0 -com.google.protobuf:protobuf-java:3.3.0 +com.google.inject:guice:5.0.1 +com.google.j2objc:j2objc-annotations:1.3 +com.google.protobuf:protobuf-java:3.13.0 com.google.template:soy:2018-03-14 com.ibm.icu:icu4j:57.1 javax.annotation:jsr250-api:1.0 javax.inject:javax.inject:1 javax.validation:validation-api:1.0.0.GA +org.checkerframework:checker-qual:3.5.0 org.json:json:20160212 org.ow2.asm:asm-analysis:6.0 org.ow2.asm:asm-commons:6.0 diff --git a/core/gradle/dependency-locks/testCompile.lockfile b/core/gradle/dependency-locks/testCompile.lockfile index 79c7c8898..0c2c47bfe 100644 --- a/core/gradle/dependency-locks/testCompile.lockfile +++ b/core/gradle/dependency-locks/testCompile.lockfile @@ -198,8 +198,8 @@ javax.xml.bind:jaxb-api:2.3.1 jline:jline:1.0 joda-time:joda-time:2.10.5 junit:junit:4.13.1 -net.bytebuddy:byte-buddy-agent:1.10.5 -net.bytebuddy:byte-buddy:1.10.17 +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.avro:avro:1.8.2 org.apache.beam:beam-model-fn-execution:2.27.0 @@ -273,11 +273,11 @@ 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.mockito:mockito-core:3.3.3 -org.mockito:mockito-junit-jupiter:3.3.3 +org.mockito:mockito-core:3.7.7 +org.mockito:mockito-junit-jupiter:3.7.7 org.mortbay.jetty:jetty-util:6.1.26 org.mortbay.jetty:jetty:6.1.26 -org.objenesis:objenesis:2.6 +org.objenesis:objenesis:3.1 org.opentest4j:opentest4j:1.2.0 org.ow2.asm:asm-analysis:8.0.1 org.ow2.asm:asm-commons:7.1 diff --git a/core/gradle/dependency-locks/testCompileClasspath.lockfile b/core/gradle/dependency-locks/testCompileClasspath.lockfile index f687786f3..2ac231aaf 100644 --- a/core/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/core/gradle/dependency-locks/testCompileClasspath.lockfile @@ -193,8 +193,8 @@ javax.xml.bind:jaxb-api:2.3.1 jline:jline:1.0 joda-time:joda-time:2.10.5 junit:junit:4.13.1 -net.bytebuddy:byte-buddy-agent:1.10.5 -net.bytebuddy:byte-buddy:1.10.17 +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.avro:avro:1.8.2 org.apache.beam:beam-model-fn-execution:2.27.0 @@ -267,11 +267,11 @@ 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.mockito:mockito-core:3.3.3 -org.mockito:mockito-junit-jupiter:3.3.3 +org.mockito:mockito-core:3.7.7 +org.mockito:mockito-junit-jupiter:3.7.7 org.mortbay.jetty:jetty-util:6.1.26 org.mortbay.jetty:jetty:6.1.26 -org.objenesis:objenesis:2.6 +org.objenesis:objenesis:3.1 org.opentest4j:opentest4j:1.2.0 org.ow2.asm:asm-analysis:8.0.1 org.ow2.asm:asm-commons:7.1 diff --git a/core/gradle/dependency-locks/testRuntime.lockfile b/core/gradle/dependency-locks/testRuntime.lockfile index af5c06510..256d3a16e 100644 --- a/core/gradle/dependency-locks/testRuntime.lockfile +++ b/core/gradle/dependency-locks/testRuntime.lockfile @@ -208,8 +208,8 @@ jline:jline:1.0 joda-time:joda-time:2.10.5 junit:junit:4.13.1 net.arnx:nashorn-promise:0.1.1 -net.bytebuddy:byte-buddy-agent:1.10.5 -net.bytebuddy:byte-buddy:1.10.17 +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.avro:avro:1.8.2 org.apache.beam:beam-model-fn-execution:2.27.0 @@ -285,11 +285,11 @@ 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.mockito:mockito-core:3.3.3 -org.mockito:mockito-junit-jupiter:3.3.3 +org.mockito:mockito-core:3.7.7 +org.mockito:mockito-junit-jupiter:3.7.7 org.mortbay.jetty:jetty-util:6.1.26 org.mortbay.jetty:jetty:6.1.26 -org.objenesis:objenesis:2.6 +org.objenesis:objenesis:3.1 org.opentest4j:opentest4j:1.2.0 org.ow2.asm:asm-analysis:8.0.1 org.ow2.asm:asm-commons:7.1 diff --git a/core/gradle/dependency-locks/testRuntimeClasspath.lockfile b/core/gradle/dependency-locks/testRuntimeClasspath.lockfile index 74e28b313..4a987f21d 100644 --- a/core/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/core/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -208,8 +208,8 @@ jline:jline:1.0 joda-time:joda-time:2.10.5 junit:junit:4.13.1 net.arnx:nashorn-promise:0.1.1 -net.bytebuddy:byte-buddy-agent:1.10.5 -net.bytebuddy:byte-buddy:1.10.17 +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.avro:avro:1.8.2 org.apache.beam:beam-model-fn-execution:2.27.0 @@ -285,11 +285,11 @@ 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.mockito:mockito-core:3.3.3 -org.mockito:mockito-junit-jupiter:3.3.3 +org.mockito:mockito-core:3.7.7 +org.mockito:mockito-junit-jupiter:3.7.7 org.mortbay.jetty:jetty-util:6.1.26 org.mortbay.jetty:jetty:6.1.26 -org.objenesis:objenesis:2.6 +org.objenesis:objenesis:3.1 org.opentest4j:opentest4j:1.2.0 org.ow2.asm:asm-analysis:8.0.1 org.ow2.asm:asm-commons:7.1 diff --git a/core/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/core/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker new file mode 100644 index 000000000..1f0955d45 --- /dev/null +++ b/core/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker @@ -0,0 +1 @@ +mock-maker-inline diff --git a/dependencies.gradle b/dependencies.gradle index a1f086be0..8337460ae 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -73,6 +73,7 @@ ext { 'com.google.http-client:google-http-client-appengine:1.34.1', 'com.google.http-client:google-http-client-jackson2:1.34.1', 'com.google.http-client:google-http-client:1.34.1', + 'com.google.inject:guice:5.0.1', 'com.google.javascript:closure-compiler:v20190301', 'com.google.monitoring-client:contrib:1.0.7', 'com.google.monitoring-client:metrics:1.0.7', @@ -157,8 +158,8 @@ ext { 'org.joda:joda-money:1.0.1', 'org.json:json:20160810', 'org.jsoup:jsoup:1.13.1', - 'org.mockito:mockito-core:3.3.3', - 'org.mockito:mockito-junit-jupiter:3.3.3', + 'org.mockito:mockito-core:3.7.7', + 'org.mockito:mockito-junit-jupiter:3.7.7', 'org.mortbay.jetty:jetty:6.1.26', 'org.postgresql:postgresql:42.2.18', '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 889360576..70ee201a5 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.12 -net.bytebuddy:byte-buddy-agent:1.10.5 -net.bytebuddy:byte-buddy:1.10.5 +net.bytebuddy:byte-buddy-agent:1.10.19 +net.bytebuddy:byte-buddy:1.10.19 org.apache.httpcomponents:httpclient:4.5.11 org.apache.httpcomponents:httpcore:4.4.13 org.apiguardian:apiguardian-api:1.1.0 @@ -64,8 +64,8 @@ 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.mockito:mockito-core:3.3.3 -org.objenesis:objenesis:2.6 +org.mockito:mockito-core:3.7.7 +org.objenesis:objenesis:3.1 org.opentest4j:opentest4j:1.2.0 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 889360576..70ee201a5 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.12 -net.bytebuddy:byte-buddy-agent:1.10.5 -net.bytebuddy:byte-buddy:1.10.5 +net.bytebuddy:byte-buddy-agent:1.10.19 +net.bytebuddy:byte-buddy:1.10.19 org.apache.httpcomponents:httpclient:4.5.11 org.apache.httpcomponents:httpcore:4.4.13 org.apiguardian:apiguardian-api:1.1.0 @@ -64,8 +64,8 @@ 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.mockito:mockito-core:3.3.3 -org.objenesis:objenesis:2.6 +org.mockito:mockito-core:3.7.7 +org.objenesis:objenesis:3.1 org.opentest4j:opentest4j:1.2.0 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 889360576..70ee201a5 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.12 -net.bytebuddy:byte-buddy-agent:1.10.5 -net.bytebuddy:byte-buddy:1.10.5 +net.bytebuddy:byte-buddy-agent:1.10.19 +net.bytebuddy:byte-buddy:1.10.19 org.apache.httpcomponents:httpclient:4.5.11 org.apache.httpcomponents:httpcore:4.4.13 org.apiguardian:apiguardian-api:1.1.0 @@ -64,8 +64,8 @@ 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.mockito:mockito-core:3.3.3 -org.objenesis:objenesis:2.6 +org.mockito:mockito-core:3.7.7 +org.objenesis:objenesis:3.1 org.opentest4j:opentest4j:1.2.0 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 889360576..70ee201a5 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.12 -net.bytebuddy:byte-buddy-agent:1.10.5 -net.bytebuddy:byte-buddy:1.10.5 +net.bytebuddy:byte-buddy-agent:1.10.19 +net.bytebuddy:byte-buddy:1.10.19 org.apache.httpcomponents:httpclient:4.5.11 org.apache.httpcomponents:httpcore:4.4.13 org.apiguardian:apiguardian-api:1.1.0 @@ -64,8 +64,8 @@ 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.mockito:mockito-core:3.3.3 -org.objenesis:objenesis:2.6 +org.mockito:mockito-core:3.7.7 +org.objenesis:objenesis:3.1 org.opentest4j:opentest4j:1.2.0 org.yaml:snakeyaml:1.17 xerces:xmlParserAPIs:2.6.2 diff --git a/prober/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/prober/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker new file mode 100644 index 000000000..1f0955d45 --- /dev/null +++ b/prober/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker @@ -0,0 +1 @@ +mock-maker-inline diff --git a/proxy/gradle/dependency-locks/testCompile.lockfile b/proxy/gradle/dependency-locks/testCompile.lockfile index e7b77fffa..002b41c69 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.12 -net.bytebuddy:byte-buddy-agent:1.10.5 -net.bytebuddy:byte-buddy:1.10.5 +net.bytebuddy:byte-buddy-agent:1.10.19 +net.bytebuddy:byte-buddy:1.10.19 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.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.mockito:mockito-core:3.3.3 -org.objenesis:objenesis:2.6 +org.mockito:mockito-core:3.7.7 +org.objenesis:objenesis:3.1 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 e7b77fffa..002b41c69 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.12 -net.bytebuddy:byte-buddy-agent:1.10.5 -net.bytebuddy:byte-buddy:1.10.5 +net.bytebuddy:byte-buddy-agent:1.10.19 +net.bytebuddy:byte-buddy:1.10.19 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.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.mockito:mockito-core:3.3.3 -org.objenesis:objenesis:2.6 +org.mockito:mockito-core:3.7.7 +org.objenesis:objenesis:3.1 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 e7b77fffa..002b41c69 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.12 -net.bytebuddy:byte-buddy-agent:1.10.5 -net.bytebuddy:byte-buddy:1.10.5 +net.bytebuddy:byte-buddy-agent:1.10.19 +net.bytebuddy:byte-buddy:1.10.19 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.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.mockito:mockito-core:3.3.3 -org.objenesis:objenesis:2.6 +org.mockito:mockito-core:3.7.7 +org.objenesis:objenesis:3.1 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 e7b77fffa..002b41c69 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.12 -net.bytebuddy:byte-buddy-agent:1.10.5 -net.bytebuddy:byte-buddy:1.10.5 +net.bytebuddy:byte-buddy-agent:1.10.19 +net.bytebuddy:byte-buddy:1.10.19 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.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.mockito:mockito-core:3.3.3 -org.objenesis:objenesis:2.6 +org.mockito:mockito-core:3.7.7 +org.objenesis:objenesis:3.1 org.opentest4j:opentest4j:1.2.0 org.yaml:snakeyaml:1.17 diff --git a/proxy/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/proxy/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker new file mode 100644 index 000000000..1f0955d45 --- /dev/null +++ b/proxy/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker @@ -0,0 +1 @@ +mock-maker-inline diff --git a/util/gradle/dependency-locks/testCompile.lockfile b/util/gradle/dependency-locks/testCompile.lockfile index 75850de82..9956ce752 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.10.5 -net.bytebuddy:byte-buddy:1.10.5 +net.bytebuddy:byte-buddy-agent:1.10.19 +net.bytebuddy:byte-buddy:1.10.19 org.apache.httpcomponents:httpclient:4.5.11 org.apache.httpcomponents:httpcore:4.4.13 org.apiguardian:apiguardian-api:1.1.0 @@ -48,13 +48,13 @@ org.checkerframework:checker-compat-qual:2.5.5 org.checkerframework:checker-qual:3.5.0 org.hamcrest:hamcrest-core:2.2 org.hamcrest:hamcrest:2.2 -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.mockito:mockito-core:3.3.3 -org.mockito:mockito-junit-jupiter:3.3.3 -org.objenesis:objenesis:2.6 +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:junit-bom:5.7.0 +org.mockito:mockito-core:3.7.7 +org.mockito:mockito-junit-jupiter:3.7.7 +org.objenesis:objenesis:3.1 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 75850de82..c71ecc354 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.10.5 -net.bytebuddy:byte-buddy:1.10.5 +net.bytebuddy:byte-buddy-agent:1.10.19 +net.bytebuddy:byte-buddy:1.10.19 org.apache.httpcomponents:httpclient:4.5.11 org.apache.httpcomponents:httpcore:4.4.13 org.apiguardian:apiguardian-api:1.1.0 @@ -53,8 +53,8 @@ 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.mockito:mockito-core:3.3.3 -org.mockito:mockito-junit-jupiter:3.3.3 -org.objenesis:objenesis:2.6 +org.mockito:mockito-core:3.7.7 +org.mockito:mockito-junit-jupiter:3.7.7 +org.objenesis:objenesis:3.1 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 cbe5ccd9f..3d24d051e 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.10.5 -net.bytebuddy:byte-buddy:1.10.5 +net.bytebuddy:byte-buddy-agent:1.10.19 +net.bytebuddy:byte-buddy:1.10.19 org.apache.httpcomponents:httpclient:4.5.11 org.apache.httpcomponents:httpcore:4.4.13 org.apiguardian:apiguardian-api:1.1.0 @@ -50,13 +50,13 @@ org.checkerframework:checker-compat-qual:2.5.5 org.checkerframework:checker-qual:3.5.0 org.hamcrest:hamcrest-core:2.2 org.hamcrest:hamcrest:2.2 -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.mockito:mockito-core:3.3.3 -org.mockito:mockito-junit-jupiter:3.3.3 -org.objenesis:objenesis:2.6 +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:junit-bom:5.7.0 +org.mockito:mockito-core:3.7.7 +org.mockito:mockito-junit-jupiter:3.7.7 +org.objenesis:objenesis:3.1 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 cbe5ccd9f..3d24d051e 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.10.5 -net.bytebuddy:byte-buddy:1.10.5 +net.bytebuddy:byte-buddy-agent:1.10.19 +net.bytebuddy:byte-buddy:1.10.19 org.apache.httpcomponents:httpclient:4.5.11 org.apache.httpcomponents:httpcore:4.4.13 org.apiguardian:apiguardian-api:1.1.0 @@ -50,13 +50,13 @@ org.checkerframework:checker-compat-qual:2.5.5 org.checkerframework:checker-qual:3.5.0 org.hamcrest:hamcrest-core:2.2 org.hamcrest:hamcrest:2.2 -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.mockito:mockito-core:3.3.3 -org.mockito:mockito-junit-jupiter:3.3.3 -org.objenesis:objenesis:2.6 +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:junit-bom:5.7.0 +org.mockito:mockito-core:3.7.7 +org.mockito:mockito-junit-jupiter:3.7.7 +org.objenesis:objenesis:3.1 org.opentest4j:opentest4j:1.2.0 org.yaml:snakeyaml:1.17 diff --git a/util/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/util/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker new file mode 100644 index 000000000..1f0955d45 --- /dev/null +++ b/util/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker @@ -0,0 +1 @@ +mock-maker-inline