diff --git a/buildSrc/gradle.lockfile b/buildSrc/gradle.lockfile index 15cf40269..d54662663 100644 --- a/buildSrc/gradle.lockfile +++ b/buildSrc/gradle.lockfile @@ -9,33 +9,32 @@ com.fasterxml.jackson:jackson-bom:2.14.1=compileClasspath,testCompileClasspath,t com.github.ben-manes.caffeine:caffeine:2.7.0=annotationProcessor,testAnnotationProcessor com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor com.google.android:annotations:4.1.1.4=testRuntimeClasspath -com.google.api-client:google-api-client:2.1.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:gapic-google-cloud-storage-v2:2.16.0-alpha=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:grpc-google-cloud-storage-v2:2.16.0-alpha=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:grpc-google-iam-v1:1.6.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-storage-v2:2.16.0-alpha=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-common-protos:2.11.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-iam-v1:1.6.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:api-common:2.2.2=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax-grpc:2.20.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax-httpjson:0.105.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax:2.20.1=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api-client:google-api-client:2.1.2=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:gapic-google-cloud-storage-v2:2.17.0-alpha=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:grpc-google-cloud-storage-v2:2.17.0-alpha=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-storage-v2:2.17.0-alpha=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-common-protos:2.12.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-iam-v1:1.7.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:api-common:2.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax-grpc:2.21.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax-httpjson:0.106.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax:2.21.0=compileClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-storage:v1-rev20220705-2.0.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-credentials:1.13.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-oauth2-http:1.13.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-credentials:1.14.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-oauth2-http:1.14.0=compileClasspath,testCompileClasspath,testRuntimeClasspath com.google.auto.value:auto-value-annotations:1.10.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.auto.value:auto-value:1.10.1=annotationProcessor +com.google.auto.value:auto-value:1.10.1=annotationProcessor,compileClasspath,testCompileClasspath,testRuntimeClasspath com.google.auto:auto-common:0.10=annotationProcessor,testAnnotationProcessor -com.google.cloud:google-cloud-core-grpc:2.9.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-core-http:2.9.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-core:2.9.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-storage:2.16.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-core-grpc:2.9.1=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-core-http:2.9.1=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-core:2.9.1=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-storage:2.17.0=compileClasspath,testCompileClasspath,testRuntimeClasspath com.google.code.findbugs:jFormatString:3.0.0=annotationProcessor,testAnnotationProcessor com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -com.google.code.gson:gson:2.10=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.code.gson:gson:2.10.1=compileClasspath,testCompileClasspath,testRuntimeClasspath com.google.common.html.types:types:1.0.6=compileClasspath,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotation:2.3.4=annotationProcessor,testAnnotationProcessor -com.google.errorprone:error_prone_annotations:2.16=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.18.0=compileClasspath,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.3.4=annotationProcessor,checkstyle,testAnnotationProcessor com.google.errorprone:error_prone_check_api:2.3.4=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_core:2.3.4=annotationProcessor,testAnnotationProcessor @@ -57,8 +56,8 @@ com.google.j2objc:j2objc-annotations:1.1=annotationProcessor,testAnnotationProce com.google.j2objc:j2objc-annotations:1.3=checkstyle,compileClasspath,testCompileClasspath,testRuntimeClasspath com.google.jsinterop:jsinterop-annotations:1.0.1=compileClasspath,testCompileClasspath,testRuntimeClasspath com.google.oauth-client:google-oauth-client:1.34.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.protobuf:protobuf-java-util:3.21.10=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.protobuf:protobuf-java:3.21.10=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.protobuf:protobuf-java-util:3.21.12=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.protobuf:protobuf-java:3.21.12=compileClasspath,testCompileClasspath,testRuntimeClasspath com.google.protobuf:protobuf-java:3.4.0=annotationProcessor,testAnnotationProcessor com.google.re2j:re2j:1.6=testRuntimeClasspath com.google.template:soy:2021-02-01=compileClasspath,testCompileClasspath,testRuntimeClasspath @@ -72,19 +71,19 @@ commons-codec:commons-codec:1.15=compileClasspath,testCompileClasspath,testRunti commons-collections:commons-collections:3.2.2=checkstyle commons-logging:commons-logging:1.2=compileClasspath,testCompileClasspath,testRuntimeClasspath info.picocli:picocli:4.5.2=checkstyle -io.grpc:grpc-alts:1.51.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-api:1.51.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-auth:1.51.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-context:1.51.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-core:1.51.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-googleapis:1.51.0=testRuntimeClasspath -io.grpc:grpc-grpclb:1.51.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-netty-shaded:1.51.0=testRuntimeClasspath -io.grpc:grpc-protobuf-lite:1.51.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf:1.51.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-services:1.51.0=testRuntimeClasspath -io.grpc:grpc-stub:1.51.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-xds:1.51.0=testRuntimeClasspath +io.grpc:grpc-alts:1.51.1=compileClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-api:1.51.1=compileClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-auth:1.51.1=compileClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-context:1.51.1=compileClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-core:1.51.1=testRuntimeClasspath +io.grpc:grpc-googleapis:1.51.1=testRuntimeClasspath +io.grpc:grpc-grpclb:1.51.1=compileClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-netty-shaded:1.51.1=testRuntimeClasspath +io.grpc:grpc-protobuf-lite:1.51.1=compileClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf:1.51.1=compileClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-services:1.51.1=testRuntimeClasspath +io.grpc:grpc-stub:1.51.1=compileClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-xds:1.51.1=testRuntimeClasspath io.opencensus:opencensus-api:0.31.1=compileClasspath,testCompileClasspath,testRuntimeClasspath io.opencensus:opencensus-contrib-http-util:0.31.1=compileClasspath,testCompileClasspath,testRuntimeClasspath io.opencensus:opencensus-proto:0.2.0=testRuntimeClasspath @@ -93,8 +92,8 @@ javax.annotation:javax.annotation-api:1.3.2=compileClasspath,testCompileClasspat javax.annotation:jsr250-api:1.0=compileClasspath,testCompileClasspath,testRuntimeClasspath javax.inject:javax.inject:1=compileClasspath,testCompileClasspath,testRuntimeClasspath junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.12.16=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.12.16=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.12.19=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.12.19=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:10.3=checkstyle org.antlr:antlr4-runtime:4.8-1=checkstyle org.apache.commons:commons-lang3:3.12.0=compileClasspath,testCompileClasspath,testRuntimeClasspath @@ -104,7 +103,7 @@ org.apache.httpcomponents:httpcore:4.4.15=compileClasspath,testCompileClasspath, org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.checkerframework:checker-qual:2.11.1=checkstyle org.checkerframework:checker-qual:3.0.0=annotationProcessor,testAnnotationProcessor -org.checkerframework:checker-qual:3.28.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.29.0=compileClasspath,testCompileClasspath,testRuntimeClasspath org.checkerframework:dataflow:3.0.0=annotationProcessor,testAnnotationProcessor org.checkerframework:javacutil:3.0.0=annotationProcessor,testAnnotationProcessor org.codehaus.mojo:animal-sniffer-annotations:1.17=annotationProcessor,testAnnotationProcessor @@ -117,12 +116,12 @@ org.jacoco:org.jacoco.core:0.8.6=jacocoAnt org.jacoco:org.jacoco.report:0.8.6=jacocoAnt org.javassist:javassist:3.26.0-GA=checkstyle org.json:json:20160212=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-engine:5.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.9.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:5.9.1=testCompileClasspath,testRuntimeClasspath -org.mockito:mockito-core:4.9.0=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.9.2=testCompileClasspath,testRuntimeClasspath +org.junit:junit-bom:5.9.2=testCompileClasspath,testRuntimeClasspath +org.mockito:mockito-core:4.11.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=testRuntimeClasspath org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:7.0=compileClasspath,testCompileClasspath,testRuntimeClasspath @@ -140,5 +139,5 @@ org.plumelib:plume-util:1.0.6=annotationProcessor,testAnnotationProcessor org.plumelib:reflection-util:0.0.2=annotationProcessor,testAnnotationProcessor org.plumelib:require-javadoc:0.1.0=annotationProcessor,testAnnotationProcessor org.reflections:reflections:0.9.12=checkstyle -org.threeten:threetenbp:1.6.4=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.threeten:threetenbp:1.6.5=compileClasspath,testCompileClasspath,testRuntimeClasspath empty= diff --git a/common/gradle.lockfile b/common/gradle.lockfile index 445242457..6cce0b026 100644 --- a/common/gradle.lockfile +++ b/common/gradle.lockfile @@ -50,11 +50,11 @@ org.jacoco:org.jacoco.ant:0.8.6=jacocoAnt org.jacoco:org.jacoco.core:0.8.6=jacocoAnt org.jacoco:org.jacoco.report:0.8.6=jacocoAnt org.javassist:javassist:3.26.0-GA=checkstyle -org.junit.jupiter:junit-jupiter-api:5.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-engine:5.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.9.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:5.9.1=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.9.2=testCompileClasspath,testRuntimeClasspath +org.junit:junit-bom:5.9.2=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:8.0.1=jacocoAnt org.ow2.asm:asm-commons:8.0.1=jacocoAnt diff --git a/common/src/main/java/google/registry/util/DateTimeUtils.java b/common/src/main/java/google/registry/util/DateTimeUtils.java index be1498edb..b82de8130 100644 --- a/common/src/main/java/google/registry/util/DateTimeUtils.java +++ b/common/src/main/java/google/registry/util/DateTimeUtils.java @@ -35,7 +35,7 @@ public abstract class DateTimeUtils { * *

This value is (2^63-1)/1000 rounded down. AppEngine stores dates as 64 bit microseconds, but * Java uses milliseconds, so this is the largest representable date that will survive a - * round-trip through Datastore. + * round-trip through the database. */ public static final DateTime END_OF_TIME = new DateTime(Long.MAX_VALUE / 1000, DateTimeZone.UTC); diff --git a/core/build.gradle b/core/build.gradle index f7f90589c..1167feb59 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -68,8 +68,6 @@ def dockerIncompatibleTestPatterns = [ // Nomulus classes, e.g., threads and objects retained by frameworks. // TODO(weiminyu): identify cause and fix offending tests. def fragileTestPatterns = [ - // Test Datastore inexplicably aborts transaction. - "google/registry/model/tmch/ClaimsListShardTest.*", // Changes cache timeouts and for some reason appears to have contention // with other tests. "google/registry/whois/WhoisCommandFactoryTest.*", @@ -168,7 +166,6 @@ dependencies { implementation deps['com.beust:jcommander'] implementation deps['com.github.ben-manes.caffeine:caffeine'] implementation deps['com.google.api:gax'] - implementation deps['com.google.api.grpc:proto-google-cloud-datastore-v1'] implementation deps['com.google.api.grpc:proto-google-common-protos'] implementation deps['com.google.api.grpc:proto-google-cloud-secretmanager-v1'] implementation deps['com.google.api-client:google-api-client'] @@ -192,7 +189,6 @@ dependencies { implementation deps['com.google.auth:google-auth-library-credentials'] implementation deps['com.google.auth:google-auth-library-oauth2-http'] implementation deps['com.google.cloud.bigdataoss:util'] - implementation deps['com.google.cloud.datastore:datastore-v1-proto-client'] implementation deps['com.google.cloud.sql:jdbc-socket-factory-core'] runtimeOnly deps['com.google.cloud.sql:postgres-socket-factory'] implementation deps['com.google.cloud:google-cloud-secretmanager'] diff --git a/core/gradle.lockfile b/core/gradle.lockfile index d468ae9c0..eefdc37a8 100644 --- a/core/gradle.lockfile +++ b/core/gradle.lockfile @@ -22,13 +22,13 @@ com.github.ben-manes.caffeine:caffeine:2.9.3=compileClasspath,default,deploy_jar com.github.docker-java:docker-java-api:3.2.13=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.docker-java:docker-java-transport-zerodep:3.2.13=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.docker-java:docker-java-transport:3.2.13=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.jnr:jffi:1.3.9=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.jnr:jffi:1.3.10=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jnr-a64asm:1.0.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.jnr:jnr-constants:0.10.3=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.jnr:jnr-enxio:0.32.13=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.jnr:jnr-ffi:2.2.11=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.jnr:jnr-posix:3.1.15=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.jnr:jnr-unixsocket:0.38.17=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.jnr:jnr-constants:0.10.4=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.jnr:jnr-enxio:0.32.14=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.jnr:jnr-ffi:2.2.13=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.jnr:jnr-posix:3.1.16=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.jnr:jnr-unixsocket:0.38.19=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,nonprodAnnotationProcessor,testAnnotationProcessor com.google.android:annotations:4.1.1.4=default,deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath @@ -37,7 +37,8 @@ com.google.api-client:google-api-client-jackson2:1.32.2=compileClasspath,default com.google.api-client:google-api-client-java6:1.35.2=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api-client:google-api-client-servlet:1.35.2=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api-client:google-api-client:1.35.2=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:gapic-google-cloud-storage-v2:2.16.0-alpha=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:gapic-google-cloud-storage-v2:2.16.0-alpha=testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:gapic-google-cloud-storage-v2:2.17.0-alpha=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:2.23.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.147.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.147.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -48,9 +49,10 @@ com.google.api.grpc:grpc-google-cloud-pubsublite-v1:1.7.1=compileClasspath,defau com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:6.31.2=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:6.31.2=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-spanner-v1:6.31.2=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:grpc-google-cloud-storage-v2:2.16.0-alpha=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:grpc-google-cloud-storage-v2:2.16.0-alpha=testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:grpc-google-cloud-storage-v2:2.17.0-alpha=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath com.google.api.grpc:grpc-google-common-protos:2.9.6=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:grpc-google-iam-v1:1.6.22=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:grpc-google-iam-v1:1.6.22=testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:2.23.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.147.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.147.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -62,23 +64,24 @@ com.google.api.grpc:proto-google-cloud-monitoring-v3:1.64.0=compileClasspath,non com.google.api.grpc:proto-google-cloud-monitoring-v3:3.4.6=default,deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-pubsub-v1:1.102.20=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-pubsublite-v1:1.7.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.6.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:2.6.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.8.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:2.8.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:6.31.2=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:6.31.2=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-v1:6.31.2=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-storage-v2:2.16.0-alpha=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2:2.6.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.96.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.96.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-common-protos:2.11.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-iam-v1:1.6.22=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:api-common:2.2.2=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax-grpc:2.20.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax-httpjson:0.105.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax:2.20.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-storage-v2:2.16.0-alpha=testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-storage-v2:2.17.0-alpha=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2:2.8.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.98.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.98.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-common-protos:2.12.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-iam-v1:1.7.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:api-common:2.4.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax-grpc:2.21.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax-httpjson:0.106.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax:2.21.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-admin-directory:directory_v1-rev118-1.25.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-appengine:v1-rev20221205-2.0.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-appengine:v1-rev20230109-2.0.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-bigquery:v2-rev20220924-2.0.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-clouddebugger:v2-rev20220318-2.0.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-cloudresourcemanager:v1-rev20220828-2.0.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -90,20 +93,19 @@ com.google.apis:google-api-services-healthcare:v1-rev20220818-2.0.0=compileClass com.google.apis:google-api-services-iamcredentials:v1-rev20210326-1.32.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-monitoring:v3-rev20221205-2.0.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-pubsub:v1-rev20220904-2.0.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-sheets:v4-rev20220927-2.0.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-sqladmin:v1beta4-rev20221017-2.0.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-sheets:v4-rev20221216-2.0.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-sqladmin:v1beta4-rev20221209-2.0.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-storage:v1-rev20220705-2.0.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.appengine:appengine-api-1.0-sdk:1.9.86=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath com.google.appengine:appengine-api-1.0-sdk:2.0.10=testCompileClasspath,testRuntimeClasspath com.google.appengine:appengine-api-stubs:2.0.10=testCompileClasspath,testRuntimeClasspath com.google.appengine:appengine-testing:1.9.86=default,deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-credentials:1.13.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-oauth2-http:1.13.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-credentials:1.14.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-oauth2-http:1.14.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.auto.service:auto-service:1.0.1=annotationProcessor com.google.auto.value:auto-value-annotations:1.10.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.auto.value:auto-value:1.10.1=annotationProcessor,testAnnotationProcessor -com.google.auto.value:auto-value:1.9=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auto.value:auto-value:1.10.1=annotationProcessor,compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.auto:auto-common:0.10=errorprone,nonprodAnnotationProcessor,testAnnotationProcessor com.google.auto:auto-common:1.2=annotationProcessor com.google.closure-stylesheets:closure-stylesheets:1.5.0=css @@ -112,30 +114,34 @@ com.google.cloud.bigdataoss:util:2.2.6=compileClasspath,default,deploy_jar,nonpr com.google.cloud.bigtable:bigtable-client-core:1.26.3=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud.bigtable:bigtable-metrics-api:1.26.3=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud.datastore:datastore-v1-proto-client:2.9.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud.sql:jdbc-socket-factory-core:1.7.2=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud.sql:postgres-socket-factory:1.7.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.cloud.sql:jdbc-socket-factory-core:1.8.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud.sql:postgres-socket-factory:1.8.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.cloud:google-cloud-bigquerystorage:2.23.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-bigtable-stats:2.14.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-bigtable:2.14.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-core-grpc:2.9.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-core-http:2.9.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-core:2.9.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-core-grpc:2.9.0=testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-core-grpc:2.9.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath +com.google.cloud:google-cloud-core-http:2.9.0=testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-core-http:2.9.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath +com.google.cloud:google-cloud-core:2.9.0=testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-core:2.9.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath com.google.cloud:google-cloud-firestore:3.6.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-monitoring:1.82.0=compileClasspath,nonprodCompileClasspath,testCompileClasspath com.google.cloud:google-cloud-monitoring:3.4.6=default,deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-nio:0.125.0=testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-nio:0.126.0=testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-pubsub:1.120.20=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-pubsublite:1.7.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-secretmanager:2.6.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-secretmanager:2.8.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-spanner:6.31.2=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-storage:2.16.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-tasks:2.6.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-storage:2.16.0=testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-storage:2.17.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath +com.google.cloud:google-cloud-tasks:2.8.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:grpc-gcp:1.2.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:proto-google-cloud-firestore-bundle-v1:3.6.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.code.findbugs:jFormatString:3.0.0=annotationProcessor,errorprone,nonprodAnnotationProcessor,testAnnotationProcessor com.google.code.findbugs:jsr305:3.0.1=css com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClasspath,default,deploy_jar,errorprone,nonprodAnnotationProcessor,nonprodCompileClasspath,nonprodRuntime,nonprodRuntimeClasspath,runtime,runtimeClasspath,soy,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -com.google.code.gson:gson:2.10=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.code.gson:gson:2.10.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.7=css,soy com.google.common.html.types:types:1.0.6=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,soy,testCompileClasspath,testRuntimeClasspath com.google.dagger:dagger-compiler:2.44.2=annotationProcessor,testAnnotationProcessor @@ -144,7 +150,7 @@ com.google.dagger:dagger-spi:2.44.2=annotationProcessor,testAnnotationProcessor com.google.dagger:dagger:2.44.2=annotationProcessor,compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.devtools.ksp:symbol-processing-api:1.7.0-1.0.6=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotation:2.3.4=annotationProcessor,errorprone,nonprodAnnotationProcessor,testAnnotationProcessor -com.google.errorprone:error_prone_annotations:2.16=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.18.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.3.4=checkstyle,errorprone,nonprodAnnotationProcessor,soy com.google.errorprone:error_prone_annotations:2.7.1=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_check_api:2.3.4=annotationProcessor,errorprone,nonprodAnnotationProcessor,testAnnotationProcessor @@ -191,9 +197,9 @@ com.google.oauth-client:google-oauth-client-java6:1.34.1=compileClasspath,defaul com.google.oauth-client:google-oauth-client-jetty:1.34.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.oauth-client:google-oauth-client-servlet:1.34.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.oauth-client:google-oauth-client:1.34.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.protobuf:protobuf-java-util:3.21.10=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.protobuf:protobuf-java-util:3.21.12=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.protobuf:protobuf-java:2.5.0=css -com.google.protobuf:protobuf-java:3.21.10=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.protobuf:protobuf-java:3.21.12=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.protobuf:protobuf-java:3.4.0=annotationProcessor,errorprone,nonprodAnnotationProcessor,testAnnotationProcessor com.google.protobuf:protobuf-java:4.0.0-rc-2=soy com.google.re2j:re2j:1.6=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -242,24 +248,24 @@ io.confluent:kafka-schema-registry-client:5.3.2=compileClasspath,default,deploy_ io.dropwizard.metrics:metrics-core:3.1.2=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.github.classgraph:classgraph:4.8.104=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.github.java-diff-utils:java-diff-utils:4.12=default,deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-alts:1.51.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-api:1.51.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-auth:1.51.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-alts:1.51.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-api:1.51.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-auth:1.51.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.grpc:grpc-census:1.49.2=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-context:1.51.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-core:1.51.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-googleapis:1.51.0=default,deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-grpclb:1.51.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-netty-shaded:1.51.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-context:1.51.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-core:1.51.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-googleapis:1.51.1=default,deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-grpclb:1.51.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-netty-shaded:1.51.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.grpc:grpc-netty:1.49.2=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf-lite:1.51.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf:1.51.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf-lite:1.51.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf:1.51.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.grpc:grpc-rls:1.49.2=default,deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath io.grpc:grpc-services:1.49.2=compileClasspath,nonprodCompileClasspath,testCompileClasspath -io.grpc:grpc-services:1.51.0=default,deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-stub:1.51.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-services:1.51.1=default,deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-stub:1.51.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.grpc:grpc-xds:1.49.2=compileClasspath,nonprodCompileClasspath,testCompileClasspath -io.grpc:grpc-xds:1.51.0=default,deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-xds:1.51.1=default,deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath io.netty:netty-buffer:4.1.77.Final=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-http2:4.1.77.Final=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-http:4.1.77.Final=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -304,8 +310,9 @@ jline:jline:1.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonp joda-time:joda-time:2.10.10=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath junit:junit:4.13.2=default,nonprodCompileClasspath,nonprodRuntimeClasspath,testCompileClasspath,testRuntimeClasspath net.arnx:nashorn-promise:0.1.1=nonprodRuntime,runtime,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.12.16=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.12.18=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.12.19=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.12.18=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath +net.bytebuddy:byte-buddy:1.12.19=testCompileClasspath,testRuntimeClasspath net.java.dev.javacc:javacc:4.1=css net.java.dev.jna:jna:5.8.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.ltgt.gradle.incap:incap:0.2=annotationProcessor,testAnnotationProcessor @@ -340,8 +347,8 @@ org.apache.commons:commons-lang3:3.12.0=compileClasspath,default,deploy_jar,nonp org.apache.commons:commons-text:1.10.0=testCompileClasspath,testRuntimeClasspath org.apache.ftpserver:ftplet-api:1.2.0=testCompileClasspath,testRuntimeClasspath org.apache.ftpserver:ftpserver-core:1.2.0=testCompileClasspath,testRuntimeClasspath -org.apache.httpcomponents:httpclient:4.5.13=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.httpcomponents:httpcore:4.4.15=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.httpcomponents:httpclient:4.5.14=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.httpcomponents:httpcore:4.4.16=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.mina:mina-core:2.1.6=testCompileClasspath,testRuntimeClasspath org.apache.sshd:sshd-core:2.0.0=testCompileClasspath,testRuntimeClasspath org.apache.sshd:sshd-scp:2.0.0=testCompileClasspath,testRuntimeClasspath @@ -356,7 +363,7 @@ org.checkerframework:checker-compat-qual:2.5.5=annotationProcessor,compileClassp org.checkerframework:checker-qual:2.11.1=checkstyle org.checkerframework:checker-qual:3.0.0=errorprone,nonprodAnnotationProcessor org.checkerframework:checker-qual:3.12.0=annotationProcessor,testAnnotationProcessor -org.checkerframework:checker-qual:3.28.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.29.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.checkerframework:checker-qual:3.5.0=nonprodRuntime,runtime,soy org.checkerframework:dataflow:3.0.0=annotationProcessor,errorprone,nonprodAnnotationProcessor,testAnnotationProcessor org.checkerframework:javacutil:3.0.0=annotationProcessor,errorprone,nonprodAnnotationProcessor,testAnnotationProcessor @@ -374,7 +381,7 @@ org.eclipse.jetty:jetty-server:9.4.49.v20220914=compileClasspath,default,deploy_ org.eclipse.jetty:jetty-servlet:9.4.49.v20220914=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util-ajax:9.4.49.v20220914=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util:9.4.49.v20220914=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-core:9.10.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-core:9.11.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:jaxb-core:4.0.1=nonprodRuntime,runtime org.glassfish.jaxb:jaxb-runtime:2.3.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:jaxb-runtime:4.0.1=nonprodRuntime,runtime @@ -410,22 +417,22 @@ org.joda:joda-money:1.0.3=compileClasspath,default,deploy_jar,nonprodCompileClas org.json:json:20160212=soy org.json:json:20200518=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jsoup:jsoup:1.15.3=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit-pioneer:junit-pioneer:1.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-engine:5.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-migrationsupport:5.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-params:5.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-launcher:1.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-runner:1.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-suite-api:1.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-suite-commons:1.9.1=testRuntimeClasspath -org.junit:junit-bom:5.9.1=testCompileClasspath,testRuntimeClasspath +org.junit-pioneer:junit-pioneer:2.0.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-migrationsupport:5.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:5.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-launcher:1.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-runner:1.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-suite-api:1.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-suite-commons:1.9.2=testRuntimeClasspath +org.junit:junit-bom:5.9.2=testCompileClasspath,testRuntimeClasspath org.jvnet.staxex:stax-ex:1.8=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.mockito:mockito-core:1.10.19=css -org.mockito:mockito-core:4.9.0=testCompileClasspath,testRuntimeClasspath -org.mockito:mockito-junit-jupiter:4.9.0=testCompileClasspath,testRuntimeClasspath +org.mockito:mockito-core:4.11.0=testCompileClasspath,testRuntimeClasspath +org.mockito:mockito-junit-jupiter:4.11.0=testCompileClasspath,testRuntimeClasspath org.mortbay.jetty:jetty-util:6.1.26=testCompileClasspath,testRuntimeClasspath org.mortbay.jetty:jetty:6.1.26=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:2.1=css @@ -466,8 +473,8 @@ org.slf4j:jcl-over-slf4j:1.7.30=nonprodRuntime,runtime,testRuntimeClasspath org.slf4j:jul-to-slf4j:1.7.30=nonprodRuntime,runtime,testRuntimeClasspath org.slf4j:slf4j-api:1.7.30=nonprodRuntime,runtime org.slf4j:slf4j-api:1.7.36=compileClasspath,nonprodCompileClasspath,nonprodRuntimeClasspath,testCompileClasspath -org.slf4j:slf4j-api:2.0.5=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -org.slf4j:slf4j-jdk14:2.0.5=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:2.0.6=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +org.slf4j:slf4j-jdk14:2.0.6=default,deploy_jar,runtimeClasspath,testRuntimeClasspath org.springframework:spring-core:5.3.18=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.springframework:spring-expression:5.3.18=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.springframework:spring-jcl:5.3.18=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -477,7 +484,7 @@ org.testcontainers:junit-jupiter:1.17.6=testCompileClasspath,testRuntimeClasspat org.testcontainers:postgresql:1.17.6=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.testcontainers:selenium:1.17.6=testCompileClasspath,testRuntimeClasspath org.testcontainers:testcontainers:1.17.6=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.threeten:threetenbp:1.6.4=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.threeten:threetenbp:1.6.5=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.tukaani:xz:1.5=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.w3c.css:sac:1.3=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.webjars.npm:viz.js-graphviz-java:2.1.3=nonprodRuntime,runtime,testRuntimeClasspath diff --git a/core/src/main/java/google/registry/bigquery/BigqueryConnection.java b/core/src/main/java/google/registry/bigquery/BigqueryConnection.java index b51e90420..9baefb6d4 100644 --- a/core/src/main/java/google/registry/bigquery/BigqueryConnection.java +++ b/core/src/main/java/google/registry/bigquery/BigqueryConnection.java @@ -36,7 +36,6 @@ import com.google.api.services.bigquery.model.GetQueryResultsResponse; import com.google.api.services.bigquery.model.Job; import com.google.api.services.bigquery.model.JobConfiguration; import com.google.api.services.bigquery.model.JobConfigurationExtract; -import com.google.api.services.bigquery.model.JobConfigurationLoad; import com.google.api.services.bigquery.model.JobConfigurationQuery; import com.google.api.services.bigquery.model.JobReference; import com.google.api.services.bigquery.model.JobStatistics; @@ -57,7 +56,6 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; import google.registry.bigquery.BigqueryUtils.DestinationFormat; -import google.registry.bigquery.BigqueryUtils.SourceFormat; import google.registry.bigquery.BigqueryUtils.TableType; import google.registry.bigquery.BigqueryUtils.WriteDisposition; import google.registry.util.NonFinalForTesting; @@ -375,23 +373,6 @@ public class BigqueryConnection implements AutoCloseable { } } - /** - * Starts an asynchronous load job to populate the specified destination table with the given - * source URIs and source format. Returns a ListenableFuture that holds the same destination table - * object on success. - */ - public ListenableFuture startLoad( - DestinationTable dest, SourceFormat sourceFormat, Iterable sourceUris) { - Job job = new Job() - .setConfiguration(new JobConfiguration() - .setLoad(new JobConfigurationLoad() - .setWriteDisposition(dest.getWriteDisposition().toString()) - .setSourceFormat(sourceFormat.toString()) - .setSourceUris(ImmutableList.copyOf(sourceUris)) - .setDestinationTable(dest.getTableReference()))); - return transform(runJobToCompletion(job, dest), this::updateTable, directExecutor()); - } - /** * Starts an asynchronous query job to populate the specified destination table with the results * of the specified query, or if the table is a view, to update the view to reflect that query. diff --git a/core/src/main/java/google/registry/bigquery/BigqueryUtils.java b/core/src/main/java/google/registry/bigquery/BigqueryUtils.java index 2bd89a794..ad88fcd8d 100644 --- a/core/src/main/java/google/registry/bigquery/BigqueryUtils.java +++ b/core/src/main/java/google/registry/bigquery/BigqueryUtils.java @@ -25,18 +25,6 @@ import org.joda.time.format.ISODateTimeFormat; /** Utilities related to Bigquery. */ public class BigqueryUtils { - /** Bigquery modes for schema fields. */ - public enum FieldMode { - NULLABLE, - REQUIRED, - REPEATED; - - /** Return the name of the field mode as it should appear in the Bigquery schema. */ - public String schemaName() { - return name(); - } - } - /** Bigquery schema field types. */ public enum FieldType { STRING, @@ -44,19 +32,7 @@ public class BigqueryUtils { FLOAT, TIMESTAMP, RECORD, - BOOLEAN; - - /** Return the name of the field type as it should appear in the Bigquery schema. */ - public String schemaName() { - return name(); - } - } - - /** Source formats for Bigquery load jobs. */ - public enum SourceFormat { - CSV, - NEWLINE_DELIMITED_JSON, - DATASTORE_BACKUP + BOOLEAN } /** Destination formats for Bigquery extract jobs. */ diff --git a/core/src/main/java/google/registry/config/RegistryConfig.java b/core/src/main/java/google/registry/config/RegistryConfig.java index 16fcb3fe3..cc1c7e671 100644 --- a/core/src/main/java/google/registry/config/RegistryConfig.java +++ b/core/src/main/java/google/registry/config/RegistryConfig.java @@ -60,7 +60,7 @@ import org.joda.time.Duration; * *

This class does not represent the total configuration of the Nomulus service. It's only * meant for settings that need to be configured once. Settings which may be subject to - * change in the future, should instead be retrieved from Datastore. The {@link + * change in the future, should instead be retrieved from the database. The {@link * google.registry.model.tld.Registry Registry} class is one such example of this. * *

Note: Only settings that are actually configurable belong in this file. It's not a catch-all diff --git a/core/src/main/java/google/registry/env/alpha/default/WEB-INF/cron.xml b/core/src/main/java/google/registry/env/alpha/default/WEB-INF/cron.xml index f0020710f..4295c253e 100644 --- a/core/src/main/java/google/registry/env/alpha/default/WEB-INF/cron.xml +++ b/core/src/main/java/google/registry/env/alpha/default/WEB-INF/cron.xml @@ -147,13 +147,4 @@ every 1 minutes synchronized backend - - - - - Delete up to 100 expired _ah_SESSION entities from Datastore. - - every 15 minutes - backend - diff --git a/core/src/main/java/google/registry/env/crash/default/WEB-INF/cron.xml b/core/src/main/java/google/registry/env/crash/default/WEB-INF/cron.xml index 82c1413d3..6f119ca73 100644 --- a/core/src/main/java/google/registry/env/crash/default/WEB-INF/cron.xml +++ b/core/src/main/java/google/registry/env/crash/default/WEB-INF/cron.xml @@ -26,9 +26,9 @@ We want it to be close to midnight because that reduces the chance that the point-in-time code won't have to go to the extra trouble of fetching old - versions of objects from Datastore. However, we don't want it to run too + versions of objects from the database. However, we don't want it to run too close to midnight, because there's always a chance that a change which was - timestamped before midnight hasn't fully been committed to Datastore. So + timestamped before midnight hasn't fully been committed to the database. So we add a 4+ minute grace period to ensure the transactions cool down, since our queries are not transactional. --> diff --git a/core/src/main/java/google/registry/env/production/default/WEB-INF/cron.xml b/core/src/main/java/google/registry/env/production/default/WEB-INF/cron.xml index 5eb4ef10a..37f83415f 100644 --- a/core/src/main/java/google/registry/env/production/default/WEB-INF/cron.xml +++ b/core/src/main/java/google/registry/env/production/default/WEB-INF/cron.xml @@ -26,9 +26,9 @@ We want it to be close to midnight because that reduces the chance that the point-in-time code won't have to go to the extra trouble of fetching old - versions of objects from Datastore. However, we don't want it to run too + versions of objects from the database. However, we don't want it to run too close to midnight, because there's always a chance that a change which was - timestamped before midnight hasn't fully been committed to Datastore. So + timestamped before midnight hasn't fully been committed to the database. So we add a 4+ minute grace period to ensure the transactions cool down, since our queries are not transactional. --> @@ -223,15 +223,6 @@ backend - - - - Delete up to 100 expired _ah_SESSION entities from Datastore. - - every 15 minutes - backend - - diff --git a/core/src/main/java/google/registry/env/sandbox/default/WEB-INF/cron.xml b/core/src/main/java/google/registry/env/sandbox/default/WEB-INF/cron.xml index 0de271ba1..5becbb1c5 100644 --- a/core/src/main/java/google/registry/env/sandbox/default/WEB-INF/cron.xml +++ b/core/src/main/java/google/registry/env/sandbox/default/WEB-INF/cron.xml @@ -165,15 +165,6 @@ backend - - - - Delete up to 100 expired _ah_SESSION entities from Datastore. - - every 15 minutes - backend - - diff --git a/core/src/main/java/google/registry/flows/domain/DomainTransferApproveFlow.java b/core/src/main/java/google/registry/flows/domain/DomainTransferApproveFlow.java index b647eaaa2..13ca12829 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainTransferApproveFlow.java +++ b/core/src/main/java/google/registry/flows/domain/DomainTransferApproveFlow.java @@ -79,9 +79,10 @@ import org.joda.time.DateTime; * transfer is automatically approved. Within that window, this flow allows the losing client to * explicitly approve the transfer request, which then becomes effective immediately. * - *

When the transfer was requested, poll messages and billing events were saved to Datastore with - * timestamps such that they only would become active when the transfer period passed. In this flow, - * those speculative objects are deleted and replaced with new ones with the correct approval time. + *

When the transfer was requested, poll messages and billing events were saved to the database + * with timestamps such that they only would become active when the transfer period passed. In this + * flow, those speculative objects are deleted and replaced with new ones with the correct approval + * time. * * @error {@link google.registry.flows.FlowUtils.NotLoggedInException} * @error {@link google.registry.flows.ResourceFlowUtils.BadAuthInfoForResourceException} diff --git a/core/src/main/java/google/registry/flows/domain/DomainTransferCancelFlow.java b/core/src/main/java/google/registry/flows/domain/DomainTransferCancelFlow.java index 7d5aea443..5249a655c 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainTransferCancelFlow.java +++ b/core/src/main/java/google/registry/flows/domain/DomainTransferCancelFlow.java @@ -62,9 +62,9 @@ import org.joda.time.DateTime; * transfer is automatically approved. Within that window, this flow allows the gaining client to * withdraw the transfer request. * - *

When the transfer was requested, poll messages and billing events were saved to Datastore with - * timestamps such that they only would become active when the transfer period passed. In this flow, - * those speculative objects are deleted. + *

When the transfer was requested, poll messages and billing events were saved to the database + * with timestamps such that they only would become active when the transfer period passed. In this + * flow, those speculative objects are deleted. * * @error {@link google.registry.flows.FlowUtils.NotLoggedInException} * @error {@link google.registry.flows.ResourceFlowUtils.BadAuthInfoForResourceException} diff --git a/core/src/main/java/google/registry/flows/domain/DomainTransferRequestFlow.java b/core/src/main/java/google/registry/flows/domain/DomainTransferRequestFlow.java index be8b19b87..507dfc0ef 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainTransferRequestFlow.java +++ b/core/src/main/java/google/registry/flows/domain/DomainTransferRequestFlow.java @@ -91,7 +91,7 @@ import org.joda.time.DateTime; * by the losing registrar or rejected, and the gaining registrar can also cancel the transfer * request. * - *

When a transfer is requested, poll messages and billing events are saved to Datastore with + *

When a transfer is requested, poll messages and billing events are saved to the database with * timestamps such that they only become active when the server-approval period passes. Keys to * these speculative objects are saved in the domain's transfer data, and on explicit approval, * rejection or cancellation of the request, they will be deleted (and in the approval case, diff --git a/core/src/main/java/google/registry/flows/poll/PollAckFlow.java b/core/src/main/java/google/registry/flows/poll/PollAckFlow.java index b9c49f757..eb8aad97a 100644 --- a/core/src/main/java/google/registry/flows/poll/PollAckFlow.java +++ b/core/src/main/java/google/registry/flows/poll/PollAckFlow.java @@ -46,9 +46,9 @@ import org.joda.time.DateTime; * An EPP flow for acknowledging {@link PollMessage}s. * *

Registrars refer to poll messages using an externally visible id generated by {@link - * PollMessageExternalKeyConverter}. One-time poll messages are deleted from Datastore once they are - * ACKed, whereas autorenew poll messages are simply marked as read, and won't be delivered again - * until the next year of their recurrence. + * PollMessageExternalKeyConverter}. One-time poll messages are deleted from the database once they + * are ACKed, whereas autorenew poll messages are simply marked as read, and won't be delivered + * again until the next year of their recurrence. * * @error {@link PollAckFlow.InvalidMessageIdException} * @error {@link PollAckFlow.MessageDoesNotExistException} diff --git a/core/src/main/java/google/registry/keyring/secretmanager/SecretManagerKeyringUpdater.java b/core/src/main/java/google/registry/keyring/secretmanager/SecretManagerKeyringUpdater.java index 4e6c8d658..42614ceda 100644 --- a/core/src/main/java/google/registry/keyring/secretmanager/SecretManagerKeyringUpdater.java +++ b/core/src/main/java/google/registry/keyring/secretmanager/SecretManagerKeyringUpdater.java @@ -51,7 +51,7 @@ import org.bouncycastle.openpgp.PGPPublicKey; /** * The {@link SecretManagerKeyringUpdater} accumulates updates to a {@link SecretManagerKeyring} and - * persists them to KMS and Datastore when closed. + * persists them to Cloud Secret Manager when closed. */ public final class SecretManagerKeyringUpdater { private static final FluentLogger logger = FluentLogger.forEnclosingClass(); @@ -125,7 +125,7 @@ public final class SecretManagerKeyringUpdater { } /** - * Persists the secrets in the Secret Manager (primary) and the Datastore (secondary). + * Persists the secrets in the Secret Manager. * *

Updates to the Secret Manager are not transactional. If an error happens, the successful * updates are not reverted; unwritten updates are aborted. This is not a problem right now, since diff --git a/core/src/main/java/google/registry/model/CacheUtils.java b/core/src/main/java/google/registry/model/CacheUtils.java index 567b2524f..0c694a17f 100644 --- a/core/src/main/java/google/registry/model/CacheUtils.java +++ b/core/src/main/java/google/registry/model/CacheUtils.java @@ -22,14 +22,14 @@ import com.github.benmanes.caffeine.cache.Caffeine; import com.google.common.base.Supplier; import java.time.Duration; -/** Utility methods related to caching Datastore entities. */ +/** Utility methods related to caching database entities. */ public class CacheUtils { /** * Memoize a supplier, with a short expiration specified in the environment config. * *

Use this for things that might change while code is running. (For example, the various lists - * downloaded from the TMCH get updated in Datastore and the caches need to be refreshed.) + * downloaded from the TMCH get updated in the database and the caches need to be refreshed.) */ public static Supplier memoizeWithShortExpiration(Supplier original) { return tryMemoizeWithExpiration(getSingletonCacheRefreshDuration(), original); diff --git a/core/src/main/java/google/registry/model/CreateAutoTimestamp.java b/core/src/main/java/google/registry/model/CreateAutoTimestamp.java index 07dc1f947..30282f6a1 100644 --- a/core/src/main/java/google/registry/model/CreateAutoTimestamp.java +++ b/core/src/main/java/google/registry/model/CreateAutoTimestamp.java @@ -23,7 +23,7 @@ import javax.persistence.PrePersist; import javax.persistence.PreUpdate; import org.joda.time.DateTime; -/** A timestamp that auto-updates when first saved to Datastore. */ +/** A timestamp that auto-updates when first saved to the database. */ @Embeddable public class CreateAutoTimestamp extends ImmutableObject implements UnsafeSerializable { diff --git a/core/src/main/java/google/registry/model/EppResourceUtils.java b/core/src/main/java/google/registry/model/EppResourceUtils.java index a2f5ed93c..a890ee15b 100644 --- a/core/src/main/java/google/registry/model/EppResourceUtils.java +++ b/core/src/main/java/google/registry/model/EppResourceUtils.java @@ -89,14 +89,14 @@ public final class EppResourceUtils { } /** - * Loads the last created version of an {@link EppResource} from Datastore by foreign key. + * Loads the last created version of an {@link EppResource} from the database by foreign key. * *

Returns empty if no resource with this foreign key was ever created, or if the most recently * created resource was deleted before time "now". * *

Loading an {@link EppResource} by itself is not sufficient to know its current state since * it may have various expirable conditions and status values that might implicitly change its - * state as time progresses even if it has not been updated in Datastore. Rather, the resource + * state as time progresses even if it has not been updated in the database. Rather, the resource * must be combined with a timestamp to view its current state. We use a global last updated * timestamp on the resource's entity group (which is essentially free since all writes to the * entity group must be serialized anyways) to guarantee monotonically increasing write times, and @@ -330,7 +330,7 @@ public final class EppResourceUtils { /** * Returns a set of {@link VKey} for domains that reference a specified contact or host. * - *

This is an eventually consistent query if used for Datastore. + *

This is an eventually consistent query if used for the database. * * @param key the referent key * @param now the logical time of the check diff --git a/core/src/main/java/google/registry/model/OteAccountBuilder.java b/core/src/main/java/google/registry/model/OteAccountBuilder.java index 6eb1ce77f..e70c6efdb 100644 --- a/core/src/main/java/google/registry/model/OteAccountBuilder.java +++ b/core/src/main/java/google/registry/model/OteAccountBuilder.java @@ -50,7 +50,7 @@ import org.joda.time.DateTime; import org.joda.time.Duration; /** - * Class to help build and persist all the OT&E entities in Datastore. + * Class to help build and persist all the OT&E entities in the database. * *

This includes the TLDs (Registries), Registrars, and the RegistrarContacts that can access the * web console. diff --git a/core/src/main/java/google/registry/model/UnsafeSerializable.java b/core/src/main/java/google/registry/model/UnsafeSerializable.java index bd01ae8d2..e408a055a 100644 --- a/core/src/main/java/google/registry/model/UnsafeSerializable.java +++ b/core/src/main/java/google/registry/model/UnsafeSerializable.java @@ -18,9 +18,7 @@ import java.io.Serializable; /** * Marker interface for Nomulus entities whose serialization are implemented in a fragile way. These - * entities are made {@link Serializable} so that they can be passed between JVMs. The intended use - * case is BEAM pipeline-based cross-database data validation between Datastore and Cloud SQL during - * the migration. Note that only objects loaded from the SQL database need serialization support. + * entities are made {@link Serializable} so that they can be passed between JVMs. * *

All entities implementing this interface take advantage of the fact that all Java collection * classes we use, either directly or indirectly, including those in Java libraries, Guava, and @@ -29,5 +27,4 @@ import java.io.Serializable; *

The {@code serialVersionUID} field has also been omitted in the implementing classes, since * they are not used for persistence. */ -// TODO(b/203609782): either remove this interface or fix implementors post migration. public interface UnsafeSerializable extends Serializable {} diff --git a/core/src/main/java/google/registry/model/UpdateAutoTimestamp.java b/core/src/main/java/google/registry/model/UpdateAutoTimestamp.java index 25163a783..87644d529 100644 --- a/core/src/main/java/google/registry/model/UpdateAutoTimestamp.java +++ b/core/src/main/java/google/registry/model/UpdateAutoTimestamp.java @@ -25,7 +25,7 @@ import javax.persistence.PrePersist; import javax.persistence.PreUpdate; import org.joda.time.DateTime; -/** A timestamp that auto-updates on each save to Datastore/Cloud SQL. */ +/** A timestamp that auto-updates on each save to Cloud SQL. */ @Embeddable public class UpdateAutoTimestamp extends ImmutableObject implements UnsafeSerializable { diff --git a/core/src/main/java/google/registry/model/billing/BillingEvent.java b/core/src/main/java/google/registry/model/billing/BillingEvent.java index 1f71c1a06..860be893e 100644 --- a/core/src/main/java/google/registry/model/billing/BillingEvent.java +++ b/core/src/main/java/google/registry/model/billing/BillingEvent.java @@ -312,7 +312,7 @@ public abstract class BillingEvent extends ImmutableObject Integer periodYears; /** - * For {@link Flag#SYNTHETIC} events, when this event was persisted to Datastore (i.e. the + * For {@link Flag#SYNTHETIC} events, when this event was persisted to the database (i.e. the * cursor position at the time the recurrence expansion job was last run). In the event a job * needs to be undone, a query on this field will return the complete set of potentially bad * events. diff --git a/core/src/main/java/google/registry/model/common/Cursor.java b/core/src/main/java/google/registry/model/common/Cursor.java index 2965c2b91..63a1e7c6c 100644 --- a/core/src/main/java/google/registry/model/common/Cursor.java +++ b/core/src/main/java/google/registry/model/common/Cursor.java @@ -52,8 +52,7 @@ public class Cursor extends UpdateAutoTimestampEntity { /** The scope of a global cursor. A global cursor is a cursor that is not specific to one tld. */ public static final String GLOBAL = "GLOBAL"; - - /** The types of cursors, used as the string id field for each cursor in Datastore. */ + /** The types of cursors, used as the string id field for each cursor in the database. */ public enum CursorType { /** Cursor for ensuring rolling transactional isolation of BRDA staging operation. */ BRDA(true), diff --git a/core/src/main/java/google/registry/model/common/DatabaseMigrationStateSchedule.java b/core/src/main/java/google/registry/model/common/DatabaseMigrationStateSchedule.java index 95346f3f7..adb169182 100644 --- a/core/src/main/java/google/registry/model/common/DatabaseMigrationStateSchedule.java +++ b/core/src/main/java/google/registry/model/common/DatabaseMigrationStateSchedule.java @@ -218,7 +218,7 @@ public class DatabaseMigrationStateSchedule extends CrossTldSingleton { /** Loads the currently-set migration schedule from SQL, or the default if none exists. */ @VisibleForTesting static TimedTransitionProperty getUncached() { - return tm().transactWithoutBackup( + return tm().transact( () -> { try { return tm().loadSingleton(DatabaseMigrationStateSchedule.class) diff --git a/core/src/main/java/google/registry/model/contact/ContactBase.java b/core/src/main/java/google/registry/model/contact/ContactBase.java index 43c6774bc..c9c291621 100644 --- a/core/src/main/java/google/registry/model/contact/ContactBase.java +++ b/core/src/main/java/google/registry/model/contact/ContactBase.java @@ -56,7 +56,7 @@ public class ContactBase extends EppResource * Unique identifier for this contact. * *

This is only unique in the sense that for any given lifetime specified as the time range - * from (creationTime, deletionTime) there can only be one contact in Datastore with this id. + * from (creationTime, deletionTime) there can only be one contact in the database with this id. * However, there can be many contacts with the same id and non-overlapping lifetimes. */ String contactId; diff --git a/core/src/main/java/google/registry/model/contact/ContactCommand.java b/core/src/main/java/google/registry/model/contact/ContactCommand.java index df522b097..99108619d 100644 --- a/core/src/main/java/google/registry/model/contact/ContactCommand.java +++ b/core/src/main/java/google/registry/model/contact/ContactCommand.java @@ -122,8 +122,8 @@ public class ContactCommand { * Unique identifier for this contact. * *

This is only unique in the sense that for any given lifetime specified as the time range - * from (creationTime, deletionTime) there can only be one contact in Datastore with this - * id. However, there can be many contacts with the same id and non-overlapping lifetimes. + * from (creationTime, deletionTime) there can only be one contact in the database with this id. + * However, there can be many contacts with the same id and non-overlapping lifetimes. */ @XmlElement(name = "id") String contactId; diff --git a/core/src/main/java/google/registry/model/domain/DesignatedContact.java b/core/src/main/java/google/registry/model/domain/DesignatedContact.java index a43090742..9fb06bdbe 100644 --- a/core/src/main/java/google/registry/model/domain/DesignatedContact.java +++ b/core/src/main/java/google/registry/model/domain/DesignatedContact.java @@ -28,7 +28,7 @@ import javax.xml.bind.annotation.XmlEnumValue; * *

A contact association on a domain consists of the contact key and the contact "type", which is * the designated role of this contact with respect to this domain. When converting to and from EPP - * XML, we use {@link ForeignKeyedDesignatedContact} to replace the contact's Datastore key with its + * XML, we use {@link ForeignKeyedDesignatedContact} to replace the contact's primary key with its * foreign key, since that is what EPP exposes. * *

Note one could in principle store contact foreign keys here in addition to keys, unlike the diff --git a/core/src/main/java/google/registry/model/domain/DomainBase.java b/core/src/main/java/google/registry/model/domain/DomainBase.java index 961a5c3a1..ca3fed5ad 100644 --- a/core/src/main/java/google/registry/model/domain/DomainBase.java +++ b/core/src/main/java/google/registry/model/domain/DomainBase.java @@ -257,8 +257,7 @@ public class DomainBase extends EppResource * *

Note that this is a Cloud SQL-based replacement for the {@code dns-pull} task queue. The * domains that have a non-null value for this field should be exactly the same as the tasks that - * would be in the {@code dns-pull} queue. Because this is Cloud SQL-specific, it is omitted from - * Datastore. + * would be in the {@code dns-pull} queue. * *

Note that in the {@link DomainHistory} table this value means something slightly different: * It means that the given domain action requested a DNS update. Unlike on the {@code Domain} @@ -485,7 +484,7 @@ public class DomainBase extends EppResource .setCurrentPackageToken(null); if (transferData.getTransferPeriod().getValue() == 1) { // Set the grace period using a key to the pre-scheduled transfer billing event. Not using - // GracePeriod.forBillingEvent() here in order to avoid the actual Datastore fetch. + // GracePeriod.forBillingEvent() here in order to avoid the actual fetch. builder.setGracePeriods( ImmutableSet.of( GracePeriod.create( diff --git a/core/src/main/java/google/registry/model/domain/DomainHistory.java b/core/src/main/java/google/registry/model/domain/DomainHistory.java index 182a2b7f2..0e5f006d5 100644 --- a/core/src/main/java/google/registry/model/domain/DomainHistory.java +++ b/core/src/main/java/google/registry/model/domain/DomainHistory.java @@ -154,7 +154,7 @@ public class DomainHistory extends HistoryEntry { * *

This will be empty for any DomainHistory/HistoryEntry generated before this field was added * (mid-2017), as well as any action that does not generate billable events (e.g. contact/host - * updates). * + * updates). */ @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER, orphanRemoval = true) @JoinColumn(name = "historyRevisionId", referencedColumnName = "historyRevisionId") diff --git a/core/src/main/java/google/registry/model/domain/ForeignKeyedDesignatedContact.java b/core/src/main/java/google/registry/model/domain/ForeignKeyedDesignatedContact.java index 745936cac..3b2f2ea0b 100644 --- a/core/src/main/java/google/registry/model/domain/ForeignKeyedDesignatedContact.java +++ b/core/src/main/java/google/registry/model/domain/ForeignKeyedDesignatedContact.java @@ -23,10 +23,10 @@ import javax.xml.bind.annotation.XmlValue; * *

This type is used on the wire for EPP XML, where only the contact ID (foreign key) is exposed. * This is converted to and from the persisted type, {@link DesignatedContact}, which stores the - * Datastore key instead of the foreign key. + * primary key instead of the foreign key. * - * @see - * RFC 5731 - EPP Domain Name Mapping - Contact and Client Identifiers + * @see RFC 5731 - EPP Domain Name Mapping + * - Contact and Client Identifiers */ public class ForeignKeyedDesignatedContact extends ImmutableObject { @XmlAttribute(required = true) diff --git a/core/src/main/java/google/registry/model/domain/GracePeriod.java b/core/src/main/java/google/registry/model/domain/GracePeriod.java index 118b9570e..a51928b93 100644 --- a/core/src/main/java/google/registry/model/domain/GracePeriod.java +++ b/core/src/main/java/google/registry/model/domain/GracePeriod.java @@ -37,7 +37,7 @@ import org.joda.time.DateTime; * A domain grace period with an expiration time. * *

When a grace period expires, it is lazily removed from the {@link Domain} the next time the - * resource is loaded from Datastore. + * resource is loaded from the database. */ @Entity @Table( @@ -84,8 +84,8 @@ public class GracePeriod extends GracePeriodBase { * Creates a GracePeriod for an (optional) OneTime billing event. * *

Normal callers should always use {@link #forBillingEvent} instead, assuming they do not need - * to avoid loading the BillingEvent from Datastore. This method should typically be called only - * from test code to explicitly construct GracePeriods. + * to avoid loading the BillingEvent from the database. This method should typically be called + * only from test code to explicitly construct GracePeriods. */ public static GracePeriod create( GracePeriodStatus type, @@ -102,8 +102,8 @@ public class GracePeriod extends GracePeriodBase { * #gracePeriodId}. * *

Normal callers should always use {@link #forBillingEvent} instead, assuming they do not need - * to avoid loading the BillingEvent from Datastore. This method should typically be called only - * from test code to explicitly construct GracePeriods. + * to avoid loading the BillingEvent from the database. This method should typically be called + * only from test code to explicitly construct GracePeriods. */ @VisibleForTesting public static GracePeriod create( diff --git a/core/src/main/java/google/registry/model/eppcommon/StatusValue.java b/core/src/main/java/google/registry/model/eppcommon/StatusValue.java index 420d8df6e..f26f6c773 100644 --- a/core/src/main/java/google/registry/model/eppcommon/StatusValue.java +++ b/core/src/main/java/google/registry/model/eppcommon/StatusValue.java @@ -60,7 +60,7 @@ public enum StatusValue implements EppEnum { /** * A status for a resource has an incoming reference from an active domain. * - *

LINKED is a "virtual" status value that should never be persisted to Datastore on any + *

LINKED is a "virtual" status value that should never be persisted to the database on any * resource. It must be computed on the fly when we need it, as the set of domains using a * resource can change at any time. */ diff --git a/core/src/main/java/google/registry/model/eppcommon/package-info.java b/core/src/main/java/google/registry/model/eppcommon/package-info.java index 82211a5ef..8b7f736f1 100644 --- a/core/src/main/java/google/registry/model/eppcommon/package-info.java +++ b/core/src/main/java/google/registry/model/eppcommon/package-info.java @@ -13,7 +13,7 @@ // limitations under the License. /** - * Nomulus Datastore model common/shared classes. + * Nomulus data model common/shared classes. * *

This package is intended to hold classes which are shared across multiple XML namespaces. As * such, no default namespace is declared in this package, and all objects in this package should be diff --git a/core/src/main/java/google/registry/model/host/HostBase.java b/core/src/main/java/google/registry/model/host/HostBase.java index c415b6d4d..f28138b48 100644 --- a/core/src/main/java/google/registry/model/host/HostBase.java +++ b/core/src/main/java/google/registry/model/host/HostBase.java @@ -57,7 +57,7 @@ public class HostBase extends EppResource { * Fully qualified hostname, which is a unique identifier for this host. * *

This is only unique in the sense that for any given lifetime specified as the time range - * from (creationTime, deletionTime) there can only be one host in Datastore with this name. + * from (creationTime, deletionTime) there can only be one host in the database with this name. * However, there can be many hosts with the same name and non-overlapping lifetimes. */ String hostName; diff --git a/core/src/main/java/google/registry/model/poll/PollMessage.java b/core/src/main/java/google/registry/model/poll/PollMessage.java index 76dda2d41..3902896e3 100644 --- a/core/src/main/java/google/registry/model/poll/PollMessage.java +++ b/core/src/main/java/google/registry/model/poll/PollMessage.java @@ -67,7 +67,7 @@ import org.joda.time.DateTime; * *

Poll messages are not delivered until their {@link #eventTime} has passed. Poll messages can * be speculatively enqueued for future delivery, and then modified or deleted before that date has - * passed. Unlike most other entities in Datastore, which are marked as deleted but otherwise + * passed. Unlike most other entities in the database, which are marked as deleted but otherwise * retained for historical purposes, poll messages are truly deleted once they have been delivered * and ACKed. * @@ -337,7 +337,8 @@ public abstract class PollMessage extends ImmutableObject /** * A one-time poll message. * - *

One-time poll messages are deleted from Datastore once they have been delivered and ACKed. + *

One-time poll messages are deleted from the database once they have been delivered and + * ACKed. */ @Entity @DiscriminatorValue("ONE_TIME") diff --git a/core/src/main/java/google/registry/model/pricing/StaticPremiumListPricingEngine.java b/core/src/main/java/google/registry/model/pricing/StaticPremiumListPricingEngine.java index 959786d1f..f1babe964 100644 --- a/core/src/main/java/google/registry/model/pricing/StaticPremiumListPricingEngine.java +++ b/core/src/main/java/google/registry/model/pricing/StaticPremiumListPricingEngine.java @@ -25,7 +25,7 @@ import javax.inject.Inject; import org.joda.money.Money; import org.joda.time.DateTime; -/** A premium list pricing engine that stores static pricing information in Datastore entities. */ +/** A premium list pricing engine that stores static pricing information in database entities. */ public final class StaticPremiumListPricingEngine implements PremiumPricingEngine { /** The name of the pricing engine, as used in {@code Registry.pricingEngineClassName}. */ diff --git a/core/src/main/java/google/registry/model/rde/RdeRevision.java b/core/src/main/java/google/registry/model/rde/RdeRevision.java index e2b26f30c..256ae56c9 100644 --- a/core/src/main/java/google/registry/model/rde/RdeRevision.java +++ b/core/src/main/java/google/registry/model/rde/RdeRevision.java @@ -37,7 +37,7 @@ import org.joda.time.DateTime; import org.joda.time.LocalDate; /** - * Datastore entity for tracking RDE revisions. + * Entity for tracking RDE revisions. * *

This class is used by the RDE staging, upload, and reporting systems to determine the revision * that should be used in the generated filename. It also determines whether or not a {@code resend} @@ -102,10 +102,10 @@ public final class RdeRevision extends UpdateAutoTimestampEntity { * Sets the revision ID for a given triplet. * *

This method verifies that the current revision is {@code revision - 1}, or that the object - * does not exist in Datastore if {@code revision == 0}. + * does not exist in the database if {@code revision == 0}. * * @throws IllegalStateException if not in a transaction - * @throws VerifyException if Datastore state doesn't meet the above criteria + * @throws VerifyException if the state doesn't meet the above criteria */ public static void saveRevision(String tld, DateTime date, RdeMode mode, int revision) { checkArgument(revision >= 0, "Negative revision: %s", revision); diff --git a/core/src/main/java/google/registry/model/registrar/Registrar.java b/core/src/main/java/google/registry/model/registrar/Registrar.java index 8e8788629..577aca356 100644 --- a/core/src/main/java/google/registry/model/registrar/Registrar.java +++ b/core/src/main/java/google/registry/model/registrar/Registrar.java @@ -217,8 +217,8 @@ public class Registrar extends UpdateAutoTimestampEntity implements Buildable, J * on its length. * *

NB: We are assuming that this field is unique across all registrar entities. This is not - * formally enforced in Datastore, but should be enforced by ICANN in that no two registrars will - * be accredited with the same name. + * formally enforced in the database, but should be enforced by ICANN in that no two registrars + * will be accredited with the same name. * * @see ICANN-Accredited * Registrars @@ -930,7 +930,7 @@ public class Registrar extends UpdateAutoTimestampEntity implements Buildable, J return email; } - /** Loads all registrar entities directly from Datastore. */ + /** Loads all registrar entities directly from the database. */ public static Iterable loadAll() { return tm().transact(() -> tm().loadAllOf(Registrar.class)); } @@ -947,7 +947,7 @@ public class Registrar extends UpdateAutoTimestampEntity implements Buildable, J .collect(toImmutableSet()); } - /** Loads and returns a registrar entity by its id directly from Datastore. */ + /** Loads and returns a registrar entity by its id directly from the database. */ public static Optional loadByRegistrarId(String registrarId) { checkArgument(!Strings.isNullOrEmpty(registrarId), "registrarId must be specified"); return tm().transact(() -> tm().loadByKeyIfPresent(createVKey(registrarId))); diff --git a/core/src/main/java/google/registry/model/registrar/RegistrarPoc.java b/core/src/main/java/google/registry/model/registrar/RegistrarPoc.java index 20935820d..1f9ac9e7c 100644 --- a/core/src/main/java/google/registry/model/registrar/RegistrarPoc.java +++ b/core/src/main/java/google/registry/model/registrar/RegistrarPoc.java @@ -121,21 +121,7 @@ public class RegistrarPoc extends ImmutableObject implements Jsonifiable, Unsafe */ Set types; - /** - * A GAIA email address that was assigned to the registrar for console login purpose. - * - *

We used to store the GAE user ID directly to identify the logged-in user in the registrar - * console, and relied on a hacky trick with datastore to get the ID from the email address when - * creating a {@link RegistrarPoc}. We switched to using the login email directly as each - * registrar is assigned a unique email address that is immutable (to them at least), so it is as - * good as an identifier as the ID itself, and it allows us to get rid of the datastore - * dependency. - * - *

We backfilled all login email addresses for existing {@link RegistrarPoc}s that have a - * non-null GAE user ID. The backfill is done by first trying the {@link #emailAddress} field, - * then trying {@link #registrarId}+"@known-dasher_domain" and picking the ones that converted to - * the existing ID stored in the database. - */ + /** A GAIA email address that was assigned to the registrar for console login purpose. */ String loginEmailAddress; /** diff --git a/core/src/main/java/google/registry/model/reporting/DomainTransactionRecord.java b/core/src/main/java/google/registry/model/reporting/DomainTransactionRecord.java index f8b9cecbf..fef8a558b 100644 --- a/core/src/main/java/google/registry/model/reporting/DomainTransactionRecord.java +++ b/core/src/main/java/google/registry/model/reporting/DomainTransactionRecord.java @@ -55,10 +55,13 @@ public class DomainTransactionRecord extends ImmutableObject @Column(nullable = false) String tld; - // The following two fields are exposed in this entity to support bulk-loading in Cloud SQL by the - // Datastore-SQL validation. They are excluded from equality check since they are not set in - // Datastore. - // TODO(b/203609782): post migration, decide whether to keep these two fields. + // The following two fields are marked as insignificant because they are only used to map the set + // of DomainTransactionRecords of a DomainHistory to the rows in the DomainTransactionRecord + // table. They are auto-populated when the DomainHistory is persisted into the database (due to + // the one-to-many mapping) and are foreign key constrained. More importantly, they cannot be set + // directly in the code. We therefore do not need to compare them for equality checks, and we + // would have to introduce setters only to set them in tests (and change a lot of test code) if + // we remove the annotation. @Insignificant String domainRepoId; @Insignificant Long historyRevisionId; diff --git a/core/src/main/java/google/registry/model/server/Lock.java b/core/src/main/java/google/registry/model/server/Lock.java index 301e98745..cba3d3cc7 100644 --- a/core/src/main/java/google/registry/model/server/Lock.java +++ b/core/src/main/java/google/registry/model/server/Lock.java @@ -240,7 +240,7 @@ public class Lock extends ImmutableObject implements Serializable { return AcquireResult.create(now, lock, newLock, lockState); }; - AcquireResult acquireResult = tm().transactWithoutBackup(lockAcquirer); + AcquireResult acquireResult = tm().transact(lockAcquirer); logAcquireResult(acquireResult); lockMetrics.recordAcquire(resourceName, scope, acquireResult.lockState()); @@ -277,7 +277,7 @@ public class Lock extends ImmutableObject implements Serializable { } return null; }; - tm().transactWithoutBackup(lockReleaser); + tm().transact(lockReleaser); } static class LockId extends ImmutableObject implements Serializable { diff --git a/core/src/main/java/google/registry/model/server/ServerSecret.java b/core/src/main/java/google/registry/model/server/ServerSecret.java index 0e8473986..6a24d98b0 100644 --- a/core/src/main/java/google/registry/model/server/ServerSecret.java +++ b/core/src/main/java/google/registry/model/server/ServerSecret.java @@ -54,7 +54,7 @@ public class ServerSecret extends CrossTldSingleton { }); } - /** Returns the global ServerSecret instance, creating it if one isn't already in Datastore. */ + /** Returns the global ServerSecret instance, creating it if one isn't already in the database. */ public static ServerSecret get() { return CACHE.get(ServerSecret.class); } diff --git a/core/src/main/java/google/registry/model/tld/Registries.java b/core/src/main/java/google/registry/model/tld/Registries.java index 4a6a6d398..4bb2e7262 100644 --- a/core/src/main/java/google/registry/model/tld/Registries.java +++ b/core/src/main/java/google/registry/model/tld/Registries.java @@ -84,7 +84,7 @@ public final class Registries { return ImmutableSet.copyOf(filterValues(cache.get(), equalTo(type)).keySet()); } - /** Returns the Registry entities themselves of the given type loaded fresh from Datastore. */ + /** Returns the Registry entities themselves of the given type loaded fresh from the database. */ public static ImmutableSet getTldEntitiesOfType(TldType type) { return Registry.get(filterValues(cache.get(), equalTo(type)).keySet()); } diff --git a/core/src/main/java/google/registry/model/tld/Registry.java b/core/src/main/java/google/registry/model/tld/Registry.java index b8c3a16d7..adf295ef6 100644 --- a/core/src/main/java/google/registry/model/tld/Registry.java +++ b/core/src/main/java/google/registry/model/tld/Registry.java @@ -955,8 +955,8 @@ public class Registry extends ImmutableObject implements Buildable, UnsafeSerial "Cannot create registry for TLD that is not a valid, canonical domain name"); // Check the validity of all TimedTransitionProperties to ensure that they have values for // START_OF_TIME. The setters above have already checked this for new values, but also check - // here to catch cases where we loaded an invalid TimedTransitionProperty from Datastore and - // cloned it into a new builder, to block re-building a Registry in an invalid state. + // here to catch cases where we loaded an invalid TimedTransitionProperty from the database + // and cloned it into a new builder, to block re-building a Registry in an invalid state. instance.tldStateTransitions.checkValidity(); instance.renewBillingCostTransitions.checkValidity(); instance.eapFeeSchedule.checkValidity(); diff --git a/core/src/main/java/google/registry/model/tld/label/ReservedList.java b/core/src/main/java/google/registry/model/tld/label/ReservedList.java index ba3f4d0ab..dd1248c53 100644 --- a/core/src/main/java/google/registry/model/tld/label/ReservedList.java +++ b/core/src/main/java/google/registry/model/tld/label/ReservedList.java @@ -106,7 +106,7 @@ public final class ReservedList } /** - * A reserved list entry entity, persisted to Datastore, that represents a single label and its + * A reserved list entry entity, persisted to the database, that represents a single label and its * reservation type. */ @javax.persistence.Entity(name = "ReservedEntry") diff --git a/core/src/main/java/google/registry/persistence/transaction/CriteriaQueryBuilder.java b/core/src/main/java/google/registry/persistence/transaction/CriteriaQueryBuilder.java index a9bd0d5c7..84d90f782 100644 --- a/core/src/main/java/google/registry/persistence/transaction/CriteriaQueryBuilder.java +++ b/core/src/main/java/google/registry/persistence/transaction/CriteriaQueryBuilder.java @@ -52,9 +52,9 @@ public class CriteriaQueryBuilder { } /** Adds a WHERE clause to the query, given the specified operation, field, and value. */ - public CriteriaQueryBuilder where( - String fieldName, WhereOperator whereClause, V value) { - Expression expression = root.get(fieldName); + public CriteriaQueryBuilder where( + String fieldName, WhereOperator whereClause, U value) { + Expression expression = root.get(fieldName); return where(whereClause.predicate(expression, value)); } @@ -74,7 +74,7 @@ public class CriteriaQueryBuilder { * Adds a WHERE clause to the query specifying that a collection field must contain a particular * value. */ - public CriteriaQueryBuilder whereFieldContains(String fieldName, Object value) { + public CriteriaQueryBuilder whereFieldContains(String fieldName, Object value) { return where( jpaTm.getEntityManager().getCriteriaBuilder().isMember(value, root.get(fieldName))); } diff --git a/core/src/main/java/google/registry/persistence/transaction/JpaTransactionManager.java b/core/src/main/java/google/registry/persistence/transaction/JpaTransactionManager.java index 9a5b8964c..daf234959 100644 --- a/core/src/main/java/google/registry/persistence/transaction/JpaTransactionManager.java +++ b/core/src/main/java/google/registry/persistence/transaction/JpaTransactionManager.java @@ -76,11 +76,6 @@ public interface JpaTransactionManager extends TransactionManager { */ Query query(String sqlString); - /** - * Execute the work in a transaction without recording the transaction for replay to datastore. - */ - T transactWithoutBackup(Supplier work); - /** Executes the work in a transaction with no retries and returns the result. */ T transactNoRetry(Supplier work); diff --git a/core/src/main/java/google/registry/persistence/transaction/JpaTransactionManagerImpl.java b/core/src/main/java/google/registry/persistence/transaction/JpaTransactionManagerImpl.java index 905263b20..58e7c8c9b 100644 --- a/core/src/main/java/google/registry/persistence/transaction/JpaTransactionManagerImpl.java +++ b/core/src/main/java/google/registry/persistence/transaction/JpaTransactionManagerImpl.java @@ -157,11 +157,6 @@ public class JpaTransactionManagerImpl implements JpaTransactionManager { return retrier.callWithRetry(() -> transactNoRetry(work), JpaRetries::isFailedTxnRetriable); } - @Override - public T transactWithoutBackup(Supplier work) { - return transact(work); - } - @Override public T transactNoRetry(Supplier work) { if (inTransaction()) { diff --git a/core/src/main/java/google/registry/persistence/transaction/QueryComposer.java b/core/src/main/java/google/registry/persistence/transaction/QueryComposer.java index 8633dfda1..0a0779e82 100644 --- a/core/src/main/java/google/registry/persistence/transaction/QueryComposer.java +++ b/core/src/main/java/google/registry/persistence/transaction/QueryComposer.java @@ -16,12 +16,12 @@ package google.registry.persistence.transaction; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; -import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import google.registry.persistence.transaction.CriteriaQueryBuilder.WhereOperator; import java.util.ArrayList; import java.util.List; import java.util.Optional; +import java.util.function.Function; import java.util.stream.Stream; import javax.annotation.Nullable; import javax.persistence.criteria.CriteriaBuilder; @@ -40,14 +40,13 @@ import javax.persistence.criteria.CriteriaBuilder; */ public abstract class QueryComposer { - // The class whose entities we're querying. Note that this limits us to single table queries in - // SQL. In datastore, there's really no other kind of query. + // The class whose entities we're querying. protected Class entityClass; // Field to order by, if any. Null if we don't care about order. @Nullable protected String orderBy; - protected List> predicates = new ArrayList>(); + protected List> predicates = new ArrayList<>(); protected QueryComposer(Class entityClass) { this.entityClass = entityClass; @@ -61,14 +60,14 @@ public abstract class QueryComposer { */ public > QueryComposer where( String fieldName, Comparator comparator, U value) { - predicates.add(new WhereClause(fieldName, comparator, value)); + predicates.add(new WhereClause<>(fieldName, comparator, value)); return this; } /** * Order the query results by the value of the specified field. * - *

TODO(mmuller): add the ability to do descending sort order. + *

TODO: add the ability to do descending sort order. */ public QueryComposer orderBy(String fieldName) { orderBy = fieldName; @@ -151,52 +150,35 @@ public abstract class QueryComposer { * "someval")'}. */ public enum Comparator { - /** - * Return only records whose field is equal to the value. - * - *

Note that the datastore string for this is empty, which is consistent with the way {@code - * filter()} works (it uses an unadorned field name to check for equality). - */ - EQ("", QueryComposer::equal), + /** Return only records whose field is equal to the value. */ + EQ(QueryComposer::equal), /** Return only records whose field is less than the value. */ - LT(" <", QueryComposer::lessThan), + LT(QueryComposer::lessThan), /** Return only records whose field is less than or equal to the value. */ - LTE(" <=", QueryComposer::lessThanOrEqualTo), + LTE(QueryComposer::lessThanOrEqualTo), /** Return only records whose field is greater than or equal to the value. */ - GTE(" >=", QueryComposer::greaterThanOrEqualTo), + GTE(QueryComposer::greaterThanOrEqualTo), /** Return only records whose field is greater than the value. */ - GT(" >", QueryComposer::greaterThan), + GT(QueryComposer::greaterThan), - /** - * Return only records whose field matches the pattern. - * - *

SQL ONLY. - */ - LIKE(null, QueryComposer::like); - - private final String datastoreString; + /** Return only records whose field matches the pattern. */ + LIKE(QueryComposer::like); @SuppressWarnings("ImmutableEnumChecker") // Functions are immutable. private final Function> operatorFactory; - Comparator( - String datastoreString, Function> operatorFactory) { - this.datastoreString = datastoreString; + Comparator(Function> operatorFactory) { this.operatorFactory = operatorFactory; } - public String getDatastoreString() { - return datastoreString; - } - public Function> getComparisonFactory() { return operatorFactory; } - }; + } protected static class WhereClause> { public String fieldName; diff --git a/core/src/main/java/google/registry/rdap/RdapJsonFormatter.java b/core/src/main/java/google/registry/rdap/RdapJsonFormatter.java index a782a258d..d781da7be 100644 --- a/core/src/main/java/google/registry/rdap/RdapJsonFormatter.java +++ b/core/src/main/java/google/registry/rdap/RdapJsonFormatter.java @@ -143,8 +143,8 @@ public class RdapJsonFormatter { * *

Reserved to cases when this object is one of many results of a search query. * - *

We want to minimize the size of the reply, and also minimize the Datastore queries needed - * to generate these replies since we might have a lot of these objects to return. + *

We want to minimize the size of the reply, and also minimize the queries needed to + * generate these replies since we might have a lot of these objects to return. * *

Each object with a SUMMARY type will have a remark with a direct link to itself, which * will return the FULL result. @@ -743,16 +743,9 @@ public class RdapJsonFormatter { // Rdap Response Profile 2.4.5 says the Registrar inside a Domain response MUST include the // ABUSE contact, but doesn't require any other contact. // - // In our current Datastore schema, to get the ABUSE contact we must go over all contacts. - // However, there's something to be said about returning smaller JSON + // Write the minimum, meaning only ABUSE for INTERNAL registrars, nothing for SUMMARY and + // everything for FULL. // - // TODO(b/117242274): Need to decide between 2 options: - // - Write the minimum, meaning only ABUSE for INTERNAL registrars, nothing for SUMMARY (also - // saves resources for the RegistrarContact Datastore query!) and everything for FULL. - // - Write everything for everything. - // - // For now we'll do the first. - if (outputDataType != OutputDataType.SUMMARY) { ImmutableList registrarContacts = registrar.getContacts().stream() diff --git a/core/src/main/java/google/registry/rdap/RdapSearchActionBase.java b/core/src/main/java/google/registry/rdap/RdapSearchActionBase.java index a3a84e0d4..6a9e59afb 100644 --- a/core/src/main/java/google/registry/rdap/RdapSearchActionBase.java +++ b/core/src/main/java/google/registry/rdap/RdapSearchActionBase.java @@ -145,9 +145,8 @@ public abstract class RdapSearchActionBase extends RdapActionBase { * clauses that make up this SQL query * @param checkForVisibility true if the results should be checked to make sure they are visible; * normally this should be equal to the shouldIncludeDeleted setting, but in cases where the - * query could not check deletion status (due to Datastore limitations such as the limit of - * one field queried for inequality, for instance), it may need to be set to true even when - * not including deleted records + * query could not check deletion status, it may need to be set to true even when not + * including deleted records * @param querySizeLimit the maximum number of items the query is expected to return, usually * because the limit has been set * @return an {@link RdapResultSet} object containing the list of resources and an incompleteness diff --git a/core/src/main/java/google/registry/rde/EscrowTaskRunner.java b/core/src/main/java/google/registry/rde/EscrowTaskRunner.java index a5dde92b0..66b15f2d7 100644 --- a/core/src/main/java/google/registry/rde/EscrowTaskRunner.java +++ b/core/src/main/java/google/registry/rde/EscrowTaskRunner.java @@ -35,12 +35,12 @@ import org.joda.time.Duration; *

This class implements the Locking Rolling Cursor pattern, which solves the problem of * how to reliably execute App Engine tasks which can't be made idempotent. * - *

{@link LockHandler} is used to ensure only one task executes at a time for a given - * {@code LockedCursorTask} subclass + TLD combination. This is necessary because App Engine tasks - * might double-execute. Normally tasks solve this by being idempotent, but that's not possible for - * RDE, which writes to a GCS filename with a deterministic name. So Datastore is used to to - * guarantee isolation. If we can't acquire the lock, it means the task is already running, so - * {@link NoContentException} is thrown to cancel the task. + *

{@link LockHandler} is used to ensure only one task executes at a time for a given {@code + * LockedCursorTask} subclass + TLD combination. This is necessary because App Engine tasks might + * double-execute. Normally tasks solve this by being idempotent, but that's not possible for RDE, + * which writes to a GCS filename with a deterministic name. So locks are used to guarantee + * isolation. If we can't acquire the lock, it means the task is already running, so {@link + * NoContentException} is thrown to cancel the task. * *

The specific date for which the deposit is generated depends on the current position of the * {@link Cursor}. If the cursor is set to tomorrow, we do nothing and return 204 No Content. If the @@ -59,7 +59,7 @@ class EscrowTaskRunner { /** * Performs task logic while the lock is held. * - * @param watermark the logical time for a point-in-time view of Datastore + * @param watermark the logical time for a point-in-time view of the database. */ void runWithLock(DateTime watermark) throws Exception; } diff --git a/core/src/main/java/google/registry/rde/PendingDepositChecker.java b/core/src/main/java/google/registry/rde/PendingDepositChecker.java index 9d0e710c7..8d9d36058 100644 --- a/core/src/main/java/google/registry/rde/PendingDepositChecker.java +++ b/core/src/main/java/google/registry/rde/PendingDepositChecker.java @@ -48,7 +48,7 @@ import org.joda.time.Duration; * *

If no deposits have been made so far, then {@code startingPoint} is used as the watermark of * the next deposit. If that's a day in the future, then escrow won't start until that date. This - * first deposit time will be set to Datastore in a transaction. + * first deposit time will be set to the database in a transaction. */ public final class PendingDepositChecker { diff --git a/core/src/main/java/google/registry/request/lock/LockHandlerImpl.java b/core/src/main/java/google/registry/request/lock/LockHandlerImpl.java index 66be0b775..d307a0a69 100644 --- a/core/src/main/java/google/registry/request/lock/LockHandlerImpl.java +++ b/core/src/main/java/google/registry/request/lock/LockHandlerImpl.java @@ -39,7 +39,7 @@ import javax.inject.Inject; import org.joda.time.DateTime; import org.joda.time.Duration; -/** Implementation of {@link LockHandler} that uses the datastore lock. */ +/** Implementation of {@link LockHandler} that uses the database lock. */ public class LockHandlerImpl implements LockHandler { private static final long serialVersionUID = 5746905970040002524L; diff --git a/core/src/main/java/google/registry/tools/AckPollMessagesCommand.java b/core/src/main/java/google/registry/tools/AckPollMessagesCommand.java index 8fd5a728b..3683628a1 100644 --- a/core/src/main/java/google/registry/tools/AckPollMessagesCommand.java +++ b/core/src/main/java/google/registry/tools/AckPollMessagesCommand.java @@ -91,13 +91,7 @@ final class AckPollMessagesCommand implements Command { }); } - /** - * Acks the poll message if not running in dry-run mode, prints regardless. - * - *

This is a separate function because the processing of poll messages is transactionally - * different between the Datastore and SQL implementations. Datastore must process the messages in - * batches, whereas we can load all messages from SQL in one transaction. - */ + /** Acks the poll message if not running in dry-run mode, prints regardless. */ private void actOnPollMessage(PollMessage pollMessage) { if (!dryRun) { PollFlowUtils.ackPollMessage(pollMessage); diff --git a/core/src/main/java/google/registry/tools/DeleteTldCommand.java b/core/src/main/java/google/registry/tools/DeleteTldCommand.java index c96502c4a..8f02e9bd0 100644 --- a/core/src/main/java/google/registry/tools/DeleteTldCommand.java +++ b/core/src/main/java/google/registry/tools/DeleteTldCommand.java @@ -26,11 +26,11 @@ import google.registry.model.tld.Registry.TldType; import google.registry.persistence.transaction.QueryComposer.Comparator; /** - * Command to delete the {@link Registry} associated with the specified TLD in Datastore. + * Command to delete the {@link Registry} associated with the specified TLD in the database. * *

This command will fail if any domains are currently registered on the TLD. */ -@Parameters(separators = " =", commandDescription = "Delete a TLD from Datastore.") +@Parameters(separators = " =", commandDescription = "Delete a TLD from the database.") final class DeleteTldCommand extends ConfirmingCommand { private Registry registry; diff --git a/core/src/main/java/google/registry/tools/GenerateEscrowDepositCommand.java b/core/src/main/java/google/registry/tools/GenerateEscrowDepositCommand.java index c81efc906..987519fb1 100644 --- a/core/src/main/java/google/registry/tools/GenerateEscrowDepositCommand.java +++ b/core/src/main/java/google/registry/tools/GenerateEscrowDepositCommand.java @@ -53,7 +53,7 @@ final class GenerateEscrowDepositCommand implements Command { @Parameter( names = {"-w", "--watermark"}, - description = "Point-in-time timestamp(s) for snapshotting Datastore.", + description = "Point-in-time timestamp(s) for which time the deposit should be generated", required = true, converter = DateTimeParameter.class) private List watermarks; diff --git a/core/src/main/java/google/registry/tools/MutatingCommand.java b/core/src/main/java/google/registry/tools/MutatingCommand.java index 3f933bb07..b72778ee6 100644 --- a/core/src/main/java/google/registry/tools/MutatingCommand.java +++ b/core/src/main/java/google/registry/tools/MutatingCommand.java @@ -40,7 +40,7 @@ import java.util.Optional; import java.util.Set; import javax.annotation.Nullable; -/** A {@link ConfirmingCommand} that changes objects in Datastore. */ +/** A {@link ConfirmingCommand} that changes objects in the database. */ public abstract class MutatingCommand extends ConfirmingCommand { /** diff --git a/core/src/main/java/google/registry/tools/RegistryCli.java b/core/src/main/java/google/registry/tools/RegistryCli.java index 2a5dd6ad3..61e0ac820 100644 --- a/core/src/main/java/google/registry/tools/RegistryCli.java +++ b/core/src/main/java/google/registry/tools/RegistryCli.java @@ -36,7 +36,7 @@ import java.util.Optional; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.postgresql.util.PSQLException; -/** Container class to create and run remote commands against a Datastore instance. */ +/** Container class to create and run remote commands against a server instance. */ @Parameters(separators = " =", commandDescription = "Command-line interface to the registry") final class RegistryCli implements CommandRunner { diff --git a/core/src/main/java/google/registry/tools/RegistryTool.java b/core/src/main/java/google/registry/tools/RegistryTool.java index c7d886390..69b83faf7 100644 --- a/core/src/main/java/google/registry/tools/RegistryTool.java +++ b/core/src/main/java/google/registry/tools/RegistryTool.java @@ -17,7 +17,7 @@ package google.registry.tools; import com.google.common.collect.ImmutableMap; import google.registry.tools.javascrap.CreateCancellationsForOneTimesCommand; -/** Container class to create and run remote commands against a Datastore instance. */ +/** Container class to create and run remote commands against a server instance. */ public final class RegistryTool { /** diff --git a/core/src/main/java/google/registry/tools/server/GenerateZoneFilesAction.java b/core/src/main/java/google/registry/tools/server/GenerateZoneFilesAction.java index 753391d4e..6d9a42aac 100644 --- a/core/src/main/java/google/registry/tools/server/GenerateZoneFilesAction.java +++ b/core/src/main/java/google/registry/tools/server/GenerateZoneFilesAction.java @@ -120,7 +120,7 @@ public class GenerateZoneFilesAction implements Runnable, JsonActionRunner.JsonA final DateTime exportTime = DateTime.parse(json.get("exportTime").toString()); // We disallow exporting within the past 2 minutes because there might be outstanding writes. // We can only reliably call loadAtPointInTime at times that are UTC midnight and > - // datastoreRetention ago in the past. + // databaseRetention ago in the past. DateTime now = clock.nowUtc(); if (exportTime.isAfter(now.minusMinutes(2))) { throw new BadRequestException("Invalid export time: must be > 2 minutes ago"); @@ -284,12 +284,12 @@ public class GenerateZoneFilesAction implements Runnable, JsonActionRunner.JsonA /** * Removes the TLD, if present, from a fully-qualified name. * - *

This would not work if a fully qualified host name in a different TLD were passed. But - * we only generate glue records for in-bailiwick name servers, meaning that the TLD will always + *

This would not work if a fully qualified host name in a different TLD were passed. But we + * only generate glue records for in-bailiwick name servers, meaning that the TLD will always * match. * - * If, for some unforeseen reason, the TLD is not present, indicate an error condition, so that - * our process for comparing Datastore and DNS data will realize that something is amiss. + *

If, for some unforeseen reason, the TLD is not present, indicate an error condition, so that + * our process for comparing SQL and DNS data will realize that something is amiss. */ private static String stripTld(String fullyQualifiedName, String tld) { return fullyQualifiedName.endsWith(tld) diff --git a/core/src/main/java/google/registry/whois/DomainOrHostLookupCommand.java b/core/src/main/java/google/registry/whois/DomainOrHostLookupCommand.java index b73ffb5bc..fb3ae14cf 100644 --- a/core/src/main/java/google/registry/whois/DomainOrHostLookupCommand.java +++ b/core/src/main/java/google/registry/whois/DomainOrHostLookupCommand.java @@ -49,7 +49,7 @@ public abstract class DomainOrHostLookupCommand implements WhoisCommand { throw new WhoisException(now, SC_NOT_FOUND, errorPrefix + " not found."); } - /** Renders a response record, provided its successfully retrieved Datastore entity. */ + /** Renders a response record, provided its successfully retrieved entity. */ protected abstract Optional getResponse( InternetDomainName domainName, DateTime now); } diff --git a/core/src/main/java/google/registry/whois/WhoisResponseImpl.java b/core/src/main/java/google/registry/whois/WhoisResponseImpl.java index ef0aae94e..f2e45513d 100644 --- a/core/src/main/java/google/registry/whois/WhoisResponseImpl.java +++ b/core/src/main/java/google/registry/whois/WhoisResponseImpl.java @@ -209,7 +209,7 @@ abstract class WhoisResponseImpl implements WhoisResponse { /** Returns raw text that should be appended to the end of ALL WHOIS responses. */ E emitLastUpdated(DateTime timestamp) { // We are assuming that our WHOIS database is always completely up to date, since it's - // querying the live backend Datastore. + // querying the live backend database. stringBuilder .append(">>> Last update of WHOIS database: ") .append(UtcDateTimeAdapter.getFormattedString(timestamp)) diff --git a/core/src/main/resources/google/registry/beam/invoicing_pipeline_metadata.json b/core/src/main/resources/google/registry/beam/invoicing_pipeline_metadata.json index 8e95264b8..e8c2ae954 100644 --- a/core/src/main/resources/google/registry/beam/invoicing_pipeline_metadata.json +++ b/core/src/main/resources/google/registry/beam/invoicing_pipeline_metadata.json @@ -1,6 +1,6 @@ { "name": "Invoice and Detailed Reports Generation", - "description": "An Apache Beam batch pipeline that reads from a Datastore export and generate monthly invoice and detailed reports, saving them on GCS.", + "description": "An Apache Beam batch pipeline that generates monthly invoice and detailed reports, saving them on GCS.", "parameters": [ { "name": "registryEnvironment", diff --git a/core/src/main/resources/google/registry/beam/spec11/sql/domain_name_infos.sql b/core/src/main/resources/google/registry/beam/spec11/sql/domain_name_infos.sql deleted file mode 100644 index 2f81cb609..000000000 --- a/core/src/main/resources/google/registry/beam/spec11/sql/domain_name_infos.sql +++ /dev/null @@ -1,51 +0,0 @@ -#standardSQL - -- Copyright 2018 The Nomulus Authors. All Rights Reserved. - -- - -- Licensed under the Apache License, Version 2.0 (the "License"); - -- you may not use this file except in compliance with the License. - -- You may obtain a copy of the License at - -- - -- http://www.apache.org/licenses/LICENSE-2.0 - -- - -- Unless required by applicable law or agreed to in writing, software - -- distributed under the License is distributed on an "AS IS" BASIS, - -- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -- See the License for the specific language governing permissions and - -- limitations under the License. - - -- This query gathers all Subdomains active within a given yearMonth - -- and emits a row containing its fully qualified domain name - -- [SLD].[TLD], the current registrar's name, and the current registrar's - -- email address. - -SELECT - domain.domainName AS domainName, - domain.__key__.name AS domainRepoId, - registrar.clientId AS registrarId, - COALESCE(registrar.emailAddress, '') AS registrarEmailAddress -FROM ( ( - SELECT - __key__, - domainName, - currentSponsorClientId, - creationTime - FROM - `%PROJECT_ID%.%DATASTORE_EXPORT_DATASET%.%DOMAIN_BASE_TABLE%` - WHERE - -- Only include active registrations - -- Registrations that are active (not deleted) will have null deletionTime - -- because END_OF_TIME is an invalid timestamp in standardSQL - (SAFE_CAST(deletionTime AS STRING) IS NULL - OR deletionTime > CURRENT_TIMESTAMP)) AS domain - JOIN ( - SELECT - __key__.name AS clientId, - emailAddress - FROM - `%PROJECT_ID%.%DATASTORE_EXPORT_DATASET%.%REGISTRAR_TABLE%` - WHERE - type = 'REAL') AS registrar - ON - domain.currentSponsorClientId = registrar.clientId) -ORDER BY - creationTime DESC diff --git a/core/src/main/resources/google/registry/beam/spec11_pipeline_metadata.json b/core/src/main/resources/google/registry/beam/spec11_pipeline_metadata.json index 13b0266f2..8451e6dac 100644 --- a/core/src/main/resources/google/registry/beam/spec11_pipeline_metadata.json +++ b/core/src/main/resources/google/registry/beam/spec11_pipeline_metadata.json @@ -1,6 +1,6 @@ { "name": "Spec11 Report Generation", - "description": "An Apache Beam batch pipeline that reads from a Datastore export and generate Spec11 report for the month, saving it to both SQL and as a JSON file on GCS.", + "description": "An Apache Beam batch pipeline that generates Spec11 report for the month, saving it to both SQL and as a JSON file on GCS.", "parameters": [ { "name": "registryEnvironment", diff --git a/core/src/main/resources/google/registry/reporting/icann/sql/activity_report_aggregation.sql b/core/src/main/resources/google/registry/reporting/icann/sql/activity_report_aggregation.sql deleted file mode 100644 index 67d9ab01f..000000000 --- a/core/src/main/resources/google/registry/reporting/icann/sql/activity_report_aggregation.sql +++ /dev/null @@ -1,97 +0,0 @@ -#standardSQL - -- Copyright 2017 The Nomulus Authors. All Rights Reserved. - -- - -- Licensed under the Apache License, Version 2.0 (the "License"); - -- you may not use this file except in compliance with the License. - -- You may obtain a copy of the License at - -- - -- http://www.apache.org/licenses/LICENSE-2.0 - -- - -- Unless required by applicable law or agreed to in writing, software - -- distributed under the License is distributed on an "AS IS" BASIS, - -- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -- See the License for the specific language governing permissions and - -- limitations under the License. - - -- This query pulls from all intermediary tables to create the activity - -- report csv, via a table transpose and sum over all activity report fields. - -SELECT - RealTlds.tld AS tld, - SUM(IF(metricName = 'operational-registrars', count, 0)) AS operational_registrars, - -- We use the Centralized Zone Data Service. - "CZDS" AS zfa_passwords, - SUM(IF(metricName = 'whois-43-queries', count, 0)) AS whois_43_queries, - SUM(IF(metricName = 'web-whois-queries', count, 0)) AS web_whois_queries, - -- We don't support searchable WHOIS. - 0 AS searchable_whois_queries, - -- DNS queries for UDP/TCP are all assumed to be received/responded. - SUM(IF(metricName = 'dns-udp-queries', count, 0)) AS dns_udp_queries_received, - SUM(IF(metricName = 'dns-udp-queries', count, 0)) AS dns_udp_queries_responded, - SUM(IF(metricName = 'dns-tcp-queries', count, 0)) AS dns_tcp_queries_received, - SUM(IF(metricName = 'dns-tcp-queries', count, 0)) AS dns_tcp_queries_responded, - -- SRS metrics. - SUM(IF(metricName = 'srs-dom-check', count, 0)) AS srs_dom_check, - SUM(IF(metricName = 'srs-dom-create', count, 0)) AS srs_dom_create, - SUM(IF(metricName = 'srs-dom-delete', count, 0)) AS srs_dom_delete, - SUM(IF(metricName = 'srs-dom-info', count, 0)) AS srs_dom_info, - SUM(IF(metricName = 'srs-dom-renew', count, 0)) AS srs_dom_renew, - SUM(IF(metricName = 'srs-dom-rgp-restore-report', count, 0)) AS srs_dom_rgp_restore_report, - SUM(IF(metricName = 'srs-dom-rgp-restore-request', count, 0)) AS srs_dom_rgp_restore_request, - SUM(IF(metricName = 'srs-dom-transfer-approve', count, 0)) AS srs_dom_transfer_approve, - SUM(IF(metricName = 'srs-dom-transfer-cancel', count, 0)) AS srs_dom_transfer_cancel, - SUM(IF(metricName = 'srs-dom-transfer-query', count, 0)) AS srs_dom_transfer_query, - SUM(IF(metricName = 'srs-dom-transfer-reject', count, 0)) AS srs_dom_transfer_reject, - SUM(IF(metricName = 'srs-dom-transfer-request', count, 0)) AS srs_dom_transfer_request, - SUM(IF(metricName = 'srs-dom-update', count, 0)) AS srs_dom_update, - SUM(IF(metricName = 'srs-host-check', count, 0)) AS srs_host_check, - SUM(IF(metricName = 'srs-host-create', count, 0)) AS srs_host_create, - SUM(IF(metricName = 'srs-host-delete', count, 0)) AS srs_host_delete, - SUM(IF(metricName = 'srs-host-info', count, 0)) AS srs_host_info, - SUM(IF(metricName = 'srs-host-update', count, 0)) AS srs_host_update, - SUM(IF(metricName = 'srs-cont-check', count, 0)) AS srs_cont_check, - SUM(IF(metricName = 'srs-cont-create', count, 0)) AS srs_cont_create, - SUM(IF(metricName = 'srs-cont-delete', count, 0)) AS srs_cont_delete, - SUM(IF(metricName = 'srs-cont-info', count, 0)) AS srs_cont_info, - SUM(IF(metricName = 'srs-cont-transfer-approve', count, 0)) AS srs_cont_transfer_approve, - SUM(IF(metricName = 'srs-cont-transfer-cancel', count, 0)) AS srs_cont_transfer_cancel, - SUM(IF(metricName = 'srs-cont-transfer-query', count, 0)) AS srs_cont_transfer_query, - SUM(IF(metricName = 'srs-cont-transfer-reject', count, 0)) AS srs_cont_transfer_reject, - SUM(IF(metricName = 'srs-cont-transfer-request', count, 0)) AS srs_cont_transfer_request, - SUM(IF(metricName = 'srs-cont-update', count, 0)) AS srs_cont_update - -- Cross join a list of all TLDs against TLD-specific metrics and then - -- filter so that only metrics with that TLD or a NULL TLD are counted - -- towards a given TLD. -FROM ( -SELECT tldStr AS tld -FROM `%PROJECT_ID%.%DATASTORE_EXPORT_DATA_SET%.%REGISTRY_TABLE%` -WHERE tldType = 'REAL' -) as RealTlds -CROSS JOIN( - SELECT - tld, - metricName, - count - FROM - ( - -- BEGIN INTERMEDIARY DATA SOURCES -- - -- Dummy data source to ensure all TLDs appear in report, even if - -- they have no recorded metrics for the month. - SELECT STRING(NULL) AS tld, STRING(NULL) AS metricName, 0 as count - UNION ALL - SELECT * FROM - `%PROJECT_ID%.%ICANN_REPORTING_DATA_SET%.%REGISTRAR_OPERATING_STATUS_TABLE%` - UNION ALL - SELECT * FROM - `%PROJECT_ID%.%ICANN_REPORTING_DATA_SET%.%DNS_COUNTS_TABLE%` - UNION ALL - SELECT * FROM - `%PROJECT_ID%.%ICANN_REPORTING_DATA_SET%.%EPP_METRICS_TABLE%` - UNION ALL - SELECT * FROM - `%PROJECT_ID%.%ICANN_REPORTING_DATA_SET%.%WHOIS_COUNTS_TABLE%` - -- END INTERMEDIARY DATA SOURCES -- - )) AS TldMetrics -WHERE RealTlds.tld = TldMetrics.tld OR TldMetrics.tld IS NULL -GROUP BY tld -ORDER BY tld diff --git a/core/src/test/java/google/registry/beam/billing/InvoicingPipelineTest.java b/core/src/test/java/google/registry/beam/billing/InvoicingPipelineTest.java index c11303bd3..80485a4db 100644 --- a/core/src/test/java/google/registry/beam/billing/InvoicingPipelineTest.java +++ b/core/src/test/java/google/registry/beam/billing/InvoicingPipelineTest.java @@ -374,7 +374,6 @@ class InvoicingPipelineTest { } private static void setupCloudSql() { - // Populate billing events in Cloud SQL to match existing test data for Datastore persistNewRegistrar("NewRegistrar"); persistNewRegistrar("TheRegistrar"); Registrar registrar1 = persistNewRegistrar("theRegistrar"); diff --git a/core/src/test/java/google/registry/beam/spec11/Spec11PipelineTest.java b/core/src/test/java/google/registry/beam/spec11/Spec11PipelineTest.java index d75193598..ee34b7807 100644 --- a/core/src/test/java/google/registry/beam/spec11/Spec11PipelineTest.java +++ b/core/src/test/java/google/registry/beam/spec11/Spec11PipelineTest.java @@ -75,9 +75,9 @@ import org.junit.jupiter.api.io.TempDir; /** * Unit tests for {@link Spec11Pipeline}. * - *

Unfortunately there is no emulator for BigQuery like that for Datastore or App Engine. - * Therefore we cannot fully test the pipeline but only test the two separate sink IO functions, - * assuming that date is sourcede correctly the {@code BigQueryIO}. + *

Unfortunately there is no emulator for BigQuery, so we cannot fully test the pipeline but only + * test the two separate sink IO functions, assuming that date is sourced correctly the {@code + * BigQueryIO}. */ class Spec11PipelineTest { @@ -214,7 +214,7 @@ class Spec11PipelineTest { } @Test - void testSuccess_readFromCloudSql() throws Exception { + void testSuccess_readFromCloudSql() { setupCloudSql(); PCollection domainNameInfos = Spec11Pipeline.readFromCloudSql(pipeline); PAssert.that(domainNameInfos).containsInAnyOrder(DOMAIN_NAME_INFOS); @@ -310,7 +310,7 @@ class Spec11PipelineTest { new File( String.format( "%s/icann/spec11/2020-01/SPEC11_MONTHLY_REPORT_2020-01-27", - reportingBucketUrl.getAbsolutePath().toString())); + reportingBucketUrl.getAbsolutePath())); return ImmutableList.copyOf( ResourceUtils.readResourceUtf8(resultFile.toURI().toURL()).split("\n")); } @@ -335,7 +335,6 @@ class Spec11PipelineTest { return false; } } - ; return true; } } diff --git a/core/src/test/java/google/registry/bigquery/CheckedBigqueryTest.java b/core/src/test/java/google/registry/bigquery/CheckedBigqueryTest.java index 7334b9e73..0f9bfcaa2 100644 --- a/core/src/test/java/google/registry/bigquery/CheckedBigqueryTest.java +++ b/core/src/test/java/google/registry/bigquery/CheckedBigqueryTest.java @@ -67,7 +67,7 @@ class CheckedBigqueryTest { } @Test - void testSuccess_datastoreCreation() throws Exception { + void testSuccess_datasetCreation() throws Exception { checkedBigquery.ensureDataSetExists("Project-Id", "Dataset-Id"); ArgumentCaptor datasetArg = ArgumentCaptor.forClass(Dataset.class); @@ -80,7 +80,7 @@ class CheckedBigqueryTest { } @Test - void testSuccess_datastoreAndTableCreation() throws Exception { + void testSuccess_datasetAndTableCreation() throws Exception { checkedBigquery.ensureDataSetAndTableExist("Project-Id", "Dataset2", "Table2"); ArgumentCaptor datasetArg = ArgumentCaptor.forClass(Dataset.class); diff --git a/core/src/test/java/google/registry/dns/writer/clouddns/CloudDnsWriterTest.java b/core/src/test/java/google/registry/dns/writer/clouddns/CloudDnsWriterTest.java index 16bf1f29a..c582b8e81 100644 --- a/core/src/test/java/google/registry/dns/writer/clouddns/CloudDnsWriterTest.java +++ b/core/src/test/java/google/registry/dns/writer/clouddns/CloudDnsWriterTest.java @@ -283,7 +283,7 @@ public class CloudDnsWriterTest { return recordSetBuilder.build(); } - /** Returns a domain to be persisted in Datastore. */ + /** Returns a domain to be persisted in the database. */ private static Domain fakeDomain( String domainName, ImmutableSet nameservers, int numDsRecords) { ImmutableSet.Builder dsDataBuilder = new ImmutableSet.Builder<>(); diff --git a/core/src/test/java/google/registry/flows/domain/DomainCheckFlowTest.java b/core/src/test/java/google/registry/flows/domain/DomainCheckFlowTest.java index 606e22743..672227906 100644 --- a/core/src/test/java/google/registry/flows/domain/DomainCheckFlowTest.java +++ b/core/src/test/java/google/registry/flows/domain/DomainCheckFlowTest.java @@ -790,7 +790,7 @@ class DomainCheckFlowTest extends ResourceCheckFlowTestCase { .setAuthInfo(DomainAuthInfo.create(PasswordAuth.create("2fooBAR"))) .build()); // Set the superordinate domain of ns1.example.com to example.com. In reality, this would have - // happened in the flow that created it, but here we just overwrite it in Datastore. + // happened in the flow that created it, but here we just overwrite it in the database. host1 = persistResource(host1.asBuilder().setSuperordinateDomain(domain.createVKey()).build()); // Create a subordinate host that is not delegated to by anyone. host3 = diff --git a/core/src/test/java/google/registry/flows/domain/DomainTransferRequestFlowTest.java b/core/src/test/java/google/registry/flows/domain/DomainTransferRequestFlowTest.java index 9f42f9452..ce4a1888c 100644 --- a/core/src/test/java/google/registry/flows/domain/DomainTransferRequestFlowTest.java +++ b/core/src/test/java/google/registry/flows/domain/DomainTransferRequestFlowTest.java @@ -306,7 +306,7 @@ class DomainTransferRequestFlowTest Stream.of(extraExpectedBillingEvents) .map(builder -> builder.setDomainHistory(historyEntryTransferRequest).build()) .collect(toImmutableSet()); - // Assert that the billing events we constructed above actually exist in Datastore. + // Assert that the billing events we constructed above actually exist in the database. ImmutableSet expectedBillingEvents = Streams.concat( Stream.of(losingClientAutorenew, gainingClientAutorenew), diff --git a/core/src/test/java/google/registry/model/domain/DomainTest.java b/core/src/test/java/google/registry/model/domain/DomainTest.java index e1ee2f24d..9f6238f41 100644 --- a/core/src/test/java/google/registry/model/domain/DomainTest.java +++ b/core/src/test/java/google/registry/model/domain/DomainTest.java @@ -235,7 +235,7 @@ public class DomainTest { @Test void testPersistence() { // Note that this only verifies that the value stored under the foreign key is the same as that - // stored under the primary key ("domain" is the domain loaded from the datastore, not the + // stored under the primary key ("domain" is the domain loaded from the the database, not the // original domain object). assertThat(loadByForeignKey(Domain.class, domain.getForeignKey(), fakeClock.nowUtc())) .hasValue(domain); diff --git a/core/src/test/java/google/registry/model/server/ServerSecretTest.java b/core/src/test/java/google/registry/model/server/ServerSecretTest.java index 26acc7344..3afc39768 100644 --- a/core/src/test/java/google/registry/model/server/ServerSecretTest.java +++ b/core/src/test/java/google/registry/model/server/ServerSecretTest.java @@ -36,7 +36,7 @@ public class ServerSecretTest extends EntityTestCase { } @Test - void testGet_bootstrapping_savesSecretToDatastore() { + void testGet_bootstrapping_savesSecret() { ServerSecret secret = ServerSecret.get(); assertThat(secret).isNotNull(); assertThat(loadByEntity(new ServerSecret())).isEqualTo(secret); diff --git a/core/src/test/java/google/registry/persistence/transaction/ReplicaSimulatingJpaTransactionManager.java b/core/src/test/java/google/registry/persistence/transaction/ReplicaSimulatingJpaTransactionManager.java index 578781334..c30584110 100644 --- a/core/src/test/java/google/registry/persistence/transaction/ReplicaSimulatingJpaTransactionManager.java +++ b/core/src/test/java/google/registry/persistence/transaction/ReplicaSimulatingJpaTransactionManager.java @@ -104,11 +104,6 @@ public class ReplicaSimulatingJpaTransactionManager implements JpaTransactionMan }); } - @Override - public T transactWithoutBackup(Supplier work) { - return transact(work); - } - @Override public T transactNoRetry(Supplier work) { return transact(work); diff --git a/core/src/test/java/google/registry/server/Fixture.java b/core/src/test/java/google/registry/server/Fixture.java index ec25d1bb0..988f7556c 100644 --- a/core/src/test/java/google/registry/server/Fixture.java +++ b/core/src/test/java/google/registry/server/Fixture.java @@ -36,7 +36,7 @@ import google.registry.testing.DatabaseHelper; import java.io.IOException; /** - * Datastore fixtures for the development webserver. + * Database fixtures for the development webserver. * *

Warning: These fixtures aren't really intended for unit tests, since they take upwards * of a second to load. @@ -162,6 +162,6 @@ public enum Fixture { } }; - /** Loads this fixture into Datastore. */ + /** Loads this fixture into the database. */ public abstract void load(); } diff --git a/core/src/test/java/google/registry/server/TestServer.java b/core/src/test/java/google/registry/server/TestServer.java index 618bbbeef..3c68d74da 100644 --- a/core/src/test/java/google/registry/server/TestServer.java +++ b/core/src/test/java/google/registry/server/TestServer.java @@ -45,8 +45,8 @@ import org.mortbay.jetty.servlet.ServletHolder; /** * HTTP server that serves static content and handles servlet requests in the calling thread. * - *

Using this server is similar to to other server classes, in that it has {@link #start()} and - * {@link #stop()} methods. However a {@link #process()} method was added, which is used to process + *

Using this server is similar to other server classes, in that it has {@link #start()} and + * {@link #stop()} methods. However, a {@link #process()} method was added, which is used to process * requests made to servlets (not static files) in the calling thread. * *

Note: This server is intended for development purposes. For the love all that is good, @@ -59,11 +59,6 @@ import org.mortbay.jetty.servlet.ServletHolder; * inside {@link ServletWrapperDelegatorServlet}. When requests come in, a {@link FutureTask} will * be sent back to this class using a {@link LinkedBlockingDeque} message queue. Those messages are * then consumed by the {@code process()} method. - * - *

The reason why this is necessary is because the App Engine local testing services (created by - * {@code LocalServiceTestHelper}) only apply to a single thread (probably to allow multi-threaded - * tests). So when Jetty creates random threads to handle requests, they won't have access to the - * Datastore and other stuff. */ public final class TestServer { diff --git a/core/src/test/java/google/registry/testing/DatabaseHelper.java b/core/src/test/java/google/registry/testing/DatabaseHelper.java index 5e8a03798..031611163 100644 --- a/core/src/test/java/google/registry/testing/DatabaseHelper.java +++ b/core/src/test/java/google/registry/testing/DatabaseHelper.java @@ -396,10 +396,10 @@ public final class DatabaseHelper { .collect( toImmutableMap(Map.Entry::getKey, entry -> entry.getValue().getValue()))) .build(); - // Since we used to persist a PremiumList to Datastore here, it is necessary to allocate an ID - // here to prevent breaking some hard-coded flow tests. IDs in tests are allocated in a - // strictly increasing sequence, if we don't pad out the ID here, we would have to renumber - // hundreds of unit tests. + // Since we used to persist a PremiumList here, it is necessary to allocate an ID here to + // prevent breaking some hard-coded flow tests. IDs in tests are allocated in a strictly + // increasing sequence, if we don't pad out the ID here, we would have to renumber hundreds of + // unit tests. allocateId(); PremiumListDao.save(premiumList); maybeAdvanceClock(); @@ -837,12 +837,12 @@ public final class DatabaseHelper { .containsExactlyElementsIn(expected); } - /** Assert that the expected billing events are exactly the ones found in the fake Datastore. */ + /** Assert that the expected billing events are exactly the ones found in test database. */ public static void assertBillingEvents(BillingEvent... expected) { assertBillingEventsEqual(getBillingEvents(), asList(expected)); } - /** Assert that the expected billing events set is exactly the one found in the fake Datastore. */ + /** Assert that the expected billing events set is exactly the one found in test database. */ public static void assertBillingEvents(Set expected) { assertBillingEventsEqual(getBillingEvents(), expected); } @@ -1321,60 +1321,6 @@ public final class DatabaseHelper { return entity; } - /** - * Sets a DATASTORE_PRIMARY_NO_ASYNC state on the {@link DatabaseMigrationStateSchedule}. - * - *

In order to allow for tests to manipulate the clock how they need, we start the transitions - * one millisecond after the clock's current time (in case the clock's current value is - * START_OF_TIME). We then advance the clock one second so that we're in the - * DATASTORE_PRIMARY_READ_ONLY phase. - * - *

We must use the current time, otherwise the setting of the migration state will fail due to - * an invalid transition. - */ - public static void setMigrationScheduleToDatastorePrimaryNoAsync(FakeClock fakeClock) { - DateTime now = fakeClock.nowUtc(); - tm().transact( - () -> - DatabaseMigrationStateSchedule.set( - ImmutableSortedMap.of( - START_OF_TIME, - MigrationState.DATASTORE_ONLY, - now.plusMillis(1), - MigrationState.DATASTORE_PRIMARY, - now.plusMillis(2), - MigrationState.DATASTORE_PRIMARY_NO_ASYNC))); - fakeClock.advanceBy(Duration.standardSeconds(1)); - } - - /** - * Sets a DATASTORE_PRIMARY_READ_ONLY state on the {@link DatabaseMigrationStateSchedule}. - * - *

In order to allow for tests to manipulate the clock how they need, we start the transitions - * one millisecond after the clock's current time (in case the clock's current value is - * START_OF_TIME). We then advance the clock one second so that we're in the - * DATASTORE_PRIMARY_READ_ONLY phase. - * - *

We must use the current time, otherwise the setting of the migration state will fail due to - * an invalid transition. - */ - public static void setMigrationScheduleToDatastorePrimaryReadOnly(FakeClock fakeClock) { - DateTime now = fakeClock.nowUtc(); - tm().transact( - () -> - DatabaseMigrationStateSchedule.set( - ImmutableSortedMap.of( - START_OF_TIME, - MigrationState.DATASTORE_ONLY, - now.plusMillis(1), - MigrationState.DATASTORE_PRIMARY, - now.plusMillis(2), - MigrationState.DATASTORE_PRIMARY_NO_ASYNC, - now.plusMillis(3), - MigrationState.DATASTORE_PRIMARY_READ_ONLY))); - fakeClock.advanceBy(Duration.standardSeconds(1)); - } - /** * Sets a SQL_PRIMARY state on the {@link DatabaseMigrationStateSchedule}. * diff --git a/core/src/test/java/google/registry/tools/AuthModuleTest.java b/core/src/test/java/google/registry/tools/AuthModuleTest.java index 0081106cc..cf492ba75 100644 --- a/core/src/test/java/google/registry/tools/AuthModuleTest.java +++ b/core/src/test/java/google/registry/tools/AuthModuleTest.java @@ -144,7 +144,7 @@ class AuthModuleTest { } private Credential getCredential() { - // Reconstruct the entire dependency graph, injecting FakeDatastoreFactory and credential + // Reconstruct the entire dependency graph, injecting FakeDataStoreFactory and credential // parameters. JacksonFactory jsonFactory = new JacksonFactory(); GoogleClientSecrets clientSecrets = getSecrets(); diff --git a/core/src/test/java/google/registry/tools/CommandTestCase.java b/core/src/test/java/google/registry/tools/CommandTestCase.java index 726ea7d68..a37dd0778 100644 --- a/core/src/test/java/google/registry/tools/CommandTestCase.java +++ b/core/src/test/java/google/registry/tools/CommandTestCase.java @@ -167,12 +167,11 @@ public abstract class CommandTestCase { return writeToNamedTmpFile("cert.pem", certificateFile); } - /** Reloads the given resource from Datastore. */ T reloadResource(T resource) { return tm().transact(() -> tm().loadByEntity(resource)); } - /** Returns count of all poll messages in Datastore. */ + /** Returns count of all poll messages. */ int getPollMessageCount() { return tm().transact(() -> tm().loadAllOf(PollMessage.class).size()); } diff --git a/core/src/test/java/google/registry/tools/CreateOrUpdateReservedListCommandTestCase.java b/core/src/test/java/google/registry/tools/CreateOrUpdateReservedListCommandTestCase.java index 0f55a78ac..8ac6f5c0c 100644 --- a/core/src/test/java/google/registry/tools/CreateOrUpdateReservedListCommandTestCase.java +++ b/core/src/test/java/google/registry/tools/CreateOrUpdateReservedListCommandTestCase.java @@ -15,8 +15,6 @@ package google.registry.tools; import static com.google.common.truth.Truth.assertThat; -import static google.registry.model.tld.label.ReservationType.FULLY_BLOCKED; -import static google.registry.persistence.transaction.TransactionManagerFactory.tm; import static google.registry.testing.TestDataHelper.loadFile; import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -24,10 +22,8 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import com.beust.jcommander.ParameterException; import com.google.common.collect.ImmutableMap; import com.google.common.io.Files; -import com.google.common.truth.Truth8; import google.registry.model.tld.label.ReservedList; import google.registry.model.tld.label.ReservedList.ReservedListEntry; -import google.registry.model.tld.label.ReservedListDao; import java.io.File; import java.io.IOException; import org.joda.time.DateTime; @@ -109,41 +105,4 @@ abstract class CreateOrUpdateReservedListCommandTestCase< .setReservedListMap(labelsToEntries) .build(); } - - ReservedList getCloudSqlReservedList(String name) { - return tm().transact( - () -> { - long revisionId = - tm().query( - "SELECT MAX(rl.revisionId) FROM ReservedList rl WHERE name = :name", - Long.class) - .setParameter("name", name) - .getSingleResult(); - return tm().query( - "FROM ReservedList WHERE revisionId = :revisionId", ReservedList.class) - .setParameter("revisionId", revisionId) - .getSingleResult(); - }); - } - - void verifyXnq9jyb4cInCloudSql() { - assertThat(ReservedListDao.checkExists("xn--q9jyb4c_common-reserved")).isTrue(); - ReservedList persistedList = getCloudSqlReservedList("xn--q9jyb4c_common-reserved"); - assertThat(persistedList.getName()).isEqualTo("xn--q9jyb4c_common-reserved"); - assertThat(persistedList.getShouldPublish()).isTrue(); - assertThat(persistedList.getReservedListEntries()) - .containsExactly( - "baddies", - ReservedListEntry.create("baddies", FULLY_BLOCKED, ""), - "ford", - ReservedListEntry.create("ford", FULLY_BLOCKED, "random comment")); - } - - void verifyXnq9jyb4cInDatastore() { - Truth8.assertThat(ReservedList.get("xn--q9jyb4c_common-reserved")).isPresent(); - ReservedList reservedList = ReservedList.get("xn--q9jyb4c_common-reserved").get(); - assertThat(reservedList.getReservedListEntries()).hasSize(2); - Truth8.assertThat(reservedList.getReservationInList("baddies")).hasValue(FULLY_BLOCKED); - Truth8.assertThat(reservedList.getReservationInList("ford")).hasValue(FULLY_BLOCKED); - } } diff --git a/core/src/test/java/google/registry/tools/CreateReservedListCommandTest.java b/core/src/test/java/google/registry/tools/CreateReservedListCommandTest.java index c6f545874..1009a2ad9 100644 --- a/core/src/test/java/google/registry/tools/CreateReservedListCommandTest.java +++ b/core/src/test/java/google/registry/tools/CreateReservedListCommandTest.java @@ -168,13 +168,6 @@ class CreateReservedListCommandTest runNameTestExpectedFailure("soy_$oy", INVALID_FORMAT_ERROR_MESSAGE); } - @Test - void testSaveToCloudSql_succeeds() throws Exception { - runCommandForced("--name=xn--q9jyb4c_common-reserved", "--input=" + reservedTermsPath); - verifyXnq9jyb4cInDatastore(); - verifyXnq9jyb4cInCloudSql(); - } - private void runNameTestExpectedFailure(String name, String expectedErrorMsg) { IllegalArgumentException thrown = assertThrows( diff --git a/core/src/test/java/google/registry/tools/DomainLockUtilsTest.java b/core/src/test/java/google/registry/tools/DomainLockUtilsTest.java index c6935725a..623acc135 100644 --- a/core/src/test/java/google/registry/tools/DomainLockUtilsTest.java +++ b/core/src/test/java/google/registry/tools/DomainLockUtilsTest.java @@ -454,7 +454,7 @@ public final class DomainLockUtilsTest { () -> domainLockUtils.verifyAndApplyLock(verificationCode, false)); assertThat(thrown).hasMessageThat().isEqualTo("Domain example.tld is already locked"); - // Failure during Datastore portion shouldn't affect the SQL object + // Failure during the lock acquisition portion shouldn't affect the SQL object RegistryLock afterAction = getRegistryLockByVerificationCode(lock.getVerificationCode()).get(); assertThat(afterAction).isEqualTo(lock); assertNoDomainChanges(); diff --git a/core/src/test/java/google/registry/tools/UpdateReservedListCommandTest.java b/core/src/test/java/google/registry/tools/UpdateReservedListCommandTest.java index 2e36c23cc..1f5f8ec08 100644 --- a/core/src/test/java/google/registry/tools/UpdateReservedListCommandTest.java +++ b/core/src/test/java/google/registry/tools/UpdateReservedListCommandTest.java @@ -24,11 +24,8 @@ import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.jupiter.api.Assertions.assertThrows; import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; import com.google.common.io.Files; import google.registry.model.tld.label.ReservedList; -import google.registry.model.tld.label.ReservedList.ReservedListEntry; -import google.registry.model.tld.label.ReservedListDao; import java.io.File; import java.nio.file.Paths; import org.junit.jupiter.api.BeforeEach; @@ -53,16 +50,6 @@ class UpdateReservedListCommandTest .build()); } - private void populateInitialReservedListInCloudSql(boolean shouldPublish) { - ReservedListDao.save( - createCloudSqlReservedList( - "xn--q9jyb4c_common-reserved", - fakeClock.nowUtc(), - shouldPublish, - ImmutableMap.of( - "helicopter", ReservedListEntry.create("helicopter", FULLY_BLOCKED, "")))); - } - @Test void testSuccess() throws Exception { runSuccessfulUpdateTest("--name=xn--q9jyb4c_common-reserved", "--input=" + reservedTermsPath); @@ -107,29 +94,10 @@ class UpdateReservedListCommandTest IllegalArgumentException thrown = assertThrows( IllegalArgumentException.class, - () -> - runCommand("--force", "--name=xn--q9jyb4c_poobah", "--input=" + reservedTermsPath)); + () -> runCommandForced("--name=xn--q9jyb4c_poobah", "--input=" + reservedTermsPath)); assertThat(thrown).hasMessageThat().contains(errorMessage); } - @Test - void testSaveToCloudSql_succeeds() throws Exception { - populateInitialReservedListInCloudSql(true); - runCommandForced("--name=xn--q9jyb4c_common-reserved", "--input=" + reservedTermsPath); - verifyXnq9jyb4cInDatastore(); - verifyXnq9jyb4cInCloudSql(); - } - - @Test - void testSaveToCloudSql_succeedsEvenPreviousListNotExist() throws Exception { - // Note that, during the dual-write phase, we always save the reserved list to Cloud SQL without - // checking if there is a list with same name. This is to backfill the existing list in Cloud - // Datastore when we update it. - runCommandForced("--name=xn--q9jyb4c_common-reserved", "--input=" + reservedTermsPath); - verifyXnq9jyb4cInDatastore(); - assertThat(ReservedListDao.checkExists("xn--q9jyb4c_common-reserved")).isTrue(); - } - @Test void testSuccess_noChanges() throws Exception { File reservedTermsFile = tmpDir.resolve("xn--q9jyb4c_common-reserved.txt").toFile(); diff --git a/core/src/test/java/google/registry/ui/server/registrar/RegistrarSettingsActionTest.java b/core/src/test/java/google/registry/ui/server/registrar/RegistrarSettingsActionTest.java index 38bfce740..d5190da2f 100644 --- a/core/src/test/java/google/registry/ui/server/registrar/RegistrarSettingsActionTest.java +++ b/core/src/test/java/google/registry/ui/server/registrar/RegistrarSettingsActionTest.java @@ -254,13 +254,13 @@ class RegistrarSettingsActionTest extends RegistrarSettingsActionTestCase { // Set the user to only have the current role for this registrar action.registrarAccessor = AuthenticatedRegistrarAccessor.createForTesting(ImmutableSetMultimap.of(CLIENT_ID, role)); - // Load the registrar as it is currently in datastore, and make sure the requested update will - // actually change it + // Load the registrar as it is currently in the database, and make sure the requested update + // will actually change it Registrar registrar = loadRegistrar(CLIENT_ID); assertThat(getter.apply(registrar)).isNotEqualTo(newValue); // Call the action to perform the requested update, then load the "updated" registrar and - // return the "datastore" registrar to its original state (for the next iteration) + // return the "database" registrar to its original state (for the next iteration) Map response = action.handleJsonRequest( ImmutableMap.of( @@ -309,8 +309,8 @@ class RegistrarSettingsActionTest extends RegistrarSettingsActionTestCase { .build(); action.registrarAccessor = AuthenticatedRegistrarAccessor.createForTesting(accessMap); - // Load the registrar as it is currently in datastore, and make sure the requested update will - // actually change it + // Load the registrar as it is currently in the database, and make sure the requested update + // will actually change it Registrar registrar = loadRegistrar(CLIENT_ID); assertThat(getter.apply(registrar)).isNotEqualTo(newValue); diff --git a/core/src/test/java/google/registry/ui/server/registrar/RegistryLockVerifyActionTest.java b/core/src/test/java/google/registry/ui/server/registrar/RegistryLockVerifyActionTest.java index 6b8fb01ce..30c6d78de 100644 --- a/core/src/test/java/google/registry/ui/server/registrar/RegistryLockVerifyActionTest.java +++ b/core/src/test/java/google/registry/ui/server/registrar/RegistryLockVerifyActionTest.java @@ -212,8 +212,8 @@ final class RegistryLockVerifyActionTest { @Test void testFailure_doesNotChangeLockObject() { - // A failure when performing Datastore actions means that no actions should be taken in the - // Cloud SQL RegistryLock object + // A failure when performing actions means that no actions should be taken in the Cloud SQL + // RegistryLock object RegistryLock lock = createLock(); saveRegistryLock(lock); // reload the lock to pick up creation time @@ -221,7 +221,7 @@ final class RegistryLockVerifyActionTest { fakeClock.advanceOneMilli(); domain = persistResource(domain.asBuilder().setStatusValues(REGISTRY_LOCK_STATUSES).build()); action.run(); - // we would have failed during the Datastore segment of the action + // we would have failed during the lock acquisition segment of the action assertThat(response.getPayload()).contains("Failed: Domain example.tld is already locked"); // verify that the changes to the SQL object were rolled back diff --git a/core/src/test/java/google/registry/whois/WhoisActionTest.java b/core/src/test/java/google/registry/whois/WhoisActionTest.java index 3e8409d3a..8c42d9a0b 100644 --- a/core/src/test/java/google/registry/whois/WhoisActionTest.java +++ b/core/src/test/java/google/registry/whois/WhoisActionTest.java @@ -284,7 +284,7 @@ public class WhoisActionTest { } @Test - void testRun_domainFlaggedAsDeletedInDatastore_isConsideredNotFound() { + void testRun_domainFlaggedAsDeletedInDatabase_isConsideredNotFound() { Registrar registrar; persistResource( makeDomain( @@ -432,7 +432,7 @@ public class WhoisActionTest { } @Test - void testRun_nameserverFlaggedAsDeletedInDatastore_doesntGetLeaked() { + void testRun_nameserverFlaggedAsDeletedInDatabase_doesntGetLeaked() { persistResource( FullFieldsTestEntityHelper.makeHost("ns1.cat.lol", "1.2.3.4") .asBuilder() diff --git a/core/src/test/java/google/registry/whois/WhoisHttpActionTest.java b/core/src/test/java/google/registry/whois/WhoisHttpActionTest.java index a7eb02857..8191b0b26 100644 --- a/core/src/test/java/google/registry/whois/WhoisHttpActionTest.java +++ b/core/src/test/java/google/registry/whois/WhoisHttpActionTest.java @@ -165,7 +165,7 @@ class WhoisHttpActionTest { } @Test - void testRun_wickedLineFeedForgeryInDatastore_crlfSubstitutedWithSpace() { + void testRun_wickedLineFeedForgeryInDatabase_crlfSubstitutedWithSpace() { Contact trl = FullFieldsTestEntityHelper.makeContact("5372808-TRL", "Eric Schmidt", "bog@cat.みんな"); trl = diff --git a/core/src/test/resources/google/registry/backup/commitlog.data b/core/src/test/resources/google/registry/backup/commitlog.data deleted file mode 100644 index 391e8f5a3..000000000 Binary files a/core/src/test/resources/google/registry/backup/commitlog.data and /dev/null differ diff --git a/core/src/test/resources/google/registry/beam/billing/billing_events_test.sql b/core/src/test/resources/google/registry/beam/billing/billing_events_test.sql deleted file mode 100644 index e20cff107..000000000 --- a/core/src/test/resources/google/registry/beam/billing/billing_events_test.sql +++ /dev/null @@ -1,100 +0,0 @@ -#standardSQL - -- Copyright 2017 The Nomulus Authors. All Rights Reserved. - -- - -- Licensed under the Apache License, Version 2.0 (the "License"); - -- you may not use this file except in compliance with the License. - -- You may obtain a copy of the License at - -- - -- http://www.apache.org/licenses/LICENSE-2.0 - -- - -- Unless required by applicable law or agreed to in writing, software - -- distributed under the License is distributed on an "AS IS" BASIS, - -- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -- See the License for the specific language governing permissions and - -- limitations under the License. - - -- This query gathers all non-canceled billing events for a given - -- YEAR_MONTH in yyyy-MM format. - -SELECT - __key__.id AS id, - billingTime, - eventTime, - BillingEvent.clientId AS registrarId, - RegistrarData.accountId AS billingId, - RegistrarData.poNumber AS poNumber, - tld, - reason as action, - targetId as domain, - BillingEvent.domainRepoId as repositoryId, - IFNULL(periodYears, 0) as years, - BillingEvent.currency AS currency, - BillingEvent.amount as amount, - -- We'll strip out non-useful flags downstream - ARRAY_TO_STRING(flags, " ") AS flags -FROM ( - SELECT - *, - -- We store cost as "CURRENCY AMOUNT" such as "JPY 800" or "USD 20.00" - SPLIT(cost, ' ')[OFFSET(0)] AS currency, - SPLIT(cost, ' ')[OFFSET(1)] AS amount, - -- Extract everything after the first dot in the domain as the TLD - REGEXP_EXTRACT(targetId, r'[.](.+)') AS tld, - REGEXP_REPLACE(SPLIT(__key__.path, ', ')[OFFSET(1)], '"', '') - AS domainRepoId, - COALESCE(cancellationMatchingBillingEvent.path, - __key__.path) AS cancellationMatchingPath - FROM - `my-project-id.latest_datastore_export.OneTime` - -- Only include real TLDs (filter prober data) - WHERE - REGEXP_EXTRACT(targetId, r'[.](.+)') IN ( - SELECT - tldStr - FROM - `my-project-id.latest_datastore_export.Registry` - WHERE - invoicingEnabled IS TRUE) ) AS BillingEvent - -- Gather billing ID from registrar table - -- This is a 'JOIN' as opposed to 'LEFT JOIN' to filter out - -- non-billable registrars -JOIN ( - SELECT - __key__.name AS clientId, - billingIdentifier, - IFNULL(poNumber, '') AS poNumber, - r.billingAccountMap.currency[SAFE_OFFSET(index)] AS currency, - r.billingAccountMap.accountId[SAFE_OFFSET(index)] AS accountId - FROM - `my-project-id.latest_datastore_export.Registrar` AS r, - UNNEST(GENERATE_ARRAY(0, ARRAY_LENGTH(r.billingAccountMap.currency) - 1)) - AS index - WHERE billingAccountMap IS NOT NULL - AND type = 'REAL') AS RegistrarData -ON - BillingEvent.clientId = RegistrarData.clientId - AND BillingEvent.currency = RegistrarData.currency - -- Gather cancellations -LEFT JOIN ( - SELECT __key__.id AS cancellationId, - COALESCE(refOneTime.path, refRecurring.path) AS cancelledEventPath, - eventTime as cancellationTime, - billingTime as cancellationBillingTime - FROM - (SELECT - *, - -- Count everything after first dot as TLD (to support multi-part TLDs). - REGEXP_EXTRACT(targetId, r'[.](.+)') AS tld - FROM - `my-project-id.latest_datastore_export.Cancellation`) -) AS Cancellation -ON BillingEvent.cancellationMatchingPath = Cancellation.cancelledEventPath -AND BillingEvent.billingTime = Cancellation.cancellationBillingTime -WHERE billingTime BETWEEN TIMESTAMP('2017-10-01 00:00:00.000000') - AND TIMESTAMP('2017-10-31 23:59:59.999999') --- Filter out canceled events -AND Cancellation.cancellationId IS NULL -ORDER BY - billingTime DESC, - id, - tld diff --git a/core/src/test/resources/google/registry/beam/initsql/pipeline_golden.dot b/core/src/test/resources/google/registry/beam/initsql/pipeline_golden.dot deleted file mode 100644 index afc1c862d..000000000 --- a/core/src/test/resources/google/registry/beam/initsql/pipeline_golden.dot +++ /dev/null @@ -1,1907 +0,0 @@ -digraph { - rankdir=LR - subgraph cluster_0 { - label = "" - subgraph cluster_1 { - label = "Load Datastore snapshot" - subgraph cluster_2 { - label = "Load Datastore snapshot/Get export file patterns" - subgraph cluster_3 { - label = "Load Datastore snapshot/Get export file patterns/Read(CreateSource)" - 4 [label="Impulse"] - subgraph cluster_5 { - label = "Load Datastore snapshot/Get export file patterns/Read(CreateSource)/ParDo(OutputSingleSource)" - 6 [label="ParMultiDo(OutputSingleSource)"] - 4 -> 6 [style=solid label=""] - } - subgraph cluster_7 { - label = "Load Datastore snapshot/Get export file patterns/Read(CreateSource)/ParDo(BoundedSourceAsSDFWrapper)" - 8 [label="ParMultiDo(BoundedSourceAsSDFWrapper)"] - 6 -> 8 [style=solid label=""] - } - } - } - subgraph cluster_9 { - label = "Load Datastore snapshot/Find export files" - subgraph cluster_10 { - label = "Load Datastore snapshot/Find export files/FileIO.MatchAll" - subgraph cluster_11 { - label = "Load Datastore snapshot/Find export files/FileIO.MatchAll/Match filepatterns" - 12 [label="ParMultiDo(Match)"] - 8 -> 12 [style=solid label=""] - } - subgraph cluster_13 { - label = "Load Datastore snapshot/Find export files/FileIO.MatchAll/Reshuffle.ViaRandomKey" - subgraph cluster_14 { - label = "Load Datastore snapshot/Find export files/FileIO.MatchAll/Reshuffle.ViaRandomKey/Pair with random key" - 15 [label="ParMultiDo(AssignShard)"] - 12 -> 15 [style=solid label=""] - } - subgraph cluster_16 { - label = "Load Datastore snapshot/Find export files/FileIO.MatchAll/Reshuffle.ViaRandomKey/Reshuffle" - subgraph cluster_17 { - label = "Load Datastore snapshot/Find export files/FileIO.MatchAll/Reshuffle.ViaRandomKey/Reshuffle/Window.Into()" - 18 [label="Window.Assign"] - 15 -> 18 [style=solid label=""] - } - subgraph cluster_19 { - label = "Load Datastore snapshot/Find export files/FileIO.MatchAll/Reshuffle.ViaRandomKey/Reshuffle/ReifyOriginalTimestamps" - subgraph cluster_20 { - label = "Load Datastore snapshot/Find export files/FileIO.MatchAll/Reshuffle.ViaRandomKey/Reshuffle/ReifyOriginalTimestamps/ParDo(Anonymous)" - 21 [label="ParMultiDo(Anonymous)"] - 18 -> 21 [style=solid label=""] - } - } - 22 [label="GroupByKey"] - 21 -> 22 [style=solid label=""] - subgraph cluster_23 { - label = "Load Datastore snapshot/Find export files/FileIO.MatchAll/Reshuffle.ViaRandomKey/Reshuffle/ExpandIterable" - 24 [label="ParMultiDo(Anonymous)"] - 22 -> 24 [style=solid label=""] - } - subgraph cluster_25 { - label = "Load Datastore snapshot/Find export files/FileIO.MatchAll/Reshuffle.ViaRandomKey/Reshuffle/RestoreOriginalTimestamps" - subgraph cluster_26 { - label = "Load Datastore snapshot/Find export files/FileIO.MatchAll/Reshuffle.ViaRandomKey/Reshuffle/RestoreOriginalTimestamps/ReifyTimestamps.RemoveWildcard" - subgraph cluster_27 { - label = "Load Datastore snapshot/Find export files/FileIO.MatchAll/Reshuffle.ViaRandomKey/Reshuffle/RestoreOriginalTimestamps/ReifyTimestamps.RemoveWildcard/ParDo(Anonymous)" - 28 [label="ParMultiDo(Anonymous)"] - 24 -> 28 [style=solid label=""] - } - } - subgraph cluster_29 { - label = "Load Datastore snapshot/Find export files/FileIO.MatchAll/Reshuffle.ViaRandomKey/Reshuffle/RestoreOriginalTimestamps/Reify.ExtractTimestampsFromValues" - subgraph cluster_30 { - label = "Load Datastore snapshot/Find export files/FileIO.MatchAll/Reshuffle.ViaRandomKey/Reshuffle/RestoreOriginalTimestamps/Reify.ExtractTimestampsFromValues/ParDo(Anonymous)" - 31 [label="ParMultiDo(Anonymous)"] - 28 -> 31 [style=solid label=""] - } - } - } - } - subgraph cluster_32 { - label = "Load Datastore snapshot/Find export files/FileIO.MatchAll/Reshuffle.ViaRandomKey/Values" - subgraph cluster_33 { - label = "Load Datastore snapshot/Find export files/FileIO.MatchAll/Reshuffle.ViaRandomKey/Values/Values" - subgraph cluster_34 { - label = "Load Datastore snapshot/Find export files/FileIO.MatchAll/Reshuffle.ViaRandomKey/Values/Values/Map" - 35 [label="ParMultiDo(Anonymous)"] - 31 -> 35 [style=solid label=""] - } - } - } - } - } - } - subgraph cluster_36 { - label = "Load Datastore snapshot/Load export data" - subgraph cluster_37 { - label = "Load Datastore snapshot/Load export data/FileIO.ReadMatches" - subgraph cluster_38 { - label = "Load Datastore snapshot/Load export data/FileIO.ReadMatches/ParDo(ToReadableFile)" - 39 [label="ParMultiDo(ToReadableFile)"] - 35 -> 39 [style=solid label=""] - } - } - subgraph cluster_40 { - label = "Load Datastore snapshot/Load export data/BackupFileReader" - 41 [label="ParMultiDo(BackupFileReader)"] - 39 -> 41 [style=solid label=""] - } - } - subgraph cluster_42 { - label = "Load Datastore snapshot/Get commitlog file patterns" - subgraph cluster_43 { - label = "Load Datastore snapshot/Get commitlog file patterns/Read(CreateSource)" - 44 [label="Impulse"] - subgraph cluster_45 { - label = "Load Datastore snapshot/Get commitlog file patterns/Read(CreateSource)/ParDo(OutputSingleSource)" - 46 [label="ParMultiDo(OutputSingleSource)"] - 44 -> 46 [style=solid label=""] - } - subgraph cluster_47 { - label = "Load Datastore snapshot/Get commitlog file patterns/Read(CreateSource)/ParDo(BoundedSourceAsSDFWrapper)" - 48 [label="ParMultiDo(BoundedSourceAsSDFWrapper)"] - 46 -> 48 [style=solid label=""] - } - } - } - subgraph cluster_49 { - label = "Load Datastore snapshot/Find commitlog files" - subgraph cluster_50 { - label = "Load Datastore snapshot/Find commitlog files/FileIO.MatchAll" - subgraph cluster_51 { - label = "Load Datastore snapshot/Find commitlog files/FileIO.MatchAll/Match filepatterns" - 52 [label="ParMultiDo(Match)"] - 48 -> 52 [style=solid label=""] - } - subgraph cluster_53 { - label = "Load Datastore snapshot/Find commitlog files/FileIO.MatchAll/Reshuffle.ViaRandomKey" - subgraph cluster_54 { - label = "Load Datastore snapshot/Find commitlog files/FileIO.MatchAll/Reshuffle.ViaRandomKey/Pair with random key" - 55 [label="ParMultiDo(AssignShard)"] - 52 -> 55 [style=solid label=""] - } - subgraph cluster_56 { - label = "Load Datastore snapshot/Find commitlog files/FileIO.MatchAll/Reshuffle.ViaRandomKey/Reshuffle" - subgraph cluster_57 { - label = "Load Datastore snapshot/Find commitlog files/FileIO.MatchAll/Reshuffle.ViaRandomKey/Reshuffle/Window.Into()" - 58 [label="Window.Assign"] - 55 -> 58 [style=solid label=""] - } - subgraph cluster_59 { - label = "Load Datastore snapshot/Find commitlog files/FileIO.MatchAll/Reshuffle.ViaRandomKey/Reshuffle/ReifyOriginalTimestamps" - subgraph cluster_60 { - label = "Load Datastore snapshot/Find commitlog files/FileIO.MatchAll/Reshuffle.ViaRandomKey/Reshuffle/ReifyOriginalTimestamps/ParDo(Anonymous)" - 61 [label="ParMultiDo(Anonymous)"] - 58 -> 61 [style=solid label=""] - } - } - 62 [label="GroupByKey"] - 61 -> 62 [style=solid label=""] - subgraph cluster_63 { - label = "Load Datastore snapshot/Find commitlog files/FileIO.MatchAll/Reshuffle.ViaRandomKey/Reshuffle/ExpandIterable" - 64 [label="ParMultiDo(Anonymous)"] - 62 -> 64 [style=solid label=""] - } - subgraph cluster_65 { - label = "Load Datastore snapshot/Find commitlog files/FileIO.MatchAll/Reshuffle.ViaRandomKey/Reshuffle/RestoreOriginalTimestamps" - subgraph cluster_66 { - label = "Load Datastore snapshot/Find commitlog files/FileIO.MatchAll/Reshuffle.ViaRandomKey/Reshuffle/RestoreOriginalTimestamps/ReifyTimestamps.RemoveWildcard" - subgraph cluster_67 { - label = "Load Datastore snapshot/Find commitlog files/FileIO.MatchAll/Reshuffle.ViaRandomKey/Reshuffle/RestoreOriginalTimestamps/ReifyTimestamps.RemoveWildcard/ParDo(Anonymous)" - 68 [label="ParMultiDo(Anonymous)"] - 64 -> 68 [style=solid label=""] - } - } - subgraph cluster_69 { - label = "Load Datastore snapshot/Find commitlog files/FileIO.MatchAll/Reshuffle.ViaRandomKey/Reshuffle/RestoreOriginalTimestamps/Reify.ExtractTimestampsFromValues" - subgraph cluster_70 { - label = "Load Datastore snapshot/Find commitlog files/FileIO.MatchAll/Reshuffle.ViaRandomKey/Reshuffle/RestoreOriginalTimestamps/Reify.ExtractTimestampsFromValues/ParDo(Anonymous)" - 71 [label="ParMultiDo(Anonymous)"] - 68 -> 71 [style=solid label=""] - } - } - } - } - subgraph cluster_72 { - label = "Load Datastore snapshot/Find commitlog files/FileIO.MatchAll/Reshuffle.ViaRandomKey/Values" - subgraph cluster_73 { - label = "Load Datastore snapshot/Find commitlog files/FileIO.MatchAll/Reshuffle.ViaRandomKey/Values/Values" - subgraph cluster_74 { - label = "Load Datastore snapshot/Find commitlog files/FileIO.MatchAll/Reshuffle.ViaRandomKey/Values/Values/Map" - 75 [label="ParMultiDo(Anonymous)"] - 71 -> 75 [style=solid label=""] - } - } - } - } - } - } - subgraph cluster_76 { - label = "Load Datastore snapshot/Filter commitLog by time" - 77 [label="ParMultiDo(FilterCommitLogFileByTime)"] - 75 -> 77 [style=solid label=""] - } - subgraph cluster_78 { - label = "Load Datastore snapshot/Load commitlog data" - subgraph cluster_79 { - label = "Load Datastore snapshot/Load commitlog data/FileIO.ReadMatches" - subgraph cluster_80 { - label = "Load Datastore snapshot/Load commitlog data/FileIO.ReadMatches/ParDo(ToReadableFile)" - 81 [label="ParMultiDo(ToReadableFile)"] - 77 -> 81 [style=solid label=""] - } - } - subgraph cluster_82 { - label = "Load Datastore snapshot/Load commitlog data/BackupFileReader" - 83 [label="ParMultiDo(BackupFileReader)"] - 81 -> 83 [style=solid label=""] - } - } - 84 [label="Flatten.PCollections"] - 41 -> 84 [style=solid label=""] - 83 -> 84 [style=solid label=""] - subgraph cluster_85 { - label = "Load Datastore snapshot/Key entities by Datastore Keys" - subgraph cluster_86 { - label = "Load Datastore snapshot/Key entities by Datastore Keys/Map" - 87 [label="ParMultiDo(Anonymous)"] - 84 -> 87 [style=solid label=""] - } - } - 88 [label="GroupByKey"] - 87 -> 88 [style=solid label=""] - 89 [label="ParMultiDo(Anonymous)"] - 88 -> 89 [style=solid label=""] - } - subgraph cluster_90 { - label = "Write to Sql: Transforms:Registry" - subgraph cluster_91 { - label = "Write to Sql: Transforms:Registry/Shard data Transforms:Registry" - subgraph cluster_92 { - label = "Write to Sql: Transforms:Registry/Shard data Transforms:Registry/AddKeys" - subgraph cluster_93 { - label = "Write to Sql: Transforms:Registry/Shard data Transforms:Registry/AddKeys/Map" - 94 [label="ParMultiDo(Anonymous)"] - 89 -> 94 [style=solid label=""] - } - } - } - subgraph cluster_95 { - label = "Write to Sql: Transforms:Registry/Group into batches Transforms:Registry" - subgraph cluster_96 { - label = "Write to Sql: Transforms:Registry/Group into batches Transforms:Registry/MapElements" - subgraph cluster_97 { - label = "Write to Sql: Transforms:Registry/Group into batches Transforms:Registry/MapElements/Map" - 98 [label="ParMultiDo(Anonymous)"] - 94 -> 98 [style=solid label=""] - } - } - subgraph cluster_99 { - label = "Write to Sql: Transforms:Registry/Group into batches Transforms:Registry/GroupIntoBatches" - subgraph cluster_100 { - label = "Write to Sql: Transforms:Registry/Group into batches Transforms:Registry/GroupIntoBatches/ParDo(GroupIntoBatches)" - 101 [label="ParMultiDo(GroupIntoBatches)"] - 98 -> 101 [style=solid label=""] - } - } - } - subgraph cluster_102 { - label = "Write to Sql: Transforms:Registry/Write in batch for Transforms:Registry" - 103 [label="ParMultiDo(SqlBatchWriter)"] - 101 -> 103 [style=solid label=""] - } - } - subgraph cluster_104 { - label = "Wait on Transforms:Registry" - subgraph cluster_105 { - label = "Wait on Transforms:Registry/To wait view 0" - subgraph cluster_106 { - label = "Wait on Transforms:Registry/To wait view 0/Window.Into()" - 107 [label="Flatten.PCollections"] - 103 -> 107 [style=solid label=""] - } - subgraph cluster_108 { - label = "Wait on Transforms:Registry/To wait view 0/ParDo(CollectWindows)" - 109 [label="ParMultiDo(CollectWindows)"] - 107 -> 109 [style=solid label=""] - } - subgraph cluster_110 { - label = "Wait on Transforms:Registry/To wait view 0/Sample.Any" - subgraph cluster_111 { - label = "Wait on Transforms:Registry/To wait view 0/Sample.Any/Combine.globally(SampleAny)" - subgraph cluster_112 { - label = "Wait on Transforms:Registry/To wait view 0/Sample.Any/Combine.globally(SampleAny)/WithKeys" - subgraph cluster_113 { - label = "Wait on Transforms:Registry/To wait view 0/Sample.Any/Combine.globally(SampleAny)/WithKeys/AddKeys" - subgraph cluster_114 { - label = "Wait on Transforms:Registry/To wait view 0/Sample.Any/Combine.globally(SampleAny)/WithKeys/AddKeys/Map" - 115 [label="ParMultiDo(Anonymous)"] - 109 -> 115 [style=solid label=""] - } - } - } - subgraph cluster_116 { - label = "Wait on Transforms:Registry/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Combine.perKey(SampleAny)" - 117 [label="GroupByKey"] - 115 -> 117 [style=solid label=""] - subgraph cluster_118 { - label = "Wait on Transforms:Registry/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Combine.perKey(SampleAny)/Combine.GroupedValues" - subgraph cluster_119 { - label = "Wait on Transforms:Registry/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Combine.perKey(SampleAny)/Combine.GroupedValues/ParDo(Anonymous)" - 120 [label="ParMultiDo(Anonymous)"] - 117 -> 120 [style=solid label=""] - } - } - } - subgraph cluster_121 { - label = "Wait on Transforms:Registry/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Values" - subgraph cluster_122 { - label = "Wait on Transforms:Registry/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Values/Values" - subgraph cluster_123 { - label = "Wait on Transforms:Registry/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Values/Values/Map" - 124 [label="ParMultiDo(Anonymous)"] - 120 -> 124 [style=solid label=""] - } - } - } - } - subgraph cluster_125 { - label = "Wait on Transforms:Registry/To wait view 0/Sample.Any/Flatten.Iterables" - subgraph cluster_126 { - label = "Wait on Transforms:Registry/To wait view 0/Sample.Any/Flatten.Iterables/FlattenIterables" - subgraph cluster_127 { - label = "Wait on Transforms:Registry/To wait view 0/Sample.Any/Flatten.Iterables/FlattenIterables/FlatMap" - 128 [label="ParMultiDo(Anonymous)"] - 124 -> 128 [style=solid label=""] - } - } - } - } - subgraph cluster_129 { - label = "Wait on Transforms:Registry/To wait view 0/View.AsList" - subgraph cluster_130 { - label = "Wait on Transforms:Registry/To wait view 0/View.AsList/IndexElements" - 131 [label="ParMultiDo(ToListView)"] - 128 -> 131 [style=solid label=""] - } - 132 [label="View.CreatePCollectionView"] - 131 -> 132 [style=solid label=""] - } - } - subgraph cluster_133 { - label = "Wait on Transforms:Registry/Wait" - subgraph cluster_134 { - label = "Wait on Transforms:Registry/Wait/Map" - 135 [label="ParMultiDo(Anonymous)"] - 89 -> 135 [style=solid label=""] - 131 -> 135 [style=dashed label=""] - } - } - } - subgraph cluster_136 { - label = "Write to Sql: Transforms:Cursor" - subgraph cluster_137 { - label = "Write to Sql: Transforms:Cursor/Shard data Transforms:Cursor" - subgraph cluster_138 { - label = "Write to Sql: Transforms:Cursor/Shard data Transforms:Cursor/AddKeys" - subgraph cluster_139 { - label = "Write to Sql: Transforms:Cursor/Shard data Transforms:Cursor/AddKeys/Map" - 140 [label="ParMultiDo(Anonymous)"] - 135 -> 140 [style=solid label=""] - } - } - } - subgraph cluster_141 { - label = "Write to Sql: Transforms:Cursor/Group into batches Transforms:Cursor" - subgraph cluster_142 { - label = "Write to Sql: Transforms:Cursor/Group into batches Transforms:Cursor/MapElements" - subgraph cluster_143 { - label = "Write to Sql: Transforms:Cursor/Group into batches Transforms:Cursor/MapElements/Map" - 144 [label="ParMultiDo(Anonymous)"] - 140 -> 144 [style=solid label=""] - } - } - subgraph cluster_145 { - label = "Write to Sql: Transforms:Cursor/Group into batches Transforms:Cursor/GroupIntoBatches" - subgraph cluster_146 { - label = "Write to Sql: Transforms:Cursor/Group into batches Transforms:Cursor/GroupIntoBatches/ParDo(GroupIntoBatches)" - 147 [label="ParMultiDo(GroupIntoBatches)"] - 144 -> 147 [style=solid label=""] - } - } - } - subgraph cluster_148 { - label = "Write to Sql: Transforms:Cursor/Write in batch for Transforms:Cursor" - 149 [label="ParMultiDo(SqlBatchWriter)"] - 147 -> 149 [style=solid label=""] - } - } - subgraph cluster_150 { - label = "Wait on Transforms:Cursor" - subgraph cluster_151 { - label = "Wait on Transforms:Cursor/To wait view 0" - subgraph cluster_152 { - label = "Wait on Transforms:Cursor/To wait view 0/Window.Into()" - 153 [label="Flatten.PCollections"] - 149 -> 153 [style=solid label=""] - } - subgraph cluster_154 { - label = "Wait on Transforms:Cursor/To wait view 0/ParDo(CollectWindows)" - 155 [label="ParMultiDo(CollectWindows)"] - 153 -> 155 [style=solid label=""] - } - subgraph cluster_156 { - label = "Wait on Transforms:Cursor/To wait view 0/Sample.Any" - subgraph cluster_157 { - label = "Wait on Transforms:Cursor/To wait view 0/Sample.Any/Combine.globally(SampleAny)" - subgraph cluster_158 { - label = "Wait on Transforms:Cursor/To wait view 0/Sample.Any/Combine.globally(SampleAny)/WithKeys" - subgraph cluster_159 { - label = "Wait on Transforms:Cursor/To wait view 0/Sample.Any/Combine.globally(SampleAny)/WithKeys/AddKeys" - subgraph cluster_160 { - label = "Wait on Transforms:Cursor/To wait view 0/Sample.Any/Combine.globally(SampleAny)/WithKeys/AddKeys/Map" - 161 [label="ParMultiDo(Anonymous)"] - 155 -> 161 [style=solid label=""] - } - } - } - subgraph cluster_162 { - label = "Wait on Transforms:Cursor/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Combine.perKey(SampleAny)" - 163 [label="GroupByKey"] - 161 -> 163 [style=solid label=""] - subgraph cluster_164 { - label = "Wait on Transforms:Cursor/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Combine.perKey(SampleAny)/Combine.GroupedValues" - subgraph cluster_165 { - label = "Wait on Transforms:Cursor/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Combine.perKey(SampleAny)/Combine.GroupedValues/ParDo(Anonymous)" - 166 [label="ParMultiDo(Anonymous)"] - 163 -> 166 [style=solid label=""] - } - } - } - subgraph cluster_167 { - label = "Wait on Transforms:Cursor/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Values" - subgraph cluster_168 { - label = "Wait on Transforms:Cursor/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Values/Values" - subgraph cluster_169 { - label = "Wait on Transforms:Cursor/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Values/Values/Map" - 170 [label="ParMultiDo(Anonymous)"] - 166 -> 170 [style=solid label=""] - } - } - } - } - subgraph cluster_171 { - label = "Wait on Transforms:Cursor/To wait view 0/Sample.Any/Flatten.Iterables" - subgraph cluster_172 { - label = "Wait on Transforms:Cursor/To wait view 0/Sample.Any/Flatten.Iterables/FlattenIterables" - subgraph cluster_173 { - label = "Wait on Transforms:Cursor/To wait view 0/Sample.Any/Flatten.Iterables/FlattenIterables/FlatMap" - 174 [label="ParMultiDo(Anonymous)"] - 170 -> 174 [style=solid label=""] - } - } - } - } - subgraph cluster_175 { - label = "Wait on Transforms:Cursor/To wait view 0/View.AsList" - subgraph cluster_176 { - label = "Wait on Transforms:Cursor/To wait view 0/View.AsList/IndexElements" - 177 [label="ParMultiDo(ToListView)"] - 174 -> 177 [style=solid label=""] - } - 178 [label="View.CreatePCollectionView"] - 177 -> 178 [style=solid label=""] - } - } - subgraph cluster_179 { - label = "Wait on Transforms:Cursor/Wait" - subgraph cluster_180 { - label = "Wait on Transforms:Cursor/Wait/Map" - 181 [label="ParMultiDo(Anonymous)"] - 89 -> 181 [style=solid label=""] - 177 -> 181 [style=dashed label=""] - } - } - } - subgraph cluster_182 { - label = "Write to Sql: Transforms:Registrar" - subgraph cluster_183 { - label = "Write to Sql: Transforms:Registrar/Shard data Transforms:Registrar" - subgraph cluster_184 { - label = "Write to Sql: Transforms:Registrar/Shard data Transforms:Registrar/AddKeys" - subgraph cluster_185 { - label = "Write to Sql: Transforms:Registrar/Shard data Transforms:Registrar/AddKeys/Map" - 186 [label="ParMultiDo(Anonymous)"] - 181 -> 186 [style=solid label=""] - } - } - } - subgraph cluster_187 { - label = "Write to Sql: Transforms:Registrar/Group into batches Transforms:Registrar" - subgraph cluster_188 { - label = "Write to Sql: Transforms:Registrar/Group into batches Transforms:Registrar/MapElements" - subgraph cluster_189 { - label = "Write to Sql: Transforms:Registrar/Group into batches Transforms:Registrar/MapElements/Map" - 190 [label="ParMultiDo(Anonymous)"] - 186 -> 190 [style=solid label=""] - } - } - subgraph cluster_191 { - label = "Write to Sql: Transforms:Registrar/Group into batches Transforms:Registrar/GroupIntoBatches" - subgraph cluster_192 { - label = "Write to Sql: Transforms:Registrar/Group into batches Transforms:Registrar/GroupIntoBatches/ParDo(GroupIntoBatches)" - 193 [label="ParMultiDo(GroupIntoBatches)"] - 190 -> 193 [style=solid label=""] - } - } - } - subgraph cluster_194 { - label = "Write to Sql: Transforms:Registrar/Write in batch for Transforms:Registrar" - 195 [label="ParMultiDo(SqlBatchWriter)"] - 193 -> 195 [style=solid label=""] - } - } - subgraph cluster_196 { - label = "Wait on Transforms:Registrar" - subgraph cluster_197 { - label = "Wait on Transforms:Registrar/To wait view 0" - subgraph cluster_198 { - label = "Wait on Transforms:Registrar/To wait view 0/Window.Into()" - 199 [label="Flatten.PCollections"] - 195 -> 199 [style=solid label=""] - } - subgraph cluster_200 { - label = "Wait on Transforms:Registrar/To wait view 0/ParDo(CollectWindows)" - 201 [label="ParMultiDo(CollectWindows)"] - 199 -> 201 [style=solid label=""] - } - subgraph cluster_202 { - label = "Wait on Transforms:Registrar/To wait view 0/Sample.Any" - subgraph cluster_203 { - label = "Wait on Transforms:Registrar/To wait view 0/Sample.Any/Combine.globally(SampleAny)" - subgraph cluster_204 { - label = "Wait on Transforms:Registrar/To wait view 0/Sample.Any/Combine.globally(SampleAny)/WithKeys" - subgraph cluster_205 { - label = "Wait on Transforms:Registrar/To wait view 0/Sample.Any/Combine.globally(SampleAny)/WithKeys/AddKeys" - subgraph cluster_206 { - label = "Wait on Transforms:Registrar/To wait view 0/Sample.Any/Combine.globally(SampleAny)/WithKeys/AddKeys/Map" - 207 [label="ParMultiDo(Anonymous)"] - 201 -> 207 [style=solid label=""] - } - } - } - subgraph cluster_208 { - label = "Wait on Transforms:Registrar/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Combine.perKey(SampleAny)" - 209 [label="GroupByKey"] - 207 -> 209 [style=solid label=""] - subgraph cluster_210 { - label = "Wait on Transforms:Registrar/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Combine.perKey(SampleAny)/Combine.GroupedValues" - subgraph cluster_211 { - label = "Wait on Transforms:Registrar/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Combine.perKey(SampleAny)/Combine.GroupedValues/ParDo(Anonymous)" - 212 [label="ParMultiDo(Anonymous)"] - 209 -> 212 [style=solid label=""] - } - } - } - subgraph cluster_213 { - label = "Wait on Transforms:Registrar/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Values" - subgraph cluster_214 { - label = "Wait on Transforms:Registrar/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Values/Values" - subgraph cluster_215 { - label = "Wait on Transforms:Registrar/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Values/Values/Map" - 216 [label="ParMultiDo(Anonymous)"] - 212 -> 216 [style=solid label=""] - } - } - } - } - subgraph cluster_217 { - label = "Wait on Transforms:Registrar/To wait view 0/Sample.Any/Flatten.Iterables" - subgraph cluster_218 { - label = "Wait on Transforms:Registrar/To wait view 0/Sample.Any/Flatten.Iterables/FlattenIterables" - subgraph cluster_219 { - label = "Wait on Transforms:Registrar/To wait view 0/Sample.Any/Flatten.Iterables/FlattenIterables/FlatMap" - 220 [label="ParMultiDo(Anonymous)"] - 216 -> 220 [style=solid label=""] - } - } - } - } - subgraph cluster_221 { - label = "Wait on Transforms:Registrar/To wait view 0/View.AsList" - subgraph cluster_222 { - label = "Wait on Transforms:Registrar/To wait view 0/View.AsList/IndexElements" - 223 [label="ParMultiDo(ToListView)"] - 220 -> 223 [style=solid label=""] - } - 224 [label="View.CreatePCollectionView"] - 223 -> 224 [style=solid label=""] - } - } - subgraph cluster_225 { - label = "Wait on Transforms:Registrar/Wait" - subgraph cluster_226 { - label = "Wait on Transforms:Registrar/Wait/Map" - 227 [label="ParMultiDo(Anonymous)"] - 89 -> 227 [style=solid label=""] - 223 -> 227 [style=dashed label=""] - } - } - } - subgraph cluster_228 { - label = "Write to Sql: Transforms:ContactResource" - subgraph cluster_229 { - label = "Write to Sql: Transforms:ContactResource/Shard data Transforms:ContactResource" - subgraph cluster_230 { - label = "Write to Sql: Transforms:ContactResource/Shard data Transforms:ContactResource/AddKeys" - subgraph cluster_231 { - label = "Write to Sql: Transforms:ContactResource/Shard data Transforms:ContactResource/AddKeys/Map" - 232 [label="ParMultiDo(Anonymous)"] - 227 -> 232 [style=solid label=""] - } - } - } - subgraph cluster_233 { - label = "Write to Sql: Transforms:ContactResource/Group into batches Transforms:ContactResource" - subgraph cluster_234 { - label = "Write to Sql: Transforms:ContactResource/Group into batches Transforms:ContactResource/MapElements" - subgraph cluster_235 { - label = "Write to Sql: Transforms:ContactResource/Group into batches Transforms:ContactResource/MapElements/Map" - 236 [label="ParMultiDo(Anonymous)"] - 232 -> 236 [style=solid label=""] - } - } - subgraph cluster_237 { - label = "Write to Sql: Transforms:ContactResource/Group into batches Transforms:ContactResource/GroupIntoBatches" - subgraph cluster_238 { - label = "Write to Sql: Transforms:ContactResource/Group into batches Transforms:ContactResource/GroupIntoBatches/ParDo(GroupIntoBatches)" - 239 [label="ParMultiDo(GroupIntoBatches)"] - 236 -> 239 [style=solid label=""] - } - } - } - subgraph cluster_240 { - label = "Write to Sql: Transforms:ContactResource/Write in batch for Transforms:ContactResource" - 241 [label="ParMultiDo(SqlBatchWriter)"] - 239 -> 241 [style=solid label=""] - } - } - subgraph cluster_242 { - label = "Wait on Transforms:ContactResource" - subgraph cluster_243 { - label = "Wait on Transforms:ContactResource/To wait view 0" - subgraph cluster_244 { - label = "Wait on Transforms:ContactResource/To wait view 0/Window.Into()" - 245 [label="Flatten.PCollections"] - 241 -> 245 [style=solid label=""] - } - subgraph cluster_246 { - label = "Wait on Transforms:ContactResource/To wait view 0/ParDo(CollectWindows)" - 247 [label="ParMultiDo(CollectWindows)"] - 245 -> 247 [style=solid label=""] - } - subgraph cluster_248 { - label = "Wait on Transforms:ContactResource/To wait view 0/Sample.Any" - subgraph cluster_249 { - label = "Wait on Transforms:ContactResource/To wait view 0/Sample.Any/Combine.globally(SampleAny)" - subgraph cluster_250 { - label = "Wait on Transforms:ContactResource/To wait view 0/Sample.Any/Combine.globally(SampleAny)/WithKeys" - subgraph cluster_251 { - label = "Wait on Transforms:ContactResource/To wait view 0/Sample.Any/Combine.globally(SampleAny)/WithKeys/AddKeys" - subgraph cluster_252 { - label = "Wait on Transforms:ContactResource/To wait view 0/Sample.Any/Combine.globally(SampleAny)/WithKeys/AddKeys/Map" - 253 [label="ParMultiDo(Anonymous)"] - 247 -> 253 [style=solid label=""] - } - } - } - subgraph cluster_254 { - label = "Wait on Transforms:ContactResource/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Combine.perKey(SampleAny)" - 255 [label="GroupByKey"] - 253 -> 255 [style=solid label=""] - subgraph cluster_256 { - label = "Wait on Transforms:ContactResource/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Combine.perKey(SampleAny)/Combine.GroupedValues" - subgraph cluster_257 { - label = "Wait on Transforms:ContactResource/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Combine.perKey(SampleAny)/Combine.GroupedValues/ParDo(Anonymous)" - 258 [label="ParMultiDo(Anonymous)"] - 255 -> 258 [style=solid label=""] - } - } - } - subgraph cluster_259 { - label = "Wait on Transforms:ContactResource/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Values" - subgraph cluster_260 { - label = "Wait on Transforms:ContactResource/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Values/Values" - subgraph cluster_261 { - label = "Wait on Transforms:ContactResource/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Values/Values/Map" - 262 [label="ParMultiDo(Anonymous)"] - 258 -> 262 [style=solid label=""] - } - } - } - } - subgraph cluster_263 { - label = "Wait on Transforms:ContactResource/To wait view 0/Sample.Any/Flatten.Iterables" - subgraph cluster_264 { - label = "Wait on Transforms:ContactResource/To wait view 0/Sample.Any/Flatten.Iterables/FlattenIterables" - subgraph cluster_265 { - label = "Wait on Transforms:ContactResource/To wait view 0/Sample.Any/Flatten.Iterables/FlattenIterables/FlatMap" - 266 [label="ParMultiDo(Anonymous)"] - 262 -> 266 [style=solid label=""] - } - } - } - } - subgraph cluster_267 { - label = "Wait on Transforms:ContactResource/To wait view 0/View.AsList" - subgraph cluster_268 { - label = "Wait on Transforms:ContactResource/To wait view 0/View.AsList/IndexElements" - 269 [label="ParMultiDo(ToListView)"] - 266 -> 269 [style=solid label=""] - } - 270 [label="View.CreatePCollectionView"] - 269 -> 270 [style=solid label=""] - } - } - subgraph cluster_271 { - label = "Wait on Transforms:ContactResource/Wait" - subgraph cluster_272 { - label = "Wait on Transforms:ContactResource/Wait/Map" - 273 [label="ParMultiDo(Anonymous)"] - 89 -> 273 [style=solid label=""] - 269 -> 273 [style=dashed label=""] - } - } - } - subgraph cluster_274 { - label = "Write to Sql: Transforms:RegistrarContact" - subgraph cluster_275 { - label = "Write to Sql: Transforms:RegistrarContact/Shard data Transforms:RegistrarContact" - subgraph cluster_276 { - label = "Write to Sql: Transforms:RegistrarContact/Shard data Transforms:RegistrarContact/AddKeys" - subgraph cluster_277 { - label = "Write to Sql: Transforms:RegistrarContact/Shard data Transforms:RegistrarContact/AddKeys/Map" - 278 [label="ParMultiDo(Anonymous)"] - 273 -> 278 [style=solid label=""] - } - } - } - subgraph cluster_279 { - label = "Write to Sql: Transforms:RegistrarContact/Group into batches Transforms:RegistrarContact" - subgraph cluster_280 { - label = "Write to Sql: Transforms:RegistrarContact/Group into batches Transforms:RegistrarContact/MapElements" - subgraph cluster_281 { - label = "Write to Sql: Transforms:RegistrarContact/Group into batches Transforms:RegistrarContact/MapElements/Map" - 282 [label="ParMultiDo(Anonymous)"] - 278 -> 282 [style=solid label=""] - } - } - subgraph cluster_283 { - label = "Write to Sql: Transforms:RegistrarContact/Group into batches Transforms:RegistrarContact/GroupIntoBatches" - subgraph cluster_284 { - label = "Write to Sql: Transforms:RegistrarContact/Group into batches Transforms:RegistrarContact/GroupIntoBatches/ParDo(GroupIntoBatches)" - 285 [label="ParMultiDo(GroupIntoBatches)"] - 282 -> 285 [style=solid label=""] - } - } - } - subgraph cluster_286 { - label = "Write to Sql: Transforms:RegistrarContact/Write in batch for Transforms:RegistrarContact" - 287 [label="ParMultiDo(SqlBatchWriter)"] - 285 -> 287 [style=solid label=""] - } - } - subgraph cluster_288 { - label = "Remove circular foreign keys from DomainBase" - 289 [label="ParMultiDo(RemoveDomainBaseForeignKeys)"] - 89 -> 289 [style=solid label=""] - } - subgraph cluster_290 { - label = "Wait on phase one" - subgraph cluster_291 { - label = "Wait on phase one/To wait view 0" - subgraph cluster_292 { - label = "Wait on phase one/To wait view 0/Window.Into()" - 293 [label="Flatten.PCollections"] - 287 -> 293 [style=solid label=""] - } - subgraph cluster_294 { - label = "Wait on phase one/To wait view 0/ParDo(CollectWindows)" - 295 [label="ParMultiDo(CollectWindows)"] - 293 -> 295 [style=solid label=""] - } - subgraph cluster_296 { - label = "Wait on phase one/To wait view 0/Sample.Any" - subgraph cluster_297 { - label = "Wait on phase one/To wait view 0/Sample.Any/Combine.globally(SampleAny)" - subgraph cluster_298 { - label = "Wait on phase one/To wait view 0/Sample.Any/Combine.globally(SampleAny)/WithKeys" - subgraph cluster_299 { - label = "Wait on phase one/To wait view 0/Sample.Any/Combine.globally(SampleAny)/WithKeys/AddKeys" - subgraph cluster_300 { - label = "Wait on phase one/To wait view 0/Sample.Any/Combine.globally(SampleAny)/WithKeys/AddKeys/Map" - 301 [label="ParMultiDo(Anonymous)"] - 295 -> 301 [style=solid label=""] - } - } - } - subgraph cluster_302 { - label = "Wait on phase one/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Combine.perKey(SampleAny)" - 303 [label="GroupByKey"] - 301 -> 303 [style=solid label=""] - subgraph cluster_304 { - label = "Wait on phase one/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Combine.perKey(SampleAny)/Combine.GroupedValues" - subgraph cluster_305 { - label = "Wait on phase one/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Combine.perKey(SampleAny)/Combine.GroupedValues/ParDo(Anonymous)" - 306 [label="ParMultiDo(Anonymous)"] - 303 -> 306 [style=solid label=""] - } - } - } - subgraph cluster_307 { - label = "Wait on phase one/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Values" - subgraph cluster_308 { - label = "Wait on phase one/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Values/Values" - subgraph cluster_309 { - label = "Wait on phase one/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Values/Values/Map" - 310 [label="ParMultiDo(Anonymous)"] - 306 -> 310 [style=solid label=""] - } - } - } - } - subgraph cluster_311 { - label = "Wait on phase one/To wait view 0/Sample.Any/Flatten.Iterables" - subgraph cluster_312 { - label = "Wait on phase one/To wait view 0/Sample.Any/Flatten.Iterables/FlattenIterables" - subgraph cluster_313 { - label = "Wait on phase one/To wait view 0/Sample.Any/Flatten.Iterables/FlattenIterables/FlatMap" - 314 [label="ParMultiDo(Anonymous)"] - 310 -> 314 [style=solid label=""] - } - } - } - } - subgraph cluster_315 { - label = "Wait on phase one/To wait view 0/View.AsList" - subgraph cluster_316 { - label = "Wait on phase one/To wait view 0/View.AsList/IndexElements" - 317 [label="ParMultiDo(ToListView)"] - 314 -> 317 [style=solid label=""] - } - 318 [label="View.CreatePCollectionView"] - 317 -> 318 [style=solid label=""] - } - } - subgraph cluster_319 { - label = "Wait on phase one/Wait" - subgraph cluster_320 { - label = "Wait on phase one/Wait/Map" - 321 [label="ParMultiDo(Anonymous)"] - 289 -> 321 [style=solid label=""] - 317 -> 321 [style=dashed label=""] - } - } - } - subgraph cluster_322 { - label = "Write to Sql: DomainBase without circular foreign keys" - subgraph cluster_323 { - label = "Write to Sql: DomainBase without circular foreign keys/Shard data DomainBase without circular foreign keys" - subgraph cluster_324 { - label = "Write to Sql: DomainBase without circular foreign keys/Shard data DomainBase without circular foreign keys/AddKeys" - subgraph cluster_325 { - label = "Write to Sql: DomainBase without circular foreign keys/Shard data DomainBase without circular foreign keys/AddKeys/Map" - 326 [label="ParMultiDo(Anonymous)"] - 321 -> 326 [style=solid label=""] - } - } - } - subgraph cluster_327 { - label = "Write to Sql: DomainBase without circular foreign keys/Group into batches DomainBase without circular foreign keys" - subgraph cluster_328 { - label = "Write to Sql: DomainBase without circular foreign keys/Group into batches DomainBase without circular foreign keys/MapElements" - subgraph cluster_329 { - label = "Write to Sql: DomainBase without circular foreign keys/Group into batches DomainBase without circular foreign keys/MapElements/Map" - 330 [label="ParMultiDo(Anonymous)"] - 326 -> 330 [style=solid label=""] - } - } - subgraph cluster_331 { - label = "Write to Sql: DomainBase without circular foreign keys/Group into batches DomainBase without circular foreign keys/GroupIntoBatches" - subgraph cluster_332 { - label = "Write to Sql: DomainBase without circular foreign keys/Group into batches DomainBase without circular foreign keys/GroupIntoBatches/ParDo(GroupIntoBatches)" - 333 [label="ParMultiDo(GroupIntoBatches)"] - 330 -> 333 [style=solid label=""] - } - } - } - subgraph cluster_334 { - label = "Write to Sql: DomainBase without circular foreign keys/Write in batch for DomainBase without circular foreign keys" - 335 [label="ParMultiDo(SqlBatchWriter)"] - 333 -> 335 [style=solid label=""] - } - } - subgraph cluster_336 { - label = "Wait on DomainBaseNoFkeys" - subgraph cluster_337 { - label = "Wait on DomainBaseNoFkeys/To wait view 0" - subgraph cluster_338 { - label = "Wait on DomainBaseNoFkeys/To wait view 0/Window.Into()" - 339 [label="Flatten.PCollections"] - 335 -> 339 [style=solid label=""] - } - subgraph cluster_340 { - label = "Wait on DomainBaseNoFkeys/To wait view 0/ParDo(CollectWindows)" - 341 [label="ParMultiDo(CollectWindows)"] - 339 -> 341 [style=solid label=""] - } - subgraph cluster_342 { - label = "Wait on DomainBaseNoFkeys/To wait view 0/Sample.Any" - subgraph cluster_343 { - label = "Wait on DomainBaseNoFkeys/To wait view 0/Sample.Any/Combine.globally(SampleAny)" - subgraph cluster_344 { - label = "Wait on DomainBaseNoFkeys/To wait view 0/Sample.Any/Combine.globally(SampleAny)/WithKeys" - subgraph cluster_345 { - label = "Wait on DomainBaseNoFkeys/To wait view 0/Sample.Any/Combine.globally(SampleAny)/WithKeys/AddKeys" - subgraph cluster_346 { - label = "Wait on DomainBaseNoFkeys/To wait view 0/Sample.Any/Combine.globally(SampleAny)/WithKeys/AddKeys/Map" - 347 [label="ParMultiDo(Anonymous)"] - 341 -> 347 [style=solid label=""] - } - } - } - subgraph cluster_348 { - label = "Wait on DomainBaseNoFkeys/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Combine.perKey(SampleAny)" - 349 [label="GroupByKey"] - 347 -> 349 [style=solid label=""] - subgraph cluster_350 { - label = "Wait on DomainBaseNoFkeys/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Combine.perKey(SampleAny)/Combine.GroupedValues" - subgraph cluster_351 { - label = "Wait on DomainBaseNoFkeys/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Combine.perKey(SampleAny)/Combine.GroupedValues/ParDo(Anonymous)" - 352 [label="ParMultiDo(Anonymous)"] - 349 -> 352 [style=solid label=""] - } - } - } - subgraph cluster_353 { - label = "Wait on DomainBaseNoFkeys/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Values" - subgraph cluster_354 { - label = "Wait on DomainBaseNoFkeys/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Values/Values" - subgraph cluster_355 { - label = "Wait on DomainBaseNoFkeys/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Values/Values/Map" - 356 [label="ParMultiDo(Anonymous)"] - 352 -> 356 [style=solid label=""] - } - } - } - } - subgraph cluster_357 { - label = "Wait on DomainBaseNoFkeys/To wait view 0/Sample.Any/Flatten.Iterables" - subgraph cluster_358 { - label = "Wait on DomainBaseNoFkeys/To wait view 0/Sample.Any/Flatten.Iterables/FlattenIterables" - subgraph cluster_359 { - label = "Wait on DomainBaseNoFkeys/To wait view 0/Sample.Any/Flatten.Iterables/FlattenIterables/FlatMap" - 360 [label="ParMultiDo(Anonymous)"] - 356 -> 360 [style=solid label=""] - } - } - } - } - subgraph cluster_361 { - label = "Wait on DomainBaseNoFkeys/To wait view 0/View.AsList" - subgraph cluster_362 { - label = "Wait on DomainBaseNoFkeys/To wait view 0/View.AsList/IndexElements" - 363 [label="ParMultiDo(ToListView)"] - 360 -> 363 [style=solid label=""] - } - 364 [label="View.CreatePCollectionView"] - 363 -> 364 [style=solid label=""] - } - } - subgraph cluster_365 { - label = "Wait on DomainBaseNoFkeys/Wait" - subgraph cluster_366 { - label = "Wait on DomainBaseNoFkeys/Wait/Map" - 367 [label="ParMultiDo(Anonymous)"] - 89 -> 367 [style=solid label=""] - 363 -> 367 [style=dashed label=""] - } - } - } - subgraph cluster_368 { - label = "Write to Sql: Transforms:HostResource" - subgraph cluster_369 { - label = "Write to Sql: Transforms:HostResource/Shard data Transforms:HostResource" - subgraph cluster_370 { - label = "Write to Sql: Transforms:HostResource/Shard data Transforms:HostResource/AddKeys" - subgraph cluster_371 { - label = "Write to Sql: Transforms:HostResource/Shard data Transforms:HostResource/AddKeys/Map" - 372 [label="ParMultiDo(Anonymous)"] - 367 -> 372 [style=solid label=""] - } - } - } - subgraph cluster_373 { - label = "Write to Sql: Transforms:HostResource/Group into batches Transforms:HostResource" - subgraph cluster_374 { - label = "Write to Sql: Transforms:HostResource/Group into batches Transforms:HostResource/MapElements" - subgraph cluster_375 { - label = "Write to Sql: Transforms:HostResource/Group into batches Transforms:HostResource/MapElements/Map" - 376 [label="ParMultiDo(Anonymous)"] - 372 -> 376 [style=solid label=""] - } - } - subgraph cluster_377 { - label = "Write to Sql: Transforms:HostResource/Group into batches Transforms:HostResource/GroupIntoBatches" - subgraph cluster_378 { - label = "Write to Sql: Transforms:HostResource/Group into batches Transforms:HostResource/GroupIntoBatches/ParDo(GroupIntoBatches)" - 379 [label="ParMultiDo(GroupIntoBatches)"] - 376 -> 379 [style=solid label=""] - } - } - } - subgraph cluster_380 { - label = "Write to Sql: Transforms:HostResource/Write in batch for Transforms:HostResource" - 381 [label="ParMultiDo(SqlBatchWriter)"] - 379 -> 381 [style=solid label=""] - } - } - subgraph cluster_382 { - label = "Wait on Transforms:HostResource" - subgraph cluster_383 { - label = "Wait on Transforms:HostResource/To wait view 0" - subgraph cluster_384 { - label = "Wait on Transforms:HostResource/To wait view 0/Window.Into()" - 385 [label="Flatten.PCollections"] - 381 -> 385 [style=solid label=""] - } - subgraph cluster_386 { - label = "Wait on Transforms:HostResource/To wait view 0/ParDo(CollectWindows)" - 387 [label="ParMultiDo(CollectWindows)"] - 385 -> 387 [style=solid label=""] - } - subgraph cluster_388 { - label = "Wait on Transforms:HostResource/To wait view 0/Sample.Any" - subgraph cluster_389 { - label = "Wait on Transforms:HostResource/To wait view 0/Sample.Any/Combine.globally(SampleAny)" - subgraph cluster_390 { - label = "Wait on Transforms:HostResource/To wait view 0/Sample.Any/Combine.globally(SampleAny)/WithKeys" - subgraph cluster_391 { - label = "Wait on Transforms:HostResource/To wait view 0/Sample.Any/Combine.globally(SampleAny)/WithKeys/AddKeys" - subgraph cluster_392 { - label = "Wait on Transforms:HostResource/To wait view 0/Sample.Any/Combine.globally(SampleAny)/WithKeys/AddKeys/Map" - 393 [label="ParMultiDo(Anonymous)"] - 387 -> 393 [style=solid label=""] - } - } - } - subgraph cluster_394 { - label = "Wait on Transforms:HostResource/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Combine.perKey(SampleAny)" - 395 [label="GroupByKey"] - 393 -> 395 [style=solid label=""] - subgraph cluster_396 { - label = "Wait on Transforms:HostResource/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Combine.perKey(SampleAny)/Combine.GroupedValues" - subgraph cluster_397 { - label = "Wait on Transforms:HostResource/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Combine.perKey(SampleAny)/Combine.GroupedValues/ParDo(Anonymous)" - 398 [label="ParMultiDo(Anonymous)"] - 395 -> 398 [style=solid label=""] - } - } - } - subgraph cluster_399 { - label = "Wait on Transforms:HostResource/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Values" - subgraph cluster_400 { - label = "Wait on Transforms:HostResource/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Values/Values" - subgraph cluster_401 { - label = "Wait on Transforms:HostResource/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Values/Values/Map" - 402 [label="ParMultiDo(Anonymous)"] - 398 -> 402 [style=solid label=""] - } - } - } - } - subgraph cluster_403 { - label = "Wait on Transforms:HostResource/To wait view 0/Sample.Any/Flatten.Iterables" - subgraph cluster_404 { - label = "Wait on Transforms:HostResource/To wait view 0/Sample.Any/Flatten.Iterables/FlattenIterables" - subgraph cluster_405 { - label = "Wait on Transforms:HostResource/To wait view 0/Sample.Any/Flatten.Iterables/FlattenIterables/FlatMap" - 406 [label="ParMultiDo(Anonymous)"] - 402 -> 406 [style=solid label=""] - } - } - } - } - subgraph cluster_407 { - label = "Wait on Transforms:HostResource/To wait view 0/View.AsList" - subgraph cluster_408 { - label = "Wait on Transforms:HostResource/To wait view 0/View.AsList/IndexElements" - 409 [label="ParMultiDo(ToListView)"] - 406 -> 409 [style=solid label=""] - } - 410 [label="View.CreatePCollectionView"] - 409 -> 410 [style=solid label=""] - } - } - subgraph cluster_411 { - label = "Wait on Transforms:HostResource/Wait" - subgraph cluster_412 { - label = "Wait on Transforms:HostResource/Wait/Map" - 413 [label="ParMultiDo(Anonymous)"] - 89 -> 413 [style=solid label=""] - 409 -> 413 [style=dashed label=""] - } - } - } - subgraph cluster_414 { - label = "Write to Sql: Transforms:HistoryEntry" - subgraph cluster_415 { - label = "Write to Sql: Transforms:HistoryEntry/Shard data Transforms:HistoryEntry" - subgraph cluster_416 { - label = "Write to Sql: Transforms:HistoryEntry/Shard data Transforms:HistoryEntry/AddKeys" - subgraph cluster_417 { - label = "Write to Sql: Transforms:HistoryEntry/Shard data Transforms:HistoryEntry/AddKeys/Map" - 418 [label="ParMultiDo(Anonymous)"] - 413 -> 418 [style=solid label=""] - } - } - } - subgraph cluster_419 { - label = "Write to Sql: Transforms:HistoryEntry/Group into batches Transforms:HistoryEntry" - subgraph cluster_420 { - label = "Write to Sql: Transforms:HistoryEntry/Group into batches Transforms:HistoryEntry/MapElements" - subgraph cluster_421 { - label = "Write to Sql: Transforms:HistoryEntry/Group into batches Transforms:HistoryEntry/MapElements/Map" - 422 [label="ParMultiDo(Anonymous)"] - 418 -> 422 [style=solid label=""] - } - } - subgraph cluster_423 { - label = "Write to Sql: Transforms:HistoryEntry/Group into batches Transforms:HistoryEntry/GroupIntoBatches" - subgraph cluster_424 { - label = "Write to Sql: Transforms:HistoryEntry/Group into batches Transforms:HistoryEntry/GroupIntoBatches/ParDo(GroupIntoBatches)" - 425 [label="ParMultiDo(GroupIntoBatches)"] - 422 -> 425 [style=solid label=""] - } - } - } - subgraph cluster_426 { - label = "Write to Sql: Transforms:HistoryEntry/Write in batch for Transforms:HistoryEntry" - 427 [label="ParMultiDo(SqlBatchWriter)"] - 425 -> 427 [style=solid label=""] - } - } - subgraph cluster_428 { - label = "Wait on Transforms:HistoryEntry" - subgraph cluster_429 { - label = "Wait on Transforms:HistoryEntry/To wait view 0" - subgraph cluster_430 { - label = "Wait on Transforms:HistoryEntry/To wait view 0/Window.Into()" - 431 [label="Flatten.PCollections"] - 427 -> 431 [style=solid label=""] - } - subgraph cluster_432 { - label = "Wait on Transforms:HistoryEntry/To wait view 0/ParDo(CollectWindows)" - 433 [label="ParMultiDo(CollectWindows)"] - 431 -> 433 [style=solid label=""] - } - subgraph cluster_434 { - label = "Wait on Transforms:HistoryEntry/To wait view 0/Sample.Any" - subgraph cluster_435 { - label = "Wait on Transforms:HistoryEntry/To wait view 0/Sample.Any/Combine.globally(SampleAny)" - subgraph cluster_436 { - label = "Wait on Transforms:HistoryEntry/To wait view 0/Sample.Any/Combine.globally(SampleAny)/WithKeys" - subgraph cluster_437 { - label = "Wait on Transforms:HistoryEntry/To wait view 0/Sample.Any/Combine.globally(SampleAny)/WithKeys/AddKeys" - subgraph cluster_438 { - label = "Wait on Transforms:HistoryEntry/To wait view 0/Sample.Any/Combine.globally(SampleAny)/WithKeys/AddKeys/Map" - 439 [label="ParMultiDo(Anonymous)"] - 433 -> 439 [style=solid label=""] - } - } - } - subgraph cluster_440 { - label = "Wait on Transforms:HistoryEntry/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Combine.perKey(SampleAny)" - 441 [label="GroupByKey"] - 439 -> 441 [style=solid label=""] - subgraph cluster_442 { - label = "Wait on Transforms:HistoryEntry/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Combine.perKey(SampleAny)/Combine.GroupedValues" - subgraph cluster_443 { - label = "Wait on Transforms:HistoryEntry/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Combine.perKey(SampleAny)/Combine.GroupedValues/ParDo(Anonymous)" - 444 [label="ParMultiDo(Anonymous)"] - 441 -> 444 [style=solid label=""] - } - } - } - subgraph cluster_445 { - label = "Wait on Transforms:HistoryEntry/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Values" - subgraph cluster_446 { - label = "Wait on Transforms:HistoryEntry/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Values/Values" - subgraph cluster_447 { - label = "Wait on Transforms:HistoryEntry/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Values/Values/Map" - 448 [label="ParMultiDo(Anonymous)"] - 444 -> 448 [style=solid label=""] - } - } - } - } - subgraph cluster_449 { - label = "Wait on Transforms:HistoryEntry/To wait view 0/Sample.Any/Flatten.Iterables" - subgraph cluster_450 { - label = "Wait on Transforms:HistoryEntry/To wait view 0/Sample.Any/Flatten.Iterables/FlattenIterables" - subgraph cluster_451 { - label = "Wait on Transforms:HistoryEntry/To wait view 0/Sample.Any/Flatten.Iterables/FlattenIterables/FlatMap" - 452 [label="ParMultiDo(Anonymous)"] - 448 -> 452 [style=solid label=""] - } - } - } - } - subgraph cluster_453 { - label = "Wait on Transforms:HistoryEntry/To wait view 0/View.AsList" - subgraph cluster_454 { - label = "Wait on Transforms:HistoryEntry/To wait view 0/View.AsList/IndexElements" - 455 [label="ParMultiDo(ToListView)"] - 452 -> 455 [style=solid label=""] - } - 456 [label="View.CreatePCollectionView"] - 455 -> 456 [style=solid label=""] - } - } - subgraph cluster_457 { - label = "Wait on Transforms:HistoryEntry/Wait" - subgraph cluster_458 { - label = "Wait on Transforms:HistoryEntry/Wait/Map" - 459 [label="ParMultiDo(Anonymous)"] - 89 -> 459 [style=solid label=""] - 455 -> 459 [style=dashed label=""] - } - } - } - subgraph cluster_460 { - label = "Write to Sql: Transforms:AllocationToken" - subgraph cluster_461 { - label = "Write to Sql: Transforms:AllocationToken/Shard data Transforms:AllocationToken" - subgraph cluster_462 { - label = "Write to Sql: Transforms:AllocationToken/Shard data Transforms:AllocationToken/AddKeys" - subgraph cluster_463 { - label = "Write to Sql: Transforms:AllocationToken/Shard data Transforms:AllocationToken/AddKeys/Map" - 464 [label="ParMultiDo(Anonymous)"] - 459 -> 464 [style=solid label=""] - } - } - } - subgraph cluster_465 { - label = "Write to Sql: Transforms:AllocationToken/Group into batches Transforms:AllocationToken" - subgraph cluster_466 { - label = "Write to Sql: Transforms:AllocationToken/Group into batches Transforms:AllocationToken/MapElements" - subgraph cluster_467 { - label = "Write to Sql: Transforms:AllocationToken/Group into batches Transforms:AllocationToken/MapElements/Map" - 468 [label="ParMultiDo(Anonymous)"] - 464 -> 468 [style=solid label=""] - } - } - subgraph cluster_469 { - label = "Write to Sql: Transforms:AllocationToken/Group into batches Transforms:AllocationToken/GroupIntoBatches" - subgraph cluster_470 { - label = "Write to Sql: Transforms:AllocationToken/Group into batches Transforms:AllocationToken/GroupIntoBatches/ParDo(GroupIntoBatches)" - 471 [label="ParMultiDo(GroupIntoBatches)"] - 468 -> 471 [style=solid label=""] - } - } - } - subgraph cluster_472 { - label = "Write to Sql: Transforms:AllocationToken/Write in batch for Transforms:AllocationToken" - 473 [label="ParMultiDo(SqlBatchWriter)"] - 471 -> 473 [style=solid label=""] - } - } - subgraph cluster_474 { - label = "Wait on Transforms:AllocationToken" - subgraph cluster_475 { - label = "Wait on Transforms:AllocationToken/To wait view 0" - subgraph cluster_476 { - label = "Wait on Transforms:AllocationToken/To wait view 0/Window.Into()" - 477 [label="Flatten.PCollections"] - 473 -> 477 [style=solid label=""] - } - subgraph cluster_478 { - label = "Wait on Transforms:AllocationToken/To wait view 0/ParDo(CollectWindows)" - 479 [label="ParMultiDo(CollectWindows)"] - 477 -> 479 [style=solid label=""] - } - subgraph cluster_480 { - label = "Wait on Transforms:AllocationToken/To wait view 0/Sample.Any" - subgraph cluster_481 { - label = "Wait on Transforms:AllocationToken/To wait view 0/Sample.Any/Combine.globally(SampleAny)" - subgraph cluster_482 { - label = "Wait on Transforms:AllocationToken/To wait view 0/Sample.Any/Combine.globally(SampleAny)/WithKeys" - subgraph cluster_483 { - label = "Wait on Transforms:AllocationToken/To wait view 0/Sample.Any/Combine.globally(SampleAny)/WithKeys/AddKeys" - subgraph cluster_484 { - label = "Wait on Transforms:AllocationToken/To wait view 0/Sample.Any/Combine.globally(SampleAny)/WithKeys/AddKeys/Map" - 485 [label="ParMultiDo(Anonymous)"] - 479 -> 485 [style=solid label=""] - } - } - } - subgraph cluster_486 { - label = "Wait on Transforms:AllocationToken/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Combine.perKey(SampleAny)" - 487 [label="GroupByKey"] - 485 -> 487 [style=solid label=""] - subgraph cluster_488 { - label = "Wait on Transforms:AllocationToken/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Combine.perKey(SampleAny)/Combine.GroupedValues" - subgraph cluster_489 { - label = "Wait on Transforms:AllocationToken/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Combine.perKey(SampleAny)/Combine.GroupedValues/ParDo(Anonymous)" - 490 [label="ParMultiDo(Anonymous)"] - 487 -> 490 [style=solid label=""] - } - } - } - subgraph cluster_491 { - label = "Wait on Transforms:AllocationToken/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Values" - subgraph cluster_492 { - label = "Wait on Transforms:AllocationToken/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Values/Values" - subgraph cluster_493 { - label = "Wait on Transforms:AllocationToken/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Values/Values/Map" - 494 [label="ParMultiDo(Anonymous)"] - 490 -> 494 [style=solid label=""] - } - } - } - } - subgraph cluster_495 { - label = "Wait on Transforms:AllocationToken/To wait view 0/Sample.Any/Flatten.Iterables" - subgraph cluster_496 { - label = "Wait on Transforms:AllocationToken/To wait view 0/Sample.Any/Flatten.Iterables/FlattenIterables" - subgraph cluster_497 { - label = "Wait on Transforms:AllocationToken/To wait view 0/Sample.Any/Flatten.Iterables/FlattenIterables/FlatMap" - 498 [label="ParMultiDo(Anonymous)"] - 494 -> 498 [style=solid label=""] - } - } - } - } - subgraph cluster_499 { - label = "Wait on Transforms:AllocationToken/To wait view 0/View.AsList" - subgraph cluster_500 { - label = "Wait on Transforms:AllocationToken/To wait view 0/View.AsList/IndexElements" - 501 [label="ParMultiDo(ToListView)"] - 498 -> 501 [style=solid label=""] - } - 502 [label="View.CreatePCollectionView"] - 501 -> 502 [style=solid label=""] - } - } - subgraph cluster_503 { - label = "Wait on Transforms:AllocationToken/Wait" - subgraph cluster_504 { - label = "Wait on Transforms:AllocationToken/Wait/Map" - 505 [label="ParMultiDo(Anonymous)"] - 89 -> 505 [style=solid label=""] - 501 -> 505 [style=dashed label=""] - } - } - } - subgraph cluster_506 { - label = "Write to Sql: Transforms:Recurring" - subgraph cluster_507 { - label = "Write to Sql: Transforms:Recurring/Shard data Transforms:Recurring" - subgraph cluster_508 { - label = "Write to Sql: Transforms:Recurring/Shard data Transforms:Recurring/AddKeys" - subgraph cluster_509 { - label = "Write to Sql: Transforms:Recurring/Shard data Transforms:Recurring/AddKeys/Map" - 510 [label="ParMultiDo(Anonymous)"] - 505 -> 510 [style=solid label=""] - } - } - } - subgraph cluster_511 { - label = "Write to Sql: Transforms:Recurring/Group into batches Transforms:Recurring" - subgraph cluster_512 { - label = "Write to Sql: Transforms:Recurring/Group into batches Transforms:Recurring/MapElements" - subgraph cluster_513 { - label = "Write to Sql: Transforms:Recurring/Group into batches Transforms:Recurring/MapElements/Map" - 514 [label="ParMultiDo(Anonymous)"] - 510 -> 514 [style=solid label=""] - } - } - subgraph cluster_515 { - label = "Write to Sql: Transforms:Recurring/Group into batches Transforms:Recurring/GroupIntoBatches" - subgraph cluster_516 { - label = "Write to Sql: Transforms:Recurring/Group into batches Transforms:Recurring/GroupIntoBatches/ParDo(GroupIntoBatches)" - 517 [label="ParMultiDo(GroupIntoBatches)"] - 514 -> 517 [style=solid label=""] - } - } - } - subgraph cluster_518 { - label = "Write to Sql: Transforms:Recurring/Write in batch for Transforms:Recurring" - 519 [label="ParMultiDo(SqlBatchWriter)"] - 517 -> 519 [style=solid label=""] - } - } - subgraph cluster_520 { - label = "Wait on Transforms:Recurring" - subgraph cluster_521 { - label = "Wait on Transforms:Recurring/To wait view 0" - subgraph cluster_522 { - label = "Wait on Transforms:Recurring/To wait view 0/Window.Into()" - 523 [label="Flatten.PCollections"] - 519 -> 523 [style=solid label=""] - } - subgraph cluster_524 { - label = "Wait on Transforms:Recurring/To wait view 0/ParDo(CollectWindows)" - 525 [label="ParMultiDo(CollectWindows)"] - 523 -> 525 [style=solid label=""] - } - subgraph cluster_526 { - label = "Wait on Transforms:Recurring/To wait view 0/Sample.Any" - subgraph cluster_527 { - label = "Wait on Transforms:Recurring/To wait view 0/Sample.Any/Combine.globally(SampleAny)" - subgraph cluster_528 { - label = "Wait on Transforms:Recurring/To wait view 0/Sample.Any/Combine.globally(SampleAny)/WithKeys" - subgraph cluster_529 { - label = "Wait on Transforms:Recurring/To wait view 0/Sample.Any/Combine.globally(SampleAny)/WithKeys/AddKeys" - subgraph cluster_530 { - label = "Wait on Transforms:Recurring/To wait view 0/Sample.Any/Combine.globally(SampleAny)/WithKeys/AddKeys/Map" - 531 [label="ParMultiDo(Anonymous)"] - 525 -> 531 [style=solid label=""] - } - } - } - subgraph cluster_532 { - label = "Wait on Transforms:Recurring/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Combine.perKey(SampleAny)" - 533 [label="GroupByKey"] - 531 -> 533 [style=solid label=""] - subgraph cluster_534 { - label = "Wait on Transforms:Recurring/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Combine.perKey(SampleAny)/Combine.GroupedValues" - subgraph cluster_535 { - label = "Wait on Transforms:Recurring/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Combine.perKey(SampleAny)/Combine.GroupedValues/ParDo(Anonymous)" - 536 [label="ParMultiDo(Anonymous)"] - 533 -> 536 [style=solid label=""] - } - } - } - subgraph cluster_537 { - label = "Wait on Transforms:Recurring/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Values" - subgraph cluster_538 { - label = "Wait on Transforms:Recurring/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Values/Values" - subgraph cluster_539 { - label = "Wait on Transforms:Recurring/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Values/Values/Map" - 540 [label="ParMultiDo(Anonymous)"] - 536 -> 540 [style=solid label=""] - } - } - } - } - subgraph cluster_541 { - label = "Wait on Transforms:Recurring/To wait view 0/Sample.Any/Flatten.Iterables" - subgraph cluster_542 { - label = "Wait on Transforms:Recurring/To wait view 0/Sample.Any/Flatten.Iterables/FlattenIterables" - subgraph cluster_543 { - label = "Wait on Transforms:Recurring/To wait view 0/Sample.Any/Flatten.Iterables/FlattenIterables/FlatMap" - 544 [label="ParMultiDo(Anonymous)"] - 540 -> 544 [style=solid label=""] - } - } - } - } - subgraph cluster_545 { - label = "Wait on Transforms:Recurring/To wait view 0/View.AsList" - subgraph cluster_546 { - label = "Wait on Transforms:Recurring/To wait view 0/View.AsList/IndexElements" - 547 [label="ParMultiDo(ToListView)"] - 544 -> 547 [style=solid label=""] - } - 548 [label="View.CreatePCollectionView"] - 547 -> 548 [style=solid label=""] - } - } - subgraph cluster_549 { - label = "Wait on Transforms:Recurring/Wait" - subgraph cluster_550 { - label = "Wait on Transforms:Recurring/Wait/Map" - 551 [label="ParMultiDo(Anonymous)"] - 89 -> 551 [style=solid label=""] - 547 -> 551 [style=dashed label=""] - } - } - } - subgraph cluster_552 { - label = "Write to Sql: Transforms:OneTime" - subgraph cluster_553 { - label = "Write to Sql: Transforms:OneTime/Shard data Transforms:OneTime" - subgraph cluster_554 { - label = "Write to Sql: Transforms:OneTime/Shard data Transforms:OneTime/AddKeys" - subgraph cluster_555 { - label = "Write to Sql: Transforms:OneTime/Shard data Transforms:OneTime/AddKeys/Map" - 556 [label="ParMultiDo(Anonymous)"] - 551 -> 556 [style=solid label=""] - } - } - } - subgraph cluster_557 { - label = "Write to Sql: Transforms:OneTime/Group into batches Transforms:OneTime" - subgraph cluster_558 { - label = "Write to Sql: Transforms:OneTime/Group into batches Transforms:OneTime/MapElements" - subgraph cluster_559 { - label = "Write to Sql: Transforms:OneTime/Group into batches Transforms:OneTime/MapElements/Map" - 560 [label="ParMultiDo(Anonymous)"] - 556 -> 560 [style=solid label=""] - } - } - subgraph cluster_561 { - label = "Write to Sql: Transforms:OneTime/Group into batches Transforms:OneTime/GroupIntoBatches" - subgraph cluster_562 { - label = "Write to Sql: Transforms:OneTime/Group into batches Transforms:OneTime/GroupIntoBatches/ParDo(GroupIntoBatches)" - 563 [label="ParMultiDo(GroupIntoBatches)"] - 560 -> 563 [style=solid label=""] - } - } - } - subgraph cluster_564 { - label = "Write to Sql: Transforms:OneTime/Write in batch for Transforms:OneTime" - 565 [label="ParMultiDo(SqlBatchWriter)"] - 563 -> 565 [style=solid label=""] - } - } - subgraph cluster_566 { - label = "Wait on Transforms:OneTime" - subgraph cluster_567 { - label = "Wait on Transforms:OneTime/To wait view 0" - subgraph cluster_568 { - label = "Wait on Transforms:OneTime/To wait view 0/Window.Into()" - 569 [label="Flatten.PCollections"] - 565 -> 569 [style=solid label=""] - } - subgraph cluster_570 { - label = "Wait on Transforms:OneTime/To wait view 0/ParDo(CollectWindows)" - 571 [label="ParMultiDo(CollectWindows)"] - 569 -> 571 [style=solid label=""] - } - subgraph cluster_572 { - label = "Wait on Transforms:OneTime/To wait view 0/Sample.Any" - subgraph cluster_573 { - label = "Wait on Transforms:OneTime/To wait view 0/Sample.Any/Combine.globally(SampleAny)" - subgraph cluster_574 { - label = "Wait on Transforms:OneTime/To wait view 0/Sample.Any/Combine.globally(SampleAny)/WithKeys" - subgraph cluster_575 { - label = "Wait on Transforms:OneTime/To wait view 0/Sample.Any/Combine.globally(SampleAny)/WithKeys/AddKeys" - subgraph cluster_576 { - label = "Wait on Transforms:OneTime/To wait view 0/Sample.Any/Combine.globally(SampleAny)/WithKeys/AddKeys/Map" - 577 [label="ParMultiDo(Anonymous)"] - 571 -> 577 [style=solid label=""] - } - } - } - subgraph cluster_578 { - label = "Wait on Transforms:OneTime/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Combine.perKey(SampleAny)" - 579 [label="GroupByKey"] - 577 -> 579 [style=solid label=""] - subgraph cluster_580 { - label = "Wait on Transforms:OneTime/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Combine.perKey(SampleAny)/Combine.GroupedValues" - subgraph cluster_581 { - label = "Wait on Transforms:OneTime/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Combine.perKey(SampleAny)/Combine.GroupedValues/ParDo(Anonymous)" - 582 [label="ParMultiDo(Anonymous)"] - 579 -> 582 [style=solid label=""] - } - } - } - subgraph cluster_583 { - label = "Wait on Transforms:OneTime/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Values" - subgraph cluster_584 { - label = "Wait on Transforms:OneTime/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Values/Values" - subgraph cluster_585 { - label = "Wait on Transforms:OneTime/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Values/Values/Map" - 586 [label="ParMultiDo(Anonymous)"] - 582 -> 586 [style=solid label=""] - } - } - } - } - subgraph cluster_587 { - label = "Wait on Transforms:OneTime/To wait view 0/Sample.Any/Flatten.Iterables" - subgraph cluster_588 { - label = "Wait on Transforms:OneTime/To wait view 0/Sample.Any/Flatten.Iterables/FlattenIterables" - subgraph cluster_589 { - label = "Wait on Transforms:OneTime/To wait view 0/Sample.Any/Flatten.Iterables/FlattenIterables/FlatMap" - 590 [label="ParMultiDo(Anonymous)"] - 586 -> 590 [style=solid label=""] - } - } - } - } - subgraph cluster_591 { - label = "Wait on Transforms:OneTime/To wait view 0/View.AsList" - subgraph cluster_592 { - label = "Wait on Transforms:OneTime/To wait view 0/View.AsList/IndexElements" - 593 [label="ParMultiDo(ToListView)"] - 590 -> 593 [style=solid label=""] - } - 594 [label="View.CreatePCollectionView"] - 593 -> 594 [style=solid label=""] - } - } - subgraph cluster_595 { - label = "Wait on Transforms:OneTime/Wait" - subgraph cluster_596 { - label = "Wait on Transforms:OneTime/Wait/Map" - 597 [label="ParMultiDo(Anonymous)"] - 89 -> 597 [style=solid label=""] - 593 -> 597 [style=dashed label=""] - } - } - } - subgraph cluster_598 { - label = "Write to Sql: Transforms:Cancellation" - subgraph cluster_599 { - label = "Write to Sql: Transforms:Cancellation/Shard data Transforms:Cancellation" - subgraph cluster_600 { - label = "Write to Sql: Transforms:Cancellation/Shard data Transforms:Cancellation/AddKeys" - subgraph cluster_601 { - label = "Write to Sql: Transforms:Cancellation/Shard data Transforms:Cancellation/AddKeys/Map" - 602 [label="ParMultiDo(Anonymous)"] - 597 -> 602 [style=solid label=""] - } - } - } - subgraph cluster_603 { - label = "Write to Sql: Transforms:Cancellation/Group into batches Transforms:Cancellation" - subgraph cluster_604 { - label = "Write to Sql: Transforms:Cancellation/Group into batches Transforms:Cancellation/MapElements" - subgraph cluster_605 { - label = "Write to Sql: Transforms:Cancellation/Group into batches Transforms:Cancellation/MapElements/Map" - 606 [label="ParMultiDo(Anonymous)"] - 602 -> 606 [style=solid label=""] - } - } - subgraph cluster_607 { - label = "Write to Sql: Transforms:Cancellation/Group into batches Transforms:Cancellation/GroupIntoBatches" - subgraph cluster_608 { - label = "Write to Sql: Transforms:Cancellation/Group into batches Transforms:Cancellation/GroupIntoBatches/ParDo(GroupIntoBatches)" - 609 [label="ParMultiDo(GroupIntoBatches)"] - 606 -> 609 [style=solid label=""] - } - } - } - subgraph cluster_610 { - label = "Write to Sql: Transforms:Cancellation/Write in batch for Transforms:Cancellation" - 611 [label="ParMultiDo(SqlBatchWriter)"] - 609 -> 611 [style=solid label=""] - } - } - subgraph cluster_612 { - label = "Wait on Transforms:Cancellation" - subgraph cluster_613 { - label = "Wait on Transforms:Cancellation/To wait view 0" - subgraph cluster_614 { - label = "Wait on Transforms:Cancellation/To wait view 0/Window.Into()" - 615 [label="Flatten.PCollections"] - 611 -> 615 [style=solid label=""] - } - subgraph cluster_616 { - label = "Wait on Transforms:Cancellation/To wait view 0/ParDo(CollectWindows)" - 617 [label="ParMultiDo(CollectWindows)"] - 615 -> 617 [style=solid label=""] - } - subgraph cluster_618 { - label = "Wait on Transforms:Cancellation/To wait view 0/Sample.Any" - subgraph cluster_619 { - label = "Wait on Transforms:Cancellation/To wait view 0/Sample.Any/Combine.globally(SampleAny)" - subgraph cluster_620 { - label = "Wait on Transforms:Cancellation/To wait view 0/Sample.Any/Combine.globally(SampleAny)/WithKeys" - subgraph cluster_621 { - label = "Wait on Transforms:Cancellation/To wait view 0/Sample.Any/Combine.globally(SampleAny)/WithKeys/AddKeys" - subgraph cluster_622 { - label = "Wait on Transforms:Cancellation/To wait view 0/Sample.Any/Combine.globally(SampleAny)/WithKeys/AddKeys/Map" - 623 [label="ParMultiDo(Anonymous)"] - 617 -> 623 [style=solid label=""] - } - } - } - subgraph cluster_624 { - label = "Wait on Transforms:Cancellation/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Combine.perKey(SampleAny)" - 625 [label="GroupByKey"] - 623 -> 625 [style=solid label=""] - subgraph cluster_626 { - label = "Wait on Transforms:Cancellation/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Combine.perKey(SampleAny)/Combine.GroupedValues" - subgraph cluster_627 { - label = "Wait on Transforms:Cancellation/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Combine.perKey(SampleAny)/Combine.GroupedValues/ParDo(Anonymous)" - 628 [label="ParMultiDo(Anonymous)"] - 625 -> 628 [style=solid label=""] - } - } - } - subgraph cluster_629 { - label = "Wait on Transforms:Cancellation/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Values" - subgraph cluster_630 { - label = "Wait on Transforms:Cancellation/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Values/Values" - subgraph cluster_631 { - label = "Wait on Transforms:Cancellation/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Values/Values/Map" - 632 [label="ParMultiDo(Anonymous)"] - 628 -> 632 [style=solid label=""] - } - } - } - } - subgraph cluster_633 { - label = "Wait on Transforms:Cancellation/To wait view 0/Sample.Any/Flatten.Iterables" - subgraph cluster_634 { - label = "Wait on Transforms:Cancellation/To wait view 0/Sample.Any/Flatten.Iterables/FlattenIterables" - subgraph cluster_635 { - label = "Wait on Transforms:Cancellation/To wait view 0/Sample.Any/Flatten.Iterables/FlattenIterables/FlatMap" - 636 [label="ParMultiDo(Anonymous)"] - 632 -> 636 [style=solid label=""] - } - } - } - } - subgraph cluster_637 { - label = "Wait on Transforms:Cancellation/To wait view 0/View.AsList" - subgraph cluster_638 { - label = "Wait on Transforms:Cancellation/To wait view 0/View.AsList/IndexElements" - 639 [label="ParMultiDo(ToListView)"] - 636 -> 639 [style=solid label=""] - } - 640 [label="View.CreatePCollectionView"] - 639 -> 640 [style=solid label=""] - } - } - subgraph cluster_641 { - label = "Wait on Transforms:Cancellation/Wait" - subgraph cluster_642 { - label = "Wait on Transforms:Cancellation/Wait/Map" - 643 [label="ParMultiDo(Anonymous)"] - 89 -> 643 [style=solid label=""] - 639 -> 643 [style=dashed label=""] - } - } - } - subgraph cluster_644 { - label = "Write to Sql: Transforms:PollMessage" - subgraph cluster_645 { - label = "Write to Sql: Transforms:PollMessage/Shard data Transforms:PollMessage" - subgraph cluster_646 { - label = "Write to Sql: Transforms:PollMessage/Shard data Transforms:PollMessage/AddKeys" - subgraph cluster_647 { - label = "Write to Sql: Transforms:PollMessage/Shard data Transforms:PollMessage/AddKeys/Map" - 648 [label="ParMultiDo(Anonymous)"] - 643 -> 648 [style=solid label=""] - } - } - } - subgraph cluster_649 { - label = "Write to Sql: Transforms:PollMessage/Group into batches Transforms:PollMessage" - subgraph cluster_650 { - label = "Write to Sql: Transforms:PollMessage/Group into batches Transforms:PollMessage/MapElements" - subgraph cluster_651 { - label = "Write to Sql: Transforms:PollMessage/Group into batches Transforms:PollMessage/MapElements/Map" - 652 [label="ParMultiDo(Anonymous)"] - 648 -> 652 [style=solid label=""] - } - } - subgraph cluster_653 { - label = "Write to Sql: Transforms:PollMessage/Group into batches Transforms:PollMessage/GroupIntoBatches" - subgraph cluster_654 { - label = "Write to Sql: Transforms:PollMessage/Group into batches Transforms:PollMessage/GroupIntoBatches/ParDo(GroupIntoBatches)" - 655 [label="ParMultiDo(GroupIntoBatches)"] - 652 -> 655 [style=solid label=""] - } - } - } - subgraph cluster_656 { - label = "Write to Sql: Transforms:PollMessage/Write in batch for Transforms:PollMessage" - 657 [label="ParMultiDo(SqlBatchWriter)"] - 655 -> 657 [style=solid label=""] - } - } - subgraph cluster_658 { - label = "Wait on Transforms:PollMessage" - subgraph cluster_659 { - label = "Wait on Transforms:PollMessage/To wait view 0" - subgraph cluster_660 { - label = "Wait on Transforms:PollMessage/To wait view 0/Window.Into()" - 661 [label="Flatten.PCollections"] - 657 -> 661 [style=solid label=""] - } - subgraph cluster_662 { - label = "Wait on Transforms:PollMessage/To wait view 0/ParDo(CollectWindows)" - 663 [label="ParMultiDo(CollectWindows)"] - 661 -> 663 [style=solid label=""] - } - subgraph cluster_664 { - label = "Wait on Transforms:PollMessage/To wait view 0/Sample.Any" - subgraph cluster_665 { - label = "Wait on Transforms:PollMessage/To wait view 0/Sample.Any/Combine.globally(SampleAny)" - subgraph cluster_666 { - label = "Wait on Transforms:PollMessage/To wait view 0/Sample.Any/Combine.globally(SampleAny)/WithKeys" - subgraph cluster_667 { - label = "Wait on Transforms:PollMessage/To wait view 0/Sample.Any/Combine.globally(SampleAny)/WithKeys/AddKeys" - subgraph cluster_668 { - label = "Wait on Transforms:PollMessage/To wait view 0/Sample.Any/Combine.globally(SampleAny)/WithKeys/AddKeys/Map" - 669 [label="ParMultiDo(Anonymous)"] - 663 -> 669 [style=solid label=""] - } - } - } - subgraph cluster_670 { - label = "Wait on Transforms:PollMessage/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Combine.perKey(SampleAny)" - 671 [label="GroupByKey"] - 669 -> 671 [style=solid label=""] - subgraph cluster_672 { - label = "Wait on Transforms:PollMessage/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Combine.perKey(SampleAny)/Combine.GroupedValues" - subgraph cluster_673 { - label = "Wait on Transforms:PollMessage/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Combine.perKey(SampleAny)/Combine.GroupedValues/ParDo(Anonymous)" - 674 [label="ParMultiDo(Anonymous)"] - 671 -> 674 [style=solid label=""] - } - } - } - subgraph cluster_675 { - label = "Wait on Transforms:PollMessage/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Values" - subgraph cluster_676 { - label = "Wait on Transforms:PollMessage/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Values/Values" - subgraph cluster_677 { - label = "Wait on Transforms:PollMessage/To wait view 0/Sample.Any/Combine.globally(SampleAny)/Values/Values/Map" - 678 [label="ParMultiDo(Anonymous)"] - 674 -> 678 [style=solid label=""] - } - } - } - } - subgraph cluster_679 { - label = "Wait on Transforms:PollMessage/To wait view 0/Sample.Any/Flatten.Iterables" - subgraph cluster_680 { - label = "Wait on Transforms:PollMessage/To wait view 0/Sample.Any/Flatten.Iterables/FlattenIterables" - subgraph cluster_681 { - label = "Wait on Transforms:PollMessage/To wait view 0/Sample.Any/Flatten.Iterables/FlattenIterables/FlatMap" - 682 [label="ParMultiDo(Anonymous)"] - 678 -> 682 [style=solid label=""] - } - } - } - } - subgraph cluster_683 { - label = "Wait on Transforms:PollMessage/To wait view 0/View.AsList" - subgraph cluster_684 { - label = "Wait on Transforms:PollMessage/To wait view 0/View.AsList/IndexElements" - 685 [label="ParMultiDo(ToListView)"] - 682 -> 685 [style=solid label=""] - } - 686 [label="View.CreatePCollectionView"] - 685 -> 686 [style=solid label=""] - } - } - subgraph cluster_687 { - label = "Wait on Transforms:PollMessage/Wait" - subgraph cluster_688 { - label = "Wait on Transforms:PollMessage/Wait/Map" - 689 [label="ParMultiDo(Anonymous)"] - 89 -> 689 [style=solid label=""] - 685 -> 689 [style=dashed label=""] - } - } - } - subgraph cluster_690 { - label = "Write to Sql: Transforms:DomainBase" - subgraph cluster_691 { - label = "Write to Sql: Transforms:DomainBase/Shard data Transforms:DomainBase" - subgraph cluster_692 { - label = "Write to Sql: Transforms:DomainBase/Shard data Transforms:DomainBase/AddKeys" - subgraph cluster_693 { - label = "Write to Sql: Transforms:DomainBase/Shard data Transforms:DomainBase/AddKeys/Map" - 694 [label="ParMultiDo(Anonymous)"] - 689 -> 694 [style=solid label=""] - } - } - } - subgraph cluster_695 { - label = "Write to Sql: Transforms:DomainBase/Group into batches Transforms:DomainBase" - subgraph cluster_696 { - label = "Write to Sql: Transforms:DomainBase/Group into batches Transforms:DomainBase/MapElements" - subgraph cluster_697 { - label = "Write to Sql: Transforms:DomainBase/Group into batches Transforms:DomainBase/MapElements/Map" - 698 [label="ParMultiDo(Anonymous)"] - 694 -> 698 [style=solid label=""] - } - } - subgraph cluster_699 { - label = "Write to Sql: Transforms:DomainBase/Group into batches Transforms:DomainBase/GroupIntoBatches" - subgraph cluster_700 { - label = "Write to Sql: Transforms:DomainBase/Group into batches Transforms:DomainBase/GroupIntoBatches/ParDo(GroupIntoBatches)" - 701 [label="ParMultiDo(GroupIntoBatches)"] - 698 -> 701 [style=solid label=""] - } - } - } - subgraph cluster_702 { - label = "Write to Sql: Transforms:DomainBase/Write in batch for Transforms:DomainBase" - 703 [label="ParMultiDo(SqlBatchWriter)"] - 701 -> 703 [style=solid label=""] - } - } - } -} diff --git a/core/src/test/resources/google/registry/beam/initsql/pipeline_golden.png b/core/src/test/resources/google/registry/beam/initsql/pipeline_golden.png deleted file mode 100644 index 1f5917f1e..000000000 Binary files a/core/src/test/resources/google/registry/beam/initsql/pipeline_golden.png and /dev/null differ diff --git a/core/src/test/resources/google/registry/export/backup_kinds.txt b/core/src/test/resources/google/registry/export/backup_kinds.txt deleted file mode 100644 index b656c2f3a..000000000 --- a/core/src/test/resources/google/registry/export/backup_kinds.txt +++ /dev/null @@ -1,17 +0,0 @@ -AllocationToken -Cancellation -Contact -Domain -EntityGroupRoot -EppResourceIndex -ForeignKeyContactIndex -ForeignKeyDomainIndex -ForeignKeyHostIndex -HistoryEntry -Host -Modification -OneTime -PollMessage -RdeRevision -Recurring -Registrar diff --git a/core/src/test/resources/google/registry/export/backup_operation_in_progress.json b/core/src/test/resources/google/registry/export/backup_operation_in_progress.json deleted file mode 100644 index 569a5fcd1..000000000 --- a/core/src/test/resources/google/registry/export/backup_operation_in_progress.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "projects/registry-project-id/operations/ASAzNjMwOTEyNjUJ", - "metadata": { - "@type": "type.googleapis.com/google.datastore.admin.v1.ExportEntitiesMetadata", - "common": { - "startTime": "2014-08-01T01:02:03Z", - "operationType": "EXPORT_ENTITIES", - "state": "PROCESSING" - }, - "entityFilter": { - "kinds": [ - "one", - "two" - ] - }, - "outputUrlPrefix": "gs://registry-project-id-datastore-export-test/2014-08-01T01:02:03_99364" - } -} diff --git a/core/src/test/resources/google/registry/export/backup_operation_success.json b/core/src/test/resources/google/registry/export/backup_operation_success.json deleted file mode 100644 index edac546b7..000000000 --- a/core/src/test/resources/google/registry/export/backup_operation_success.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "projects/registry-project-id/operations/ASAzNjMwOTEyNjUJ", - "metadata": { - "@type": "type.googleapis.com/google.datastore.admin.v1.ExportEntitiesMetadata", - "common": { - "startTime": "2014-08-01T01:02:03Z", - "endTime": "2014-08-01T01:32:03Z", - "operationType": "EXPORT_ENTITIES", - "state": "SUCCESSFUL" - }, - "entityFilter": { - "kinds": [ - "one", - "two" - ] - }, - "outputUrlPrefix": "gs://registry-project-id-datastore-export-test/2014-08-01T01:02:03_99364" - }, - "done": true -} diff --git a/core/src/test/resources/google/registry/export/crosstld_kinds.txt b/core/src/test/resources/google/registry/export/crosstld_kinds.txt deleted file mode 100644 index cff62d534..000000000 --- a/core/src/test/resources/google/registry/export/crosstld_kinds.txt +++ /dev/null @@ -1,2 +0,0 @@ -Registrar -ServerSecret diff --git a/core/src/test/resources/google/registry/export/datastore/common_metadata.json b/core/src/test/resources/google/registry/export/datastore/common_metadata.json deleted file mode 100644 index 7354fdec5..000000000 --- a/core/src/test/resources/google/registry/export/datastore/common_metadata.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "startTime": "2018-10-29T16:01:04.645299Z", - "operationType": "EXPORT_ENTITIES", - "state": "SUCCESSFUL" -} diff --git a/core/src/test/resources/google/registry/export/datastore/entity_filter.json b/core/src/test/resources/google/registry/export/datastore/entity_filter.json deleted file mode 100644 index 26e836fee..000000000 --- a/core/src/test/resources/google/registry/export/datastore/entity_filter.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "kinds": [ - "Registry", - "Registrar", - "Domain" - ] -} diff --git a/core/src/test/resources/google/registry/export/datastore/export_request_content.json b/core/src/test/resources/google/registry/export/datastore/export_request_content.json deleted file mode 100644 index 9c52b578d..000000000 --- a/core/src/test/resources/google/registry/export/datastore/export_request_content.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "entityFilter": { - "kinds": ["Registry", "Registrar", "Domain"] - }, - "outputUrlPrefix": "gs://mybucket/path" -} diff --git a/core/src/test/resources/google/registry/export/datastore/metadata.json b/core/src/test/resources/google/registry/export/datastore/metadata.json deleted file mode 100644 index 719064f86..000000000 --- a/core/src/test/resources/google/registry/export/datastore/metadata.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "@type": "type.googleapis.com/google.datastore.admin.v1.ExportEntitiesMetadata", - "common": { - "startTime": "2018-10-29T16:01:04.645299Z", - "endTime": "2018-10-29T16:02:19.009859Z", - "operationType": "EXPORT_ENTITIES", - "state": "SUCCESSFUL" - }, - "progressEntities": { - "workCompleted": "51797", - "workEstimated": "54513" - }, - "progressBytes": { - "workCompleted": "96908367", - "workEstimated": "73773755" - }, - "entityFilter": { - "kinds": [ - "Registry", - "Registrar", - "Domain" - ] - }, - "outputUrlPrefix": "gs://domain-registry-alpha-datastore-export-test/2018-10-29T16:01:04_99364" -} diff --git a/core/src/test/resources/google/registry/export/datastore/operation.json b/core/src/test/resources/google/registry/export/datastore/operation.json deleted file mode 100644 index 9d0a3aeef..000000000 --- a/core/src/test/resources/google/registry/export/datastore/operation.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "projects/domain-registry-alpha/operations/ASAzNjMwOTEyNjUJ", - "metadata": { - "@type": "type.googleapis.com/google.datastore.admin.v1.ExportEntitiesMetadata", - "common": { - "startTime": "2018-10-29T16:01:04.645299Z", - "operationType": "EXPORT_ENTITIES", - "state": "PROCESSING" - }, - "entityFilter": { - "kinds": [ - "Registry", - "Registrar", - "Domain" - ] - }, - "outputUrlPrefix": "gs://domain-registry-alpha-datastore-export-test/2018-10-29T16:01:04_99364" - } -} diff --git a/core/src/test/resources/google/registry/export/datastore/operation_list.json b/core/src/test/resources/google/registry/export/datastore/operation_list.json deleted file mode 100644 index 14b708922..000000000 --- a/core/src/test/resources/google/registry/export/datastore/operation_list.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "operations": [ - { - "name": "projects/domain-registry-alpha/operations/ASAzNjMwOTEyNjUJ", - "metadata": { - "@type": "type.googleapis.com/google.datastore.admin.v1.ExportEntitiesMetadata", - "common": { - "startTime": "2018-10-29T16:01:04.645299Z", - "operationType": "EXPORT_ENTITIES", - "state": "PROCESSING" - }, - "progressEntities": { - "workCompleted": "51797", - "workEstimated": "54513" - }, - "entityFilter": { - "kinds": [ - "Registry", - "Registrar", - "Domain" - ] - }, - "outputUrlPrefix": "gs://domain-registry-alpha-datastore-export-test/2018-10-29T16:01:04_99364" - } - }, - { - "name": "projects/domain-registry-alpha/operations/ASAzNjMwOTEyNjUJ", - "metadata": { - "@type": "type.googleapis.com/google.datastore.admin.v1.ExportEntitiesMetadata", - "common": { - "startTime": "2018-10-29T16:01:04.645299Z", - "endTime": "2018-10-29T16:02:04.645299Z", - "operationType": "EXPORT_ENTITIES", - "state": "PROCESSING" - }, - "progressEntities": { - "workCompleted": "51797", - "workEstimated": "54513" - }, - "progressBytes": { - "workCompleted": "96908367", - "workEstimated": "73773755" - }, - "entityFilter": { - "kinds": [ - "Registry", - "Registrar", - "Domain" - ] - }, - "outputUrlPrefix": "gs://domain-registry-alpha-datastore-export-test/2018-10-29T16:01:04_99364" - } - } - ] -} diff --git a/core/src/test/resources/google/registry/export/datastore/prettyprinted_operation.json b/core/src/test/resources/google/registry/export/datastore/prettyprinted_operation.json deleted file mode 100644 index 67967e7ba..000000000 --- a/core/src/test/resources/google/registry/export/datastore/prettyprinted_operation.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "done" : false, - "metadata" : { - "common" : { - "operationType" : "EXPORT_ENTITIES", - "startTime" : "2018-10-29T16:01:04.645299Z", - "state" : "PROCESSING" - }, - "entityFilter" : { - "kinds" : [ "Registry", "Registrar", "Domain" ] - }, - "outputUrlPrefix" : "gs://domain-registry-alpha-datastore-export-test/2018-10-29T16:01:04_99364", - "@type" : "type.googleapis.com/google.datastore.admin.v1.ExportEntitiesMetadata" - }, - "name" : "projects/domain-registry-alpha/operations/ASAzNjMwOTEyNjUJ" -} diff --git a/core/src/test/resources/google/registry/export/datastore/progress.json b/core/src/test/resources/google/registry/export/datastore/progress.json deleted file mode 100644 index 3bf805a0c..000000000 --- a/core/src/test/resources/google/registry/export/datastore/progress.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "workCompleted": "51797", - "workEstimated": "54513" -} diff --git a/core/src/test/resources/google/registry/export/pretty_printed_success_backup_operation.json b/core/src/test/resources/google/registry/export/pretty_printed_success_backup_operation.json deleted file mode 100644 index 6a321fc0b..000000000 --- a/core/src/test/resources/google/registry/export/pretty_printed_success_backup_operation.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "done" : true, - "metadata" : { - "common" : { - "endTime" : "2014-08-01T01:32:03Z", - "operationType" : "EXPORT_ENTITIES", - "startTime" : "2014-08-01T01:02:03Z", - "state" : "SUCCESSFUL" - }, - "entityFilter" : { - "kinds" : [ "one", "two" ] - }, - "outputUrlPrefix" : "gs://registry-project-id-datastore-export-test/2014-08-01T01:02:03_99364", - "@type" : "type.googleapis.com/google.datastore.admin.v1.ExportEntitiesMetadata" - }, - "name" : "projects/registry-project-id/operations/ASAzNjMwOTEyNjUJ" -} diff --git a/core/src/test/resources/google/registry/export/reporting_kinds.txt b/core/src/test/resources/google/registry/export/reporting_kinds.txt deleted file mode 100644 index fa1cd7a60..000000000 --- a/core/src/test/resources/google/registry/export/reporting_kinds.txt +++ /dev/null @@ -1,15 +0,0 @@ -AllocationToken -Cancellation -Contact -Domain -EppResourceIndex -ForeignKeyContactIndex -ForeignKeyDomainIndex -ForeignKeyHostIndex -HistoryEntry -Host -Modification -OneTime -PollMessage -Recurring -Registrar diff --git a/core/src/test/resources/google/registry/reporting/icann/activity_report_aggregation_test.sql b/core/src/test/resources/google/registry/reporting/icann/activity_report_aggregation_test.sql deleted file mode 100644 index 9f8097c2a..000000000 --- a/core/src/test/resources/google/registry/reporting/icann/activity_report_aggregation_test.sql +++ /dev/null @@ -1,97 +0,0 @@ -#standardSQL - -- Copyright 2017 The Nomulus Authors. All Rights Reserved. - -- - -- Licensed under the Apache License, Version 2.0 (the "License"); - -- you may not use this file except in compliance with the License. - -- You may obtain a copy of the License at - -- - -- http://www.apache.org/licenses/LICENSE-2.0 - -- - -- Unless required by applicable law or agreed to in writing, software - -- distributed under the License is distributed on an "AS IS" BASIS, - -- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -- See the License for the specific language governing permissions and - -- limitations under the License. - - -- This query pulls from all intermediary tables to create the activity - -- report csv, via a table transpose and sum over all activity report fields. - -SELECT - RealTlds.tld AS tld, - SUM(IF(metricName = 'operational-registrars', count, 0)) AS operational_registrars, - -- We use the Centralized Zone Data Service. - "CZDS" AS zfa_passwords, - SUM(IF(metricName = 'whois-43-queries', count, 0)) AS whois_43_queries, - SUM(IF(metricName = 'web-whois-queries', count, 0)) AS web_whois_queries, - -- We don't support searchable WHOIS. - 0 AS searchable_whois_queries, - -- DNS queries for UDP/TCP are all assumed to be received/responded. - SUM(IF(metricName = 'dns-udp-queries', count, 0)) AS dns_udp_queries_received, - SUM(IF(metricName = 'dns-udp-queries', count, 0)) AS dns_udp_queries_responded, - SUM(IF(metricName = 'dns-tcp-queries', count, 0)) AS dns_tcp_queries_received, - SUM(IF(metricName = 'dns-tcp-queries', count, 0)) AS dns_tcp_queries_responded, - -- SRS metrics. - SUM(IF(metricName = 'srs-dom-check', count, 0)) AS srs_dom_check, - SUM(IF(metricName = 'srs-dom-create', count, 0)) AS srs_dom_create, - SUM(IF(metricName = 'srs-dom-delete', count, 0)) AS srs_dom_delete, - SUM(IF(metricName = 'srs-dom-info', count, 0)) AS srs_dom_info, - SUM(IF(metricName = 'srs-dom-renew', count, 0)) AS srs_dom_renew, - SUM(IF(metricName = 'srs-dom-rgp-restore-report', count, 0)) AS srs_dom_rgp_restore_report, - SUM(IF(metricName = 'srs-dom-rgp-restore-request', count, 0)) AS srs_dom_rgp_restore_request, - SUM(IF(metricName = 'srs-dom-transfer-approve', count, 0)) AS srs_dom_transfer_approve, - SUM(IF(metricName = 'srs-dom-transfer-cancel', count, 0)) AS srs_dom_transfer_cancel, - SUM(IF(metricName = 'srs-dom-transfer-query', count, 0)) AS srs_dom_transfer_query, - SUM(IF(metricName = 'srs-dom-transfer-reject', count, 0)) AS srs_dom_transfer_reject, - SUM(IF(metricName = 'srs-dom-transfer-request', count, 0)) AS srs_dom_transfer_request, - SUM(IF(metricName = 'srs-dom-update', count, 0)) AS srs_dom_update, - SUM(IF(metricName = 'srs-host-check', count, 0)) AS srs_host_check, - SUM(IF(metricName = 'srs-host-create', count, 0)) AS srs_host_create, - SUM(IF(metricName = 'srs-host-delete', count, 0)) AS srs_host_delete, - SUM(IF(metricName = 'srs-host-info', count, 0)) AS srs_host_info, - SUM(IF(metricName = 'srs-host-update', count, 0)) AS srs_host_update, - SUM(IF(metricName = 'srs-cont-check', count, 0)) AS srs_cont_check, - SUM(IF(metricName = 'srs-cont-create', count, 0)) AS srs_cont_create, - SUM(IF(metricName = 'srs-cont-delete', count, 0)) AS srs_cont_delete, - SUM(IF(metricName = 'srs-cont-info', count, 0)) AS srs_cont_info, - SUM(IF(metricName = 'srs-cont-transfer-approve', count, 0)) AS srs_cont_transfer_approve, - SUM(IF(metricName = 'srs-cont-transfer-cancel', count, 0)) AS srs_cont_transfer_cancel, - SUM(IF(metricName = 'srs-cont-transfer-query', count, 0)) AS srs_cont_transfer_query, - SUM(IF(metricName = 'srs-cont-transfer-reject', count, 0)) AS srs_cont_transfer_reject, - SUM(IF(metricName = 'srs-cont-transfer-request', count, 0)) AS srs_cont_transfer_request, - SUM(IF(metricName = 'srs-cont-update', count, 0)) AS srs_cont_update - -- Cross join a list of all TLDs against TLD-specific metrics and then - -- filter so that only metrics with that TLD or a NULL TLD are counted - -- towards a given TLD. -FROM ( -SELECT tldStr AS tld -FROM `domain-registry-alpha.latest_datastore_export.Registry` -WHERE tldType = 'REAL' -) as RealTlds -CROSS JOIN( - SELECT - tld, - metricName, - count - FROM - ( - -- BEGIN INTERMEDIARY DATA SOURCES -- - -- Dummy data source to ensure all TLDs appear in report, even if - -- they have no recorded metrics for the month. - SELECT STRING(NULL) AS tld, STRING(NULL) AS metricName, 0 as count - UNION ALL - SELECT * FROM - `domain-registry-alpha.icann_reporting.registrar_operating_status_201709` - UNION ALL - SELECT * FROM - `domain-registry-alpha.icann_reporting.dns_counts_201709` - UNION ALL - SELECT * FROM - `domain-registry-alpha.icann_reporting.epp_metrics_201709` - UNION ALL - SELECT * FROM - `domain-registry-alpha.icann_reporting.whois_counts_201709` - -- END INTERMEDIARY DATA SOURCES -- - )) AS TldMetrics -WHERE RealTlds.tld = TldMetrics.tld OR TldMetrics.tld IS NULL -GROUP BY tld -ORDER BY tld diff --git a/core/src/test/resources/google/registry/reporting/icann/dns_counts_test.sql b/core/src/test/resources/google/registry/reporting/icann/dns_counts_test.sql deleted file mode 100644 index 85293dbb3..000000000 --- a/core/src/test/resources/google/registry/reporting/icann/dns_counts_test.sql +++ /dev/null @@ -1,29 +0,0 @@ -#standardSQL - -- Copyright 2017 The Nomulus Authors. All Rights Reserved. - -- - -- Licensed under the Apache License, Version 2.0 (the "License"); - -- you may not use this file except in compliance with the License. - -- You may obtain a copy of the License at - -- - -- http://www.apache.org/licenses/LICENSE-2.0 - -- - -- Unless required by applicable law or agreed to in writing, software - -- distributed under the License is distributed on an "AS IS" BASIS, - -- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -- See the License for the specific language governing permissions and - -- limitations under the License. - - -- Query for DNS metrics. - - -- You must configure this yourself to enable activity reporting, according - -- to whatever metrics your DNS provider makes available. We hope to make - -- this available in the open-source build in the near future. - -SELECT - STRING(NULL) AS tld, - metricName, - -1 AS count -FROM (( - SELECT 'dns-udp-queries' AS metricName) - UNION ALL - (SELECT 'dns-tcp-queries' AS metricName)) diff --git a/core/src/test/resources/google/registry/reporting/icann/epp_metrics_test.sql b/core/src/test/resources/google/registry/reporting/icann/epp_metrics_test.sql deleted file mode 100644 index 62b74e172..000000000 --- a/core/src/test/resources/google/registry/reporting/icann/epp_metrics_test.sql +++ /dev/null @@ -1,58 +0,0 @@ -#standardSQL - -- Copyright 2017 The Nomulus Authors. All Rights Reserved. - -- - -- Licensed under the Apache License, Version 2.0 (the "License"); - -- you may not use this file except in compliance with the License. - -- You may obtain a copy of the License at - -- - -- http://www.apache.org/licenses/LICENSE-2.0 - -- - -- Unless required by applicable law or agreed to in writing, software - -- distributed under the License is distributed on an "AS IS" BASIS, - -- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -- See the License for the specific language governing permissions and - -- limitations under the License. - - -- Query FlowReporter JSON log messages and calculate SRS metrics. - - -- We use ugly regex's over the monthly appengine logs to determine how many - -- EPP requests we received for each command. For example: - -- {"commandType":"check"...,"targetIds":["ais.a.how"], - -- "tld":"","tlds":["a.how"],"icannActivityReportField":"srs-dom-check"} - -SELECT - -- Remove quotation marks from tld fields. - REGEXP_EXTRACT(tld, '^"(.*)"$') AS tld, - activityReportField AS metricName, - COUNT(*) AS count -FROM ( - SELECT - -- TODO(b/32486667): Replace with JSON.parse() UDF when available for views - SPLIT( - REGEXP_EXTRACT(JSON_EXTRACT(json, '$.tlds'), r'^\[(.*)\]$')) AS tlds, - JSON_EXTRACT_SCALAR(json, - '$.resourceType') AS resourceType, - JSON_EXTRACT_SCALAR(json, - '$.icannActivityReportField') AS activityReportField - FROM ( - SELECT - -- Extract the logged JSON payload. - REGEXP_EXTRACT(logMessage, r'FLOW-LOG-SIGNATURE-METADATA: (.*)\n?$') - AS json - FROM `domain-registry-alpha.icann_reporting.monthly_logs_201709` AS logs - JOIN - UNNEST(logs.logMessage) AS logMessage - WHERE - STARTS_WITH(logMessage, "google.registry.flows.FlowReporter recordToLogs: FLOW-LOG-SIGNATURE-METADATA"))) AS regexes -JOIN - -- Unnest the JSON-parsed tlds. - UNNEST(regexes.tlds) AS tld --- Exclude cases that can't be tabulated correctly, where activityReportField --- is null/empty, or TLD is null/empty despite being a domain flow. -WHERE - activityReportField != '' - AND (tld != '' OR resourceType != 'domain') -GROUP BY - tld, metricName -ORDER BY - tld, metricName diff --git a/core/src/test/resources/google/registry/reporting/icann/monthly_logs_test.sql b/core/src/test/resources/google/registry/reporting/icann/monthly_logs_test.sql deleted file mode 100644 index 86660f304..000000000 --- a/core/src/test/resources/google/registry/reporting/icann/monthly_logs_test.sql +++ /dev/null @@ -1,30 +0,0 @@ -#standardSQL - -- Copyright 2017 The Nomulus Authors. All Rights Reserved. - -- - -- Licensed under the Apache License, Version 2.0 (the "License"); - -- you may not use this file except in compliance with the License. - -- You may obtain a copy of the License at - -- - -- http://www.apache.org/licenses/LICENSE-2.0 - -- - -- Unless required by applicable law or agreed to in writing, software - -- distributed under the License is distributed on an "AS IS" BASIS, - -- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -- See the License for the specific language governing permissions and - -- limitations under the License. - - -- Query to fetch AppEngine request logs for the report month. - - -- START_OF_MONTH and END_OF_MONTH should be in YYYYMM01 format. - -SELECT - protoPayload.resource AS requestPath, - ARRAY( - SELECT - logMessage - FROM - UNNEST(protoPayload.line)) AS logMessage -FROM - `domain-registry-alpha.appengine_logs.appengine_googleapis_com_request_log_*` -WHERE - _TABLE_SUFFIX BETWEEN '20170901' AND '20170930' diff --git a/core/src/test/resources/google/registry/reporting/icann/transaction_transfer_losing_test.sql b/core/src/test/resources/google/registry/reporting/icann/transaction_transfer_losing_test.sql deleted file mode 100644 index fc60eff27..000000000 --- a/core/src/test/resources/google/registry/reporting/icann/transaction_transfer_losing_test.sql +++ /dev/null @@ -1,85 +0,0 @@ -#standardSQL - -- Copyright 2017 The Nomulus Authors. All Rights Reserved. - -- - -- Licensed under the Apache License, Version 2.0 (the "License"); - -- you may not use this file except in compliance with the License. - -- You may obtain a copy of the License at - -- - -- http://www.apache.org/licenses/LICENSE-2.0 - -- - -- Unless required by applicable law or agreed to in writing, software - -- distributed under the License is distributed on an "AS IS" BASIS, - -- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -- See the License for the specific language governing permissions and - -- limitations under the License. - - -- Counts the number of mutating transactions each registrar made. - - -- We populate the fields through explicit logging of - -- DomainTransactionRecords, which contain all necessary information for - -- reporting (such as reporting time, report field, report amount, etc. - - -- A special note on transfers: we only record 'TRANSFER_SUCCESSFUL' or - -- 'TRANSFER_NACKED', and we can infer the gaining and losing parties - -- from the enclosing HistoryEntry's clientId and otherClientId - -- respectively. This query templates the client ID, field for transfer - -- success, field for transfer nacks and default field. This allows us to - -- create one query for TRANSFER_GAINING and the other report fields, - -- and one query for TRANSFER_LOSING fields from the same template. - --- This outer select just converts the registrar's clientId to their name. -SELECT - tld, - registrar_table.registrarName AS registrar_name, - metricName, - metricValue -FROM ( - SELECT - tld, - clientId, - CASE - WHEN field = 'TRANSFER_SUCCESSFUL' THEN 'TRANSFER_LOSING_SUCCESSFUL' - WHEN field = 'TRANSFER_NACKED' THEN 'TRANSFER_LOSING_NACKED' - ELSE NULL - END AS metricName, - SUM(amount) AS metricValue - FROM ( - SELECT - CASE - -- Explicit transfer acks (approve) and nacks (reject) are done - -- by the opposing registrar. Thus, for these specific actions, - -- we swap the 'otherClientId' with the 'clientId' to properly - -- account for this reversal. - WHEN (entries.type = 'DOMAIN_TRANSFER_APPROVE' - OR entries.type = 'DOMAIN_TRANSFER_REJECT') - THEN entries.clientId - ELSE entries.otherClientId - END AS clientId, - entries.domainTransactionRecords.tld[SAFE_OFFSET(index)] AS tld, - entries.domainTransactionRecords.reportingTime[SAFE_OFFSET(index)] - AS reportingTime, - entries.domainTransactionRecords.reportField[SAFE_OFFSET(index)] - AS field, - entries.domainTransactionRecords.reportAmount[SAFE_OFFSET(index)] - AS amount - FROM - `domain-registry-alpha.latest_datastore_export.HistoryEntry` - AS entries, - -- This allows us to 'loop' through the arrays in parallel by index - UNNEST(GENERATE_ARRAY(0, ARRAY_LENGTH( - entries.domainTransactionRecords.tld) - 1)) AS index - -- Ignore null entries - WHERE entries.domainTransactionRecords IS NOT NULL ) - -- Only look at this month's data - WHERE reportingTime - BETWEEN TIMESTAMP('2017-09-01 00:00:00.000') - AND TIMESTAMP('2017-09-30 23:59:59.999') - GROUP BY - tld, - clientId, - field ) AS counts_table -JOIN - `domain-registry-alpha.latest_datastore_export.Registrar` - AS registrar_table -ON - counts_table.clientId = registrar_table.__key__.name diff --git a/core/src/test/resources/google/registry/reporting/icann/whois_counts_test.sql b/core/src/test/resources/google/registry/reporting/icann/whois_counts_test.sql deleted file mode 100644 index 8aa1caea0..000000000 --- a/core/src/test/resources/google/registry/reporting/icann/whois_counts_test.sql +++ /dev/null @@ -1,33 +0,0 @@ -#standardSQL - -- Copyright 2017 The Nomulus Authors. All Rights Reserved. - -- - -- Licensed under the Apache License, Version 2.0 (the "License"); - -- you may not use this file except in compliance with the License. - -- You may obtain a copy of the License at - -- - -- http://www.apache.org/licenses/LICENSE-2.0 - -- - -- Unless required by applicable law or agreed to in writing, software - -- distributed under the License is distributed on an "AS IS" BASIS, - -- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -- See the License for the specific language governing permissions and - -- limitations under the License. - - -- Query for WHOIS metrics. - - -- This searches the monthly appengine logs for Whois requests, and - -- counts the number of hits via both endpoints (port 43 and the web). - -SELECT - STRING(NULL) AS tld, - CASE - WHEN requestPath = '/_dr/whois' THEN 'whois-43-queries' - WHEN SUBSTR(requestPath, 0, 7) = '/whois/' THEN 'web-whois-queries' - END AS metricName, - COUNT(requestPath) AS count -FROM - `domain-registry-alpha.icann_reporting.monthly_logs_201709` -GROUP BY - metricName -HAVING - metricName IS NOT NULL diff --git a/core/src/test/resources/google/registry/testing/logging.properties b/core/src/test/resources/google/registry/testing/logging.properties index 78e38c1b8..f2bd31b64 100644 --- a/core/src/test/resources/google/registry/testing/logging.properties +++ b/core/src/test/resources/google/registry/testing/logging.properties @@ -3,7 +3,6 @@ handlers = java.util.logging.ConsoleHandler google.registry.level = FINE -com.google.appengine.api.datastore.dev.LocalDatastoreService.level = WARNING com.google.appengine.api.taskqueue.dev.level = WARNING com.google.apphosting.utils.config.level = WARNING org.quartz.level = WARNING diff --git a/core/src/test/resources/google/registry/tools/datastore-export/kind_AllocationToken/all_namespaces_kind_AllocationToken.export_metadata b/core/src/test/resources/google/registry/tools/datastore-export/kind_AllocationToken/all_namespaces_kind_AllocationToken.export_metadata deleted file mode 100644 index 9d8db2bac..000000000 Binary files a/core/src/test/resources/google/registry/tools/datastore-export/kind_AllocationToken/all_namespaces_kind_AllocationToken.export_metadata and /dev/null differ diff --git a/core/src/test/resources/google/registry/tools/datastore-export/kind_AllocationToken/output-0 b/core/src/test/resources/google/registry/tools/datastore-export/kind_AllocationToken/output-0 deleted file mode 100644 index 74665d8d6..000000000 Binary files a/core/src/test/resources/google/registry/tools/datastore-export/kind_AllocationToken/output-0 and /dev/null differ diff --git a/core/src/test/resources/google/registry/tools/datastore-export/kind_AllocationToken/output-1 b/core/src/test/resources/google/registry/tools/datastore-export/kind_AllocationToken/output-1 deleted file mode 100644 index e69de29bb..000000000 diff --git a/db/gradle.lockfile b/db/gradle.lockfile index f24c1f346..52a7fe1fd 100644 --- a/db/gradle.lockfile +++ b/db/gradle.lockfile @@ -12,25 +12,25 @@ com.github.ben-manes.caffeine:caffeine:2.9.3=testCompileClasspath,testRuntimeCla com.github.docker-java:docker-java-api:3.2.13=testCompileClasspath,testRuntimeClasspath com.github.docker-java:docker-java-transport-zerodep:3.2.13=testCompileClasspath,testRuntimeClasspath com.github.docker-java:docker-java-transport:3.2.13=testCompileClasspath,testRuntimeClasspath -com.github.jnr:jffi:1.3.9=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.github.jnr:jffi:1.3.10=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-a64asm:1.0.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-constants:0.10.3=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-enxio:0.32.13=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-ffi:2.2.11=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-posix:3.1.15=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-unixsocket:0.38.17=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-constants:0.10.4=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-enxio:0.32.14=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-ffi:2.2.13=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-posix:3.1.16=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-unixsocket:0.38.19=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor -com.google.api-client:google-api-client:2.0.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api:gax:2.19.4=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.apis:google-api-services-sqladmin:v1beta4-rev20221017-2.0.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-credentials:1.12.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-oauth2-http:1.12.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api-client:google-api-client:2.1.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api:gax:2.20.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.apis:google-api-services-sqladmin:v1beta4-rev20221209-2.0.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-credentials:1.13.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-oauth2-http:1.13.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.auto.value:auto-value-annotations:1.10=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.auto.value:auto-value-annotations:1.8.1=testCompileClasspath com.google.auto:auto-common:0.10=annotationProcessor,errorprone,testAnnotationProcessor -com.google.cloud.sql:jdbc-socket-factory-core:1.7.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.cloud.sql:postgres-socket-factory:1.7.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.cloud.sql:jdbc-socket-factory-core:1.8.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.cloud.sql:postgres-socket-factory:1.8.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.code.findbugs:jFormatString:3.0.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,default,deploy_jar,errorprone,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.10=default,deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -48,7 +48,7 @@ com.google.guava:guava:27.0.1-jre=annotationProcessor,errorprone,testAnnotationP com.google.guava:guava:29.0-jre=checkstyle com.google.guava:guava:31.1-jre=default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,checkstyle,default,deploy_jar,errorprone,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -com.google.http-client:google-http-client-apache-v2:1.42.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.http-client:google-http-client-apache-v2:1.42.3=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.http-client:google-http-client-gson:1.42.3=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.http-client:google-http-client:1.42.3=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:1.1=annotationProcessor,errorprone,testAnnotationProcessor @@ -59,7 +59,7 @@ com.google.truth:truth:1.1.3=testCompileClasspath,testRuntimeClasspath com.googlecode.java-diff-utils:diffutils:1.3.0=annotationProcessor,errorprone,testAnnotationProcessor com.puppycrawl.tools:checkstyle:8.37=checkstyle commons-beanutils:commons-beanutils:1.9.4=checkstyle -commons-codec:commons-codec:1.11=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +commons-codec:commons-codec:1.15=default,deploy_jar,runtimeClasspath,testRuntimeClasspath commons-collections:commons-collections:3.2.2=checkstyle commons-logging:commons-logging:1.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath info.picocli:picocli:4.5.2=checkstyle @@ -86,7 +86,7 @@ org.checkerframework:checker-qual:3.19.0=testCompileClasspath,testRuntimeClasspa org.checkerframework:dataflow:3.0.0=annotationProcessor,errorprone,testAnnotationProcessor org.checkerframework:javacutil:3.0.0=annotationProcessor,errorprone,testAnnotationProcessor org.codehaus.mojo:animal-sniffer-annotations:1.17=annotationProcessor,errorprone,testAnnotationProcessor -org.flywaydb:flyway-core:9.10.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-core:9.11.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hamcrest:hamcrest-core:1.3=testCompileClasspath,testRuntimeClasspath org.jacoco:org.jacoco.agent:0.8.6=jacocoAgent,jacocoAnt org.jacoco:org.jacoco.ant:0.8.6=jacocoAnt @@ -94,11 +94,11 @@ org.jacoco:org.jacoco.core:0.8.6=jacocoAnt org.jacoco:org.jacoco.report:0.8.6=jacocoAnt org.javassist:javassist:3.26.0-GA=checkstyle org.jetbrains:annotations:17.0.0=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-engine:5.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.9.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:5.9.1=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.9.2=testCompileClasspath,testRuntimeClasspath +org.junit:junit-bom:5.9.2=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:8.0.1=jacocoAnt org.ow2.asm:asm-analysis:9.4=default,deploy_jar,runtimeClasspath,testRuntimeClasspath diff --git a/dependencies.gradle b/dependencies.gradle index 279963c5d..efa68df96 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -101,8 +101,6 @@ ext { 'args4j:args4j:[2.0.26,)', 'com.google.api:gax:[1.66.0,)', 'com.google.api.grpc:proto-google-cloud-secretmanager-v1:[1.4.0,)', - // The two below are needed only for Datastore bulk delete pipeline. - 'com.google.api.grpc:proto-google-cloud-datastore-v1:[0.88.9,)', 'com.google.api.grpc:proto-google-cloud-tasks-v2:[1.33.2,)', 'com.google.api.grpc:proto-google-common-protos:[2.1.0,)', @@ -128,9 +126,7 @@ ext { 'com.google.auto.service:auto-service:[1.0-rc7,)', 'com.google.auto.value:auto-value-annotations:[1.7.4,)', 'com.google.auto.value:auto-value:[1.7.4,)', - // The two below are needed only for Datastore bulk delete pipeline. 'com.google.cloud.bigdataoss:util:2.2.6', - 'com.google.cloud.datastore:datastore-v1-proto-client:[1.6.3,)', 'com.google.cloud.sql:jdbc-socket-factory-core:[1.2.1,)', 'com.google.cloud.sql:postgres-socket-factory:[1.2.1,)', 'com.google.cloud:google-cloud-core:[1.94.3,)', diff --git a/docs/admin-tool.md b/docs/admin-tool.md index 39c0b751e..cb47fcd79 100644 --- a/docs/admin-tool.md +++ b/docs/admin-tool.md @@ -99,5 +99,5 @@ that are used by a large number of other tools are: * **`ListObjectsCommand`** -- Lists all objects of a specific type from the server and outputs them. * **`MutatingCommand`** -- Provides a facility to create or update entities in - Datastore, and uses a diff algorithm to display the changes that will be + the database, and uses a diff algorithm to display the changes that will be made before committing them. diff --git a/docs/architecture.md b/docs/architecture.md index f60848586..21a622b9b 100644 --- a/docs/architecture.md +++ b/docs/architecture.md @@ -120,17 +120,6 @@ specification for the cron task. Here are the task queues in use by the system. All are push queues unless explicitly marked as otherwise. -* `async-delete-pull` and `async-host-rename-pull` -- Pull queues for tasks to - asynchronously delete contacts/hosts and to asynchronously refresh DNS for - renamed hosts, respectively. Tasks are enqueued during EPP flows and then - handled in batches by the regularly running cron tasks - `DeleteContactsAndHostsAction` and `RefreshDnsOnHostRenameAction`. -* `bigquery-streaming-metrics` -- Queue for metrics that are asynchronously - streamed to BigQuery in the `Metrics` class. Tasks are enqueued during EPP - flows in `EppController`. This means that there is a lag of a few seconds to - a few minutes between when metrics are generated and when they are queryable - in BigQuery, but this is preferable to slowing all EPP flows down and - blocking them on BigQuery streaming. * `brda` -- Queue for tasks to upload weekly Bulk Registration Data Access (BRDA) files to a location where they are available to ICANN. The `RdeStagingReducer` (part of the RDE MapReduce) creates these tasks at the @@ -141,33 +130,6 @@ explicitly marked as otherwise. `DnsWriter` for the TLD. * `dns-publish` -- Queue for batches of DNS updates to be pushed to DNS writers. -* `export-bigquery-poll` -- Queue for tasks to query the success/failure of a - given BigQuery export job. Tasks are enqueued by `BigqueryPollJobAction`. -* `export-commits` -- Queue for tasks to export commit log checkpoints. Tasks - are enqueued by `CommitLogCheckpointAction` (which is run every minute by - cron) and executed by `ExportCommitLogDiffAction`. -* `export-snapshot` -- Cron and push queue for tasks to load a Datastore - snapshot that was stored in Google Cloud Storage and export it to BigQuery. - Tasks are enqueued by both cron and `CheckSnapshotAction` and are executed - by both `ExportSnapshotAction` and `LoadSnapshotAction`. -* `export-snapshot-poll` -- Queue for tasks to check that a Datastore snapshot - has been successfully uploaded to Google Cloud Storage (this is an - asynchronous background operation that can take an indeterminate amount of - time). Once the snapshot is successfully uploaded, it is imported into - BigQuery. Tasks are enqueued by `ExportSnapshotAction` and executed by - `CheckSnapshotAction`. -* `export-snapshot-update-view` -- Queue for tasks to update the BigQuery - views to point to the most recently uploaded snapshot. Tasks are enqueued by - `LoadSnapshotAction` and executed by `UpdateSnapshotViewAction`. -* `group-members-sync` -- Cron queue for tasks to sync registrar contacts (not - domain contacts!) to Google Groups. Tasks are executed by - `SyncGroupMembersAction`. -* `load[0-9]` -- Queues used to load-test the system by `LoadTestAction`. - These queues don't need to exist except when actively running load tests - (running load tests on production environments is not recommended). There - are ten of these queues to provide simple sharding, because Nomulus is - capable of handling significantly more Queries Per Second than the highest - throttle limit available on task queues (which is 500 qps). * `lordn-claims` and `lordn-sunrise` -- Pull queues for handling LORDN exports. Tasks are enqueued synchronously during EPP commands depending on whether the domain name in question has a claims notice ID. @@ -298,109 +260,19 @@ of experience running a production registry using this codebase. errors, it can be pushed to Production. 5. Repeat once weekly, or potentially more often. -## Cloud Datastore +## Cloud SQL -Nomulus uses [Cloud -Datastore](https://cloud.google.com/appengine/docs/java/datastore/) as its -primary database. Cloud Datastore is a NoSQL document database that provides -automatic horizontal scaling, high performance, and high availability. All -information that is persisted to Cloud Datastore takes the form of Java classes -annotated with `@Entity` that are located in the `model` package. The [Objectify -library](https://cloud.google.com/appengine/docs/java/gettingstarted/using-datastore-objectify) -is used to persist instances of these classes in a format that Datastore -understands. - -A brief overview of the different entity types found in the App Engine Datastore -Viewer may help administrators understand what they are seeing. Note that some -of these entities are part of App Engine tools that are outside of the domain -registry codebase: - -* `_AE_*` -- These entities are created by App Engine. -* `_ah_SESSION` -- These entities track App Engine client sessions. -* `_GAE_MR_*` -- These entities are generated by App Engine while running - MapReduces. -* `BackupStatus` -- There should only be one of these entities, used to - maintain the state of the backup process. -* `Cancellation` -- A cancellation is a special type of billing event which - represents the cancellation of another billing event such as a OneTime or - Recurring. -* `ClaimsList`, `ClaimsListShard`, and `ClaimsListSingleton` -- These entities - store the TMCH claims list, for use in trademark processing. -* `CommitLog*` -- These entities store the commit log information. -* `Contact` -- These hold the ICANN contact information (but not - registrar contacts, who have a separate entity type). -* `Cursor` -- We use Cursor entities to maintain state about daily processes, - remembering which dates have been processed. For instance, for the RDE - export, Cursor entities maintain the date up to which each TLD has been - exported. -* `Domain` -- These hold the ICANN domain information. -* `DomainRecord` -- These are used during the DNS update process. -* `EntityGroupRoot` -- There is only one EntityGroupRoot entity, which serves - as the Datastore parent of many other entities. -* `EppResourceIndex` -- These entities allow enumeration of EPP resources - (such as domains, hosts and contacts), which would otherwise be difficult to - do in Datastore. -* `ExceptionReportEntity` -- These entities are generated automatically by - ECatcher, a Google-internal logging and debugging tool. Non-Google users - should not encounter these entries. -* `ForeignKeyContactIndex`, `ForeignKeyDomainIndex`, and - `ForeignKeyHostIndex` -- These act as a unique index on contacts, domains - and hosts, allowing transactional lookup by foreign key. -* `HistoryEntry` -- A HistoryEntry is the record of a command which mutated an - EPP resource. It serves as the parent of BillingEvents and PollMessages. -* `HostRecord` -- These are used during the DNS update process. -* `Host` -- These hold the ICANN host information. -* `Lock` -- Lock entities are used to control access to a shared resource such - as an App Engine queue. Under ordinary circumstances, these locks will be - cleaned up automatically, and should not accumulate. -* `MR-*` -- These entities are generated by the App Engine MapReduce library - in the course of running MapReduces. -* `Modification` -- A Modification is a special type of billing event which - represents the modification of a OneTime billing event. -* `OneTime` -- A OneTime is a billing event which represents a one-time charge - or credit to the client (as opposed to Recurring). -* `pipeline-*` -- These entities are also generated by the App Engine - MapReduce library. -* `PollMessage` -- PollMessages are generated by the system to notify - registrars of asynchronous responses and status changes. -* `PremiumList`, `PremiumListEntry`, and `PremiumListRevision` -- The standard - method for determining which domain names receive premium pricing is to - maintain a static list of premium names. Each PremiumList contains some - number of PremiumListRevisions, each of which in turn contains a - PremiumListEntry for each premium name. -* `RdeRevision` -- These entities are used by the RDE subsystem in the process - of generating files. -* `Recurring` -- A Recurring is a billing event which represents a recurring - charge to the client (as opposed to OneTime). -* `Registrar` -- These hold information about client registrars. -* `RegistrarPoc` -- Registrars have contacts just as domains do. These are - stored in a special RegistrarPoc entity. -* `Registry` -- These hold information about the TLDs supported by the - Registry system. -* `RegistryCursor` -- These entities are the predecessor to the Cursor - entities. We are no longer using them, and will be deleting them soon. -* `ReservedList` -- Each ReservedList entity represents an entire list of - reserved names which cannot be registered. Each TLD can have one or more - attached reserved lists. -* `ServerSecret` -- this is a single entity containing the secret numbers used - for generating tokens such as XSRF tokens. -* `SignedMarkRevocationList` -- The entities together contain the Signed Mark - Data Revocation List file downloaded from the TMCH MarksDB each day. Each - entity contains up to 10,000 rows of the file, so depending on the size of - the file, there will be some handful of entities. -* `TmchCrl` -- This is a single entity containing ICANN's TMCH CA Certificate - Revocation List. +To be filled. ## Cloud Storage buckets Nomulus uses [Cloud Storage](https://cloud.google.com/storage/) for bulk storage -of large flat files that aren't suitable for Datastore. These files include -backups, RDE exports, Datastore snapshots (for ingestion into BigQuery), and -reports. Each bucket name must be unique across all of Google Cloud Storage, so -we use the common recommended pattern of prefixing all buckets with the name of -the App Engine app (which is itself globally unique). Most of the bucket names -are configurable, but the defaults are as follows, with PROJECT standing in as a -placeholder for the App Engine app name: +of large flat files that aren't suitable for Cloud SQL. These files include +backups, RDE exports, and reports. Each bucket name must be unique across all of +Google Cloud Storage, so we use the common recommended pattern of prefixing all +buckets with the name of the App Engine app (which is itself globally unique). +Most of the bucket names are configurable, but the defaults are as follows, with +PROJECT standing in as a placeholder for the App Engine app name: * `PROJECT-billing` -- Monthly invoice files for each registrar. * `PROJECT-commits` -- Daily exports of commit logs that are needed for @@ -421,9 +293,6 @@ placeholder for the App Engine app name: regularly uploaded to the escrow provider. Lifecycle is set to 90 days. The bucket must exist. * `PROJECT-reporting` -- Contains monthly ICANN reporting files. -* `PROJECT-snapshots` -- Contains daily exports of Datastore entities of types - defined in `ExportConstants.java`. These are imported into BigQuery daily to - allow for in-depth querying. * `PROJECT.appspot.com` -- Temporary MapReduce files are stored here. By default, the App Engine MapReduce library places its temporary files in a bucket named {project}.appspot.com. This bucket must exist. To keep diff --git a/docs/code-structure.md b/docs/code-structure.md index 0bacf3636..4e604005e 100644 --- a/docs/code-structure.md +++ b/docs/code-structure.md @@ -77,14 +77,14 @@ The following cursor types are defined: * **`SYNC_REGISTRAR_SHEET`** - Tracks the last time the registrar spreadsheet was successfully synced. -All `Cursor` entities in Datastore contain a `DateTime` that represents the next -timestamp at which an operation should resume processing and a `CursorType` that -identifies which operation the cursor is associated with. In many cases, there -are multiple cursors per operation; for instance, the cursors related to RDE -reporting, staging, and upload are per-TLD cursors. To accomplish this, each +All `Cursor` entities in the database contain a `DateTime` that represents the +next timestamp at which an operation should resume processing and a `CursorType` +that identifies which operation the cursor is associated with. In many cases, +there are multiple cursors per operation; for instance, the cursors related to +RDE reporting, staging, and upload are per-TLD cursors. To accomplish this, each `Cursor` also has a scope, a `Key` to which the particular cursor applies (this can be e.g. a `Registry` or any other `ImmutableObject` in -Datastore, depending on the operation). If the `Cursor` applies to the entire +the database, depending on the operation). If the `Cursor` applies to the entire registry environment, it is considered a global cursor and has a scope of `EntityGroupRoot.getCrossTldKey()`. @@ -172,27 +172,14 @@ objects by their unique IDs: * `Host`: fully-qualified host name Since all `EppResource` entities are indexed on ROID (which is also unique, but -not as useful as the resource's name), a `ForeignKeyIndex` provides a way to +not as useful as the resource's name), the `ForeignKeyUtils` provides a way to look up the resources using another key which is also unique during the lifetime of the resource (though not for all time). -A `ForeignKeyIndex` is updated as a resource is created or deleted. It is -important to note that throughout the lifecycle of an `EppResource`, the -underlying Datastore entity is never hard-deleted; its deletion time is set to -the time at which the EPP command to delete the resource was set, and it remains -in Datastore. Other resources with that same name can then be created. - -## EPP resource index - -An `EppResourceIndex` is an index that allows for quick enumeration of all -`EppResource` entities in Datastore. Datastore does not otherwise provide an -easy way to efficiently and strongly consistently enumerate all entities of a -given type. Each `EppResourceIndex` is assigned randomly to an -`EppResourceIndexBucket` upon creation, the number of which is configured to be -greater than the number of shards typically used for Mapreduces that enumerate -these entities. Mapreduces that process all `EppResource` entities (or -subclasses thereof) distribute each `EppResourceIndexBucket` to available -shards. +It is important to note that throughout the lifecycle of an `EppResource`, the +underlying entity is never hard-deleted; its deletion time is set to the time at +which the EPP command to delete the resource was set, and it remains in the +database. Other resources with that same name can then be created. ## History entries @@ -232,7 +219,7 @@ between the registry and registrars. Refer to [RFC 5730 Section 2.9.2.3](https://tools.ietf.org/html/rfc5730#section-2.9.2.3) for their protocol specification. -Poll messages are stored by the system as entities in Datastore. All poll +Poll messages are stored by the system as entities in the database. All poll messages have an event time at which they become active; any poll request before that time will not return the poll message. For example, every domain when created enqueues a speculative poll message for the automatic renewal of the diff --git a/docs/coding-faq.md b/docs/coding-faq.md index f2f42ea26..713b07758 100644 --- a/docs/coding-faq.md +++ b/docs/coding-faq.md @@ -3,50 +3,6 @@ This file is a motley assortment of informational emails generated in response to questions from development partners. -## Which entities are backed up using commit logs? - -Short answer: Check the file `backup_kinds.txt`. - -Long answer: There are really two axes. Our custom Ofy actually doesn't -condition commit logging on the `@Entity` class being mutated. Rather, it -conditions based on: - -1. the methods you're invoking -1. annotations on the class being mutated - -**Methods:** The standard `save()` and `delete()` methods always write commit -logs. The alternate `saveWithoutBackup()` and `deleteWithoutBackup()` methods -never write commit logs (and have appropriately scary names to avoid accidental -use). This makes it clear what you're getting at the callsite. - -**Annotations:** There are regular `@Entity`-annotated entities, -`@VirtualEntity`-annotated entities, and `@NotBackedUp`-annotated entities. An -`@VirtualEntity` is a "virtual entity" that just serves to construct parent keys -for other entities (e.g. `EppResourceIndexBucket`) and is never written to -Datastore itself. An `@NotBackedUp`-annotated entity is one that specifically -shouldn't be backed up (like the commit log entities themselves). - -We don't actually prevent you from not-backing-up a regular entity, because -sometimes that's necessary (e.g. in the restore logic, and some other -miscellaneous places). We do prevent you from trying to save/delete an -`@VirtualEntity` (with or without backups) or save/delete an `@NotBackedUp` -entity with backups (i.e. using the regular `save()`/`delete()` calls), since -these are always usage errors. - -We went with an `@NotBackedUp` annotation versus an `@BackedUp` annotation -largely because the not-backed-up case is more of the special case (as explained -above, the annotation itself doesn't directly turn backups on or off). To keep -track of what we're intending to back up, we: - -1. synthesize a list of all the backed-up kinds by filtering the registered - entity classes to remove those with `@VirtualEntity` and `@NotBackedUp` - annotations: - [`ExportConstants`](https://github.com/google/nomulus/blob/master/java/google/registry/export/ExportConstants.java#L82), -1. check this list into the repo: - [`backup_kinds.txt`](https://github.com/google/nomulus/blob/master/javatests/google/registry/export/backup_kinds.txt), then -1. run an enforcement test to make sure it is up to date: - [`ExportConstantsTest`](https://github.com/google/nomulus/blob/master/javatests/google/registry/export/ExportConstantsTest.java#L55). - ## How do I mock Google Cloud Storage in tests? AppEngine's GCS client automatically switches over to a local implementation, @@ -142,31 +98,4 @@ specify .domain.tld after the nameserver wildcard (e.g. ns*.domain.tld). But you can't do anything else, like searching for nameservers with ns*.tld. When using a wildcard, we currently require a prefix of at least two characters, to avoid having someone search for *. There are other limitations to the system which we -plan to address in the future. - -## How do I embed a new class in an existing Datastore entity class? - -In Objectify 4.x, which we are pinned to, you have to annotate a class with -@Embed in order to natively nest it within an entity, e.g. as a field within an -@Entity class. This behavior is different from how things work in Objectify 5.x, -which is what the current documentation reflects. Unfortunately the 4.x docs are -hard to access, but you can search this old copy for "embed" to see the details: - -[https://raw.githubusercontent.com/objectify/objectify-legacy-wiki/v4/Entities.wiki](https://raw.githubusercontent.com/objectify/objectify-legacy-wiki/v4/Entities.wiki) - -So you'd have to annotate your subobject with @Embed for it to work. It's -possible in Objectify 4.x to have a class that's both @Embed and @Entity, but -it'd be a little unorthodox. Usually it'd be cleaner to either make it purely -@Embed (so purely a container for data within the parent entity) or purely -@Entity, in which case you wouldn't use it as a field of the other @Entity but -would instead refer to it by key, e.g. you'd store a Key instead. -For objects which don't change very often, it is preferable to use the @Entity -approach. - -## How do I resolve Bazel package visibility problems? - -As a short-term solution, you can disable the bazel visibility checking with -[`--nocheck_visibility`](https://www.bazel.io/versions/master/docs/bazel-user-manual.html#flag--check_visibility). -We are investigating ways to clarify the way that custom functionality is -expected to be added, which will involve changing the package visibility -accordingly. +plan to address in the future. \ No newline at end of file diff --git a/docs/configuration.md b/docs/configuration.md index 8d602ad1e..3f1906643 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -4,7 +4,7 @@ There are multiple different kinds of configuration that go into getting a working registry system up and running. Broadly speaking, configuration works in two ways -- globally, for the entire sytem, and per-TLD. Global configuration is managed by editing code and deploying a new version, whereas per-TLD -configuration is data that lives in Datastore in `Registry` entities, and is +configuration is data that lives in the database in `Registry` entities, and is updated by running `nomulus` commands without having to deploy a new version. ## Initial configuration @@ -39,7 +39,6 @@ The main files of note that come pre-configured in Nomulus are: * `web.xml` -- Configuration of URL paths on the webserver * `appengine-web.xml` -- Overall App Engine settings including number and type of instances -* `datastore-indexes.xml` -- Configuration of entity indexes in Datastore * `queue.xml` -- Configuration of App Engine task queues * `application.xml` -- Configuration of the application name and its services @@ -49,8 +48,8 @@ doc, and the rest are covered in the general App Engine documentation. If you are not writing new code to implement custom features, is unlikely that you will need to make any modifications beyond simple changes to `application.xml` and `appengine-web.xml`. If you are writing new features, it's -likely you'll need to add cronjobs, URL paths, Datastore indexes, and task -queues, and thus edit those associated XML files. +likely you'll need to add cronjobs, URL paths, and task queues, and thus edit +those associated XML files. The existing codebase is configured for running a full-scale registry with multiple TLDs. In order to deploy to App Engine, you will either need to @@ -177,7 +176,7 @@ SecretManager to configure accordingly, for example: ## Per-TLD configuration -`Registry` entities, which are persisted to Datastore, are used for per-TLD +`Registry` entities, which are persisted to the database, are used for per-TLD configuration. They contain any kind of configuration that is specific to a TLD, such as the create/renew price of a domain name, the pricing engine implementation, the DNS writer implementation, whether escrow exports are diff --git a/docs/developing.md b/docs/developing.md index ca3fe0620..c15ea423a 100644 --- a/docs/developing.md +++ b/docs/developing.md @@ -34,61 +34,4 @@ will continue running until you terminate the process. If you are adding new URL paths, or new directories of web-accessible resources, you will need to make the corresponding changes in `RegistryTestServer`. This class contains all of the routing and static file information used by the local -development server. - -## Performing Datastore schema migrations - -At some point in the development of a large product it will most likely become -necessary to perform a schema migration on data persisted to the database. -Because Datastore is a schema-less database, adding new fields is as simple as -writing to them, but changing the names or data formats of existing fields -requires more care, especially on a running production environment. The -Objectify documentation has a good [introductory -guide](https://github.com/objectify/objectify/wiki/SchemaMigration) to schema -migrations that is worth reading. Beyond that, you may want to use some of the -following techniques. - -The requirements for a good schema migration are as follows: - -* There must be no down-time or interruption of service. -* The upgrade must be rollback-safe, i.e. the new version of the app can be - reverted and everything will continue working. - -In order to meet these requirements, a multiple-phase roll-out strategy is used -as follows: - -1. Dual-write, reading from old field. Add the new Datastore fields along with - any required Datastore indexes. Use an `@OnSave` method on the entity to - copy over the contents of the old field to the new field every time the - entity is saved. -2. Deploy the new version of the app. -3. Re-save all affected entities in Datastore. For `EppResources` this can be - accomplished by running - [`ResaveAllEppResourcesAction`](https://github.com/google/nomulus/blob/master/java/google/registry/tools/server/ResaveAllEppResourcesAction.java); - for other entities you may need to write something custom. Re-saving all - entities forces the `@OnSave` method to fire for every entity, copying over - the contents of the old fields to the new fields. Any additional entities - that are created after the mapreduce is run will have the right values for - the new field because the `@OnSave` method is writing them. -4. Dual-write, now reading from new field. Switch over all places in the code - that are using the data to read from the new fields rather than from the old - fields. Adjust the `@OnSave` method so that it is copying over the contents - from the new field to the old field. Dual-writing to the old fields ensures - that it is safe to roll back to the prior version if necessary, since the - data it is expecting will still be there. -5. Deploy the new version of the app. -6. Delete the old fields, their indexes, and the `@OnSave` method. -7. Deploy the new version of the app. The schema migration is now complete. - -The migration away from using a wrapper class around Keys on `Domain` -objects is instructive as an example: - -* [Step - 1](https://github.com/google/nomulus/commit/861fd60d2cb408ba2f9570d3881d316475b728c2), - which implements dual-writing. -* [Step - 4](https://github.com/google/nomulus/commit/361a53a3c985c14539e5ec1a31cf4ad192f67a5d), - which switches over to using the new fields. -* [Step - 6](https://github.com/google/nomulus/commit/780a5add78e735589f25f736059c29e9faf9aef5), - which removes the old fields. +development server. \ No newline at end of file diff --git a/docs/flows.md b/docs/flows.md index bc34cd028..e7277ccf6 100644 --- a/docs/flows.md +++ b/docs/flows.md @@ -582,7 +582,7 @@ that window, this flow allows the losing client to explicitly approve the transfer request, which then becomes effective immediately. When the transfer was requested, poll messages and billing events were saved to -Datastore with timestamps such that they only would become active when the +the database with timestamps such that they only would become active when the transfer period passed. In this flow, those speculative objects are deleted and replaced with new ones with the correct approval time. @@ -621,7 +621,7 @@ that window, this flow allows the gaining client to withdraw the transfer request. When the transfer was requested, poll messages and billing events were saved to -Datastore with timestamps such that they only would become active when the +the database with timestamps such that they only would become active when the transfer period passed. In this flow, those speculative objects are deleted. ### Errors @@ -705,8 +705,8 @@ default five days) after which the transfer is automatically approved. Within that window, the transfer might be approved explicitly by the losing registrar or rejected, and the gaining registrar can also cancel the transfer request. -When a transfer is requested, poll messages and billing events are saved to -Datastore with timestamps such that they only become active when the +When a transfer is requested, poll messages and billing events are saved to the +database with timestamps such that they only become active when the server-approval period passes. Keys to these speculative objects are saved in the domain's transfer data, and on explicit approval, rejection or cancellation of the request, they will be deleted (and in the approval case, replaced with @@ -1033,8 +1033,9 @@ An EPP flow for acknowledging {@link PollMessage}s. Registrars refer to poll messages using an externally visible id generated by {@link PollMessageExternalKeyConverter}. One-time poll messages are deleted from -Datastore once they are ACKed, whereas autorenew poll messages are simply marked -as read, and won't be delivered again until the next year of their recurrence. +the database once they are ACKed, whereas autorenew poll messages are simply +marked as read, and won't be delivered again until the next year of their +recurrence. ### Errors diff --git a/docs/gradle.lockfile b/docs/gradle.lockfile index 5eff5d3ca..4f8289fd1 100644 --- a/docs/gradle.lockfile +++ b/docs/gradle.lockfile @@ -21,13 +21,13 @@ com.github.ben-manes.caffeine:caffeine:2.9.3=default,deploy_jar,runtimeClasspath com.github.docker-java:docker-java-api:3.2.13=default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.docker-java:docker-java-transport-zerodep:3.2.13=default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.docker-java:docker-java-transport:3.2.13=default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.jnr:jffi:1.3.9=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.github.jnr:jffi:1.3.10=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-a64asm:1.0.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-constants:0.10.3=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-enxio:0.32.13=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-ffi:2.2.11=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-posix:3.1.15=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-unixsocket:0.38.17=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-constants:0.10.4=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-enxio:0.32.14=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-ffi:2.2.13=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-posix:3.1.16=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-unixsocket:0.38.19=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.android:annotations:4.1.1.4=default,deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -36,7 +36,7 @@ com.google.api-client:google-api-client-jackson2:1.32.2=default,deploy_jar,runti com.google.api-client:google-api-client-java6:1.35.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api-client:google-api-client-servlet:1.35.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api-client:google-api-client:1.35.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:gapic-google-cloud-storage-v2:2.16.0-alpha=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:gapic-google-cloud-storage-v2:2.17.0-alpha=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:2.23.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.147.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.147.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -47,9 +47,8 @@ com.google.api.grpc:grpc-google-cloud-pubsublite-v1:1.7.1=default,deploy_jar,run com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:6.31.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:6.31.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-spanner-v1:6.31.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:grpc-google-cloud-storage-v2:2.16.0-alpha=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:grpc-google-cloud-storage-v2:2.17.0-alpha=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-common-protos:2.9.6=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:grpc-google-iam-v1:1.6.22=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:2.23.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.147.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.147.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -60,23 +59,23 @@ com.google.api.grpc:proto-google-cloud-firestore-v1:3.6.0=default,deploy_jar,run com.google.api.grpc:proto-google-cloud-monitoring-v3:3.4.6=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-pubsub-v1:1.102.20=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-pubsublite-v1:1.7.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.6.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:2.6.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.8.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:2.8.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:6.31.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:6.31.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-v1:6.31.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-storage-v2:2.16.0-alpha=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2:2.6.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.96.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.96.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-common-protos:2.11.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-iam-v1:1.6.22=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api:api-common:2.2.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api:gax-grpc:2.20.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api:gax-httpjson:0.105.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api:gax:2.20.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-storage-v2:2.17.0-alpha=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2:2.8.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.98.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.98.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-common-protos:2.12.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-iam-v1:1.7.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api:api-common:2.4.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api:gax-grpc:2.21.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api:gax-httpjson:0.106.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api:gax:2.21.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.apis:google-api-services-admin-directory:directory_v1-rev118-1.25.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.apis:google-api-services-appengine:v1-rev20221205-2.0.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.apis:google-api-services-appengine:v1-rev20230109-2.0.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.apis:google-api-services-bigquery:v2-rev20220924-2.0.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.apis:google-api-services-clouddebugger:v2-rev20220318-2.0.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.apis:google-api-services-cloudresourcemanager:v1-rev20220828-2.0.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -88,49 +87,49 @@ com.google.apis:google-api-services-healthcare:v1-rev20220818-2.0.0=default,depl com.google.apis:google-api-services-iamcredentials:v1-rev20210326-1.32.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.apis:google-api-services-monitoring:v3-rev20221205-2.0.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.apis:google-api-services-pubsub:v1-rev20220904-2.0.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.apis:google-api-services-sheets:v4-rev20220927-2.0.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.apis:google-api-services-sqladmin:v1beta4-rev20221017-2.0.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.apis:google-api-services-sheets:v4-rev20221216-2.0.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.apis:google-api-services-sqladmin:v1beta4-rev20221209-2.0.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.apis:google-api-services-storage:v1-rev20220705-2.0.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.appengine:appengine-api-1.0-sdk:1.9.86=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.appengine:appengine-testing:1.9.86=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-credentials:1.13.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-oauth2-http:1.13.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-credentials:1.14.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-oauth2-http:1.14.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.auto.service:auto-service-annotations:1.0.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.auto.value:auto-value-annotations:1.10.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.auto.value:auto-value-annotations:1.8.1=testCompileClasspath -com.google.auto.value:auto-value:1.9=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.auto.value:auto-value:1.10.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.auto:auto-common:0.10=annotationProcessor,errorprone,testAnnotationProcessor com.google.cloud.bigdataoss:gcsio:2.2.6=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.cloud.bigdataoss:util:2.2.6=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.cloud.bigtable:bigtable-client-core:1.26.3=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.cloud.bigtable:bigtable-metrics-api:1.26.3=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.cloud.datastore:datastore-v1-proto-client:2.9.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.cloud.sql:jdbc-socket-factory-core:1.7.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.cloud.sql:postgres-socket-factory:1.7.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.cloud.sql:jdbc-socket-factory-core:1.8.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.cloud.sql:postgres-socket-factory:1.8.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.cloud:google-cloud-bigquerystorage:2.23.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.cloud:google-cloud-bigtable-stats:2.14.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.cloud:google-cloud-bigtable:2.14.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-core-grpc:2.9.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-core-http:2.9.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-core:2.9.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-core-grpc:2.9.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-core-http:2.9.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-core:2.9.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.cloud:google-cloud-firestore:3.6.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.cloud:google-cloud-monitoring:3.4.6=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.cloud:google-cloud-pubsub:1.120.20=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.cloud:google-cloud-pubsublite:1.7.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-secretmanager:2.6.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-secretmanager:2.8.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.cloud:google-cloud-spanner:6.31.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-storage:2.16.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-tasks:2.6.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-storage:2.17.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-tasks:2.8.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.cloud:grpc-gcp:1.2.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.cloud:proto-google-cloud-firestore-bundle-v1:3.6.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.code.findbugs:jFormatString:3.0.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClasspath,default,deploy_jar,errorprone,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -com.google.code.gson:gson:2.10=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.code.gson:gson:2.10.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.common.html.types:types:1.0.6=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.dagger:dagger:2.44.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotation:2.3.4=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.11.0=compileClasspath,testCompileClasspath -com.google.errorprone:error_prone_annotations:2.16=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.18.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.3.4=annotationProcessor,checkstyle,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_check_api:2.3.4=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_core:2.3.4=annotationProcessor,errorprone,testAnnotationProcessor @@ -164,8 +163,8 @@ com.google.oauth-client:google-oauth-client-java6:1.34.1=default,deploy_jar,runt com.google.oauth-client:google-oauth-client-jetty:1.34.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.oauth-client:google-oauth-client-servlet:1.34.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.oauth-client:google-oauth-client:1.34.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.protobuf:protobuf-java-util:3.21.10=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.protobuf:protobuf-java:3.21.10=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.protobuf:protobuf-java-util:3.21.12=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.protobuf:protobuf-java:3.21.12=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.protobuf:protobuf-java:3.4.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.re2j:re2j:1.6=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.re2j:re2j:1.7=compileClasspath,testCompileClasspath @@ -195,22 +194,22 @@ io.confluent:kafka-schema-registry-client:5.3.2=default,deploy_jar,runtimeClassp io.dropwizard.metrics:metrics-core:3.1.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath io.github.classgraph:classgraph:4.8.104=default,deploy_jar,runtimeClasspath,testRuntimeClasspath io.github.java-diff-utils:java-diff-utils:4.12=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-alts:1.51.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-api:1.51.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-auth:1.51.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-alts:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-api:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-auth:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath io.grpc:grpc-census:1.49.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-context:1.51.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-core:1.51.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-googleapis:1.51.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-grpclb:1.51.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-netty-shaded:1.51.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-context:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-core:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-googleapis:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-grpclb:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-netty-shaded:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath io.grpc:grpc-netty:1.49.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf-lite:1.51.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf:1.51.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf-lite:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath io.grpc:grpc-rls:1.49.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-services:1.51.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-stub:1.51.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-xds:1.51.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-services:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-stub:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-xds:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath io.netty:netty-buffer:4.1.77.Final=default,deploy_jar,runtimeClasspath,testRuntimeClasspath io.netty:netty-codec-http2:4.1.77.Final=default,deploy_jar,runtimeClasspath,testRuntimeClasspath io.netty:netty-codec-http:4.1.77.Final=default,deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -278,8 +277,8 @@ org.apache.beam:beam-vendor-guava-26_0-jre:0.1=default,deploy_jar,runtimeClasspa org.apache.commons:commons-compress:1.22=default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.commons:commons-csv:1.9.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath org.apache.commons:commons-lang3:3.12.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -org.apache.httpcomponents:httpclient:4.5.13=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -org.apache.httpcomponents:httpcore:4.4.15=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +org.apache.httpcomponents:httpclient:4.5.14=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +org.apache.httpcomponents:httpcore:4.4.16=default,deploy_jar,runtimeClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.bouncycastle:bcpg-jdk15on:1.67=default,deploy_jar,runtimeClasspath,testRuntimeClasspath org.bouncycastle:bcpkix-jdk15on:1.67=default,deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -290,7 +289,7 @@ org.checkerframework:checker-qual:2.11.1=checkstyle org.checkerframework:checker-qual:3.0.0=annotationProcessor,errorprone,testAnnotationProcessor org.checkerframework:checker-qual:3.12.0=compileClasspath org.checkerframework:checker-qual:3.13.0=testCompileClasspath -org.checkerframework:checker-qual:3.28.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.29.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath org.checkerframework:dataflow:3.0.0=annotationProcessor,errorprone,testAnnotationProcessor org.checkerframework:javacutil:3.0.0=annotationProcessor,errorprone,testAnnotationProcessor org.codehaus.jackson:jackson-core-asl:1.9.13=default,deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -305,7 +304,7 @@ org.eclipse.jetty:jetty-server:9.4.49.v20220914=default,deploy_jar,runtimeClassp org.eclipse.jetty:jetty-servlet:9.4.49.v20220914=default,deploy_jar,runtimeClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util-ajax:9.4.49.v20220914=default,deploy_jar,runtimeClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util:9.4.49.v20220914=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -org.flywaydb:flyway-core:9.10.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +org.flywaydb:flyway-core:9.11.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath org.glassfish.jaxb:jaxb-runtime:2.3.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath org.glassfish.jaxb:txw2:2.3.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath org.gwtproject:gwt-user:2.10.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -326,15 +325,15 @@ org.jetbrains:annotations:17.0.0=default,deploy_jar,runtimeClasspath,testCompile org.joda:joda-money:1.0.3=default,deploy_jar,runtimeClasspath,testRuntimeClasspath org.json:json:20200518=default,deploy_jar,runtimeClasspath,testRuntimeClasspath org.jsoup:jsoup:1.15.3=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-engine:5.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-launcher:1.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-runner:1.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-suite-api:1.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-suite-commons:1.9.1=testRuntimeClasspath -org.junit:junit-bom:5.9.1=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-launcher:1.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-runner:1.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-suite-api:1.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-suite-commons:1.9.2=testRuntimeClasspath +org.junit:junit-bom:5.9.2=testCompileClasspath,testRuntimeClasspath org.jvnet.staxex:stax-ex:1.8=default,deploy_jar,runtimeClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:8.0.1=jacocoAnt @@ -355,8 +354,8 @@ org.postgresql:postgresql:42.5.1=default,deploy_jar,runtimeClasspath,testRuntime org.reflections:reflections:0.9.12=checkstyle org.rnorth.duct-tape:duct-tape:1.0.8=default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-api:1.7.36=testCompileClasspath -org.slf4j:slf4j-api:2.0.5=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -org.slf4j:slf4j-jdk14:2.0.5=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:2.0.6=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +org.slf4j:slf4j-jdk14:2.0.6=default,deploy_jar,runtimeClasspath,testRuntimeClasspath org.springframework:spring-core:5.3.18=default,deploy_jar,runtimeClasspath,testRuntimeClasspath org.springframework:spring-expression:5.3.18=default,deploy_jar,runtimeClasspath,testRuntimeClasspath org.springframework:spring-jcl:5.3.18=default,deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -365,7 +364,7 @@ org.testcontainers:jdbc:1.17.6=default,deploy_jar,runtimeClasspath,testRuntimeCl org.testcontainers:junit-jupiter:1.17.6=testCompileClasspath,testRuntimeClasspath org.testcontainers:postgresql:1.17.6=default,deploy_jar,runtimeClasspath,testRuntimeClasspath org.testcontainers:testcontainers:1.17.6=default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.threeten:threetenbp:1.6.4=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +org.threeten:threetenbp:1.6.5=default,deploy_jar,runtimeClasspath,testRuntimeClasspath org.tukaani:xz:1.5=default,deploy_jar,runtimeClasspath,testRuntimeClasspath org.w3c.css:sac:1.3=default,deploy_jar,runtimeClasspath,testRuntimeClasspath org.xerial.snappy:snappy-java:1.1.8.4=default,deploy_jar,runtimeClasspath,testRuntimeClasspath diff --git a/docs/gradle.md b/docs/gradle.md index cf5731df8..ece536ef5 100644 --- a/docs/gradle.md +++ b/docs/gradle.md @@ -40,12 +40,12 @@ is easier to exclude the suite classes than individual test classes. This is the reason why all test tasks in the :core project contain the exclude pattern '"**/*TestCase.*", "**/*TestSuite.*"' -Many Nomulus tests are not hermetic: they modify global state (e.g., the shared -local instance of Datastore) but do not clean up on completion. This becomes a -problem with Gradle. In the beginning we forced Gradle to run every test class -in a new process, and incurred heavy overheads. Since then, we have fixed some -tests, and manged to divide all tests into three suites that do not have -intra-suite conflicts. We will revisit the remaining tests soon. +Many Nomulus tests are not hermetic: they modify global state, but do not clean +up on completion. This becomes a problem with Gradle. In the beginning we forced +Gradle to run every test class in a new process, and incurred heavy overheads. +Since then, we have fixed some tests, and manged to divide all tests into three +suites that do not have intra-suite conflicts. We will revisit the remaining +tests soon. Note that it is unclear if all conflicting tests have been identified. More may be exposed if test execution order changes, e.g., when new tests are added or diff --git a/docs/operational-procedures.md b/docs/operational-procedures.md index 4e365ea71..089951b1c 100644 --- a/docs/operational-procedures.md +++ b/docs/operational-procedures.md @@ -86,35 +86,14 @@ agreement][registry-agreement]. Nomulus provides [code to generate and send these deposits](./operational-procedures/rde-deposits.md). -### Monthly registry activity reporting +### Monthly registry activity and transaction reporting -ICANN requires monthly activity reporting. The details are contained in -Specification 3 of the [registry agreement][registry-agreement]. +ICANN requires monthly activity and transaction reporting. The details are +contained in Specification 3 of the [registry agreement][registry-agreement]. -These reports are generated by querying tables of Datastore snapshots which have -been exported to the BigQuery data warehouse. The Nomulus release includes the -queries used by Google. The script is Google-specific at the moment, but should -be easy to modify to support a different instance of Nomulus. - -The SQL queries which assemble the report are generated by the Python script -[icann_report_query_builder.py](https://github.com/google/nomulus/blob/master/python/google/registry/reporting/icann_report_query_builder.py). -The script generates a monolithic SQL query which is then executed against the -BigQuery tables to generate a result table containing activity report data for -all the TLDs in the system. With a little work, the data can be extracted into -CSVs in the proper format. - -The test script -[icann_report_query_builder_test.py](https://github.com/google/nomulus/blob/master/python/google/registry/reporting/icann_report_query_builder_test.py) -shows how the script is run, and the test data file -[golden_activity_query.sql](https://github.com/google/nomulus/blob/master/python/google/registry/reporting/testdata/golden_activity_query.sql) -shows what the resulting SQL looks like. - -### Monthly transaction reporting - -ICANN requires monthly transaction reporting. The details are also contained in -Specification 3 of the [registry agreement][registry-agreement]. - -Transaction reporting is not currently part of the Nomulus release. +These reports are mostly generated by querying the Cloud SQL database. There is +currently a Google proprietary class to query DNS related activities that is +not included in the open source Nomulus release. ### Zone File Access (ZFA) diff --git a/docs/operational-procedures/premium-list-management.md b/docs/operational-procedures/premium-list-management.md index 53fd5c1c2..747a00be8 100644 --- a/docs/operational-procedures/premium-list-management.md +++ b/docs/operational-procedures/premium-list-management.md @@ -4,12 +4,12 @@ Nomulus comes with a `StaticPremiumListPricingEngine` that determines premium prices of domain labels (i.e. the part of the domain name without the TLD) by -checking for their presence on a list of prices in Datastore. `nomulus` is used -to load and update these lists from flat text files. The format of this list is -simple: It is a newline-delimited CSV text file with each line containing the -label and its price (including currency specifier in ISO-4217 format). Any -individual label may not appear more than once in the file. Here's an example of -the formatting: +checking for their presence on a list of prices in the database. `nomulus` is +used to load and update these lists from flat text files. The format of this +list is simple: It is a newline-delimited CSV text file with each line +containing the label and its price (including currency specifier in ISO-4217 +format). Any individual label may not appear more than once in the file. Here's +an example of the formatting: ``` premium,USD 100 @@ -28,7 +28,7 @@ location that is accessible to all members of your team (ideally in a source control system for revision tracking). These files should be thought of as the canonical versions of your premium lists. Note that there is no provided way to reconstruct a premium list .txt file from the premium list that is loaded into -Datastore (though in principle it would be easy to do by writing a tool to do +the database (though in principle it would be easy to do by writing a tool to do so), so don't lose those .txt files. The nomulus repository contains an @@ -37,7 +37,7 @@ The nomulus repository contains an ## Creating a premium list Once the file containing the premium prices is ready, run the -`create_premium_list` command to load it into Datastore as follows: +`create_premium_list` command to load it into the database as follows: ```shell $ nomulus -e {ENVIRONMENT} create_premium_list -n exampletld -i exampletld.txt @@ -106,8 +106,9 @@ premiumList=Key(EntityGroupRoot("cross-tld")/PremiumList("exampletld")) ## Listing all available premium lists -The `list_premium_lists` command is used to list all premium lists in Datastore. -It takes no arguments and displays a simple list of premium lists as follows: +The `list_premium_lists` command is used to list all premium lists in the +database. It takes no arguments and displays a simple list of premium lists as +follows: ```shell $ nomulus -e {ENVIRONMENT} list_premium_lists diff --git a/docs/operational-procedures/rde-deposits.md b/docs/operational-procedures/rde-deposits.md index 5e2d43662..5754717af 100644 --- a/docs/operational-procedures/rde-deposits.md +++ b/docs/operational-procedures/rde-deposits.md @@ -26,7 +26,7 @@ need to implement a working and secure key store from which RDE can pull the private key used to transmit the deposits via sFTP. For each phase and TLD in the process, the system maintains a `Cursor` entity in -Datastore, which contains a timestamp indicating that everything before the +the database, which contains a timestamp indicating that everything before the timestamp is current (except for RDE_UPLOAD_SFTP, which works a little differently). Only if the current time is after the cursor time do the actions check to see if they have work to do. For RDE, there are separate cursor types diff --git a/docs/operational-procedures/reserved-list-management.md b/docs/operational-procedures/reserved-list-management.md index ac867867c..79d6c52a8 100644 --- a/docs/operational-procedures/reserved-list-management.md +++ b/docs/operational-procedures/reserved-list-management.md @@ -82,7 +82,7 @@ reserved lists (see subsequent sections). The two naming patterns are thus: ## Creating a reserved list Once the file containing the list of reserved terms is created, run the -`create_reserved_list` command to load it into Datastore as follows. For the +`create_reserved_list` command to load it into the database as follows. For the purposes of this example, we are creating a common reserved list named "common_bad-words". @@ -163,8 +163,8 @@ reservedLists=[Key(EntityGroupRoot("cross-tld")/ReservedList("common_bad-word ## Listing all available reserved lists -The `list_reserved_lists` command is used to list all reserved lists in -Datastore. It takes no arguments and displays a simple list of reserved lists in +The `list_reserved_lists` command is used to list all reserved lists in the +database. It takes no arguments and displays a simple list of reserved lists in newline-delimited format as follows: ```shell diff --git a/java_common.gradle b/java_common.gradle index e56b62cf4..3dfbbcb4a 100644 --- a/java_common.gradle +++ b/java_common.gradle @@ -86,8 +86,7 @@ test { // and assign the path to it to the GOOGLE_APPLICATION_CREDENTIALS environment // variable. // -// A typical use case is to run tests from desktop that accesses Cloud resources. See -// core/src/test/java/google/registry/beam/initsql/BeamJpaModuleTest.java for an example. +// A typical use case is to run tests from desktop that accesses Cloud resources. tasks.withType(Test).configureEach { def gcp_integration_env_property = 'test.gcp_integration.env' diff --git a/networking/gradle.lockfile b/networking/gradle.lockfile index 957c3e571..4f824f49b 100644 --- a/networking/gradle.lockfile +++ b/networking/gradle.lockfile @@ -11,27 +11,27 @@ com.github.docker-java:docker-java-transport:3.2.13=testCompileClasspath,testRun com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.android:annotations:4.1.1.4=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api-client:google-api-client:1.35.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2:2.6.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.96.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.96.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-common-protos:2.10.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-iam-v1:1.6.7=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api:api-common:2.2.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api:gax-grpc:2.19.5=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api:gax-httpjson:0.104.5=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api:gax:2.19.5=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2:2.8.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.98.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.98.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-common-protos:2.12.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-iam-v1:1.7.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api:api-common:2.4.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api:gax-grpc:2.21.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api:gax-httpjson:0.106.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api:gax:2.21.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.appengine:appengine-api-1.0-sdk:1.9.86=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.appengine:appengine-testing:1.9.86=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-credentials:1.12.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-oauth2-http:1.12.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.auto.value:auto-value-annotations:1.10=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-credentials:1.14.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-oauth2-http:1.14.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.auto.value:auto-value-annotations:1.10.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.auto.value:auto-value-annotations:1.8.1=testCompileClasspath com.google.auto.value:auto-value:1.10.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.auto:auto-common:0.10=annotationProcessor,errorprone,testAnnotationProcessor -com.google.cloud:google-cloud-tasks:2.6.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-tasks:2.8.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.code.findbugs:jFormatString:3.0.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClasspath,default,deploy_jar,errorprone,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -com.google.code.gson:gson:2.10=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.code.gson:gson:2.10.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.dagger:dagger-compiler:2.44.2=annotationProcessor,testAnnotationProcessor com.google.dagger:dagger-producers:2.44.2=annotationProcessor,testAnnotationProcessor com.google.dagger:dagger-spi:2.44.2=annotationProcessor,testAnnotationProcessor @@ -39,7 +39,7 @@ com.google.dagger:dagger:2.44.2=annotationProcessor,compileClasspath,default,dep com.google.devtools.ksp:symbol-processing-api:1.7.0-1.0.6=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotation:2.3.4=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.11.0=compileClasspath,testCompileClasspath -com.google.errorprone:error_prone_annotations:2.16=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.18.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.3.4=checkstyle,errorprone com.google.errorprone:error_prone_annotations:2.7.1=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_check_api:2.3.4=annotationProcessor,errorprone,testAnnotationProcessor @@ -61,8 +61,8 @@ com.google.http-client:google-http-client:1.42.3=default,deploy_jar,runtimeClass com.google.j2objc:j2objc-annotations:1.1=errorprone com.google.j2objc:j2objc-annotations:1.3=annotationProcessor,checkstyle,compileClasspath,default,deploy_jar,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.oauth-client:google-oauth-client:1.34.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.protobuf:protobuf-java-util:3.21.9=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.protobuf:protobuf-java:3.21.9=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.protobuf:protobuf-java-util:3.21.12=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.protobuf:protobuf-java:3.21.12=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.protobuf:protobuf-java:3.4.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.re2j:re2j:1.6=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.truth:truth:1.1.3=default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -77,27 +77,27 @@ commons-collections:commons-collections:3.2.2=checkstyle commons-logging:commons-logging:1.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath info.picocli:picocli:4.5.2=checkstyle io.github.java-diff-utils:java-diff-utils:4.12=default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-alts:1.50.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-api:1.50.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-auth:1.50.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-context:1.50.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-core:1.50.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-googleapis:1.50.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-grpclb:1.50.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-netty-shaded:1.50.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf-lite:1.50.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf:1.50.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-services:1.50.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-stub:1.50.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-xds:1.50.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-alts:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-api:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-auth:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-context:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-core:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-googleapis:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-grpclb:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-netty-shaded:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf-lite:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-services:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-stub:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-xds:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath io.netty:netty-buffer:4.1.59.Final=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-http:4.1.59.Final=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec:4.1.59.Final=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-common:4.1.59.Final=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-handler:4.1.59.Final=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-resolver:4.1.59.Final=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-tcnative-boringssl-static:2.0.54.Final=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.netty:netty-tcnative-classes:2.0.54.Final=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.netty:netty-tcnative-boringssl-static:2.0.56.Final=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.netty:netty-tcnative-classes:2.0.56.Final=default,deploy_jar,runtimeClasspath,testRuntimeClasspath io.netty:netty-transport:4.1.59.Final=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opencensus:opencensus-api:0.31.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath io.opencensus:opencensus-contrib-http-util:0.31.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -116,8 +116,8 @@ net.ltgt.gradle.incap:incap:0.2=annotationProcessor,testAnnotationProcessor net.sf.saxon:Saxon-HE:10.3=checkstyle org.antlr:antlr4-runtime:4.8-1=checkstyle org.apache.commons:commons-compress:1.22=testCompileClasspath,testRuntimeClasspath -org.apache.httpcomponents:httpclient:4.5.13=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -org.apache.httpcomponents:httpcore:4.4.15=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +org.apache.httpcomponents:httpclient:4.5.14=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +org.apache.httpcomponents:httpcore:4.4.16=default,deploy_jar,runtimeClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.bouncycastle:bcpkix-jdk15on:1.67=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.bouncycastle:bcprov-jdk15on:1.67=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -127,7 +127,7 @@ org.checkerframework:checker-qual:2.11.1=checkstyle org.checkerframework:checker-qual:3.0.0=errorprone org.checkerframework:checker-qual:3.12.0=annotationProcessor,compileClasspath,testAnnotationProcessor org.checkerframework:checker-qual:3.19.0=testCompileClasspath -org.checkerframework:checker-qual:3.27.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.29.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath org.checkerframework:dataflow:3.0.0=annotationProcessor,errorprone,testAnnotationProcessor org.checkerframework:javacutil:3.0.0=annotationProcessor,errorprone,testAnnotationProcessor org.codehaus.mojo:animal-sniffer-annotations:1.17=errorprone @@ -147,16 +147,16 @@ org.jetbrains.kotlin:kotlin-stdlib:1.7.0=annotationProcessor,testAnnotationProce org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.5.0=annotationProcessor,testAnnotationProcessor org.jetbrains:annotations:13.0=annotationProcessor,testAnnotationProcessor org.jetbrains:annotations:17.0.0=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-engine:5.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-params:5.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-launcher:1.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-runner:1.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-suite-api:1.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-suite-commons:1.9.1=testRuntimeClasspath -org.junit:junit-bom:5.9.1=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:5.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-launcher:1.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-runner:1.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-suite-api:1.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-suite-commons:1.9.2=testRuntimeClasspath +org.junit:junit-bom:5.9.2=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:8.0.1=jacocoAnt org.ow2.asm:asm-commons:8.0.1=jacocoAnt @@ -172,6 +172,6 @@ org.rnorth.duct-tape:duct-tape:1.0.8=testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-api:1.7.36=testCompileClasspath,testRuntimeClasspath org.testcontainers:junit-jupiter:1.17.6=testCompileClasspath,testRuntimeClasspath org.testcontainers:testcontainers:1.17.6=testCompileClasspath,testRuntimeClasspath -org.threeten:threetenbp:1.6.4=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +org.threeten:threetenbp:1.6.5=default,deploy_jar,runtimeClasspath,testRuntimeClasspath org.yaml:snakeyaml:1.33=default,deploy_jar,runtimeClasspath,testRuntimeClasspath empty=archives,errorproneJavac diff --git a/prober/gradle.lockfile b/prober/gradle.lockfile index b3fbeb5ee..3a5250db4 100644 --- a/prober/gradle.lockfile +++ b/prober/gradle.lockfile @@ -11,28 +11,27 @@ com.github.docker-java:docker-java-transport:3.2.13=testCompileClasspath,testRun com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.android:annotations:4.1.1.4=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api-client:google-api-client:1.35.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2:2.6.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.96.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.96.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-common-protos:2.10.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-iam-v1:1.6.7=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api:api-common:2.2.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api:gax-grpc:2.19.5=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api:gax-httpjson:0.104.5=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api:gax:2.19.5=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2:2.8.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.98.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.98.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-common-protos:2.12.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-iam-v1:1.7.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api:api-common:2.4.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api:gax-grpc:2.21.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api:gax-httpjson:0.106.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api:gax:2.21.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.appengine:appengine-api-1.0-sdk:1.9.86=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.appengine:appengine-testing:1.9.86=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-credentials:1.12.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-oauth2-http:1.12.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.auto.value:auto-value-annotations:1.10=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.auto.value:auto-value-annotations:1.10.1=compileClasspath +com.google.auth:google-auth-library-credentials:1.14.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-oauth2-http:1.14.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.auto.value:auto-value-annotations:1.10.1=compileClasspath,default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.auto.value:auto-value-annotations:1.8.1=testCompileClasspath com.google.auto.value:auto-value:1.10.1=annotationProcessor,default,deploy_jar,runtimeClasspath,testAnnotationProcessor,testRuntimeClasspath com.google.auto:auto-common:0.10=annotationProcessor,errorprone,testAnnotationProcessor -com.google.cloud:google-cloud-tasks:2.6.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-tasks:2.8.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.code.findbugs:jFormatString:3.0.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClasspath,default,deploy_jar,errorprone,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -com.google.code.gson:gson:2.10=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.code.gson:gson:2.10.1=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.dagger:dagger-compiler:2.44.2=annotationProcessor,testAnnotationProcessor com.google.dagger:dagger-producers:2.44.2=annotationProcessor,testAnnotationProcessor com.google.dagger:dagger-spi:2.44.2=annotationProcessor,testAnnotationProcessor @@ -40,7 +39,7 @@ com.google.dagger:dagger:2.44.2=annotationProcessor,compileClasspath,default,dep com.google.devtools.ksp:symbol-processing-api:1.7.0-1.0.6=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotation:2.3.4=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.11.0=compileClasspath,testCompileClasspath -com.google.errorprone:error_prone_annotations:2.16=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.18.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.3.4=checkstyle,errorprone com.google.errorprone:error_prone_annotations:2.7.1=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_check_api:2.3.4=annotationProcessor,errorprone,testAnnotationProcessor @@ -64,8 +63,8 @@ com.google.j2objc:j2objc-annotations:1.3=annotationProcessor,checkstyle,compileC com.google.monitoring-client:contrib:1.0.7=testCompileClasspath,testRuntimeClasspath com.google.monitoring-client:metrics:1.0.7=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.oauth-client:google-oauth-client:1.34.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.protobuf:protobuf-java-util:3.21.9=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.protobuf:protobuf-java:3.21.9=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.protobuf:protobuf-java-util:3.21.12=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.protobuf:protobuf-java:3.21.12=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.protobuf:protobuf-java:3.4.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.re2j:re2j:1.1=compileClasspath,testCompileClasspath com.google.re2j:re2j:1.6=default,deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -81,27 +80,27 @@ commons-collections:commons-collections:3.2.2=checkstyle commons-logging:commons-logging:1.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath info.picocli:picocli:4.5.2=checkstyle io.github.java-diff-utils:java-diff-utils:4.12=default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-alts:1.50.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-api:1.50.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-auth:1.50.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-context:1.50.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-core:1.50.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-googleapis:1.50.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-grpclb:1.50.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-netty-shaded:1.50.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf-lite:1.50.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf:1.50.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-services:1.50.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-stub:1.50.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-xds:1.50.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-alts:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-api:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-auth:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-context:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-core:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-googleapis:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-grpclb:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-netty-shaded:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf-lite:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-services:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-stub:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-xds:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath io.netty:netty-buffer:4.1.59.Final=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-http:4.1.59.Final=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec:4.1.59.Final=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-common:4.1.59.Final=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-handler:4.1.59.Final=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-resolver:4.1.59.Final=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-tcnative-boringssl-static:2.0.54.Final=default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-tcnative-classes:2.0.54.Final=default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-tcnative-boringssl-static:2.0.56.Final=default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-tcnative-classes:2.0.56.Final=default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-transport:4.1.59.Final=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opencensus:opencensus-api:0.31.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath io.opencensus:opencensus-contrib-http-util:0.31.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -115,15 +114,15 @@ javax.mail:mail:1.5.0-b01=default,deploy_jar,runtimeClasspath,testRuntimeClasspa javax.xml.bind:jaxb-api:2.4.0-b180830.0359=default,deploy_jar,runtimeClasspath,testRuntimeClasspath joda-time:joda-time:2.12.2=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath junit:junit:4.13.2=default,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.12.16=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.12.16=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.12.19=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.12.19=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=testCompileClasspath,testRuntimeClasspath net.ltgt.gradle.incap:incap:0.2=annotationProcessor,testAnnotationProcessor net.sf.saxon:Saxon-HE:10.3=checkstyle org.antlr:antlr4-runtime:4.8-1=checkstyle org.apache.commons:commons-compress:1.22=testCompileClasspath,testRuntimeClasspath -org.apache.httpcomponents:httpclient:4.5.13=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -org.apache.httpcomponents:httpcore:4.4.15=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +org.apache.httpcomponents:httpclient:4.5.14=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +org.apache.httpcomponents:httpcore:4.4.16=default,deploy_jar,runtimeClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.bouncycastle:bcpkix-jdk15on:1.67=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.bouncycastle:bcprov-jdk15on:1.67=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -133,7 +132,7 @@ org.checkerframework:checker-qual:2.11.1=checkstyle org.checkerframework:checker-qual:3.0.0=errorprone org.checkerframework:checker-qual:3.12.0=annotationProcessor,compileClasspath,testAnnotationProcessor org.checkerframework:checker-qual:3.19.0=testCompileClasspath -org.checkerframework:checker-qual:3.27.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.29.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath org.checkerframework:dataflow:3.0.0=annotationProcessor,errorprone,testAnnotationProcessor org.checkerframework:javacutil:3.0.0=annotationProcessor,errorprone,testAnnotationProcessor org.codehaus.mojo:animal-sniffer-annotations:1.17=errorprone @@ -153,17 +152,17 @@ org.jetbrains.kotlin:kotlin-stdlib:1.7.0=annotationProcessor,testAnnotationProce org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.5.0=annotationProcessor,testAnnotationProcessor org.jetbrains:annotations:13.0=annotationProcessor,testAnnotationProcessor org.jetbrains:annotations:17.0.0=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-engine:5.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-params:5.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-launcher:1.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-runner:1.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-suite-api:1.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-suite-commons:1.9.1=testRuntimeClasspath -org.junit:junit-bom:5.9.1=testCompileClasspath,testRuntimeClasspath -org.mockito:mockito-core:4.9.0=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:5.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-launcher:1.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-runner:1.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-suite-api:1.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-suite-commons:1.9.2=testRuntimeClasspath +org.junit:junit-bom:5.9.2=testCompileClasspath,testRuntimeClasspath +org.mockito:mockito-core:4.11.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=testRuntimeClasspath org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:8.0.1=jacocoAnt @@ -180,7 +179,7 @@ org.rnorth.duct-tape:duct-tape:1.0.8=testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-api:1.7.36=testCompileClasspath,testRuntimeClasspath org.testcontainers:junit-jupiter:1.17.6=testCompileClasspath,testRuntimeClasspath org.testcontainers:testcontainers:1.17.6=testCompileClasspath,testRuntimeClasspath -org.threeten:threetenbp:1.6.4=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +org.threeten:threetenbp:1.6.5=default,deploy_jar,runtimeClasspath,testRuntimeClasspath org.yaml:snakeyaml:1.33=default,deploy_jar,runtimeClasspath,testRuntimeClasspath xerces:xmlParserAPIs:2.6.2=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath xpp3:xpp3:1.1.4c=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/proxy/gradle.lockfile b/proxy/gradle.lockfile index 6d6916dd4..1b3560176 100644 --- a/proxy/gradle.lockfile +++ b/proxy/gradle.lockfile @@ -14,44 +14,43 @@ com.github.docker-java:docker-java-transport:3.2.13=testCompileClasspath,testRun com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.android:annotations:4.1.1.4=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api-client:google-api-client:1.35.2=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:gapic-google-cloud-storage-v2:2.16.0-alpha=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:grpc-google-cloud-storage-v2:2.16.0-alpha=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:grpc-google-iam-v1:1.6.22=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-storage-v2:2.16.0-alpha=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2:2.6.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.96.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.96.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-common-protos:2.11.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-iam-v1:1.6.22=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:api-common:2.2.2=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax-grpc:2.20.1=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax-httpjson:0.105.1=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax:2.20.1=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:gapic-google-cloud-storage-v2:2.17.0-alpha=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:grpc-google-cloud-storage-v2:2.17.0-alpha=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-storage-v2:2.17.0-alpha=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2:2.8.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.98.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.98.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-common-protos:2.12.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-iam-v1:1.7.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:api-common:2.4.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax-grpc:2.21.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax-httpjson:0.106.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax:2.21.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-cloudkms:v1-rev20221107-2.0.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-monitoring:v3-rev20221205-2.0.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-storage:v1-rev20220705-2.0.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.appengine:appengine-api-1.0-sdk:1.9.86=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.appengine:appengine-testing:1.9.86=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-credentials:1.13.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-oauth2-http:1.13.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-credentials:1.14.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-oauth2-http:1.14.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.auto.value:auto-value-annotations:1.10.1=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.auto.value:auto-value:1.10.1=annotationProcessor,default,deploy_jar,runtimeClasspath,testAnnotationProcessor,testRuntimeClasspath +com.google.auto.value:auto-value:1.10.1=annotationProcessor,compileClasspath,default,deploy_jar,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.auto:auto-common:0.10=annotationProcessor,errorprone,testAnnotationProcessor -com.google.cloud:google-cloud-core-grpc:2.9.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-core-http:2.9.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-core:2.9.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-storage:2.16.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-tasks:2.6.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-core-grpc:2.9.1=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-core-http:2.9.1=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-core:2.9.1=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-storage:2.17.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-tasks:2.8.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.code.findbugs:jFormatString:3.0.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClasspath,default,deploy_jar,errorprone,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -com.google.code.gson:gson:2.10=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.code.gson:gson:2.10.1=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.dagger:dagger-compiler:2.44.2=annotationProcessor,testAnnotationProcessor com.google.dagger:dagger-producers:2.44.2=annotationProcessor,testAnnotationProcessor com.google.dagger:dagger-spi:2.44.2=annotationProcessor,testAnnotationProcessor com.google.dagger:dagger:2.44.2=annotationProcessor,compileClasspath,default,deploy_jar,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.devtools.ksp:symbol-processing-api:1.7.0-1.0.6=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotation:2.3.4=annotationProcessor,errorprone,testAnnotationProcessor -com.google.errorprone:error_prone_annotations:2.16=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.18.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.3.4=checkstyle,errorprone com.google.errorprone:error_prone_annotations:2.7.1=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_check_api:2.3.4=annotationProcessor,errorprone,testAnnotationProcessor @@ -78,8 +77,8 @@ com.google.monitoring-client:contrib:1.0.7=testCompileClasspath,testRuntimeClass com.google.monitoring-client:metrics:1.0.7=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.monitoring-client:stackdriver:1.0.7=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.oauth-client:google-oauth-client:1.34.1=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.protobuf:protobuf-java-util:3.21.10=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.protobuf:protobuf-java:3.21.10=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.protobuf:protobuf-java-util:3.21.12=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.protobuf:protobuf-java:3.21.12=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.protobuf:protobuf-java:3.4.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.re2j:re2j:1.1=compileClasspath,testCompileClasspath com.google.re2j:re2j:1.6=default,deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -95,27 +94,27 @@ commons-collections:commons-collections:3.2.2=checkstyle commons-logging:commons-logging:1.2=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath info.picocli:picocli:4.5.2=checkstyle io.github.java-diff-utils:java-diff-utils:4.12=default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-alts:1.51.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-api:1.51.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-auth:1.51.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-context:1.51.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-core:1.51.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-googleapis:1.51.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-grpclb:1.51.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-netty-shaded:1.51.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf-lite:1.51.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf:1.51.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-services:1.51.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-stub:1.51.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-xds:1.51.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-alts:1.51.1=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-api:1.51.1=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-auth:1.51.1=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-context:1.51.1=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-core:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-googleapis:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-grpclb:1.51.1=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-netty-shaded:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf-lite:1.51.1=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf:1.51.1=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-services:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-stub:1.51.1=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-xds:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath io.netty:netty-buffer:4.1.59.Final=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-http:4.1.59.Final=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec:4.1.59.Final=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-common:4.1.59.Final=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-handler:4.1.59.Final=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-resolver:4.1.59.Final=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-tcnative-boringssl-static:2.0.54.Final=default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-tcnative-classes:2.0.54.Final=default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-tcnative-boringssl-static:2.0.56.Final=default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-tcnative-classes:2.0.56.Final=default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-transport:4.1.59.Final=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opencensus:opencensus-api:0.31.1=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opencensus:opencensus-contrib-http-util:0.31.1=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -129,15 +128,17 @@ javax.mail:mail:1.5.0-b01=default,deploy_jar,runtimeClasspath,testRuntimeClasspa javax.xml.bind:jaxb-api:2.4.0-b180830.0359=default,deploy_jar,runtimeClasspath,testRuntimeClasspath joda-time:joda-time:2.12.2=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath junit:junit:4.13.2=default,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.12.16=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.12.16=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.12.19=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.12.19=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=testCompileClasspath,testRuntimeClasspath net.ltgt.gradle.incap:incap:0.2=annotationProcessor,testAnnotationProcessor net.sf.saxon:Saxon-HE:10.3=checkstyle org.antlr:antlr4-runtime:4.8-1=checkstyle org.apache.commons:commons-compress:1.22=testCompileClasspath,testRuntimeClasspath -org.apache.httpcomponents:httpclient:4.5.13=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.httpcomponents:httpcore:4.4.15=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.httpcomponents:httpclient:4.5.13=compileClasspath,testCompileClasspath +org.apache.httpcomponents:httpclient:4.5.14=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +org.apache.httpcomponents:httpcore:4.4.15=compileClasspath,testCompileClasspath +org.apache.httpcomponents:httpcore:4.4.16=default,deploy_jar,runtimeClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.bouncycastle:bcpkix-jdk15on:1.67=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.bouncycastle:bcprov-jdk15on:1.67=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -146,7 +147,7 @@ org.checkerframework:checker-compat-qual:2.5.5=annotationProcessor,default,deplo org.checkerframework:checker-qual:2.11.1=checkstyle org.checkerframework:checker-qual:3.0.0=errorprone org.checkerframework:checker-qual:3.12.0=annotationProcessor,testAnnotationProcessor -org.checkerframework:checker-qual:3.28.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.29.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.checkerframework:dataflow:3.0.0=annotationProcessor,errorprone,testAnnotationProcessor org.checkerframework:javacutil:3.0.0=annotationProcessor,errorprone,testAnnotationProcessor org.codehaus.mojo:animal-sniffer-annotations:1.17=errorprone @@ -166,17 +167,17 @@ org.jetbrains.kotlin:kotlin-stdlib:1.7.0=annotationProcessor,testAnnotationProce org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.5.0=annotationProcessor,testAnnotationProcessor org.jetbrains:annotations:13.0=annotationProcessor,testAnnotationProcessor org.jetbrains:annotations:17.0.0=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-engine:5.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-params:5.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-launcher:1.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-runner:1.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-suite-api:1.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-suite-commons:1.9.1=testRuntimeClasspath -org.junit:junit-bom:5.9.1=testCompileClasspath,testRuntimeClasspath -org.mockito:mockito-core:4.9.0=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:5.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-launcher:1.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-runner:1.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-suite-api:1.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-suite-commons:1.9.2=testRuntimeClasspath +org.junit:junit-bom:5.9.2=testCompileClasspath,testRuntimeClasspath +org.mockito:mockito-core:4.11.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=testRuntimeClasspath org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:8.0.1=jacocoAnt @@ -193,6 +194,6 @@ org.rnorth.duct-tape:duct-tape:1.0.8=testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-api:1.7.36=testCompileClasspath,testRuntimeClasspath org.testcontainers:junit-jupiter:1.17.6=testCompileClasspath,testRuntimeClasspath org.testcontainers:testcontainers:1.17.6=testCompileClasspath,testRuntimeClasspath -org.threeten:threetenbp:1.6.4=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.threeten:threetenbp:1.6.5=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.yaml:snakeyaml:1.33=default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=archives,errorproneJavac diff --git a/proxy/src/main/java/google/registry/proxy/handler/ProxyProtocolHandler.java b/proxy/src/main/java/google/registry/proxy/handler/ProxyProtocolHandler.java index 5b9de25e3..557eea9f6 100644 --- a/proxy/src/main/java/google/registry/proxy/handler/ProxyProtocolHandler.java +++ b/proxy/src/main/java/google/registry/proxy/handler/ProxyProtocolHandler.java @@ -32,7 +32,7 @@ import javax.inject.Inject; * *

When an EPP client connects to the registry (through the proxy), the registry performs two * validations to ensure that only known registrars are allowed. First it checks the sha265 hash of - * the client SSL certificate and match it to the hash stored in datastore for the registrar. It + * the client SSL certificate and match it to the hash stored in the database for the registrar. It * then checks if the connection is from an allow-listed IP address that belongs to that registrar. * *

The proxy receives client connects via the GCP load balancer, which results in the loss of diff --git a/python/google/registry/scripts/testdata/datastore-indexes.xml b/python/google/registry/scripts/testdata/datastore-indexes.xml deleted file mode 100644 index ac0ac70a2..000000000 --- a/python/google/registry/scripts/testdata/datastore-indexes.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/python/google/registry/scripts/testdata/index.yaml b/python/google/registry/scripts/testdata/index.yaml deleted file mode 100644 index 5df79db08..000000000 --- a/python/google/registry/scripts/testdata/index.yaml +++ /dev/null @@ -1,93 +0,0 @@ -indexes: - -- kind: ContactResource - properties: - - name: currentSponsorClientId - - name: deletionTime - -- kind: DomainBase - properties: - - name: ^i - - name: currentSponsorClientId - - name: deletionTime - -- kind: DomainBase - properties: - - name: ^i - - name: tld - - name: deletionTime - -- kind: DomainBase - properties: - - name: currentSponsorClientId - - name: deletionTime - -- kind: Host - properties: - - name: currentSponsorClientId - - name: deletionTime - -- kind: RegistrarBillingEntry - ancestor: yes - properties: - - name: currency - - name: created - direction: desc - -- kind: DomainBase - properties: - - name: allContacts.contact - - name: deletionTime - -- kind: DomainBase - properties: - - name: nsHosts - - name: deletionTime - -- kind: DomainBase - properties: - - name: ^i - - name: nsHosts - - name: deletionTime - -- kind: Host - properties: - - name: inetAddresses - - name: deletionTime - -- kind: PollMessage - properties: - - name: clientId - - name: eventTime - -- kind: PollMessage - ancestor: yes - properties: - - name: clientId - - name: eventTime - -- kind: HistoryEntry - ancestor: yes - properties: - - name: modificationTime - -- kind: DomainBase - properties: - - name: ^i - - name: fullyQualifiedDomainName - -- kind: DomainBase - properties: - - name: ^i - - name: tld - - name: fullyQualifiedDomainName - -- kind: Host - properties: - - name: deletionTime - - name: fullyQualifiedHostName - -- kind: ContactResource - properties: - - name: deletionTime - - name: searchName diff --git a/python/google/registry/scripts/xml_to_index_yaml_translator.py b/python/google/registry/scripts/xml_to_index_yaml_translator.py deleted file mode 100644 index 39f959730..000000000 --- a/python/google/registry/scripts/xml_to_index_yaml_translator.py +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 2017 The Nomulus Authors. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -"""Convert App Engine Java datastore-indexes.xml file to index.yaml format. - -Pass the name of a datastore-indexes.xml file. The output will be dumped to -stdout. - -The resulting file can be used to call the gcloud cleanup-indexes command, -which interactively removes indexes which are defined on an App Engine -project but not present in the file. The syntax for that command is: - - gcloud datastore cleanup-indexes {index.yaml file} --project={project-id} -""" - -import sys -from xml.etree import ElementTree - - -def main(argv): - if len(argv) < 2: - print 'Usage: command {datastore-indexes.xml file}' - return 1 - - root = ElementTree.parse(argv[1]).getroot() - print 'indexes:' - for index in root: - print '' - print '- kind: %s' % index.attrib['kind'] - if index.attrib['ancestor'] != 'false': - print ' ancestor: %s' % ('yes' if (index.attrib['ancestor'] == 'true') - else 'no') - print ' properties:' - for index_property in index: - print ' - name: %s' % index_property.attrib['name'] - if index_property.attrib['direction'] != 'asc': - print ' direction: %s' % index_property.attrib['direction'] - -if __name__ == '__main__': - main(sys.argv) diff --git a/python/google/registry/scripts/xml_to_index_yaml_translator_test.py b/python/google/registry/scripts/xml_to_index_yaml_translator_test.py deleted file mode 100644 index 15c9a84f7..000000000 --- a/python/google/registry/scripts/xml_to_index_yaml_translator_test.py +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 2017 The Nomulus Authors. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -"""Tests for xml_to_index_yaml_translator.py.""" - -import contextlib -import StringIO -import sys -import unittest -from google.registry.scripts import xml_to_index_yaml_translator - - -@contextlib.contextmanager -def _RedirectStdout(): - orig_stdout = sys.stdout - sio = StringIO.StringIO() - sys.stdout = sio - try: - yield sio - finally: - sys.stdout = orig_stdout - - -class XmlToIndexYamlTranslatorTest(unittest.TestCase): - - def testSuccess(self): - with _RedirectStdout() as sio: - xml_to_index_yaml_translator.main(['test', - 'python/' - 'google/registry/scripts/testdata/' - 'datastore-indexes.xml']) - actual = sio.getvalue() - expectedfile = open('python/google/registry/' - 'scripts/testdata/index.yaml') - expected = expectedfile.read() - self.assertEqual(actual, expected) - - -if __name__ == '__main__': - unittest.main() diff --git a/services/backend/gradle.lockfile b/services/backend/gradle.lockfile index b8e0750a5..e7f52fb88 100644 --- a/services/backend/gradle.lockfile +++ b/services/backend/gradle.lockfile @@ -19,13 +19,13 @@ com.github.ben-manes.caffeine:caffeine:2.9.3=compileClasspath,default,runtimeCla com.github.docker-java:docker-java-api:3.2.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.docker-java:docker-java-transport-zerodep:3.2.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.docker-java:docker-java-transport:3.2.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.jnr:jffi:1.3.9=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.jnr:jffi:1.3.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jnr-a64asm:1.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.jnr:jnr-constants:0.10.3=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.jnr:jnr-enxio:0.32.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.jnr:jnr-ffi:2.2.11=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.jnr:jnr-posix:3.1.15=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.jnr:jnr-unixsocket:0.38.17=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.jnr:jnr-constants:0.10.4=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.jnr:jnr-enxio:0.32.14=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.jnr:jnr-ffi:2.2.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.jnr:jnr-posix:3.1.16=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.jnr:jnr-unixsocket:0.38.19=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.android:annotations:4.1.1.4=default,runtimeClasspath,testRuntimeClasspath com.google.api-client:google-api-client-appengine:1.35.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -33,7 +33,7 @@ com.google.api-client:google-api-client-jackson2:1.32.2=compileClasspath,default com.google.api-client:google-api-client-java6:1.35.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api-client:google-api-client-servlet:1.35.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api-client:google-api-client:1.35.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:gapic-google-cloud-storage-v2:2.16.0-alpha=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:gapic-google-cloud-storage-v2:2.17.0-alpha=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:2.23.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.147.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.147.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -44,9 +44,8 @@ com.google.api.grpc:grpc-google-cloud-pubsublite-v1:1.7.1=compileClasspath,defau com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:6.31.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:6.31.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-spanner-v1:6.31.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:grpc-google-cloud-storage-v2:2.16.0-alpha=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:grpc-google-cloud-storage-v2:2.17.0-alpha=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-common-protos:2.9.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:grpc-google-iam-v1:1.6.22=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:2.23.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.147.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.147.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -58,23 +57,23 @@ com.google.api.grpc:proto-google-cloud-monitoring-v3:1.64.0=compileClasspath,tes com.google.api.grpc:proto-google-cloud-monitoring-v3:3.4.6=default,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-pubsub-v1:1.102.20=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-pubsublite-v1:1.7.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.6.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:2.6.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.8.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:2.8.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:6.31.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:6.31.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-v1:6.31.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-storage-v2:2.16.0-alpha=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2:2.6.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.96.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.96.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-common-protos:2.11.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-iam-v1:1.6.22=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:api-common:2.2.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax-grpc:2.20.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax-httpjson:0.105.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax:2.20.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-storage-v2:2.17.0-alpha=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2:2.8.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.98.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.98.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-common-protos:2.12.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-iam-v1:1.7.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:api-common:2.4.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax-grpc:2.21.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax-httpjson:0.106.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax:2.21.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-admin-directory:directory_v1-rev118-1.25.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-appengine:v1-rev20221205-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-appengine:v1-rev20230109-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-bigquery:v2-rev20220924-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-clouddebugger:v2-rev20220318-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-cloudresourcemanager:v1-rev20220828-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -86,45 +85,45 @@ com.google.apis:google-api-services-healthcare:v1-rev20220818-2.0.0=compileClass com.google.apis:google-api-services-iamcredentials:v1-rev20210326-1.32.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-monitoring:v3-rev20221205-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-pubsub:v1-rev20220904-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-sheets:v4-rev20220927-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-sqladmin:v1beta4-rev20221017-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-sheets:v4-rev20221216-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-sqladmin:v1beta4-rev20221209-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-storage:v1-rev20220705-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.appengine:appengine-api-1.0-sdk:1.9.86=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.appengine:appengine-testing:1.9.86=default,runtimeClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-credentials:1.13.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-oauth2-http:1.13.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-credentials:1.14.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-oauth2-http:1.14.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.auto.service:auto-service-annotations:1.0.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.auto.value:auto-value-annotations:1.10.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.auto.value:auto-value:1.9=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auto.value:auto-value:1.10.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud.bigdataoss:gcsio:2.2.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud.bigdataoss:util:2.2.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud.bigtable:bigtable-client-core:1.26.3=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud.bigtable:bigtable-metrics-api:1.26.3=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud.datastore:datastore-v1-proto-client:2.9.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud.sql:jdbc-socket-factory-core:1.7.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud.sql:postgres-socket-factory:1.7.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud.sql:jdbc-socket-factory-core:1.8.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud.sql:postgres-socket-factory:1.8.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-bigquerystorage:2.23.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-bigtable-stats:2.14.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-bigtable:2.14.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-core-grpc:2.9.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-core-http:2.9.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-core:2.9.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-core-grpc:2.9.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-core-http:2.9.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-core:2.9.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-firestore:3.6.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-monitoring:1.82.0=compileClasspath,testCompileClasspath com.google.cloud:google-cloud-monitoring:3.4.6=default,runtimeClasspath,testRuntimeClasspath com.google.cloud:google-cloud-pubsub:1.120.20=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-pubsublite:1.7.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-secretmanager:2.6.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-secretmanager:2.8.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-spanner:6.31.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-storage:2.16.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-tasks:2.6.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-storage:2.17.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-tasks:2.8.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:grpc-gcp:1.2.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:proto-google-cloud-firestore-bundle-v1:3.6.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.code.gson:gson:2.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.code.gson:gson:2.10.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.common.html.types:types:1.0.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.dagger:dagger:2.44.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.errorprone:error_prone_annotations:2.16=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.18.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.escapevelocity:escapevelocity:0.9.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.flatbuffers:flatbuffers-java:1.12.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.flogger:flogger-system-backend:0.7.4=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -151,8 +150,8 @@ com.google.oauth-client:google-oauth-client-java6:1.34.1=compileClasspath,defaul com.google.oauth-client:google-oauth-client-jetty:1.34.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.oauth-client:google-oauth-client-servlet:1.34.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.oauth-client:google-oauth-client:1.34.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.protobuf:protobuf-java-util:3.21.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.protobuf:protobuf-java:3.21.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.protobuf:protobuf-java-util:3.21.12=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.protobuf:protobuf-java:3.21.12=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.template:soy:2021-02-01=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.truth:truth:1.1.3=default,runtimeClasspath,testRuntimeClasspath @@ -175,24 +174,24 @@ io.confluent:kafka-schema-registry-client:5.3.2=compileClasspath,default,runtime io.dropwizard.metrics:metrics-core:3.1.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.github.classgraph:classgraph:4.8.104=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.github.java-diff-utils:java-diff-utils:4.12=default,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-alts:1.51.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-api:1.51.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-auth:1.51.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-alts:1.51.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-api:1.51.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-auth:1.51.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.grpc:grpc-census:1.49.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-context:1.51.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-core:1.51.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-googleapis:1.51.0=default,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-grpclb:1.51.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-netty-shaded:1.51.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-context:1.51.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-core:1.51.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-googleapis:1.51.1=default,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-grpclb:1.51.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-netty-shaded:1.51.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.grpc:grpc-netty:1.49.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf-lite:1.51.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf:1.51.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf-lite:1.51.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf:1.51.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.grpc:grpc-rls:1.49.2=default,runtimeClasspath,testRuntimeClasspath io.grpc:grpc-services:1.49.2=compileClasspath,testCompileClasspath -io.grpc:grpc-services:1.51.0=default,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-stub:1.51.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-services:1.51.1=default,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-stub:1.51.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.grpc:grpc-xds:1.49.2=compileClasspath,testCompileClasspath -io.grpc:grpc-xds:1.51.0=default,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-xds:1.51.1=default,runtimeClasspath,testRuntimeClasspath io.netty:netty-buffer:4.1.77.Final=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-http2:4.1.77.Final=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-http:4.1.77.Final=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -257,13 +256,13 @@ org.apache.beam:beam-vendor-guava-26_0-jre:0.1=compileClasspath,default,runtimeC org.apache.commons:commons-compress:1.22=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.commons:commons-csv:1.9.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.commons:commons-lang3:3.12.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.httpcomponents:httpclient:4.5.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.httpcomponents:httpcore:4.4.15=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.httpcomponents:httpclient:4.5.14=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.httpcomponents:httpcore:4.4.16=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.bouncycastle:bcpg-jdk15on:1.67=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.bouncycastle:bcpkix-jdk15on:1.67=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.bouncycastle:bcprov-jdk15on:1.67=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.checkerframework:checker-compat-qual:2.5.5=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.checkerframework:checker-qual:3.28.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.29.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.jackson:jackson-core-asl:1.9.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.jackson:jackson-mapper-asl:1.9.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.22=default,runtimeClasspath,testRuntimeClasspath @@ -275,7 +274,7 @@ org.eclipse.jetty:jetty-server:9.4.49.v20220914=compileClasspath,default,runtime org.eclipse.jetty:jetty-servlet:9.4.49.v20220914=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util-ajax:9.4.49.v20220914=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util:9.4.49.v20220914=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-core:9.10.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-core:9.11.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:jaxb-runtime:2.3.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:txw2:2.3.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.gwtproject:gwt-user:2.10.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -298,8 +297,8 @@ org.ow2.asm:asm-util:9.4=compileClasspath,default,runtimeClasspath,testCompileCl org.ow2.asm:asm:9.4=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.postgresql:postgresql:42.5.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.rnorth.duct-tape:duct-tape:1.0.8=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.slf4j:slf4j-api:2.0.5=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.slf4j:slf4j-jdk14:2.0.5=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:2.0.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-jdk14:2.0.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.springframework:spring-core:5.3.18=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.springframework:spring-expression:5.3.18=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.springframework:spring-jcl:5.3.18=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -307,7 +306,7 @@ org.testcontainers:database-commons:1.17.6=compileClasspath,default,runtimeClass org.testcontainers:jdbc:1.17.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.testcontainers:postgresql:1.17.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.testcontainers:testcontainers:1.17.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.threeten:threetenbp:1.6.4=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.threeten:threetenbp:1.6.5=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.tukaani:xz:1.5=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.w3c.css:sac:1.3=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.xerial.snappy:snappy-java:1.1.8.4=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/services/default/gradle.lockfile b/services/default/gradle.lockfile index b8e0750a5..e7f52fb88 100644 --- a/services/default/gradle.lockfile +++ b/services/default/gradle.lockfile @@ -19,13 +19,13 @@ com.github.ben-manes.caffeine:caffeine:2.9.3=compileClasspath,default,runtimeCla com.github.docker-java:docker-java-api:3.2.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.docker-java:docker-java-transport-zerodep:3.2.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.docker-java:docker-java-transport:3.2.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.jnr:jffi:1.3.9=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.jnr:jffi:1.3.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jnr-a64asm:1.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.jnr:jnr-constants:0.10.3=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.jnr:jnr-enxio:0.32.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.jnr:jnr-ffi:2.2.11=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.jnr:jnr-posix:3.1.15=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.jnr:jnr-unixsocket:0.38.17=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.jnr:jnr-constants:0.10.4=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.jnr:jnr-enxio:0.32.14=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.jnr:jnr-ffi:2.2.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.jnr:jnr-posix:3.1.16=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.jnr:jnr-unixsocket:0.38.19=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.android:annotations:4.1.1.4=default,runtimeClasspath,testRuntimeClasspath com.google.api-client:google-api-client-appengine:1.35.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -33,7 +33,7 @@ com.google.api-client:google-api-client-jackson2:1.32.2=compileClasspath,default com.google.api-client:google-api-client-java6:1.35.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api-client:google-api-client-servlet:1.35.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api-client:google-api-client:1.35.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:gapic-google-cloud-storage-v2:2.16.0-alpha=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:gapic-google-cloud-storage-v2:2.17.0-alpha=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:2.23.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.147.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.147.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -44,9 +44,8 @@ com.google.api.grpc:grpc-google-cloud-pubsublite-v1:1.7.1=compileClasspath,defau com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:6.31.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:6.31.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-spanner-v1:6.31.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:grpc-google-cloud-storage-v2:2.16.0-alpha=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:grpc-google-cloud-storage-v2:2.17.0-alpha=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-common-protos:2.9.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:grpc-google-iam-v1:1.6.22=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:2.23.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.147.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.147.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -58,23 +57,23 @@ com.google.api.grpc:proto-google-cloud-monitoring-v3:1.64.0=compileClasspath,tes com.google.api.grpc:proto-google-cloud-monitoring-v3:3.4.6=default,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-pubsub-v1:1.102.20=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-pubsublite-v1:1.7.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.6.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:2.6.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.8.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:2.8.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:6.31.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:6.31.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-v1:6.31.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-storage-v2:2.16.0-alpha=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2:2.6.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.96.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.96.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-common-protos:2.11.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-iam-v1:1.6.22=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:api-common:2.2.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax-grpc:2.20.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax-httpjson:0.105.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax:2.20.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-storage-v2:2.17.0-alpha=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2:2.8.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.98.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.98.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-common-protos:2.12.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-iam-v1:1.7.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:api-common:2.4.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax-grpc:2.21.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax-httpjson:0.106.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax:2.21.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-admin-directory:directory_v1-rev118-1.25.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-appengine:v1-rev20221205-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-appengine:v1-rev20230109-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-bigquery:v2-rev20220924-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-clouddebugger:v2-rev20220318-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-cloudresourcemanager:v1-rev20220828-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -86,45 +85,45 @@ com.google.apis:google-api-services-healthcare:v1-rev20220818-2.0.0=compileClass com.google.apis:google-api-services-iamcredentials:v1-rev20210326-1.32.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-monitoring:v3-rev20221205-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-pubsub:v1-rev20220904-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-sheets:v4-rev20220927-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-sqladmin:v1beta4-rev20221017-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-sheets:v4-rev20221216-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-sqladmin:v1beta4-rev20221209-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-storage:v1-rev20220705-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.appengine:appengine-api-1.0-sdk:1.9.86=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.appengine:appengine-testing:1.9.86=default,runtimeClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-credentials:1.13.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-oauth2-http:1.13.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-credentials:1.14.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-oauth2-http:1.14.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.auto.service:auto-service-annotations:1.0.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.auto.value:auto-value-annotations:1.10.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.auto.value:auto-value:1.9=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auto.value:auto-value:1.10.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud.bigdataoss:gcsio:2.2.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud.bigdataoss:util:2.2.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud.bigtable:bigtable-client-core:1.26.3=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud.bigtable:bigtable-metrics-api:1.26.3=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud.datastore:datastore-v1-proto-client:2.9.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud.sql:jdbc-socket-factory-core:1.7.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud.sql:postgres-socket-factory:1.7.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud.sql:jdbc-socket-factory-core:1.8.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud.sql:postgres-socket-factory:1.8.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-bigquerystorage:2.23.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-bigtable-stats:2.14.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-bigtable:2.14.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-core-grpc:2.9.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-core-http:2.9.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-core:2.9.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-core-grpc:2.9.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-core-http:2.9.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-core:2.9.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-firestore:3.6.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-monitoring:1.82.0=compileClasspath,testCompileClasspath com.google.cloud:google-cloud-monitoring:3.4.6=default,runtimeClasspath,testRuntimeClasspath com.google.cloud:google-cloud-pubsub:1.120.20=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-pubsublite:1.7.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-secretmanager:2.6.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-secretmanager:2.8.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-spanner:6.31.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-storage:2.16.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-tasks:2.6.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-storage:2.17.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-tasks:2.8.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:grpc-gcp:1.2.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:proto-google-cloud-firestore-bundle-v1:3.6.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.code.gson:gson:2.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.code.gson:gson:2.10.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.common.html.types:types:1.0.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.dagger:dagger:2.44.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.errorprone:error_prone_annotations:2.16=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.18.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.escapevelocity:escapevelocity:0.9.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.flatbuffers:flatbuffers-java:1.12.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.flogger:flogger-system-backend:0.7.4=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -151,8 +150,8 @@ com.google.oauth-client:google-oauth-client-java6:1.34.1=compileClasspath,defaul com.google.oauth-client:google-oauth-client-jetty:1.34.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.oauth-client:google-oauth-client-servlet:1.34.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.oauth-client:google-oauth-client:1.34.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.protobuf:protobuf-java-util:3.21.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.protobuf:protobuf-java:3.21.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.protobuf:protobuf-java-util:3.21.12=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.protobuf:protobuf-java:3.21.12=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.template:soy:2021-02-01=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.truth:truth:1.1.3=default,runtimeClasspath,testRuntimeClasspath @@ -175,24 +174,24 @@ io.confluent:kafka-schema-registry-client:5.3.2=compileClasspath,default,runtime io.dropwizard.metrics:metrics-core:3.1.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.github.classgraph:classgraph:4.8.104=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.github.java-diff-utils:java-diff-utils:4.12=default,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-alts:1.51.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-api:1.51.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-auth:1.51.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-alts:1.51.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-api:1.51.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-auth:1.51.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.grpc:grpc-census:1.49.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-context:1.51.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-core:1.51.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-googleapis:1.51.0=default,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-grpclb:1.51.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-netty-shaded:1.51.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-context:1.51.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-core:1.51.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-googleapis:1.51.1=default,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-grpclb:1.51.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-netty-shaded:1.51.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.grpc:grpc-netty:1.49.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf-lite:1.51.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf:1.51.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf-lite:1.51.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf:1.51.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.grpc:grpc-rls:1.49.2=default,runtimeClasspath,testRuntimeClasspath io.grpc:grpc-services:1.49.2=compileClasspath,testCompileClasspath -io.grpc:grpc-services:1.51.0=default,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-stub:1.51.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-services:1.51.1=default,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-stub:1.51.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.grpc:grpc-xds:1.49.2=compileClasspath,testCompileClasspath -io.grpc:grpc-xds:1.51.0=default,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-xds:1.51.1=default,runtimeClasspath,testRuntimeClasspath io.netty:netty-buffer:4.1.77.Final=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-http2:4.1.77.Final=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-http:4.1.77.Final=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -257,13 +256,13 @@ org.apache.beam:beam-vendor-guava-26_0-jre:0.1=compileClasspath,default,runtimeC org.apache.commons:commons-compress:1.22=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.commons:commons-csv:1.9.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.commons:commons-lang3:3.12.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.httpcomponents:httpclient:4.5.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.httpcomponents:httpcore:4.4.15=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.httpcomponents:httpclient:4.5.14=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.httpcomponents:httpcore:4.4.16=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.bouncycastle:bcpg-jdk15on:1.67=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.bouncycastle:bcpkix-jdk15on:1.67=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.bouncycastle:bcprov-jdk15on:1.67=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.checkerframework:checker-compat-qual:2.5.5=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.checkerframework:checker-qual:3.28.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.29.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.jackson:jackson-core-asl:1.9.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.jackson:jackson-mapper-asl:1.9.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.22=default,runtimeClasspath,testRuntimeClasspath @@ -275,7 +274,7 @@ org.eclipse.jetty:jetty-server:9.4.49.v20220914=compileClasspath,default,runtime org.eclipse.jetty:jetty-servlet:9.4.49.v20220914=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util-ajax:9.4.49.v20220914=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util:9.4.49.v20220914=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-core:9.10.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-core:9.11.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:jaxb-runtime:2.3.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:txw2:2.3.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.gwtproject:gwt-user:2.10.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -298,8 +297,8 @@ org.ow2.asm:asm-util:9.4=compileClasspath,default,runtimeClasspath,testCompileCl org.ow2.asm:asm:9.4=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.postgresql:postgresql:42.5.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.rnorth.duct-tape:duct-tape:1.0.8=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.slf4j:slf4j-api:2.0.5=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.slf4j:slf4j-jdk14:2.0.5=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:2.0.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-jdk14:2.0.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.springframework:spring-core:5.3.18=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.springframework:spring-expression:5.3.18=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.springframework:spring-jcl:5.3.18=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -307,7 +306,7 @@ org.testcontainers:database-commons:1.17.6=compileClasspath,default,runtimeClass org.testcontainers:jdbc:1.17.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.testcontainers:postgresql:1.17.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.testcontainers:testcontainers:1.17.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.threeten:threetenbp:1.6.4=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.threeten:threetenbp:1.6.5=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.tukaani:xz:1.5=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.w3c.css:sac:1.3=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.xerial.snappy:snappy-java:1.1.8.4=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/services/pubapi/gradle.lockfile b/services/pubapi/gradle.lockfile index b8e0750a5..e7f52fb88 100644 --- a/services/pubapi/gradle.lockfile +++ b/services/pubapi/gradle.lockfile @@ -19,13 +19,13 @@ com.github.ben-manes.caffeine:caffeine:2.9.3=compileClasspath,default,runtimeCla com.github.docker-java:docker-java-api:3.2.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.docker-java:docker-java-transport-zerodep:3.2.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.docker-java:docker-java-transport:3.2.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.jnr:jffi:1.3.9=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.jnr:jffi:1.3.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jnr-a64asm:1.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.jnr:jnr-constants:0.10.3=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.jnr:jnr-enxio:0.32.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.jnr:jnr-ffi:2.2.11=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.jnr:jnr-posix:3.1.15=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.jnr:jnr-unixsocket:0.38.17=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.jnr:jnr-constants:0.10.4=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.jnr:jnr-enxio:0.32.14=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.jnr:jnr-ffi:2.2.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.jnr:jnr-posix:3.1.16=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.jnr:jnr-unixsocket:0.38.19=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.android:annotations:4.1.1.4=default,runtimeClasspath,testRuntimeClasspath com.google.api-client:google-api-client-appengine:1.35.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -33,7 +33,7 @@ com.google.api-client:google-api-client-jackson2:1.32.2=compileClasspath,default com.google.api-client:google-api-client-java6:1.35.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api-client:google-api-client-servlet:1.35.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api-client:google-api-client:1.35.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:gapic-google-cloud-storage-v2:2.16.0-alpha=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:gapic-google-cloud-storage-v2:2.17.0-alpha=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:2.23.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.147.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.147.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -44,9 +44,8 @@ com.google.api.grpc:grpc-google-cloud-pubsublite-v1:1.7.1=compileClasspath,defau com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:6.31.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:6.31.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-spanner-v1:6.31.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:grpc-google-cloud-storage-v2:2.16.0-alpha=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:grpc-google-cloud-storage-v2:2.17.0-alpha=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-common-protos:2.9.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:grpc-google-iam-v1:1.6.22=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:2.23.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.147.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.147.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -58,23 +57,23 @@ com.google.api.grpc:proto-google-cloud-monitoring-v3:1.64.0=compileClasspath,tes com.google.api.grpc:proto-google-cloud-monitoring-v3:3.4.6=default,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-pubsub-v1:1.102.20=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-pubsublite-v1:1.7.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.6.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:2.6.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.8.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:2.8.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:6.31.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:6.31.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-v1:6.31.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-storage-v2:2.16.0-alpha=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2:2.6.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.96.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.96.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-common-protos:2.11.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-iam-v1:1.6.22=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:api-common:2.2.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax-grpc:2.20.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax-httpjson:0.105.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax:2.20.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-storage-v2:2.17.0-alpha=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2:2.8.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.98.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.98.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-common-protos:2.12.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-iam-v1:1.7.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:api-common:2.4.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax-grpc:2.21.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax-httpjson:0.106.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax:2.21.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-admin-directory:directory_v1-rev118-1.25.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-appengine:v1-rev20221205-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-appengine:v1-rev20230109-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-bigquery:v2-rev20220924-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-clouddebugger:v2-rev20220318-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-cloudresourcemanager:v1-rev20220828-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -86,45 +85,45 @@ com.google.apis:google-api-services-healthcare:v1-rev20220818-2.0.0=compileClass com.google.apis:google-api-services-iamcredentials:v1-rev20210326-1.32.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-monitoring:v3-rev20221205-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-pubsub:v1-rev20220904-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-sheets:v4-rev20220927-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-sqladmin:v1beta4-rev20221017-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-sheets:v4-rev20221216-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-sqladmin:v1beta4-rev20221209-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-storage:v1-rev20220705-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.appengine:appengine-api-1.0-sdk:1.9.86=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.appengine:appengine-testing:1.9.86=default,runtimeClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-credentials:1.13.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-oauth2-http:1.13.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-credentials:1.14.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-oauth2-http:1.14.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.auto.service:auto-service-annotations:1.0.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.auto.value:auto-value-annotations:1.10.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.auto.value:auto-value:1.9=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auto.value:auto-value:1.10.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud.bigdataoss:gcsio:2.2.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud.bigdataoss:util:2.2.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud.bigtable:bigtable-client-core:1.26.3=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud.bigtable:bigtable-metrics-api:1.26.3=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud.datastore:datastore-v1-proto-client:2.9.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud.sql:jdbc-socket-factory-core:1.7.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud.sql:postgres-socket-factory:1.7.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud.sql:jdbc-socket-factory-core:1.8.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud.sql:postgres-socket-factory:1.8.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-bigquerystorage:2.23.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-bigtable-stats:2.14.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-bigtable:2.14.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-core-grpc:2.9.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-core-http:2.9.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-core:2.9.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-core-grpc:2.9.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-core-http:2.9.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-core:2.9.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-firestore:3.6.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-monitoring:1.82.0=compileClasspath,testCompileClasspath com.google.cloud:google-cloud-monitoring:3.4.6=default,runtimeClasspath,testRuntimeClasspath com.google.cloud:google-cloud-pubsub:1.120.20=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-pubsublite:1.7.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-secretmanager:2.6.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-secretmanager:2.8.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-spanner:6.31.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-storage:2.16.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-tasks:2.6.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-storage:2.17.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-tasks:2.8.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:grpc-gcp:1.2.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:proto-google-cloud-firestore-bundle-v1:3.6.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.code.gson:gson:2.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.code.gson:gson:2.10.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.common.html.types:types:1.0.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.dagger:dagger:2.44.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.errorprone:error_prone_annotations:2.16=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.18.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.escapevelocity:escapevelocity:0.9.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.flatbuffers:flatbuffers-java:1.12.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.flogger:flogger-system-backend:0.7.4=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -151,8 +150,8 @@ com.google.oauth-client:google-oauth-client-java6:1.34.1=compileClasspath,defaul com.google.oauth-client:google-oauth-client-jetty:1.34.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.oauth-client:google-oauth-client-servlet:1.34.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.oauth-client:google-oauth-client:1.34.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.protobuf:protobuf-java-util:3.21.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.protobuf:protobuf-java:3.21.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.protobuf:protobuf-java-util:3.21.12=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.protobuf:protobuf-java:3.21.12=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.template:soy:2021-02-01=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.truth:truth:1.1.3=default,runtimeClasspath,testRuntimeClasspath @@ -175,24 +174,24 @@ io.confluent:kafka-schema-registry-client:5.3.2=compileClasspath,default,runtime io.dropwizard.metrics:metrics-core:3.1.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.github.classgraph:classgraph:4.8.104=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.github.java-diff-utils:java-diff-utils:4.12=default,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-alts:1.51.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-api:1.51.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-auth:1.51.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-alts:1.51.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-api:1.51.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-auth:1.51.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.grpc:grpc-census:1.49.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-context:1.51.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-core:1.51.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-googleapis:1.51.0=default,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-grpclb:1.51.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-netty-shaded:1.51.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-context:1.51.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-core:1.51.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-googleapis:1.51.1=default,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-grpclb:1.51.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-netty-shaded:1.51.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.grpc:grpc-netty:1.49.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf-lite:1.51.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf:1.51.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf-lite:1.51.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf:1.51.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.grpc:grpc-rls:1.49.2=default,runtimeClasspath,testRuntimeClasspath io.grpc:grpc-services:1.49.2=compileClasspath,testCompileClasspath -io.grpc:grpc-services:1.51.0=default,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-stub:1.51.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-services:1.51.1=default,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-stub:1.51.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.grpc:grpc-xds:1.49.2=compileClasspath,testCompileClasspath -io.grpc:grpc-xds:1.51.0=default,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-xds:1.51.1=default,runtimeClasspath,testRuntimeClasspath io.netty:netty-buffer:4.1.77.Final=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-http2:4.1.77.Final=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-http:4.1.77.Final=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -257,13 +256,13 @@ org.apache.beam:beam-vendor-guava-26_0-jre:0.1=compileClasspath,default,runtimeC org.apache.commons:commons-compress:1.22=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.commons:commons-csv:1.9.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.commons:commons-lang3:3.12.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.httpcomponents:httpclient:4.5.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.httpcomponents:httpcore:4.4.15=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.httpcomponents:httpclient:4.5.14=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.httpcomponents:httpcore:4.4.16=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.bouncycastle:bcpg-jdk15on:1.67=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.bouncycastle:bcpkix-jdk15on:1.67=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.bouncycastle:bcprov-jdk15on:1.67=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.checkerframework:checker-compat-qual:2.5.5=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.checkerframework:checker-qual:3.28.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.29.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.jackson:jackson-core-asl:1.9.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.jackson:jackson-mapper-asl:1.9.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.22=default,runtimeClasspath,testRuntimeClasspath @@ -275,7 +274,7 @@ org.eclipse.jetty:jetty-server:9.4.49.v20220914=compileClasspath,default,runtime org.eclipse.jetty:jetty-servlet:9.4.49.v20220914=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util-ajax:9.4.49.v20220914=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util:9.4.49.v20220914=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-core:9.10.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-core:9.11.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:jaxb-runtime:2.3.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:txw2:2.3.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.gwtproject:gwt-user:2.10.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -298,8 +297,8 @@ org.ow2.asm:asm-util:9.4=compileClasspath,default,runtimeClasspath,testCompileCl org.ow2.asm:asm:9.4=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.postgresql:postgresql:42.5.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.rnorth.duct-tape:duct-tape:1.0.8=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.slf4j:slf4j-api:2.0.5=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.slf4j:slf4j-jdk14:2.0.5=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:2.0.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-jdk14:2.0.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.springframework:spring-core:5.3.18=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.springframework:spring-expression:5.3.18=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.springframework:spring-jcl:5.3.18=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -307,7 +306,7 @@ org.testcontainers:database-commons:1.17.6=compileClasspath,default,runtimeClass org.testcontainers:jdbc:1.17.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.testcontainers:postgresql:1.17.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.testcontainers:testcontainers:1.17.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.threeten:threetenbp:1.6.4=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.threeten:threetenbp:1.6.5=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.tukaani:xz:1.5=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.w3c.css:sac:1.3=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.xerial.snappy:snappy-java:1.1.8.4=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/services/tools/gradle.lockfile b/services/tools/gradle.lockfile index b8e0750a5..e7f52fb88 100644 --- a/services/tools/gradle.lockfile +++ b/services/tools/gradle.lockfile @@ -19,13 +19,13 @@ com.github.ben-manes.caffeine:caffeine:2.9.3=compileClasspath,default,runtimeCla com.github.docker-java:docker-java-api:3.2.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.docker-java:docker-java-transport-zerodep:3.2.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.docker-java:docker-java-transport:3.2.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.jnr:jffi:1.3.9=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.jnr:jffi:1.3.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jnr-a64asm:1.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.jnr:jnr-constants:0.10.3=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.jnr:jnr-enxio:0.32.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.jnr:jnr-ffi:2.2.11=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.jnr:jnr-posix:3.1.15=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.jnr:jnr-unixsocket:0.38.17=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.jnr:jnr-constants:0.10.4=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.jnr:jnr-enxio:0.32.14=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.jnr:jnr-ffi:2.2.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.jnr:jnr-posix:3.1.16=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.jnr:jnr-unixsocket:0.38.19=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.android:annotations:4.1.1.4=default,runtimeClasspath,testRuntimeClasspath com.google.api-client:google-api-client-appengine:1.35.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -33,7 +33,7 @@ com.google.api-client:google-api-client-jackson2:1.32.2=compileClasspath,default com.google.api-client:google-api-client-java6:1.35.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api-client:google-api-client-servlet:1.35.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api-client:google-api-client:1.35.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:gapic-google-cloud-storage-v2:2.16.0-alpha=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:gapic-google-cloud-storage-v2:2.17.0-alpha=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:2.23.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.147.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.147.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -44,9 +44,8 @@ com.google.api.grpc:grpc-google-cloud-pubsublite-v1:1.7.1=compileClasspath,defau com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:6.31.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:6.31.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-spanner-v1:6.31.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:grpc-google-cloud-storage-v2:2.16.0-alpha=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:grpc-google-cloud-storage-v2:2.17.0-alpha=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-common-protos:2.9.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:grpc-google-iam-v1:1.6.22=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:2.23.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.147.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.147.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -58,23 +57,23 @@ com.google.api.grpc:proto-google-cloud-monitoring-v3:1.64.0=compileClasspath,tes com.google.api.grpc:proto-google-cloud-monitoring-v3:3.4.6=default,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-pubsub-v1:1.102.20=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-pubsublite-v1:1.7.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.6.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:2.6.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.8.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:2.8.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:6.31.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:6.31.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-v1:6.31.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-storage-v2:2.16.0-alpha=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2:2.6.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.96.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.96.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-common-protos:2.11.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-iam-v1:1.6.22=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:api-common:2.2.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax-grpc:2.20.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax-httpjson:0.105.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax:2.20.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-storage-v2:2.17.0-alpha=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2:2.8.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.98.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.98.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-common-protos:2.12.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-iam-v1:1.7.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:api-common:2.4.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax-grpc:2.21.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax-httpjson:0.106.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax:2.21.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-admin-directory:directory_v1-rev118-1.25.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-appengine:v1-rev20221205-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-appengine:v1-rev20230109-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-bigquery:v2-rev20220924-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-clouddebugger:v2-rev20220318-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-cloudresourcemanager:v1-rev20220828-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -86,45 +85,45 @@ com.google.apis:google-api-services-healthcare:v1-rev20220818-2.0.0=compileClass com.google.apis:google-api-services-iamcredentials:v1-rev20210326-1.32.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-monitoring:v3-rev20221205-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-pubsub:v1-rev20220904-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-sheets:v4-rev20220927-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-sqladmin:v1beta4-rev20221017-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-sheets:v4-rev20221216-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-sqladmin:v1beta4-rev20221209-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-storage:v1-rev20220705-2.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.appengine:appengine-api-1.0-sdk:1.9.86=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.appengine:appengine-testing:1.9.86=default,runtimeClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-credentials:1.13.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-oauth2-http:1.13.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-credentials:1.14.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-oauth2-http:1.14.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.auto.service:auto-service-annotations:1.0.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.auto.value:auto-value-annotations:1.10.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.auto.value:auto-value:1.9=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auto.value:auto-value:1.10.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud.bigdataoss:gcsio:2.2.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud.bigdataoss:util:2.2.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud.bigtable:bigtable-client-core:1.26.3=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud.bigtable:bigtable-metrics-api:1.26.3=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud.datastore:datastore-v1-proto-client:2.9.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud.sql:jdbc-socket-factory-core:1.7.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud.sql:postgres-socket-factory:1.7.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud.sql:jdbc-socket-factory-core:1.8.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud.sql:postgres-socket-factory:1.8.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-bigquerystorage:2.23.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-bigtable-stats:2.14.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-bigtable:2.14.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-core-grpc:2.9.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-core-http:2.9.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-core:2.9.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-core-grpc:2.9.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-core-http:2.9.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-core:2.9.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-firestore:3.6.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-monitoring:1.82.0=compileClasspath,testCompileClasspath com.google.cloud:google-cloud-monitoring:3.4.6=default,runtimeClasspath,testRuntimeClasspath com.google.cloud:google-cloud-pubsub:1.120.20=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-pubsublite:1.7.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-secretmanager:2.6.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-secretmanager:2.8.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-spanner:6.31.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-storage:2.16.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-tasks:2.6.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-storage:2.17.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-tasks:2.8.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:grpc-gcp:1.2.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:proto-google-cloud-firestore-bundle-v1:3.6.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.code.gson:gson:2.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.code.gson:gson:2.10.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.common.html.types:types:1.0.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.dagger:dagger:2.44.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.errorprone:error_prone_annotations:2.16=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.18.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.escapevelocity:escapevelocity:0.9.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.flatbuffers:flatbuffers-java:1.12.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.flogger:flogger-system-backend:0.7.4=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -151,8 +150,8 @@ com.google.oauth-client:google-oauth-client-java6:1.34.1=compileClasspath,defaul com.google.oauth-client:google-oauth-client-jetty:1.34.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.oauth-client:google-oauth-client-servlet:1.34.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.oauth-client:google-oauth-client:1.34.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.protobuf:protobuf-java-util:3.21.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.protobuf:protobuf-java:3.21.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.protobuf:protobuf-java-util:3.21.12=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.protobuf:protobuf-java:3.21.12=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.template:soy:2021-02-01=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.truth:truth:1.1.3=default,runtimeClasspath,testRuntimeClasspath @@ -175,24 +174,24 @@ io.confluent:kafka-schema-registry-client:5.3.2=compileClasspath,default,runtime io.dropwizard.metrics:metrics-core:3.1.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.github.classgraph:classgraph:4.8.104=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.github.java-diff-utils:java-diff-utils:4.12=default,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-alts:1.51.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-api:1.51.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-auth:1.51.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-alts:1.51.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-api:1.51.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-auth:1.51.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.grpc:grpc-census:1.49.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-context:1.51.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-core:1.51.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-googleapis:1.51.0=default,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-grpclb:1.51.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-netty-shaded:1.51.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-context:1.51.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-core:1.51.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-googleapis:1.51.1=default,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-grpclb:1.51.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-netty-shaded:1.51.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.grpc:grpc-netty:1.49.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf-lite:1.51.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf:1.51.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf-lite:1.51.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf:1.51.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.grpc:grpc-rls:1.49.2=default,runtimeClasspath,testRuntimeClasspath io.grpc:grpc-services:1.49.2=compileClasspath,testCompileClasspath -io.grpc:grpc-services:1.51.0=default,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-stub:1.51.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-services:1.51.1=default,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-stub:1.51.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.grpc:grpc-xds:1.49.2=compileClasspath,testCompileClasspath -io.grpc:grpc-xds:1.51.0=default,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-xds:1.51.1=default,runtimeClasspath,testRuntimeClasspath io.netty:netty-buffer:4.1.77.Final=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-http2:4.1.77.Final=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-http:4.1.77.Final=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -257,13 +256,13 @@ org.apache.beam:beam-vendor-guava-26_0-jre:0.1=compileClasspath,default,runtimeC org.apache.commons:commons-compress:1.22=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.commons:commons-csv:1.9.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.commons:commons-lang3:3.12.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.httpcomponents:httpclient:4.5.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.httpcomponents:httpcore:4.4.15=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.httpcomponents:httpclient:4.5.14=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.httpcomponents:httpcore:4.4.16=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.bouncycastle:bcpg-jdk15on:1.67=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.bouncycastle:bcpkix-jdk15on:1.67=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.bouncycastle:bcprov-jdk15on:1.67=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.checkerframework:checker-compat-qual:2.5.5=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.checkerframework:checker-qual:3.28.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.29.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.jackson:jackson-core-asl:1.9.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.jackson:jackson-mapper-asl:1.9.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.22=default,runtimeClasspath,testRuntimeClasspath @@ -275,7 +274,7 @@ org.eclipse.jetty:jetty-server:9.4.49.v20220914=compileClasspath,default,runtime org.eclipse.jetty:jetty-servlet:9.4.49.v20220914=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util-ajax:9.4.49.v20220914=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util:9.4.49.v20220914=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-core:9.10.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-core:9.11.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:jaxb-runtime:2.3.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:txw2:2.3.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.gwtproject:gwt-user:2.10.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -298,8 +297,8 @@ org.ow2.asm:asm-util:9.4=compileClasspath,default,runtimeClasspath,testCompileCl org.ow2.asm:asm:9.4=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.postgresql:postgresql:42.5.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.rnorth.duct-tape:duct-tape:1.0.8=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.slf4j:slf4j-api:2.0.5=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.slf4j:slf4j-jdk14:2.0.5=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:2.0.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-jdk14:2.0.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.springframework:spring-core:5.3.18=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.springframework:spring-expression:5.3.18=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.springframework:spring-jcl:5.3.18=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -307,7 +306,7 @@ org.testcontainers:database-commons:1.17.6=compileClasspath,default,runtimeClass org.testcontainers:jdbc:1.17.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.testcontainers:postgresql:1.17.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.testcontainers:testcontainers:1.17.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.threeten:threetenbp:1.6.4=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.threeten:threetenbp:1.6.5=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.tukaani:xz:1.5=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.w3c.css:sac:1.3=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.xerial.snappy:snappy-java:1.1.8.4=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/util/gradle.lockfile b/util/gradle.lockfile index 36c075cc0..7dfc44ab8 100644 --- a/util/gradle.lockfile +++ b/util/gradle.lockfile @@ -11,37 +11,35 @@ com.github.docker-java:docker-java-transport:3.2.13=testCompileClasspath,testRun com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.android:annotations:4.1.1.4=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api-client:google-api-client:1.35.2=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2:2.6.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.96.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.96.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-common-protos:2.10.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-iam-v1:1.6.7=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:api-common:2.2.2=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax-grpc:2.19.5=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax-httpjson:0.104.5=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax:2.19.5=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2:2.8.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.98.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.98.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-common-protos:2.12.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-iam-v1:1.7.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:api-common:2.4.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax-grpc:2.21.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax-httpjson:0.106.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax:2.21.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.appengine:appengine-api-1.0-sdk:1.9.86=compileClasspath,default,deploy_jar,runtimeClasspath com.google.appengine:appengine-api-1.0-sdk:2.0.10=testCompileClasspath,testRuntimeClasspath com.google.appengine:appengine-api-stubs:2.0.10=testCompileClasspath,testRuntimeClasspath com.google.appengine:appengine-testing:1.9.86=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-credentials:1.12.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-credentials:1.13.0=compileClasspath,testCompileClasspath -com.google.auth:google-auth-library-oauth2-http:1.12.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-oauth2-http:1.13.0=compileClasspath,testCompileClasspath -com.google.auto.value:auto-value-annotations:1.10=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.auto.value:auto-value:1.10.1=annotationProcessor,default,deploy_jar,runtimeClasspath,testAnnotationProcessor,testRuntimeClasspath +com.google.auth:google-auth-library-credentials:1.14.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-oauth2-http:1.14.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auto.value:auto-value-annotations:1.10.1=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auto.value:auto-value:1.10.1=annotationProcessor,compileClasspath,default,deploy_jar,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.auto:auto-common:0.10=annotationProcessor,errorprone,testAnnotationProcessor -com.google.cloud:google-cloud-tasks:2.6.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-tasks:2.8.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.code.findbugs:jFormatString:3.0.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClasspath,default,deploy_jar,errorprone,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -com.google.code.gson:gson:2.10=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.code.gson:gson:2.10.1=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.dagger:dagger-compiler:2.44.2=annotationProcessor,testAnnotationProcessor com.google.dagger:dagger-producers:2.44.2=annotationProcessor,testAnnotationProcessor com.google.dagger:dagger-spi:2.44.2=annotationProcessor,testAnnotationProcessor com.google.dagger:dagger:2.44.2=annotationProcessor,compileClasspath,default,deploy_jar,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.devtools.ksp:symbol-processing-api:1.7.0-1.0.6=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotation:2.3.4=annotationProcessor,errorprone,testAnnotationProcessor -com.google.errorprone:error_prone_annotations:2.16=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.18.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.3.4=checkstyle,errorprone com.google.errorprone:error_prone_annotations:2.7.1=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_check_api:2.3.4=annotationProcessor,errorprone,testAnnotationProcessor @@ -64,11 +62,9 @@ com.google.http-client:google-http-client:1.42.3=compileClasspath,default,deploy com.google.j2objc:j2objc-annotations:1.1=errorprone com.google.j2objc:j2objc-annotations:1.3=annotationProcessor,checkstyle,compileClasspath,default,deploy_jar,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.oauth-client:google-oauth-client:1.34.1=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.protobuf:protobuf-java-util:3.21.9=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.protobuf:protobuf-java-util:4.0.0-rc-2=compileClasspath,testCompileClasspath -com.google.protobuf:protobuf-java:3.21.9=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.protobuf:protobuf-java-util:3.21.12=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.protobuf:protobuf-java:3.21.12=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.protobuf:protobuf-java:3.4.0=annotationProcessor,errorprone,testAnnotationProcessor -com.google.protobuf:protobuf-java:4.0.0-rc-2=compileClasspath,testCompileClasspath com.google.re2j:re2j:1.6=default,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.re2j:re2j:1.7=compileClasspath,testCompileClasspath com.google.truth:truth:1.1.3=default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -83,19 +79,19 @@ commons-collections:commons-collections:3.2.2=checkstyle commons-logging:commons-logging:1.2=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath info.picocli:picocli:4.5.2=checkstyle io.github.java-diff-utils:java-diff-utils:4.12=default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-alts:1.50.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-api:1.50.2=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-auth:1.50.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-context:1.50.2=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-core:1.50.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-googleapis:1.50.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-grpclb:1.50.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-netty-shaded:1.50.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf-lite:1.50.2=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf:1.50.2=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-services:1.50.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-stub:1.50.2=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-xds:1.50.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-alts:1.51.1=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-api:1.51.1=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-auth:1.51.1=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-context:1.51.1=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-core:1.51.1=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-googleapis:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-grpclb:1.51.1=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-netty-shaded:1.51.1=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf-lite:1.51.1=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf:1.51.1=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-services:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-stub:1.51.1=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-xds:1.51.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath io.opencensus:opencensus-api:0.31.1=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opencensus:opencensus-contrib-http-util:0.31.1=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opencensus:opencensus-proto:0.2.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -108,15 +104,15 @@ javax.mail:mail:1.5.0-b01=compileClasspath,default,deploy_jar,runtimeClasspath,t javax.xml.bind:jaxb-api:2.4.0-b180830.0359=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath joda-time:joda-time:2.12.2=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath junit:junit:4.13.2=default,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.12.16=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.12.16=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.12.19=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.12.19=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=testCompileClasspath,testRuntimeClasspath net.ltgt.gradle.incap:incap:0.2=annotationProcessor,testAnnotationProcessor net.sf.saxon:Saxon-HE:10.3=checkstyle org.antlr:antlr4-runtime:4.8-1=checkstyle org.apache.commons:commons-compress:1.22=testCompileClasspath,testRuntimeClasspath -org.apache.httpcomponents:httpclient:4.5.13=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.httpcomponents:httpcore:4.4.15=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.httpcomponents:httpclient:4.5.14=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.httpcomponents:httpcore:4.4.16=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.bouncycastle:bcpkix-jdk15on:1.67=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.bouncycastle:bcprov-jdk15on:1.67=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -124,12 +120,12 @@ org.checkerframework:checker-compat-qual:2.5.5=annotationProcessor,compileClassp org.checkerframework:checker-qual:2.11.1=checkstyle org.checkerframework:checker-qual:3.0.0=errorprone org.checkerframework:checker-qual:3.12.0=annotationProcessor,testAnnotationProcessor -org.checkerframework:checker-qual:3.27.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.29.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.checkerframework:dataflow:3.0.0=annotationProcessor,errorprone,testAnnotationProcessor org.checkerframework:javacutil:3.0.0=annotationProcessor,errorprone,testAnnotationProcessor org.codehaus.mojo:animal-sniffer-annotations:1.17=errorprone org.codehaus.mojo:animal-sniffer-annotations:1.22=default,deploy_jar,runtimeClasspath,testRuntimeClasspath -org.conscrypt:conscrypt-openjdk-uber:2.5.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath +org.conscrypt:conscrypt-openjdk-uber:2.5.2=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hamcrest:hamcrest-core:1.3=default org.hamcrest:hamcrest-core:2.2=testCompileClasspath,testRuntimeClasspath org.hamcrest:hamcrest:2.2=testCompileClasspath,testRuntimeClasspath @@ -146,17 +142,17 @@ org.jetbrains.kotlin:kotlin-stdlib:1.7.0=annotationProcessor,testAnnotationProce org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.5.0=annotationProcessor,testAnnotationProcessor org.jetbrains:annotations:13.0=annotationProcessor,testAnnotationProcessor org.jetbrains:annotations:17.0.0=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-engine:5.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-launcher:1.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-runner:1.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-suite-api:1.9.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-suite-commons:1.9.1=testRuntimeClasspath -org.junit:junit-bom:5.9.1=testCompileClasspath,testRuntimeClasspath -org.mockito:mockito-core:4.9.0=testCompileClasspath,testRuntimeClasspath -org.mockito:mockito-junit-jupiter:4.9.0=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-launcher:1.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-runner:1.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-suite-api:1.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-suite-commons:1.9.2=testRuntimeClasspath +org.junit:junit-bom:5.9.2=testCompileClasspath,testRuntimeClasspath +org.mockito:mockito-core:4.11.0=testCompileClasspath,testRuntimeClasspath +org.mockito:mockito-junit-jupiter:4.11.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=testRuntimeClasspath org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:8.0.1=jacocoAnt @@ -173,6 +169,6 @@ org.rnorth.duct-tape:duct-tape:1.0.8=testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-api:1.7.36=testCompileClasspath,testRuntimeClasspath org.testcontainers:junit-jupiter:1.17.6=testCompileClasspath,testRuntimeClasspath org.testcontainers:testcontainers:1.17.6=testCompileClasspath,testRuntimeClasspath -org.threeten:threetenbp:1.6.4=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.threeten:threetenbp:1.6.5=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.yaml:snakeyaml:1.33=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=archives,errorproneJavac diff --git a/util/src/main/java/google/registry/util/DiffUtils.java b/util/src/main/java/google/registry/util/DiffUtils.java index d74821f0f..9bc9eff15 100644 --- a/util/src/main/java/google/registry/util/DiffUtils.java +++ b/util/src/main/java/google/registry/util/DiffUtils.java @@ -55,7 +55,7 @@ public final class DiffUtils { } } - /** Pretty-prints a deep diff between two maps that represent Datastore entities. */ + /** Pretty-prints a deep diff between two maps that represent entities. */ public static String prettyPrintEntityDeepDiff(Map a, Map b) { return prettyPrintDiffedMap(deepDiff(a, b, true), null); } diff --git a/util/src/main/java/google/registry/util/ListNamingUtils.java b/util/src/main/java/google/registry/util/ListNamingUtils.java index 1c7ba1dd6..2c1fe9e2f 100644 --- a/util/src/main/java/google/registry/util/ListNamingUtils.java +++ b/util/src/main/java/google/registry/util/ListNamingUtils.java @@ -17,9 +17,7 @@ package google.registry.util; import com.google.common.io.Files; import java.nio.file.Path; -/** - * A utility class for conversion of input file paths into names for entities in Datastore. - */ +/** A utility class for conversion of input file paths into names for entities in the database. */ public final class ListNamingUtils { /** Turns a file path into a name suitable for use as the name of a premium or reserved list. */ diff --git a/util/src/main/java/google/registry/util/RegistrarUtils.java b/util/src/main/java/google/registry/util/RegistrarUtils.java index 65cd84368..1600e7078 100644 --- a/util/src/main/java/google/registry/util/RegistrarUtils.java +++ b/util/src/main/java/google/registry/util/RegistrarUtils.java @@ -31,8 +31,8 @@ public class RegistrarUtils { /** * Returns a normalized registrar ID by taking the input and making it lowercase and removing all - * characters that aren't alphanumeric or hyphens. The normalized id should be unique in - * Datastore, and is suitable for use in email addresses. + * characters that aren't alphanumeric or hyphens. The normalized id should be unique in the + * database, and is suitable for use in email addresses. */ public static String normalizeRegistrarId(String registrarId) { return Ascii.toLowerCase(registrarId).replaceAll("[^a-z0-9\\-]", "");