From 3139a2ffeecd94cee98316481c1407fa3ee6d218 Mon Sep 17 00:00:00 2001 From: Ben McIlwain Date: Wed, 19 Feb 2020 18:29:59 -0500 Subject: [PATCH] Start using JUnit 5 (#488) * Start using JUnit 5 This converts a single test class over to JUnit 5 (YamlUtilsTest). The main differences you'll notice are that @RunWith isn't needed anymore, test classes and test methods can now be package-private, and the @Test annotation comes from the org.junit.jupiter.api package instead of org.junit. There's a lot more differences between 4 and 5 than this that we'll need to keep in mind when converting more test classes; for some more details, see: https://www.baeldung.com/junit-5-migration In order to allow JUnit 4 and 5 test classes to coexist, I've had to add two new dependencies, org.junit.jupiter:junit-jupiter-engine and org.junit.vintage:junit-vintage-engine, which exist in addition to junit:junit for now. Eventually, once we've completed migrating over all JUnit 4 test classes, then we can remove junit and junit-vintage-engine and just be left with junit-jupiter-engine. * Delete no longer needed lockfiles * Merge branch 'master' into first-junit5 --- build.gradle | 1 + buildSrc/build.gradle | 3 + buildSrc/gradle/dependency-locks/apt.lockfile | 3 - .../gradle/dependency-locks/archives.lockfile | 3 - .../gradle/dependency-locks/compile.lockfile | 7 +-- .../compileClasspath.lockfile | 7 +-- .../gradle/dependency-locks/default.lockfile | 61 ------------------- .../dependency-locks/deploy_jar.lockfile | 7 +-- .../dependency-locks/errorprone.lockfile | 24 -------- .../gradle/dependency-locks/runtime.lockfile | 7 +-- .../runtimeClasspath.lockfile | 7 +-- .../gradle/dependency-locks/testApt.lockfile | 3 - .../dependency-locks/testCompile.lockfile | 15 +++-- .../testCompileClasspath.lockfile | 15 +++-- .../dependency-locks/testRuntime.lockfile | 15 +++-- .../testRuntimeClasspath.lockfile | 15 +++-- common/build.gradle | 2 + .../gradle/dependency-locks/compile.lockfile | 7 +-- .../compileClasspath.lockfile | 7 +-- .../gradle/dependency-locks/default.lockfile | 7 +-- .../dependency-locks/deploy_jar.lockfile | 7 +-- .../gradle/dependency-locks/runtime.lockfile | 7 +-- .../runtimeClasspath.lockfile | 7 +-- .../dependency-locks/testCompile.lockfile | 15 +++-- .../testCompileClasspath.lockfile | 15 +++-- .../dependency-locks/testRuntime.lockfile | 15 +++-- .../testRuntimeClasspath.lockfile | 15 +++-- .../dependency-locks/testingCompile.lockfile | 7 +-- .../testingCompileClasspath.lockfile | 7 +-- .../dependency-locks/testingRuntime.lockfile | 7 +-- .../testingRuntimeClasspath.lockfile | 7 +-- .../dependency-license/allowed_licenses.json | 8 +++ core/build.gradle | 2 + core/gradle/dependency-locks/compile.lockfile | 27 ++++---- .../compileClasspath.lockfile | 27 ++++---- core/gradle/dependency-locks/default.lockfile | 27 ++++---- .../dependency-locks/deploy_jar.lockfile | 27 ++++---- .../dependency-locks/nonprodCompile.lockfile | 27 ++++---- .../nonprodCompileClasspath.lockfile | 27 ++++---- .../dependency-locks/nonprodRuntime.lockfile | 27 ++++---- .../nonprodRuntimeClasspath.lockfile | 27 ++++---- core/gradle/dependency-locks/runtime.lockfile | 27 ++++---- .../runtimeClasspath.lockfile | 27 ++++---- .../dependency-locks/testCompile.lockfile | 37 ++++++----- .../testCompileClasspath.lockfile | 37 ++++++----- .../dependency-locks/testRuntime.lockfile | 37 ++++++----- .../testRuntimeClasspath.lockfile | 37 ++++++----- .../CidrAddressBlockListConverter.java | 1 - db/build.gradle | 2 + .../dependency-locks/testCompile.lockfile | 15 +++-- .../testCompileClasspath.lockfile | 15 +++-- .../dependency-locks/testRuntime.lockfile | 15 +++-- .../testRuntimeClasspath.lockfile | 15 +++-- dependencies.gradle | 6 +- networking/build.gradle | 2 + .../gradle/dependency-locks/compile.lockfile | 7 +-- .../compileClasspath.lockfile | 7 +-- .../gradle/dependency-locks/default.lockfile | 7 +-- .../dependency-locks/deploy_jar.lockfile | 7 +-- .../gradle/dependency-locks/runtime.lockfile | 7 +-- .../runtimeClasspath.lockfile | 7 +-- .../dependency-locks/testCompile.lockfile | 15 +++-- .../testCompileClasspath.lockfile | 15 +++-- .../dependency-locks/testRuntime.lockfile | 15 +++-- .../testRuntimeClasspath.lockfile | 15 +++-- prober/build.gradle | 2 + .../gradle/dependency-locks/compile.lockfile | 7 +-- .../compileClasspath.lockfile | 7 +-- .../gradle/dependency-locks/default.lockfile | 7 +-- .../dependency-locks/deploy_jar.lockfile | 7 +-- .../gradle/dependency-locks/runtime.lockfile | 7 +-- .../runtimeClasspath.lockfile | 7 +-- .../dependency-locks/testCompile.lockfile | 15 +++-- .../testCompileClasspath.lockfile | 15 +++-- .../dependency-locks/testRuntime.lockfile | 15 +++-- .../testRuntimeClasspath.lockfile | 15 +++-- proxy/build.gradle | 2 + .../gradle/dependency-locks/compile.lockfile | 7 +-- .../compileClasspath.lockfile | 7 +-- .../gradle/dependency-locks/default.lockfile | 7 +-- .../dependency-locks/deploy_jar.lockfile | 7 +-- .../gradle/dependency-locks/runtime.lockfile | 7 +-- .../runtimeClasspath.lockfile | 7 +-- .../dependency-locks/testCompile.lockfile | 15 +++-- .../testCompileClasspath.lockfile | 15 +++-- .../dependency-locks/testRuntime.lockfile | 15 +++-- .../testRuntimeClasspath.lockfile | 15 +++-- .../gradle/dependency-locks/compile.lockfile | 27 ++++---- .../compileClasspath.lockfile | 27 ++++---- .../gradle/dependency-locks/default.lockfile | 27 ++++---- .../gradle/dependency-locks/runtime.lockfile | 27 ++++---- .../runtimeClasspath.lockfile | 27 ++++---- .../dependency-locks/testCompile.lockfile | 27 ++++---- .../testCompileClasspath.lockfile | 27 ++++---- .../dependency-locks/testRuntime.lockfile | 27 ++++---- .../testRuntimeClasspath.lockfile | 27 ++++---- .../gradle/dependency-locks/compile.lockfile | 27 ++++---- .../compileClasspath.lockfile | 27 ++++---- .../gradle/dependency-locks/default.lockfile | 27 ++++---- .../gradle/dependency-locks/runtime.lockfile | 27 ++++---- .../runtimeClasspath.lockfile | 27 ++++---- .../dependency-locks/testCompile.lockfile | 27 ++++---- .../testCompileClasspath.lockfile | 27 ++++---- .../dependency-locks/testRuntime.lockfile | 27 ++++---- .../testRuntimeClasspath.lockfile | 27 ++++---- .../gradle/dependency-locks/compile.lockfile | 27 ++++---- .../compileClasspath.lockfile | 27 ++++---- .../gradle/dependency-locks/default.lockfile | 27 ++++---- .../gradle/dependency-locks/runtime.lockfile | 27 ++++---- .../runtimeClasspath.lockfile | 27 ++++---- .../dependency-locks/testCompile.lockfile | 27 ++++---- .../testCompileClasspath.lockfile | 27 ++++---- .../dependency-locks/testRuntime.lockfile | 27 ++++---- .../testRuntimeClasspath.lockfile | 27 ++++---- .../gradle/dependency-locks/compile.lockfile | 27 ++++---- .../compileClasspath.lockfile | 27 ++++---- .../gradle/dependency-locks/default.lockfile | 27 ++++---- .../gradle/dependency-locks/runtime.lockfile | 27 ++++---- .../runtimeClasspath.lockfile | 27 ++++---- .../dependency-locks/testCompile.lockfile | 27 ++++---- .../testCompileClasspath.lockfile | 27 ++++---- .../dependency-locks/testRuntime.lockfile | 27 ++++---- .../testRuntimeClasspath.lockfile | 27 ++++---- util/build.gradle | 2 + util/gradle/dependency-locks/compile.lockfile | 7 +-- .../compileClasspath.lockfile | 7 +-- util/gradle/dependency-locks/default.lockfile | 7 +-- .../dependency-locks/deploy_jar.lockfile | 7 +-- util/gradle/dependency-locks/runtime.lockfile | 7 +-- .../runtimeClasspath.lockfile | 7 +-- .../dependency-locks/testCompile.lockfile | 17 ++++-- .../testCompileClasspath.lockfile | 17 ++++-- .../dependency-locks/testRuntime.lockfile | 17 ++++-- .../testRuntimeClasspath.lockfile | 17 ++++-- .../google/registry/util/YamlUtilsTest.java | 17 +++--- 135 files changed, 1202 insertions(+), 1033 deletions(-) delete mode 100644 buildSrc/gradle/dependency-locks/apt.lockfile delete mode 100644 buildSrc/gradle/dependency-locks/archives.lockfile delete mode 100644 buildSrc/gradle/dependency-locks/default.lockfile delete mode 100644 buildSrc/gradle/dependency-locks/errorprone.lockfile delete mode 100644 buildSrc/gradle/dependency-locks/testApt.lockfile diff --git a/build.gradle b/build.gradle index ab6a81d04..0d9851a14 100644 --- a/build.gradle +++ b/build.gradle @@ -177,6 +177,7 @@ allprojects { } else { println "Java dependencies: Using Maven Central..." mavenCentral() + google() } } diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 14d785ba8..5570135af 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -43,6 +43,7 @@ repositories { if (project.ext.properties.mavenUrl == null) { println "Plugin dependencies: Using Maven central..." mavenCentral() + google() } else { maven { println "Plugin dependencies: Using repo ${mavenUrl}..." @@ -81,6 +82,8 @@ dependencies { testCompile deps['com.google.truth:truth'] testCompile deps['com.google.truth.extensions:truth-java8-extension'] testCompile deps['junit:junit'] + testCompile deps['org.junit.jupiter:junit-jupiter-engine'] + testCompile deps['org.junit.vintage:junit-vintage-engine'] testCompile deps['org.mockito:mockito-core'] } diff --git a/buildSrc/gradle/dependency-locks/apt.lockfile b/buildSrc/gradle/dependency-locks/apt.lockfile deleted file mode 100644 index 656c5dbcc..000000000 --- a/buildSrc/gradle/dependency-locks/apt.lockfile +++ /dev/null @@ -1,3 +0,0 @@ -# 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. diff --git a/buildSrc/gradle/dependency-locks/archives.lockfile b/buildSrc/gradle/dependency-locks/archives.lockfile deleted file mode 100644 index 656c5dbcc..000000000 --- a/buildSrc/gradle/dependency-locks/archives.lockfile +++ /dev/null @@ -1,3 +0,0 @@ -# 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. diff --git a/buildSrc/gradle/dependency-locks/compile.lockfile b/buildSrc/gradle/dependency-locks/compile.lockfile index af10edfea..cf73afbb8 100644 --- a/buildSrc/gradle/dependency-locks/compile.lockfile +++ b/buildSrc/gradle/dependency-locks/compile.lockfile @@ -20,9 +20,9 @@ com.google.cloud:google-cloud-storage:1.59.0 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.errorprone:error_prone_annotations:2.3.2 +com.google.errorprone:error_prone_annotations:2.3.4 com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:28.1-jre +com.google.guava:guava:28.2-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.0-beta1 com.google.http-client:google-http-client-appengine:1.27.0 @@ -50,8 +50,7 @@ org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.6 org.apache.httpcomponents:httpclient:4.5.8 org.apache.httpcomponents:httpcore:4.4.11 -org.checkerframework:checker-qual:2.8.1 -org.codehaus.mojo:animal-sniffer-annotations:1.18 +org.checkerframework:checker-qual:2.10.0 org.json:json:20160212 org.ow2.asm:asm-analysis:6.0 org.ow2.asm:asm-commons:6.0 diff --git a/buildSrc/gradle/dependency-locks/compileClasspath.lockfile b/buildSrc/gradle/dependency-locks/compileClasspath.lockfile index af10edfea..cf73afbb8 100644 --- a/buildSrc/gradle/dependency-locks/compileClasspath.lockfile +++ b/buildSrc/gradle/dependency-locks/compileClasspath.lockfile @@ -20,9 +20,9 @@ com.google.cloud:google-cloud-storage:1.59.0 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.errorprone:error_prone_annotations:2.3.2 +com.google.errorprone:error_prone_annotations:2.3.4 com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:28.1-jre +com.google.guava:guava:28.2-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.0-beta1 com.google.http-client:google-http-client-appengine:1.27.0 @@ -50,8 +50,7 @@ org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.6 org.apache.httpcomponents:httpclient:4.5.8 org.apache.httpcomponents:httpcore:4.4.11 -org.checkerframework:checker-qual:2.8.1 -org.codehaus.mojo:animal-sniffer-annotations:1.18 +org.checkerframework:checker-qual:2.10.0 org.json:json:20160212 org.ow2.asm:asm-analysis:6.0 org.ow2.asm:asm-commons:6.0 diff --git a/buildSrc/gradle/dependency-locks/default.lockfile b/buildSrc/gradle/dependency-locks/default.lockfile deleted file mode 100644 index af10edfea..000000000 --- a/buildSrc/gradle/dependency-locks/default.lockfile +++ /dev/null @@ -1,61 +0,0 @@ -# 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. -aopalliance:aopalliance:1.0 -args4j:args4j:2.0.23 -com.fasterxml.jackson.core:jackson-core:2.9.9 -com.google.api-client:google-api-client:1.27.0 -com.google.api.grpc:proto-google-common-protos:1.12.0 -com.google.api.grpc:proto-google-iam-v1:0.12.0 -com.google.api:api-common:1.7.0 -com.google.api:gax-httpjson:0.52.1 -com.google.api:gax:1.35.1 -com.google.apis:google-api-services-storage:v1-rev20181013-1.27.0 -com.google.auth:google-auth-library-credentials:0.16.1 -com.google.auth:google-auth-library-oauth2-http:0.16.1 -com.google.auto.value:auto-value-annotations:1.6.3 -com.google.cloud:google-cloud-core-http:1.59.0 -com.google.cloud:google-cloud-core:1.59.0 -com.google.cloud:google-cloud-storage:1.59.0 -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.errorprone:error_prone_annotations:2.3.2 -com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:28.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.http-client:google-http-client-appengine:1.27.0 -com.google.http-client:google-http-client-jackson2:1.30.1 -com.google.http-client:google-http-client:1.30.1 -com.google.inject.extensions:guice-multibindings:4.1.0 -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.template:soy:2018-03-14 -com.ibm.icu:icu4j:57.1 -commons-codec:commons-codec:1.11 -commons-logging:commons-logging:1.2 -io.grpc:grpc-context:1.19.0 -io.opencensus:opencensus-api:0.21.0 -io.opencensus:opencensus-contrib-http-util:0.21.0 -javax.annotation:javax.annotation-api:1.2 -javax.annotation:jsr250-api:1.0 -javax.inject:javax.inject:1 -javax.validation:validation-api:1.0.0.GA -joda-time:joda-time:2.9.2 -org.apache.commons:commons-lang3:3.8.1 -org.apache.commons:commons-text:1.6 -org.apache.httpcomponents:httpclient:4.5.8 -org.apache.httpcomponents:httpcore:4.4.11 -org.checkerframework:checker-qual:2.8.1 -org.codehaus.mojo:animal-sniffer-annotations:1.18 -org.json:json:20160212 -org.ow2.asm:asm-analysis:6.0 -org.ow2.asm:asm-commons:6.0 -org.ow2.asm:asm-tree:6.0 -org.ow2.asm:asm-util:6.0 -org.ow2.asm:asm:6.0 -org.threeten:threetenbp:1.3.3 diff --git a/buildSrc/gradle/dependency-locks/deploy_jar.lockfile b/buildSrc/gradle/dependency-locks/deploy_jar.lockfile index af10edfea..cf73afbb8 100644 --- a/buildSrc/gradle/dependency-locks/deploy_jar.lockfile +++ b/buildSrc/gradle/dependency-locks/deploy_jar.lockfile @@ -20,9 +20,9 @@ com.google.cloud:google-cloud-storage:1.59.0 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.errorprone:error_prone_annotations:2.3.2 +com.google.errorprone:error_prone_annotations:2.3.4 com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:28.1-jre +com.google.guava:guava:28.2-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.0-beta1 com.google.http-client:google-http-client-appengine:1.27.0 @@ -50,8 +50,7 @@ org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.6 org.apache.httpcomponents:httpclient:4.5.8 org.apache.httpcomponents:httpcore:4.4.11 -org.checkerframework:checker-qual:2.8.1 -org.codehaus.mojo:animal-sniffer-annotations:1.18 +org.checkerframework:checker-qual:2.10.0 org.json:json:20160212 org.ow2.asm:asm-analysis:6.0 org.ow2.asm:asm-commons:6.0 diff --git a/buildSrc/gradle/dependency-locks/errorprone.lockfile b/buildSrc/gradle/dependency-locks/errorprone.lockfile deleted file mode 100644 index 0e2d9b8d4..000000000 --- a/buildSrc/gradle/dependency-locks/errorprone.lockfile +++ /dev/null @@ -1,24 +0,0 @@ -# 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.github.kevinstern:software-and-algorithms:1.0 -com.github.stephenc.jcip:jcip-annotations:1.0-1 -com.google.auto:auto-common:0.10 -com.google.code.findbugs:jFormatString:3.0.0 -com.google.code.findbugs:jsr305:3.0.2 -com.google.errorprone:error_prone_annotation:2.3.3 -com.google.errorprone:error_prone_annotations:2.3.3 -com.google.errorprone:error_prone_check_api:2.3.3 -com.google.errorprone:error_prone_core:2.3.3 -com.google.errorprone:error_prone_type_annotations:2.3.3 -com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:27.0.1-jre -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava -com.google.j2objc:j2objc-annotations:1.1 -com.google.protobuf:protobuf-java:3.4.0 -com.googlecode.java-diff-utils:diffutils:1.3.0 -org.checkerframework:checker-qual:2.5.3 -org.checkerframework:dataflow:2.5.3 -org.checkerframework:javacutil:2.5.3 -org.codehaus.mojo:animal-sniffer-annotations:1.17 -org.pcollections:pcollections:2.1.2 diff --git a/buildSrc/gradle/dependency-locks/runtime.lockfile b/buildSrc/gradle/dependency-locks/runtime.lockfile index af10edfea..cf73afbb8 100644 --- a/buildSrc/gradle/dependency-locks/runtime.lockfile +++ b/buildSrc/gradle/dependency-locks/runtime.lockfile @@ -20,9 +20,9 @@ com.google.cloud:google-cloud-storage:1.59.0 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.errorprone:error_prone_annotations:2.3.2 +com.google.errorprone:error_prone_annotations:2.3.4 com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:28.1-jre +com.google.guava:guava:28.2-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.0-beta1 com.google.http-client:google-http-client-appengine:1.27.0 @@ -50,8 +50,7 @@ org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.6 org.apache.httpcomponents:httpclient:4.5.8 org.apache.httpcomponents:httpcore:4.4.11 -org.checkerframework:checker-qual:2.8.1 -org.codehaus.mojo:animal-sniffer-annotations:1.18 +org.checkerframework:checker-qual:2.10.0 org.json:json:20160212 org.ow2.asm:asm-analysis:6.0 org.ow2.asm:asm-commons:6.0 diff --git a/buildSrc/gradle/dependency-locks/runtimeClasspath.lockfile b/buildSrc/gradle/dependency-locks/runtimeClasspath.lockfile index af10edfea..cf73afbb8 100644 --- a/buildSrc/gradle/dependency-locks/runtimeClasspath.lockfile +++ b/buildSrc/gradle/dependency-locks/runtimeClasspath.lockfile @@ -20,9 +20,9 @@ com.google.cloud:google-cloud-storage:1.59.0 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.errorprone:error_prone_annotations:2.3.2 +com.google.errorprone:error_prone_annotations:2.3.4 com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:28.1-jre +com.google.guava:guava:28.2-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.0-beta1 com.google.http-client:google-http-client-appengine:1.27.0 @@ -50,8 +50,7 @@ org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.6 org.apache.httpcomponents:httpclient:4.5.8 org.apache.httpcomponents:httpcore:4.4.11 -org.checkerframework:checker-qual:2.8.1 -org.codehaus.mojo:animal-sniffer-annotations:1.18 +org.checkerframework:checker-qual:2.10.0 org.json:json:20160212 org.ow2.asm:asm-analysis:6.0 org.ow2.asm:asm-commons:6.0 diff --git a/buildSrc/gradle/dependency-locks/testApt.lockfile b/buildSrc/gradle/dependency-locks/testApt.lockfile deleted file mode 100644 index 656c5dbcc..000000000 --- a/buildSrc/gradle/dependency-locks/testApt.lockfile +++ /dev/null @@ -1,3 +0,0 @@ -# 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. diff --git a/buildSrc/gradle/dependency-locks/testCompile.lockfile b/buildSrc/gradle/dependency-locks/testCompile.lockfile index c2dbdfa33..d8b4528f2 100644 --- a/buildSrc/gradle/dependency-locks/testCompile.lockfile +++ b/buildSrc/gradle/dependency-locks/testCompile.lockfile @@ -20,9 +20,9 @@ com.google.cloud:google-cloud-storage:1.59.0 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.errorprone:error_prone_annotations:2.3.2 +com.google.errorprone:error_prone_annotations:2.3.4 com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:28.1-jre +com.google.guava:guava:28.2-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.0-beta1 com.google.http-client:google-http-client-appengine:1.27.0 @@ -56,13 +56,20 @@ org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.6 org.apache.httpcomponents:httpclient:4.5.8 org.apache.httpcomponents:httpcore:4.4.11 +org.apiguardian:apiguardian-api:1.1.0 org.checkerframework:checker-compat-qual:2.5.5 -org.checkerframework:checker-qual:2.8.1 -org.codehaus.mojo:animal-sniffer-annotations:1.18 +org.checkerframework:checker-qual:2.10.0 org.hamcrest:hamcrest-core:1.3 org.json:json:20160212 +org.junit.jupiter:junit-jupiter-api:5.6.0 +org.junit.jupiter:junit-jupiter-engine:5.6.0 +org.junit.platform:junit-platform-commons:1.6.0 +org.junit.platform:junit-platform-engine:1.6.0 +org.junit.vintage:junit-vintage-engine:5.6.0 +org.junit:junit-bom:5.6.0 org.mockito:mockito-core:2.25.0 org.objenesis:objenesis:2.6 +org.opentest4j:opentest4j:1.2.0 org.ow2.asm:asm-analysis:6.0 org.ow2.asm:asm-commons:6.0 org.ow2.asm:asm-tree:6.0 diff --git a/buildSrc/gradle/dependency-locks/testCompileClasspath.lockfile b/buildSrc/gradle/dependency-locks/testCompileClasspath.lockfile index c2dbdfa33..d8b4528f2 100644 --- a/buildSrc/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/buildSrc/gradle/dependency-locks/testCompileClasspath.lockfile @@ -20,9 +20,9 @@ com.google.cloud:google-cloud-storage:1.59.0 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.errorprone:error_prone_annotations:2.3.2 +com.google.errorprone:error_prone_annotations:2.3.4 com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:28.1-jre +com.google.guava:guava:28.2-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.0-beta1 com.google.http-client:google-http-client-appengine:1.27.0 @@ -56,13 +56,20 @@ org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.6 org.apache.httpcomponents:httpclient:4.5.8 org.apache.httpcomponents:httpcore:4.4.11 +org.apiguardian:apiguardian-api:1.1.0 org.checkerframework:checker-compat-qual:2.5.5 -org.checkerframework:checker-qual:2.8.1 -org.codehaus.mojo:animal-sniffer-annotations:1.18 +org.checkerframework:checker-qual:2.10.0 org.hamcrest:hamcrest-core:1.3 org.json:json:20160212 +org.junit.jupiter:junit-jupiter-api:5.6.0 +org.junit.jupiter:junit-jupiter-engine:5.6.0 +org.junit.platform:junit-platform-commons:1.6.0 +org.junit.platform:junit-platform-engine:1.6.0 +org.junit.vintage:junit-vintage-engine:5.6.0 +org.junit:junit-bom:5.6.0 org.mockito:mockito-core:2.25.0 org.objenesis:objenesis:2.6 +org.opentest4j:opentest4j:1.2.0 org.ow2.asm:asm-analysis:6.0 org.ow2.asm:asm-commons:6.0 org.ow2.asm:asm-tree:6.0 diff --git a/buildSrc/gradle/dependency-locks/testRuntime.lockfile b/buildSrc/gradle/dependency-locks/testRuntime.lockfile index c2dbdfa33..d8b4528f2 100644 --- a/buildSrc/gradle/dependency-locks/testRuntime.lockfile +++ b/buildSrc/gradle/dependency-locks/testRuntime.lockfile @@ -20,9 +20,9 @@ com.google.cloud:google-cloud-storage:1.59.0 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.errorprone:error_prone_annotations:2.3.2 +com.google.errorprone:error_prone_annotations:2.3.4 com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:28.1-jre +com.google.guava:guava:28.2-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.0-beta1 com.google.http-client:google-http-client-appengine:1.27.0 @@ -56,13 +56,20 @@ org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.6 org.apache.httpcomponents:httpclient:4.5.8 org.apache.httpcomponents:httpcore:4.4.11 +org.apiguardian:apiguardian-api:1.1.0 org.checkerframework:checker-compat-qual:2.5.5 -org.checkerframework:checker-qual:2.8.1 -org.codehaus.mojo:animal-sniffer-annotations:1.18 +org.checkerframework:checker-qual:2.10.0 org.hamcrest:hamcrest-core:1.3 org.json:json:20160212 +org.junit.jupiter:junit-jupiter-api:5.6.0 +org.junit.jupiter:junit-jupiter-engine:5.6.0 +org.junit.platform:junit-platform-commons:1.6.0 +org.junit.platform:junit-platform-engine:1.6.0 +org.junit.vintage:junit-vintage-engine:5.6.0 +org.junit:junit-bom:5.6.0 org.mockito:mockito-core:2.25.0 org.objenesis:objenesis:2.6 +org.opentest4j:opentest4j:1.2.0 org.ow2.asm:asm-analysis:6.0 org.ow2.asm:asm-commons:6.0 org.ow2.asm:asm-tree:6.0 diff --git a/buildSrc/gradle/dependency-locks/testRuntimeClasspath.lockfile b/buildSrc/gradle/dependency-locks/testRuntimeClasspath.lockfile index c2dbdfa33..d8b4528f2 100644 --- a/buildSrc/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/buildSrc/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -20,9 +20,9 @@ com.google.cloud:google-cloud-storage:1.59.0 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.errorprone:error_prone_annotations:2.3.2 +com.google.errorprone:error_prone_annotations:2.3.4 com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:28.1-jre +com.google.guava:guava:28.2-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.0-beta1 com.google.http-client:google-http-client-appengine:1.27.0 @@ -56,13 +56,20 @@ org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.6 org.apache.httpcomponents:httpclient:4.5.8 org.apache.httpcomponents:httpcore:4.4.11 +org.apiguardian:apiguardian-api:1.1.0 org.checkerframework:checker-compat-qual:2.5.5 -org.checkerframework:checker-qual:2.8.1 -org.codehaus.mojo:animal-sniffer-annotations:1.18 +org.checkerframework:checker-qual:2.10.0 org.hamcrest:hamcrest-core:1.3 org.json:json:20160212 +org.junit.jupiter:junit-jupiter-api:5.6.0 +org.junit.jupiter:junit-jupiter-engine:5.6.0 +org.junit.platform:junit-platform-commons:1.6.0 +org.junit.platform:junit-platform-engine:1.6.0 +org.junit.vintage:junit-vintage-engine:5.6.0 +org.junit:junit-bom:5.6.0 org.mockito:mockito-core:2.25.0 org.objenesis:objenesis:2.6 +org.opentest4j:opentest4j:1.2.0 org.ow2.asm:asm-analysis:6.0 org.ow2.asm:asm-commons:6.0 org.ow2.asm:asm-tree:6.0 diff --git a/common/build.gradle b/common/build.gradle index 7e1e900a9..327e58fe9 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -62,4 +62,6 @@ dependencies { testingCompile deps['io.github.java-diff-utils:java-diff-utils'] testCompile deps['junit:junit'] + testCompile deps['org.junit.jupiter:junit-jupiter-engine'] + testCompile deps['org.junit.vintage:junit-vintage-engine'] } diff --git a/common/gradle/dependency-locks/compile.lockfile b/common/gradle/dependency-locks/compile.lockfile index afe40dd97..9140127b6 100644 --- a/common/gradle/dependency-locks/compile.lockfile +++ b/common/gradle/dependency-locks/compile.lockfile @@ -2,12 +2,11 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. com.google.code.findbugs:jsr305:3.0.2 -com.google.errorprone:error_prone_annotations:2.3.2 +com.google.errorprone:error_prone_annotations:2.3.4 com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:28.1-jre +com.google.guava:guava:28.2-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.j2objc:j2objc-annotations:1.3 javax.inject:javax.inject:1 joda-time:joda-time:2.9.2 -org.checkerframework:checker-qual:2.8.1 -org.codehaus.mojo:animal-sniffer-annotations:1.18 +org.checkerframework:checker-qual:2.10.0 diff --git a/common/gradle/dependency-locks/compileClasspath.lockfile b/common/gradle/dependency-locks/compileClasspath.lockfile index afe40dd97..9140127b6 100644 --- a/common/gradle/dependency-locks/compileClasspath.lockfile +++ b/common/gradle/dependency-locks/compileClasspath.lockfile @@ -2,12 +2,11 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. com.google.code.findbugs:jsr305:3.0.2 -com.google.errorprone:error_prone_annotations:2.3.2 +com.google.errorprone:error_prone_annotations:2.3.4 com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:28.1-jre +com.google.guava:guava:28.2-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.j2objc:j2objc-annotations:1.3 javax.inject:javax.inject:1 joda-time:joda-time:2.9.2 -org.checkerframework:checker-qual:2.8.1 -org.codehaus.mojo:animal-sniffer-annotations:1.18 +org.checkerframework:checker-qual:2.10.0 diff --git a/common/gradle/dependency-locks/default.lockfile b/common/gradle/dependency-locks/default.lockfile index afe40dd97..9140127b6 100644 --- a/common/gradle/dependency-locks/default.lockfile +++ b/common/gradle/dependency-locks/default.lockfile @@ -2,12 +2,11 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. com.google.code.findbugs:jsr305:3.0.2 -com.google.errorprone:error_prone_annotations:2.3.2 +com.google.errorprone:error_prone_annotations:2.3.4 com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:28.1-jre +com.google.guava:guava:28.2-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.j2objc:j2objc-annotations:1.3 javax.inject:javax.inject:1 joda-time:joda-time:2.9.2 -org.checkerframework:checker-qual:2.8.1 -org.codehaus.mojo:animal-sniffer-annotations:1.18 +org.checkerframework:checker-qual:2.10.0 diff --git a/common/gradle/dependency-locks/deploy_jar.lockfile b/common/gradle/dependency-locks/deploy_jar.lockfile index afe40dd97..9140127b6 100644 --- a/common/gradle/dependency-locks/deploy_jar.lockfile +++ b/common/gradle/dependency-locks/deploy_jar.lockfile @@ -2,12 +2,11 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. com.google.code.findbugs:jsr305:3.0.2 -com.google.errorprone:error_prone_annotations:2.3.2 +com.google.errorprone:error_prone_annotations:2.3.4 com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:28.1-jre +com.google.guava:guava:28.2-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.j2objc:j2objc-annotations:1.3 javax.inject:javax.inject:1 joda-time:joda-time:2.9.2 -org.checkerframework:checker-qual:2.8.1 -org.codehaus.mojo:animal-sniffer-annotations:1.18 +org.checkerframework:checker-qual:2.10.0 diff --git a/common/gradle/dependency-locks/runtime.lockfile b/common/gradle/dependency-locks/runtime.lockfile index afe40dd97..9140127b6 100644 --- a/common/gradle/dependency-locks/runtime.lockfile +++ b/common/gradle/dependency-locks/runtime.lockfile @@ -2,12 +2,11 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. com.google.code.findbugs:jsr305:3.0.2 -com.google.errorprone:error_prone_annotations:2.3.2 +com.google.errorprone:error_prone_annotations:2.3.4 com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:28.1-jre +com.google.guava:guava:28.2-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.j2objc:j2objc-annotations:1.3 javax.inject:javax.inject:1 joda-time:joda-time:2.9.2 -org.checkerframework:checker-qual:2.8.1 -org.codehaus.mojo:animal-sniffer-annotations:1.18 +org.checkerframework:checker-qual:2.10.0 diff --git a/common/gradle/dependency-locks/runtimeClasspath.lockfile b/common/gradle/dependency-locks/runtimeClasspath.lockfile index afe40dd97..9140127b6 100644 --- a/common/gradle/dependency-locks/runtimeClasspath.lockfile +++ b/common/gradle/dependency-locks/runtimeClasspath.lockfile @@ -2,12 +2,11 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. com.google.code.findbugs:jsr305:3.0.2 -com.google.errorprone:error_prone_annotations:2.3.2 +com.google.errorprone:error_prone_annotations:2.3.4 com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:28.1-jre +com.google.guava:guava:28.2-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.j2objc:j2objc-annotations:1.3 javax.inject:javax.inject:1 joda-time:joda-time:2.9.2 -org.checkerframework:checker-qual:2.8.1 -org.codehaus.mojo:animal-sniffer-annotations:1.18 +org.checkerframework:checker-qual:2.10.0 diff --git a/common/gradle/dependency-locks/testCompile.lockfile b/common/gradle/dependency-locks/testCompile.lockfile index 49fb111e0..61933c94a 100644 --- a/common/gradle/dependency-locks/testCompile.lockfile +++ b/common/gradle/dependency-locks/testCompile.lockfile @@ -3,10 +3,10 @@ # This file is expected to be part of source control. com.google.auto.value:auto-value-annotations:1.6.3 com.google.code.findbugs:jsr305:3.0.2 -com.google.errorprone:error_prone_annotations:2.3.2 +com.google.errorprone:error_prone_annotations:2.3.4 com.google.flogger:flogger:0.1 com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:28.1-jre +com.google.guava:guava:28.2-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.j2objc:j2objc-annotations:1.3 com.google.truth:truth:1.0 @@ -15,8 +15,15 @@ io.github.java-diff-utils:java-diff-utils:4.0 javax.inject:javax.inject:1 joda-time:joda-time:2.9.2 junit:junit:4.13 +org.apiguardian:apiguardian-api:1.1.0 org.checkerframework:checker-compat-qual:2.5.5 -org.checkerframework:checker-qual:2.8.1 -org.codehaus.mojo:animal-sniffer-annotations:1.18 +org.checkerframework:checker-qual:2.10.0 org.eclipse.jgit:org.eclipse.jgit:4.4.1.201607150455-r org.hamcrest:hamcrest-core:1.3 +org.junit.jupiter:junit-jupiter-api:5.6.0 +org.junit.jupiter:junit-jupiter-engine:5.6.0 +org.junit.platform:junit-platform-commons:1.6.0 +org.junit.platform:junit-platform-engine:1.6.0 +org.junit.vintage:junit-vintage-engine:5.6.0 +org.junit:junit-bom:5.6.0 +org.opentest4j:opentest4j:1.2.0 diff --git a/common/gradle/dependency-locks/testCompileClasspath.lockfile b/common/gradle/dependency-locks/testCompileClasspath.lockfile index 49fb111e0..61933c94a 100644 --- a/common/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/common/gradle/dependency-locks/testCompileClasspath.lockfile @@ -3,10 +3,10 @@ # This file is expected to be part of source control. com.google.auto.value:auto-value-annotations:1.6.3 com.google.code.findbugs:jsr305:3.0.2 -com.google.errorprone:error_prone_annotations:2.3.2 +com.google.errorprone:error_prone_annotations:2.3.4 com.google.flogger:flogger:0.1 com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:28.1-jre +com.google.guava:guava:28.2-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.j2objc:j2objc-annotations:1.3 com.google.truth:truth:1.0 @@ -15,8 +15,15 @@ io.github.java-diff-utils:java-diff-utils:4.0 javax.inject:javax.inject:1 joda-time:joda-time:2.9.2 junit:junit:4.13 +org.apiguardian:apiguardian-api:1.1.0 org.checkerframework:checker-compat-qual:2.5.5 -org.checkerframework:checker-qual:2.8.1 -org.codehaus.mojo:animal-sniffer-annotations:1.18 +org.checkerframework:checker-qual:2.10.0 org.eclipse.jgit:org.eclipse.jgit:4.4.1.201607150455-r org.hamcrest:hamcrest-core:1.3 +org.junit.jupiter:junit-jupiter-api:5.6.0 +org.junit.jupiter:junit-jupiter-engine:5.6.0 +org.junit.platform:junit-platform-commons:1.6.0 +org.junit.platform:junit-platform-engine:1.6.0 +org.junit.vintage:junit-vintage-engine:5.6.0 +org.junit:junit-bom:5.6.0 +org.opentest4j:opentest4j:1.2.0 diff --git a/common/gradle/dependency-locks/testRuntime.lockfile b/common/gradle/dependency-locks/testRuntime.lockfile index 2d4964689..686525a34 100644 --- a/common/gradle/dependency-locks/testRuntime.lockfile +++ b/common/gradle/dependency-locks/testRuntime.lockfile @@ -3,11 +3,11 @@ # This file is expected to be part of source control. com.google.auto.value:auto-value-annotations:1.6.3 com.google.code.findbugs:jsr305:3.0.2 -com.google.errorprone:error_prone_annotations:2.3.2 +com.google.errorprone:error_prone_annotations:2.3.4 com.google.flogger:flogger-system-backend:0.1 com.google.flogger:flogger:0.1 com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:28.1-jre +com.google.guava:guava:28.2-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.j2objc:j2objc-annotations:1.3 com.google.truth:truth:1.0 @@ -16,8 +16,15 @@ io.github.java-diff-utils:java-diff-utils:4.0 javax.inject:javax.inject:1 joda-time:joda-time:2.9.2 junit:junit:4.13 +org.apiguardian:apiguardian-api:1.1.0 org.checkerframework:checker-compat-qual:2.5.5 -org.checkerframework:checker-qual:2.8.1 -org.codehaus.mojo:animal-sniffer-annotations:1.18 +org.checkerframework:checker-qual:2.10.0 org.eclipse.jgit:org.eclipse.jgit:4.4.1.201607150455-r org.hamcrest:hamcrest-core:1.3 +org.junit.jupiter:junit-jupiter-api:5.6.0 +org.junit.jupiter:junit-jupiter-engine:5.6.0 +org.junit.platform:junit-platform-commons:1.6.0 +org.junit.platform:junit-platform-engine:1.6.0 +org.junit.vintage:junit-vintage-engine:5.6.0 +org.junit:junit-bom:5.6.0 +org.opentest4j:opentest4j:1.2.0 diff --git a/common/gradle/dependency-locks/testRuntimeClasspath.lockfile b/common/gradle/dependency-locks/testRuntimeClasspath.lockfile index 2d4964689..686525a34 100644 --- a/common/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/common/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -3,11 +3,11 @@ # This file is expected to be part of source control. com.google.auto.value:auto-value-annotations:1.6.3 com.google.code.findbugs:jsr305:3.0.2 -com.google.errorprone:error_prone_annotations:2.3.2 +com.google.errorprone:error_prone_annotations:2.3.4 com.google.flogger:flogger-system-backend:0.1 com.google.flogger:flogger:0.1 com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:28.1-jre +com.google.guava:guava:28.2-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.j2objc:j2objc-annotations:1.3 com.google.truth:truth:1.0 @@ -16,8 +16,15 @@ io.github.java-diff-utils:java-diff-utils:4.0 javax.inject:javax.inject:1 joda-time:joda-time:2.9.2 junit:junit:4.13 +org.apiguardian:apiguardian-api:1.1.0 org.checkerframework:checker-compat-qual:2.5.5 -org.checkerframework:checker-qual:2.8.1 -org.codehaus.mojo:animal-sniffer-annotations:1.18 +org.checkerframework:checker-qual:2.10.0 org.eclipse.jgit:org.eclipse.jgit:4.4.1.201607150455-r org.hamcrest:hamcrest-core:1.3 +org.junit.jupiter:junit-jupiter-api:5.6.0 +org.junit.jupiter:junit-jupiter-engine:5.6.0 +org.junit.platform:junit-platform-commons:1.6.0 +org.junit.platform:junit-platform-engine:1.6.0 +org.junit.vintage:junit-vintage-engine:5.6.0 +org.junit:junit-bom:5.6.0 +org.opentest4j:opentest4j:1.2.0 diff --git a/common/gradle/dependency-locks/testingCompile.lockfile b/common/gradle/dependency-locks/testingCompile.lockfile index 87ad3eee7..970819ff9 100644 --- a/common/gradle/dependency-locks/testingCompile.lockfile +++ b/common/gradle/dependency-locks/testingCompile.lockfile @@ -3,10 +3,10 @@ # This file is expected to be part of source control. com.google.auto.value:auto-value-annotations:1.6.3 com.google.code.findbugs:jsr305:3.0.2 -com.google.errorprone:error_prone_annotations:2.3.2 +com.google.errorprone:error_prone_annotations:2.3.4 com.google.flogger:flogger:0.1 com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:28.1-jre +com.google.guava:guava:28.2-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.j2objc:j2objc-annotations:1.3 com.google.truth:truth:1.0 @@ -16,7 +16,6 @@ javax.inject:javax.inject:1 joda-time:joda-time:2.9.2 junit:junit:4.12 org.checkerframework:checker-compat-qual:2.5.5 -org.checkerframework:checker-qual:2.8.1 -org.codehaus.mojo:animal-sniffer-annotations:1.18 +org.checkerframework:checker-qual:2.10.0 org.eclipse.jgit:org.eclipse.jgit:4.4.1.201607150455-r org.hamcrest:hamcrest-core:1.3 diff --git a/common/gradle/dependency-locks/testingCompileClasspath.lockfile b/common/gradle/dependency-locks/testingCompileClasspath.lockfile index 87ad3eee7..970819ff9 100644 --- a/common/gradle/dependency-locks/testingCompileClasspath.lockfile +++ b/common/gradle/dependency-locks/testingCompileClasspath.lockfile @@ -3,10 +3,10 @@ # This file is expected to be part of source control. com.google.auto.value:auto-value-annotations:1.6.3 com.google.code.findbugs:jsr305:3.0.2 -com.google.errorprone:error_prone_annotations:2.3.2 +com.google.errorprone:error_prone_annotations:2.3.4 com.google.flogger:flogger:0.1 com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:28.1-jre +com.google.guava:guava:28.2-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.j2objc:j2objc-annotations:1.3 com.google.truth:truth:1.0 @@ -16,7 +16,6 @@ javax.inject:javax.inject:1 joda-time:joda-time:2.9.2 junit:junit:4.12 org.checkerframework:checker-compat-qual:2.5.5 -org.checkerframework:checker-qual:2.8.1 -org.codehaus.mojo:animal-sniffer-annotations:1.18 +org.checkerframework:checker-qual:2.10.0 org.eclipse.jgit:org.eclipse.jgit:4.4.1.201607150455-r org.hamcrest:hamcrest-core:1.3 diff --git a/common/gradle/dependency-locks/testingRuntime.lockfile b/common/gradle/dependency-locks/testingRuntime.lockfile index 11dac3337..b4fc038be 100644 --- a/common/gradle/dependency-locks/testingRuntime.lockfile +++ b/common/gradle/dependency-locks/testingRuntime.lockfile @@ -3,11 +3,11 @@ # This file is expected to be part of source control. com.google.auto.value:auto-value-annotations:1.6.3 com.google.code.findbugs:jsr305:3.0.2 -com.google.errorprone:error_prone_annotations:2.3.2 +com.google.errorprone:error_prone_annotations:2.3.4 com.google.flogger:flogger-system-backend:0.1 com.google.flogger:flogger:0.1 com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:28.1-jre +com.google.guava:guava:28.2-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.j2objc:j2objc-annotations:1.3 com.google.truth:truth:1.0 @@ -17,7 +17,6 @@ javax.inject:javax.inject:1 joda-time:joda-time:2.9.2 junit:junit:4.12 org.checkerframework:checker-compat-qual:2.5.5 -org.checkerframework:checker-qual:2.8.1 -org.codehaus.mojo:animal-sniffer-annotations:1.18 +org.checkerframework:checker-qual:2.10.0 org.eclipse.jgit:org.eclipse.jgit:4.4.1.201607150455-r org.hamcrest:hamcrest-core:1.3 diff --git a/common/gradle/dependency-locks/testingRuntimeClasspath.lockfile b/common/gradle/dependency-locks/testingRuntimeClasspath.lockfile index 11dac3337..b4fc038be 100644 --- a/common/gradle/dependency-locks/testingRuntimeClasspath.lockfile +++ b/common/gradle/dependency-locks/testingRuntimeClasspath.lockfile @@ -3,11 +3,11 @@ # This file is expected to be part of source control. com.google.auto.value:auto-value-annotations:1.6.3 com.google.code.findbugs:jsr305:3.0.2 -com.google.errorprone:error_prone_annotations:2.3.2 +com.google.errorprone:error_prone_annotations:2.3.4 com.google.flogger:flogger-system-backend:0.1 com.google.flogger:flogger:0.1 com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:28.1-jre +com.google.guava:guava:28.2-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.j2objc:j2objc-annotations:1.3 com.google.truth:truth:1.0 @@ -17,7 +17,6 @@ javax.inject:javax.inject:1 joda-time:joda-time:2.9.2 junit:junit:4.12 org.checkerframework:checker-compat-qual:2.5.5 -org.checkerframework:checker-qual:2.8.1 -org.codehaus.mojo:animal-sniffer-annotations:1.18 +org.checkerframework:checker-qual:2.10.0 org.eclipse.jgit:org.eclipse.jgit:4.4.1.201607150455-r org.hamcrest:hamcrest-core:1.3 diff --git a/config/dependency-license/allowed_licenses.json b/config/dependency-license/allowed_licenses.json index b62171509..201a088ea 100644 --- a/config/dependency-license/allowed_licenses.json +++ b/config/dependency-license/allowed_licenses.json @@ -144,6 +144,9 @@ { "moduleLicense": "Eclipse Public License 2.0" }, + { + "moduleLicense": "Eclipse Public License v2.0" + }, { "moduleLicense": "https://www.eclipse.org/legal/epl-2.0/, http://www.gnu.org/copyleft/gpl.html, http://www.gnu.org/licenses/lgpl.html" }, @@ -224,6 +227,11 @@ "moduleLicense": "Public Domain", "moduleName": "org.tukaani:xz" }, + { + // Actually Eclipse Public License v2.0 + "moduleLicense": null, + "moduleName": "org.junit:junit-bom" + }, { "moduleLicense": "The W3C Software License" } diff --git a/core/build.gradle b/core/build.gradle index b55180fd8..c49781e9b 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -300,6 +300,8 @@ dependencies { testCompile deps['org.hamcrest:hamcrest-library'] compile deps['org.hibernate:hibernate-hikaricp'] testCompile deps['junit:junit'] + testCompile deps['org.junit.jupiter:junit-jupiter-engine'] + testCompile deps['org.junit.vintage:junit-vintage-engine'] testCompile deps['org.mockito:mockito-core'] runtime deps['org.postgresql:postgresql'] diff --git a/core/gradle/dependency-locks/compile.lockfile b/core/gradle/dependency-locks/compile.lockfile index 701cefc66..669a7975d 100644 --- a/core/gradle/dependency-locks/compile.lockfile +++ b/core/gradle/dependency-locks/compile.lockfile @@ -1,20 +1,21 @@ # 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. +androidx.annotation:annotation:1.1.0 antlr:antlr:2.7.7 aopalliance:aopalliance:1.0 args4j:args4j:2.0.23 cglib:cglib-nodep:2.2 com.beust:jcommander:1.60 com.fasterxml.jackson.core:jackson-annotations:2.9.10 -com.fasterxml.jackson.core:jackson-core:2.9.10 +com.fasterxml.jackson.core:jackson-core:2.10.2 com.fasterxml.jackson.core:jackson-databind:2.9.10 com.fasterxml:classmate:1.3.4 -com.google.api-client:google-api-client-appengine:1.30.7 +com.google.api-client:google-api-client-appengine:1.30.8 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.7 -com.google.api-client:google-api-client:1.30.7 +com.google.api-client:google-api-client-servlet:1.30.8 +com.google.api-client:google-api-client:1.30.8 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -76,19 +77,19 @@ com.google.code.findbugs:jsr305:3.0.2 com.google.code.gson:gson:2.8.5 com.google.common.html.types:types:1.0.4 com.google.dagger:dagger:2.21 -com.google.errorprone:error_prone_annotations:2.3.3 +com.google.errorprone:error_prone_annotations:2.3.4 com.google.flogger:flogger-system-backend:0.3.1 com.google.flogger:flogger:0.3.1 com.google.flogger:google-extensions:0.3.1 com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:28.1-jre +com.google.guava:guava:28.2-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.34.0 -com.google.http-client:google-http-client-jackson2:1.32.1 +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-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.34.0 +com.google.http-client:google-http-client:1.34.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 @@ -183,14 +184,14 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.11 +org.apache.httpcomponents:httpcore:4.4.13 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 -org.checkerframework:checker-qual:2.8.1 +org.checkerframework:checker-qual:2.10.0 org.codehaus.jackson:jackson-core-asl:1.9.13 org.codehaus.jackson:jackson-mapper-asl:1.9.13 -org.codehaus.mojo:animal-sniffer-annotations:1.18 +org.codehaus.mojo:animal-sniffer-annotations:1.17 org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.flywaydb:flyway-core:5.2.4 diff --git a/core/gradle/dependency-locks/compileClasspath.lockfile b/core/gradle/dependency-locks/compileClasspath.lockfile index 96d02ee16..7ce3b6263 100644 --- a/core/gradle/dependency-locks/compileClasspath.lockfile +++ b/core/gradle/dependency-locks/compileClasspath.lockfile @@ -1,20 +1,21 @@ # 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. +androidx.annotation:annotation:1.1.0 antlr:antlr:2.7.7 aopalliance:aopalliance:1.0 args4j:args4j:2.0.23 cglib:cglib-nodep:2.2 com.beust:jcommander:1.60 com.fasterxml.jackson.core:jackson-annotations:2.9.10 -com.fasterxml.jackson.core:jackson-core:2.9.10 +com.fasterxml.jackson.core:jackson-core:2.10.2 com.fasterxml.jackson.core:jackson-databind:2.9.10 com.fasterxml:classmate:1.3.4 -com.google.api-client:google-api-client-appengine:1.30.7 +com.google.api-client:google-api-client-appengine:1.30.8 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.7 -com.google.api-client:google-api-client:1.30.7 +com.google.api-client:google-api-client-servlet:1.30.8 +com.google.api-client:google-api-client:1.30.8 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -76,18 +77,18 @@ com.google.code.findbugs:jsr305:3.0.2 com.google.code.gson:gson:2.8.5 com.google.common.html.types:types:1.0.4 com.google.dagger:dagger:2.21 -com.google.errorprone:error_prone_annotations:2.3.3 +com.google.errorprone:error_prone_annotations:2.3.4 com.google.flogger:flogger:0.3.1 com.google.flogger:google-extensions:0.3.1 com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:28.1-jre +com.google.guava:guava:28.2-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.34.0 -com.google.http-client:google-http-client-jackson2:1.32.1 +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-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.34.0 +com.google.http-client:google-http-client:1.34.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 @@ -180,14 +181,14 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.11 +org.apache.httpcomponents:httpcore:4.4.13 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 -org.checkerframework:checker-qual:2.8.1 +org.checkerframework:checker-qual:2.10.0 org.codehaus.jackson:jackson-core-asl:1.9.13 org.codehaus.jackson:jackson-mapper-asl:1.9.13 -org.codehaus.mojo:animal-sniffer-annotations:1.18 +org.codehaus.mojo:animal-sniffer-annotations:1.17 org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.flywaydb:flyway-core:5.2.4 diff --git a/core/gradle/dependency-locks/default.lockfile b/core/gradle/dependency-locks/default.lockfile index f4736f0d6..57f66a88e 100644 --- a/core/gradle/dependency-locks/default.lockfile +++ b/core/gradle/dependency-locks/default.lockfile @@ -1,13 +1,14 @@ # 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. +androidx.annotation:annotation:1.1.0 antlr:antlr:2.7.7 aopalliance:aopalliance:1.0 args4j:args4j:2.0.23 cglib:cglib-nodep:2.2 com.beust:jcommander:1.60 com.fasterxml.jackson.core:jackson-annotations:2.9.10 -com.fasterxml.jackson.core:jackson-core:2.9.10 +com.fasterxml.jackson.core:jackson-core:2.10.2 com.fasterxml.jackson.core:jackson-databind:2.9.10 com.fasterxml:classmate:1.3.4 com.github.jnr:jffi:1.2.17 @@ -18,11 +19,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.7 +com.google.api-client:google-api-client-appengine:1.30.8 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.7 -com.google.api-client:google-api-client:1.30.7 +com.google.api-client:google-api-client-servlet:1.30.8 +com.google.api-client:google-api-client:1.30.8 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -87,19 +88,19 @@ com.google.code.findbugs:jsr305:3.0.2 com.google.code.gson:gson:2.8.5 com.google.common.html.types:types:1.0.4 com.google.dagger:dagger:2.21 -com.google.errorprone:error_prone_annotations:2.3.3 +com.google.errorprone:error_prone_annotations:2.3.4 com.google.flogger:flogger-system-backend:0.3.1 com.google.flogger:flogger:0.3.1 com.google.flogger:google-extensions:0.3.1 com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:28.1-jre +com.google.guava:guava:28.2-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.34.0 -com.google.http-client:google-http-client-jackson2:1.32.1 +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-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.34.0 +com.google.http-client:google-http-client:1.34.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 @@ -194,14 +195,14 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.11 +org.apache.httpcomponents:httpcore:4.4.13 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 -org.checkerframework:checker-qual:2.8.1 +org.checkerframework:checker-qual:2.10.0 org.codehaus.jackson:jackson-core-asl:1.9.13 org.codehaus.jackson:jackson-mapper-asl:1.9.13 -org.codehaus.mojo:animal-sniffer-annotations:1.18 +org.codehaus.mojo:animal-sniffer-annotations:1.17 org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.flywaydb:flyway-core:5.2.4 diff --git a/core/gradle/dependency-locks/deploy_jar.lockfile b/core/gradle/dependency-locks/deploy_jar.lockfile index b78f8835c..fe32a492c 100644 --- a/core/gradle/dependency-locks/deploy_jar.lockfile +++ b/core/gradle/dependency-locks/deploy_jar.lockfile @@ -1,13 +1,14 @@ # 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. +androidx.annotation:annotation:1.1.0 antlr:antlr:2.7.7 aopalliance:aopalliance:1.0 args4j:args4j:2.0.23 cglib:cglib-nodep:2.2 com.beust:jcommander:1.60 com.fasterxml.jackson.core:jackson-annotations:2.9.10 -com.fasterxml.jackson.core:jackson-core:2.9.10 +com.fasterxml.jackson.core:jackson-core:2.10.2 com.fasterxml.jackson.core:jackson-databind:2.9.10 com.fasterxml:classmate:1.3.4 com.github.jnr:jffi:1.2.17 @@ -18,11 +19,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.7 +com.google.api-client:google-api-client-appengine:1.30.8 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.7 -com.google.api-client:google-api-client:1.30.7 +com.google.api-client:google-api-client-servlet:1.30.8 +com.google.api-client:google-api-client:1.30.8 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -87,19 +88,19 @@ com.google.code.findbugs:jsr305:3.0.2 com.google.code.gson:gson:2.8.5 com.google.common.html.types:types:1.0.4 com.google.dagger:dagger:2.21 -com.google.errorprone:error_prone_annotations:2.3.3 +com.google.errorprone:error_prone_annotations:2.3.4 com.google.flogger:flogger-system-backend:0.3.1 com.google.flogger:flogger:0.3.1 com.google.flogger:google-extensions:0.3.1 com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:28.1-jre +com.google.guava:guava:28.2-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.34.0 -com.google.http-client:google-http-client-jackson2:1.32.1 +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-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.34.0 +com.google.http-client:google-http-client:1.34.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 @@ -193,14 +194,14 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.11 +org.apache.httpcomponents:httpcore:4.4.13 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 -org.checkerframework:checker-qual:2.8.1 +org.checkerframework:checker-qual:2.10.0 org.codehaus.jackson:jackson-core-asl:1.9.13 org.codehaus.jackson:jackson-mapper-asl:1.9.13 -org.codehaus.mojo:animal-sniffer-annotations:1.18 +org.codehaus.mojo:animal-sniffer-annotations:1.17 org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.flywaydb:flyway-core:5.2.4 diff --git a/core/gradle/dependency-locks/nonprodCompile.lockfile b/core/gradle/dependency-locks/nonprodCompile.lockfile index 701cefc66..669a7975d 100644 --- a/core/gradle/dependency-locks/nonprodCompile.lockfile +++ b/core/gradle/dependency-locks/nonprodCompile.lockfile @@ -1,20 +1,21 @@ # 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. +androidx.annotation:annotation:1.1.0 antlr:antlr:2.7.7 aopalliance:aopalliance:1.0 args4j:args4j:2.0.23 cglib:cglib-nodep:2.2 com.beust:jcommander:1.60 com.fasterxml.jackson.core:jackson-annotations:2.9.10 -com.fasterxml.jackson.core:jackson-core:2.9.10 +com.fasterxml.jackson.core:jackson-core:2.10.2 com.fasterxml.jackson.core:jackson-databind:2.9.10 com.fasterxml:classmate:1.3.4 -com.google.api-client:google-api-client-appengine:1.30.7 +com.google.api-client:google-api-client-appengine:1.30.8 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.7 -com.google.api-client:google-api-client:1.30.7 +com.google.api-client:google-api-client-servlet:1.30.8 +com.google.api-client:google-api-client:1.30.8 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -76,19 +77,19 @@ com.google.code.findbugs:jsr305:3.0.2 com.google.code.gson:gson:2.8.5 com.google.common.html.types:types:1.0.4 com.google.dagger:dagger:2.21 -com.google.errorprone:error_prone_annotations:2.3.3 +com.google.errorprone:error_prone_annotations:2.3.4 com.google.flogger:flogger-system-backend:0.3.1 com.google.flogger:flogger:0.3.1 com.google.flogger:google-extensions:0.3.1 com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:28.1-jre +com.google.guava:guava:28.2-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.34.0 -com.google.http-client:google-http-client-jackson2:1.32.1 +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-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.34.0 +com.google.http-client:google-http-client:1.34.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 @@ -183,14 +184,14 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.11 +org.apache.httpcomponents:httpcore:4.4.13 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 -org.checkerframework:checker-qual:2.8.1 +org.checkerframework:checker-qual:2.10.0 org.codehaus.jackson:jackson-core-asl:1.9.13 org.codehaus.jackson:jackson-mapper-asl:1.9.13 -org.codehaus.mojo:animal-sniffer-annotations:1.18 +org.codehaus.mojo:animal-sniffer-annotations:1.17 org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.flywaydb:flyway-core:5.2.4 diff --git a/core/gradle/dependency-locks/nonprodCompileClasspath.lockfile b/core/gradle/dependency-locks/nonprodCompileClasspath.lockfile index b764534d8..75efd8c75 100644 --- a/core/gradle/dependency-locks/nonprodCompileClasspath.lockfile +++ b/core/gradle/dependency-locks/nonprodCompileClasspath.lockfile @@ -1,20 +1,21 @@ # 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. +androidx.annotation:annotation:1.1.0 antlr:antlr:2.7.7 aopalliance:aopalliance:1.0 args4j:args4j:2.0.23 cglib:cglib-nodep:2.2 com.beust:jcommander:1.60 com.fasterxml.jackson.core:jackson-annotations:2.9.10 -com.fasterxml.jackson.core:jackson-core:2.9.10 +com.fasterxml.jackson.core:jackson-core:2.10.2 com.fasterxml.jackson.core:jackson-databind:2.9.10 com.fasterxml:classmate:1.3.4 -com.google.api-client:google-api-client-appengine:1.30.7 +com.google.api-client:google-api-client-appengine:1.30.8 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.7 -com.google.api-client:google-api-client:1.30.7 +com.google.api-client:google-api-client-servlet:1.30.8 +com.google.api-client:google-api-client:1.30.8 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -76,18 +77,18 @@ com.google.code.findbugs:jsr305:3.0.2 com.google.code.gson:gson:2.8.5 com.google.common.html.types:types:1.0.4 com.google.dagger:dagger:2.21 -com.google.errorprone:error_prone_annotations:2.3.3 +com.google.errorprone:error_prone_annotations:2.3.4 com.google.flogger:flogger:0.3.1 com.google.flogger:google-extensions:0.3.1 com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:28.1-jre +com.google.guava:guava:28.2-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.34.0 -com.google.http-client:google-http-client-jackson2:1.32.1 +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-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.34.0 +com.google.http-client:google-http-client:1.34.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 @@ -181,14 +182,14 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.11 +org.apache.httpcomponents:httpcore:4.4.13 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 -org.checkerframework:checker-qual:2.8.1 +org.checkerframework:checker-qual:2.10.0 org.codehaus.jackson:jackson-core-asl:1.9.13 org.codehaus.jackson:jackson-mapper-asl:1.9.13 -org.codehaus.mojo:animal-sniffer-annotations:1.18 +org.codehaus.mojo:animal-sniffer-annotations:1.17 org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.flywaydb:flyway-core:5.2.4 diff --git a/core/gradle/dependency-locks/nonprodRuntime.lockfile b/core/gradle/dependency-locks/nonprodRuntime.lockfile index 1e3a6e54c..974816d6c 100644 --- a/core/gradle/dependency-locks/nonprodRuntime.lockfile +++ b/core/gradle/dependency-locks/nonprodRuntime.lockfile @@ -1,20 +1,21 @@ # 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. +androidx.annotation:annotation:1.1.0 antlr:antlr:2.7.7 aopalliance:aopalliance:1.0 args4j:args4j:2.0.23 cglib:cglib-nodep:2.2 com.beust:jcommander:1.60 com.fasterxml.jackson.core:jackson-annotations:2.9.10 -com.fasterxml.jackson.core:jackson-core:2.9.10 +com.fasterxml.jackson.core:jackson-core:2.10.2 com.fasterxml.jackson.core:jackson-databind:2.9.10 com.fasterxml:classmate:1.3.4 -com.google.api-client:google-api-client-appengine:1.30.7 +com.google.api-client:google-api-client-appengine:1.30.8 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.7 -com.google.api-client:google-api-client:1.30.7 +com.google.api-client:google-api-client-servlet:1.30.8 +com.google.api-client:google-api-client:1.30.8 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -76,19 +77,19 @@ com.google.code.findbugs:jsr305:3.0.2 com.google.code.gson:gson:2.8.5 com.google.common.html.types:types:1.0.4 com.google.dagger:dagger:2.21 -com.google.errorprone:error_prone_annotations:2.3.3 +com.google.errorprone:error_prone_annotations:2.3.4 com.google.flogger:flogger-system-backend:0.3.1 com.google.flogger:flogger:0.3.1 com.google.flogger:google-extensions:0.3.1 com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:28.1-jre +com.google.guava:guava:28.2-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.34.0 -com.google.http-client:google-http-client-jackson2:1.32.1 +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-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.34.0 +com.google.http-client:google-http-client:1.34.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 @@ -183,14 +184,14 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.11 +org.apache.httpcomponents:httpcore:4.4.13 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 -org.checkerframework:checker-qual:2.8.1 +org.checkerframework:checker-qual:2.10.0 org.codehaus.jackson:jackson-core-asl:1.9.13 org.codehaus.jackson:jackson-mapper-asl:1.9.13 -org.codehaus.mojo:animal-sniffer-annotations:1.18 +org.codehaus.mojo:animal-sniffer-annotations:1.17 org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.flywaydb:flyway-core:5.2.4 diff --git a/core/gradle/dependency-locks/nonprodRuntimeClasspath.lockfile b/core/gradle/dependency-locks/nonprodRuntimeClasspath.lockfile index 1e3a6e54c..974816d6c 100644 --- a/core/gradle/dependency-locks/nonprodRuntimeClasspath.lockfile +++ b/core/gradle/dependency-locks/nonprodRuntimeClasspath.lockfile @@ -1,20 +1,21 @@ # 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. +androidx.annotation:annotation:1.1.0 antlr:antlr:2.7.7 aopalliance:aopalliance:1.0 args4j:args4j:2.0.23 cglib:cglib-nodep:2.2 com.beust:jcommander:1.60 com.fasterxml.jackson.core:jackson-annotations:2.9.10 -com.fasterxml.jackson.core:jackson-core:2.9.10 +com.fasterxml.jackson.core:jackson-core:2.10.2 com.fasterxml.jackson.core:jackson-databind:2.9.10 com.fasterxml:classmate:1.3.4 -com.google.api-client:google-api-client-appengine:1.30.7 +com.google.api-client:google-api-client-appengine:1.30.8 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.7 -com.google.api-client:google-api-client:1.30.7 +com.google.api-client:google-api-client-servlet:1.30.8 +com.google.api-client:google-api-client:1.30.8 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -76,19 +77,19 @@ com.google.code.findbugs:jsr305:3.0.2 com.google.code.gson:gson:2.8.5 com.google.common.html.types:types:1.0.4 com.google.dagger:dagger:2.21 -com.google.errorprone:error_prone_annotations:2.3.3 +com.google.errorprone:error_prone_annotations:2.3.4 com.google.flogger:flogger-system-backend:0.3.1 com.google.flogger:flogger:0.3.1 com.google.flogger:google-extensions:0.3.1 com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:28.1-jre +com.google.guava:guava:28.2-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.34.0 -com.google.http-client:google-http-client-jackson2:1.32.1 +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-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.34.0 +com.google.http-client:google-http-client:1.34.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 @@ -183,14 +184,14 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.11 +org.apache.httpcomponents:httpcore:4.4.13 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 -org.checkerframework:checker-qual:2.8.1 +org.checkerframework:checker-qual:2.10.0 org.codehaus.jackson:jackson-core-asl:1.9.13 org.codehaus.jackson:jackson-mapper-asl:1.9.13 -org.codehaus.mojo:animal-sniffer-annotations:1.18 +org.codehaus.mojo:animal-sniffer-annotations:1.17 org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.flywaydb:flyway-core:5.2.4 diff --git a/core/gradle/dependency-locks/runtime.lockfile b/core/gradle/dependency-locks/runtime.lockfile index 1e3a6e54c..974816d6c 100644 --- a/core/gradle/dependency-locks/runtime.lockfile +++ b/core/gradle/dependency-locks/runtime.lockfile @@ -1,20 +1,21 @@ # 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. +androidx.annotation:annotation:1.1.0 antlr:antlr:2.7.7 aopalliance:aopalliance:1.0 args4j:args4j:2.0.23 cglib:cglib-nodep:2.2 com.beust:jcommander:1.60 com.fasterxml.jackson.core:jackson-annotations:2.9.10 -com.fasterxml.jackson.core:jackson-core:2.9.10 +com.fasterxml.jackson.core:jackson-core:2.10.2 com.fasterxml.jackson.core:jackson-databind:2.9.10 com.fasterxml:classmate:1.3.4 -com.google.api-client:google-api-client-appengine:1.30.7 +com.google.api-client:google-api-client-appengine:1.30.8 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.7 -com.google.api-client:google-api-client:1.30.7 +com.google.api-client:google-api-client-servlet:1.30.8 +com.google.api-client:google-api-client:1.30.8 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -76,19 +77,19 @@ com.google.code.findbugs:jsr305:3.0.2 com.google.code.gson:gson:2.8.5 com.google.common.html.types:types:1.0.4 com.google.dagger:dagger:2.21 -com.google.errorprone:error_prone_annotations:2.3.3 +com.google.errorprone:error_prone_annotations:2.3.4 com.google.flogger:flogger-system-backend:0.3.1 com.google.flogger:flogger:0.3.1 com.google.flogger:google-extensions:0.3.1 com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:28.1-jre +com.google.guava:guava:28.2-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.34.0 -com.google.http-client:google-http-client-jackson2:1.32.1 +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-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.34.0 +com.google.http-client:google-http-client:1.34.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 @@ -183,14 +184,14 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.11 +org.apache.httpcomponents:httpcore:4.4.13 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 -org.checkerframework:checker-qual:2.8.1 +org.checkerframework:checker-qual:2.10.0 org.codehaus.jackson:jackson-core-asl:1.9.13 org.codehaus.jackson:jackson-mapper-asl:1.9.13 -org.codehaus.mojo:animal-sniffer-annotations:1.18 +org.codehaus.mojo:animal-sniffer-annotations:1.17 org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.flywaydb:flyway-core:5.2.4 diff --git a/core/gradle/dependency-locks/runtimeClasspath.lockfile b/core/gradle/dependency-locks/runtimeClasspath.lockfile index b78f8835c..fe32a492c 100644 --- a/core/gradle/dependency-locks/runtimeClasspath.lockfile +++ b/core/gradle/dependency-locks/runtimeClasspath.lockfile @@ -1,13 +1,14 @@ # 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. +androidx.annotation:annotation:1.1.0 antlr:antlr:2.7.7 aopalliance:aopalliance:1.0 args4j:args4j:2.0.23 cglib:cglib-nodep:2.2 com.beust:jcommander:1.60 com.fasterxml.jackson.core:jackson-annotations:2.9.10 -com.fasterxml.jackson.core:jackson-core:2.9.10 +com.fasterxml.jackson.core:jackson-core:2.10.2 com.fasterxml.jackson.core:jackson-databind:2.9.10 com.fasterxml:classmate:1.3.4 com.github.jnr:jffi:1.2.17 @@ -18,11 +19,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.7 +com.google.api-client:google-api-client-appengine:1.30.8 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.7 -com.google.api-client:google-api-client:1.30.7 +com.google.api-client:google-api-client-servlet:1.30.8 +com.google.api-client:google-api-client:1.30.8 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -87,19 +88,19 @@ com.google.code.findbugs:jsr305:3.0.2 com.google.code.gson:gson:2.8.5 com.google.common.html.types:types:1.0.4 com.google.dagger:dagger:2.21 -com.google.errorprone:error_prone_annotations:2.3.3 +com.google.errorprone:error_prone_annotations:2.3.4 com.google.flogger:flogger-system-backend:0.3.1 com.google.flogger:flogger:0.3.1 com.google.flogger:google-extensions:0.3.1 com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:28.1-jre +com.google.guava:guava:28.2-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.34.0 -com.google.http-client:google-http-client-jackson2:1.32.1 +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-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.34.0 +com.google.http-client:google-http-client:1.34.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 @@ -193,14 +194,14 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.11 +org.apache.httpcomponents:httpcore:4.4.13 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 -org.checkerframework:checker-qual:2.8.1 +org.checkerframework:checker-qual:2.10.0 org.codehaus.jackson:jackson-core-asl:1.9.13 org.codehaus.jackson:jackson-mapper-asl:1.9.13 -org.codehaus.mojo:animal-sniffer-annotations:1.18 +org.codehaus.mojo:animal-sniffer-annotations:1.17 org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.flywaydb:flyway-core:5.2.4 diff --git a/core/gradle/dependency-locks/testCompile.lockfile b/core/gradle/dependency-locks/testCompile.lockfile index b266067f1..854a2c2ae 100644 --- a/core/gradle/dependency-locks/testCompile.lockfile +++ b/core/gradle/dependency-locks/testCompile.lockfile @@ -1,20 +1,21 @@ # 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. +androidx.annotation:annotation:1.1.0 antlr:antlr:2.7.7 aopalliance:aopalliance:1.0 args4j:args4j:2.33 cglib:cglib-nodep:2.2 com.beust:jcommander:1.60 com.fasterxml.jackson.core:jackson-annotations:2.9.10 -com.fasterxml.jackson.core:jackson-core:2.9.10 +com.fasterxml.jackson.core:jackson-core:2.10.2 com.fasterxml.jackson.core:jackson-databind:2.9.10 com.fasterxml:classmate:1.3.4 -com.google.api-client:google-api-client-appengine:1.30.7 +com.google.api-client:google-api-client-appengine:1.30.8 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.7 -com.google.api-client:google-api-client:1.30.7 +com.google.api-client:google-api-client-servlet:1.30.8 +com.google.api-client:google-api-client:1.30.8 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -77,20 +78,20 @@ com.google.code.findbugs:jsr305:3.0.2 com.google.code.gson:gson:2.8.5 com.google.common.html.types:types:1.0.4 com.google.dagger:dagger:2.21 -com.google.errorprone:error_prone_annotations:2.3.3 +com.google.errorprone:error_prone_annotations:2.3.4 com.google.flogger:flogger-system-backend:0.3.1 com.google.flogger:flogger:0.3.1 com.google.flogger:google-extensions:0.3.1 com.google.guava:failureaccess:1.0.1 -com.google.guava:guava-testlib:28.1-jre -com.google.guava:guava:28.1-jre +com.google.guava:guava-testlib:28.2-jre +com.google.guava:guava:28.2-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.34.0 -com.google.http-client:google-http-client-jackson2:1.32.1 +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-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.34.0 +com.google.http-client:google-http-client:1.34.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 @@ -198,21 +199,22 @@ org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.6 org.apache.ftpserver:ftplet-api:1.0.6 org.apache.ftpserver:ftpserver-core:1.0.6 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.11 +org.apache.httpcomponents:httpcore:4.4.13 org.apache.mina:mina-core:2.0.4 org.apache.sshd:sshd-core:2.0.0 org.apache.sshd:sshd-scp:2.0.0 org.apache.sshd:sshd-sftp:2.0.0 org.apache.tomcat:tomcat-annotations-api:8.0.5 +org.apiguardian:apiguardian-api:1.1.0 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcpkix-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-compat-qual:2.5.5 -org.checkerframework:checker-qual:2.8.1 +org.checkerframework:checker-qual:2.10.0 org.codehaus.jackson:jackson-core-asl:1.9.13 org.codehaus.jackson:jackson-mapper-asl:1.9.13 -org.codehaus.mojo:animal-sniffer-annotations:1.18 +org.codehaus.mojo:animal-sniffer-annotations:1.17 org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.flywaydb:flyway-core:5.2.4 @@ -231,11 +233,18 @@ org.jboss:jandex:2.0.5.Final org.jetbrains:annotations:17.0.0 org.joda:joda-money:1.0.1 org.json:json:20160810 +org.junit.jupiter:junit-jupiter-api:5.6.0 +org.junit.jupiter:junit-jupiter-engine:5.6.0 +org.junit.platform:junit-platform-commons:1.6.0 +org.junit.platform:junit-platform-engine:1.6.0 +org.junit.vintage:junit-vintage-engine:5.6.0 +org.junit:junit-bom:5.6.0 org.jvnet.staxex:stax-ex:1.8 org.mockito:mockito-core:2.25.0 org.mortbay.jetty:jetty-util:6.1.26 org.mortbay.jetty:jetty:6.1.26 org.objenesis:objenesis:2.6 +org.opentest4j:opentest4j:1.2.0 org.ow2.asm:asm-analysis:6.0 org.ow2.asm:asm-commons:6.0 org.ow2.asm:asm-tree:6.0 diff --git a/core/gradle/dependency-locks/testCompileClasspath.lockfile b/core/gradle/dependency-locks/testCompileClasspath.lockfile index b9e9f851a..b5cdf53a1 100644 --- a/core/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/core/gradle/dependency-locks/testCompileClasspath.lockfile @@ -1,20 +1,21 @@ # 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. +androidx.annotation:annotation:1.1.0 antlr:antlr:2.7.7 aopalliance:aopalliance:1.0 args4j:args4j:2.33 cglib:cglib-nodep:2.2 com.beust:jcommander:1.60 com.fasterxml.jackson.core:jackson-annotations:2.9.10 -com.fasterxml.jackson.core:jackson-core:2.9.10 +com.fasterxml.jackson.core:jackson-core:2.10.2 com.fasterxml.jackson.core:jackson-databind:2.9.10 com.fasterxml:classmate:1.3.4 -com.google.api-client:google-api-client-appengine:1.30.7 +com.google.api-client:google-api-client-appengine:1.30.8 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.7 -com.google.api-client:google-api-client:1.30.7 +com.google.api-client:google-api-client-servlet:1.30.8 +com.google.api-client:google-api-client:1.30.8 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -77,19 +78,19 @@ com.google.code.findbugs:jsr305:3.0.2 com.google.code.gson:gson:2.8.5 com.google.common.html.types:types:1.0.4 com.google.dagger:dagger:2.21 -com.google.errorprone:error_prone_annotations:2.3.3 +com.google.errorprone:error_prone_annotations:2.3.4 com.google.flogger:flogger:0.3.1 com.google.flogger:google-extensions:0.3.1 com.google.guava:failureaccess:1.0.1 -com.google.guava:guava-testlib:28.1-jre -com.google.guava:guava:28.1-jre +com.google.guava:guava-testlib:28.2-jre +com.google.guava:guava:28.2-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.34.0 -com.google.http-client:google-http-client-jackson2:1.32.1 +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-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.34.0 +com.google.http-client:google-http-client:1.34.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 @@ -196,21 +197,22 @@ org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.6 org.apache.ftpserver:ftplet-api:1.0.6 org.apache.ftpserver:ftpserver-core:1.0.6 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.11 +org.apache.httpcomponents:httpcore:4.4.13 org.apache.mina:mina-core:2.0.4 org.apache.sshd:sshd-core:2.0.0 org.apache.sshd:sshd-scp:2.0.0 org.apache.sshd:sshd-sftp:2.0.0 org.apache.tomcat:tomcat-annotations-api:8.0.5 +org.apiguardian:apiguardian-api:1.1.0 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcpkix-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-compat-qual:2.5.5 -org.checkerframework:checker-qual:2.8.1 +org.checkerframework:checker-qual:2.10.0 org.codehaus.jackson:jackson-core-asl:1.9.13 org.codehaus.jackson:jackson-mapper-asl:1.9.13 -org.codehaus.mojo:animal-sniffer-annotations:1.18 +org.codehaus.mojo:animal-sniffer-annotations:1.17 org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.flywaydb:flyway-core:5.2.4 @@ -229,11 +231,18 @@ org.jboss:jandex:2.0.5.Final org.jetbrains:annotations:17.0.0 org.joda:joda-money:1.0.1 org.json:json:20160810 +org.junit.jupiter:junit-jupiter-api:5.6.0 +org.junit.jupiter:junit-jupiter-engine:5.6.0 +org.junit.platform:junit-platform-commons:1.6.0 +org.junit.platform:junit-platform-engine:1.6.0 +org.junit.vintage:junit-vintage-engine:5.6.0 +org.junit:junit-bom:5.6.0 org.jvnet.staxex:stax-ex:1.8 org.mockito:mockito-core:2.25.0 org.mortbay.jetty:jetty-util:6.1.26 org.mortbay.jetty:jetty:6.1.26 org.objenesis:objenesis:2.6 +org.opentest4j:opentest4j:1.2.0 org.ow2.asm:asm-analysis:6.0 org.ow2.asm:asm-commons:6.0 org.ow2.asm:asm-tree:6.0 diff --git a/core/gradle/dependency-locks/testRuntime.lockfile b/core/gradle/dependency-locks/testRuntime.lockfile index b8efc6086..472ba6e54 100644 --- a/core/gradle/dependency-locks/testRuntime.lockfile +++ b/core/gradle/dependency-locks/testRuntime.lockfile @@ -1,13 +1,14 @@ # 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. +androidx.annotation:annotation:1.1.0 antlr:antlr:2.7.7 aopalliance:aopalliance:1.0 args4j:args4j:2.33 cglib:cglib-nodep:2.2 com.beust:jcommander:1.60 com.fasterxml.jackson.core:jackson-annotations:2.9.10 -com.fasterxml.jackson.core:jackson-core:2.9.10 +com.fasterxml.jackson.core:jackson-core:2.10.2 com.fasterxml.jackson.core:jackson-databind:2.9.10 com.fasterxml:classmate:1.3.4 com.github.jnr:jffi:1.2.17 @@ -18,11 +19,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.7 +com.google.api-client:google-api-client-appengine:1.30.8 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.7 -com.google.api-client:google-api-client:1.30.7 +com.google.api-client:google-api-client-servlet:1.30.8 +com.google.api-client:google-api-client:1.30.8 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -88,20 +89,20 @@ com.google.code.findbugs:jsr305:3.0.2 com.google.code.gson:gson:2.8.5 com.google.common.html.types:types:1.0.4 com.google.dagger:dagger:2.21 -com.google.errorprone:error_prone_annotations:2.3.3 +com.google.errorprone:error_prone_annotations:2.3.4 com.google.flogger:flogger-system-backend:0.3.1 com.google.flogger:flogger:0.3.1 com.google.flogger:google-extensions:0.3.1 com.google.guava:failureaccess:1.0.1 -com.google.guava:guava-testlib:28.1-jre -com.google.guava:guava:28.1-jre +com.google.guava:guava-testlib:28.2-jre +com.google.guava:guava:28.2-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.34.0 -com.google.http-client:google-http-client-jackson2:1.32.1 +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-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.34.0 +com.google.http-client:google-http-client:1.34.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 @@ -210,21 +211,22 @@ org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.6 org.apache.ftpserver:ftplet-api:1.0.6 org.apache.ftpserver:ftpserver-core:1.0.6 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.11 +org.apache.httpcomponents:httpcore:4.4.13 org.apache.mina:mina-core:2.0.4 org.apache.sshd:sshd-core:2.0.0 org.apache.sshd:sshd-scp:2.0.0 org.apache.sshd:sshd-sftp:2.0.0 org.apache.tomcat:tomcat-annotations-api:8.0.5 +org.apiguardian:apiguardian-api:1.1.0 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcpkix-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-compat-qual:2.5.5 -org.checkerframework:checker-qual:2.8.1 +org.checkerframework:checker-qual:2.10.0 org.codehaus.jackson:jackson-core-asl:1.9.13 org.codehaus.jackson:jackson-mapper-asl:1.9.13 -org.codehaus.mojo:animal-sniffer-annotations:1.18 +org.codehaus.mojo:animal-sniffer-annotations:1.17 org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.eclipse.jgit:org.eclipse.jgit:4.4.1.201607150455-r @@ -244,11 +246,18 @@ org.jboss:jandex:2.0.5.Final org.jetbrains:annotations:17.0.0 org.joda:joda-money:1.0.1 org.json:json:20160810 +org.junit.jupiter:junit-jupiter-api:5.6.0 +org.junit.jupiter:junit-jupiter-engine:5.6.0 +org.junit.platform:junit-platform-commons:1.6.0 +org.junit.platform:junit-platform-engine:1.6.0 +org.junit.vintage:junit-vintage-engine:5.6.0 +org.junit:junit-bom:5.6.0 org.jvnet.staxex:stax-ex:1.8 org.mockito:mockito-core:2.25.0 org.mortbay.jetty:jetty-util:6.1.26 org.mortbay.jetty:jetty:6.1.26 org.objenesis:objenesis:2.6 +org.opentest4j:opentest4j:1.2.0 org.ow2.asm:asm-analysis:7.0 org.ow2.asm:asm-commons:6.0 org.ow2.asm:asm-tree:7.0 diff --git a/core/gradle/dependency-locks/testRuntimeClasspath.lockfile b/core/gradle/dependency-locks/testRuntimeClasspath.lockfile index b8efc6086..472ba6e54 100644 --- a/core/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/core/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -1,13 +1,14 @@ # 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. +androidx.annotation:annotation:1.1.0 antlr:antlr:2.7.7 aopalliance:aopalliance:1.0 args4j:args4j:2.33 cglib:cglib-nodep:2.2 com.beust:jcommander:1.60 com.fasterxml.jackson.core:jackson-annotations:2.9.10 -com.fasterxml.jackson.core:jackson-core:2.9.10 +com.fasterxml.jackson.core:jackson-core:2.10.2 com.fasterxml.jackson.core:jackson-databind:2.9.10 com.fasterxml:classmate:1.3.4 com.github.jnr:jffi:1.2.17 @@ -18,11 +19,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.7 +com.google.api-client:google-api-client-appengine:1.30.8 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.7 -com.google.api-client:google-api-client:1.30.7 +com.google.api-client:google-api-client-servlet:1.30.8 +com.google.api-client:google-api-client:1.30.8 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -88,20 +89,20 @@ com.google.code.findbugs:jsr305:3.0.2 com.google.code.gson:gson:2.8.5 com.google.common.html.types:types:1.0.4 com.google.dagger:dagger:2.21 -com.google.errorprone:error_prone_annotations:2.3.3 +com.google.errorprone:error_prone_annotations:2.3.4 com.google.flogger:flogger-system-backend:0.3.1 com.google.flogger:flogger:0.3.1 com.google.flogger:google-extensions:0.3.1 com.google.guava:failureaccess:1.0.1 -com.google.guava:guava-testlib:28.1-jre -com.google.guava:guava:28.1-jre +com.google.guava:guava-testlib:28.2-jre +com.google.guava:guava:28.2-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.34.0 -com.google.http-client:google-http-client-jackson2:1.32.1 +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-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.34.0 +com.google.http-client:google-http-client:1.34.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 @@ -210,21 +211,22 @@ org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.6 org.apache.ftpserver:ftplet-api:1.0.6 org.apache.ftpserver:ftpserver-core:1.0.6 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.11 +org.apache.httpcomponents:httpcore:4.4.13 org.apache.mina:mina-core:2.0.4 org.apache.sshd:sshd-core:2.0.0 org.apache.sshd:sshd-scp:2.0.0 org.apache.sshd:sshd-sftp:2.0.0 org.apache.tomcat:tomcat-annotations-api:8.0.5 +org.apiguardian:apiguardian-api:1.1.0 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcpkix-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-compat-qual:2.5.5 -org.checkerframework:checker-qual:2.8.1 +org.checkerframework:checker-qual:2.10.0 org.codehaus.jackson:jackson-core-asl:1.9.13 org.codehaus.jackson:jackson-mapper-asl:1.9.13 -org.codehaus.mojo:animal-sniffer-annotations:1.18 +org.codehaus.mojo:animal-sniffer-annotations:1.17 org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.eclipse.jgit:org.eclipse.jgit:4.4.1.201607150455-r @@ -244,11 +246,18 @@ org.jboss:jandex:2.0.5.Final org.jetbrains:annotations:17.0.0 org.joda:joda-money:1.0.1 org.json:json:20160810 +org.junit.jupiter:junit-jupiter-api:5.6.0 +org.junit.jupiter:junit-jupiter-engine:5.6.0 +org.junit.platform:junit-platform-commons:1.6.0 +org.junit.platform:junit-platform-engine:1.6.0 +org.junit.vintage:junit-vintage-engine:5.6.0 +org.junit:junit-bom:5.6.0 org.jvnet.staxex:stax-ex:1.8 org.mockito:mockito-core:2.25.0 org.mortbay.jetty:jetty-util:6.1.26 org.mortbay.jetty:jetty:6.1.26 org.objenesis:objenesis:2.6 +org.opentest4j:opentest4j:1.2.0 org.ow2.asm:asm-analysis:7.0 org.ow2.asm:asm-commons:6.0 org.ow2.asm:asm-tree:7.0 diff --git a/core/src/main/java/google/registry/persistence/converter/CidrAddressBlockListConverter.java b/core/src/main/java/google/registry/persistence/converter/CidrAddressBlockListConverter.java index f7072f60d..5b3a23a4d 100644 --- a/core/src/main/java/google/registry/persistence/converter/CidrAddressBlockListConverter.java +++ b/core/src/main/java/google/registry/persistence/converter/CidrAddressBlockListConverter.java @@ -35,5 +35,4 @@ public class CidrAddressBlockListConverter extends StringListConverterBase