From dd0e3b7c24b176dd7add2ef453b433255bebd47a Mon Sep 17 00:00:00 2001 From: Lai Jiang Date: Mon, 23 Dec 2019 13:09:47 -0500 Subject: [PATCH] Consolidate certificate supplier module (#410) * Consolidate certificate supplier module Both the proxy and the proxy needs certificate suppliers. The PR consolidates the module that providings those bindings to a shared module and switched the proxy to use that module. The prober currently uses P12 file to store its certificates. I am debating keeping that supplier ro converting them to PEM files for simplicity. * Rename mode enum values to be more descriptive * Update annotation names to be more descriptive --- core/gradle/dependency-locks/compile.lockfile | 28 +-- .../compileClasspath.lockfile | 28 +-- core/gradle/dependency-locks/default.lockfile | 28 +-- .../dependency-locks/deploy_jar.lockfile | 28 +-- core/gradle/dependency-locks/runtime.lockfile | 28 +-- .../runtimeClasspath.lockfile | 28 +-- .../dependency-locks/testCompile.lockfile | 28 +-- .../testCompileClasspath.lockfile | 28 +-- .../dependency-locks/testRuntime.lockfile | 28 +-- .../testRuntimeClasspath.lockfile | 28 +-- networking/build.gradle | 6 + .../annotationProcessor.lockfile | 10 + .../gradle/dependency-locks/compile.lockfile | 2 + .../compileClasspath.lockfile | 2 + .../gradle/dependency-locks/default.lockfile | 2 + .../dependency-locks/deploy_jar.lockfile | 2 + .../gradle/dependency-locks/runtime.lockfile | 2 + .../runtimeClasspath.lockfile | 2 + .../testAnnotationProcessor.lockfile | 10 + .../module/CertificateSupplierModule.java | 178 ++++++++++++------ .../module/CertificateSupplierModuleTest.java | 119 +++++++----- .../google/registry/proxy/ProxyModule.java | 22 ++- .../registry/proxy/ProtocolModuleTest.java | 22 ++- .../gradle/dependency-locks/compile.lockfile | 28 +-- .../compileClasspath.lockfile | 28 +-- .../gradle/dependency-locks/default.lockfile | 28 +-- .../gradle/dependency-locks/runtime.lockfile | 28 +-- .../runtimeClasspath.lockfile | 28 +-- .../dependency-locks/testCompile.lockfile | 28 +-- .../testCompileClasspath.lockfile | 28 +-- .../dependency-locks/testRuntime.lockfile | 28 +-- .../testRuntimeClasspath.lockfile | 28 +-- .../gradle/dependency-locks/compile.lockfile | 28 +-- .../compileClasspath.lockfile | 28 +-- .../gradle/dependency-locks/default.lockfile | 28 +-- .../gradle/dependency-locks/runtime.lockfile | 28 +-- .../runtimeClasspath.lockfile | 28 +-- .../dependency-locks/testCompile.lockfile | 28 +-- .../testCompileClasspath.lockfile | 28 +-- .../dependency-locks/testRuntime.lockfile | 28 +-- .../testRuntimeClasspath.lockfile | 28 +-- .../gradle/dependency-locks/compile.lockfile | 28 +-- .../compileClasspath.lockfile | 28 +-- .../gradle/dependency-locks/default.lockfile | 28 +-- .../gradle/dependency-locks/runtime.lockfile | 28 +-- .../runtimeClasspath.lockfile | 28 +-- .../dependency-locks/testCompile.lockfile | 28 +-- .../testCompileClasspath.lockfile | 28 +-- .../dependency-locks/testRuntime.lockfile | 28 +-- .../testRuntimeClasspath.lockfile | 28 +-- .../gradle/dependency-locks/compile.lockfile | 28 +-- .../compileClasspath.lockfile | 28 +-- .../gradle/dependency-locks/default.lockfile | 28 +-- .../gradle/dependency-locks/runtime.lockfile | 28 +-- .../runtimeClasspath.lockfile | 28 +-- .../dependency-locks/testCompile.lockfile | 28 +-- .../testCompileClasspath.lockfile | 28 +-- .../dependency-locks/testRuntime.lockfile | 28 +-- .../testRuntimeClasspath.lockfile | 28 +-- 59 files changed, 909 insertions(+), 758 deletions(-) rename proxy/src/main/java/google/registry/proxy/CertificateModule.java => networking/src/main/java/google/registry/networking/module/CertificateSupplierModule.java (60%) rename proxy/src/test/java/google/registry/proxy/CertificateModuleTest.java => networking/src/test/java/google/registry/networking/module/CertificateSupplierModuleTest.java (51%) diff --git a/core/gradle/dependency-locks/compile.lockfile b/core/gradle/dependency-locks/compile.lockfile index 3d383f5dd..0a42113fa 100644 --- a/core/gradle/dependency-locks/compile.lockfile +++ b/core/gradle/dependency-locks/compile.lockfile @@ -10,11 +10,11 @@ com.fasterxml.jackson.core:jackson-annotations:2.9.10 com.fasterxml.jackson.core:jackson-core:2.9.10 com.fasterxml.jackson.core:jackson-databind:2.9.10 com.fasterxml:classmate:1.3.4 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -84,22 +84,22 @@ com.google.guava:failureaccess:1.0.1 com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -124,7 +124,7 @@ io.dropwizard.metrics:metrics-core:3.1.2 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-grpclb:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 @@ -146,10 +146,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -183,8 +183,8 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 diff --git a/core/gradle/dependency-locks/compileClasspath.lockfile b/core/gradle/dependency-locks/compileClasspath.lockfile index 122f7b0ce..40c6897f2 100644 --- a/core/gradle/dependency-locks/compileClasspath.lockfile +++ b/core/gradle/dependency-locks/compileClasspath.lockfile @@ -10,11 +10,11 @@ com.fasterxml.jackson.core:jackson-annotations:2.9.10 com.fasterxml.jackson.core:jackson-core:2.9.10 com.fasterxml.jackson.core:jackson-databind:2.9.10 com.fasterxml:classmate:1.3.4 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -83,22 +83,22 @@ com.google.guava:failureaccess:1.0.1 com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -123,7 +123,7 @@ io.dropwizard.metrics:metrics-core:3.1.2 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 io.grpc:grpc-netty:1.17.1 @@ -144,10 +144,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -180,8 +180,8 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 diff --git a/core/gradle/dependency-locks/default.lockfile b/core/gradle/dependency-locks/default.lockfile index f75b37858..305e2e2ff 100644 --- a/core/gradle/dependency-locks/default.lockfile +++ b/core/gradle/dependency-locks/default.lockfile @@ -18,11 +18,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -95,22 +95,22 @@ com.google.guava:failureaccess:1.0.1 com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -135,7 +135,7 @@ io.dropwizard.metrics:metrics-core:3.1.2 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-grpclb:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 @@ -157,10 +157,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -194,8 +194,8 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 diff --git a/core/gradle/dependency-locks/deploy_jar.lockfile b/core/gradle/dependency-locks/deploy_jar.lockfile index d3e7ad1c9..186a1a743 100644 --- a/core/gradle/dependency-locks/deploy_jar.lockfile +++ b/core/gradle/dependency-locks/deploy_jar.lockfile @@ -18,11 +18,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -95,22 +95,22 @@ com.google.guava:failureaccess:1.0.1 com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -135,7 +135,7 @@ io.dropwizard.metrics:metrics-core:3.1.2 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-grpclb:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 @@ -157,10 +157,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -193,8 +193,8 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 diff --git a/core/gradle/dependency-locks/runtime.lockfile b/core/gradle/dependency-locks/runtime.lockfile index 40ebc8cb3..505484ffa 100644 --- a/core/gradle/dependency-locks/runtime.lockfile +++ b/core/gradle/dependency-locks/runtime.lockfile @@ -10,11 +10,11 @@ com.fasterxml.jackson.core:jackson-annotations:2.9.10 com.fasterxml.jackson.core:jackson-core:2.9.10 com.fasterxml.jackson.core:jackson-databind:2.9.10 com.fasterxml:classmate:1.3.4 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -84,22 +84,22 @@ com.google.guava:failureaccess:1.0.1 com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -124,7 +124,7 @@ io.dropwizard.metrics:metrics-core:3.1.2 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-grpclb:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 @@ -146,10 +146,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -183,8 +183,8 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 diff --git a/core/gradle/dependency-locks/runtimeClasspath.lockfile b/core/gradle/dependency-locks/runtimeClasspath.lockfile index d3e7ad1c9..186a1a743 100644 --- a/core/gradle/dependency-locks/runtimeClasspath.lockfile +++ b/core/gradle/dependency-locks/runtimeClasspath.lockfile @@ -18,11 +18,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -95,22 +95,22 @@ com.google.guava:failureaccess:1.0.1 com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -135,7 +135,7 @@ io.dropwizard.metrics:metrics-core:3.1.2 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-grpclb:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 @@ -157,10 +157,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -193,8 +193,8 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 diff --git a/core/gradle/dependency-locks/testCompile.lockfile b/core/gradle/dependency-locks/testCompile.lockfile index 735e1b392..064e30af6 100644 --- a/core/gradle/dependency-locks/testCompile.lockfile +++ b/core/gradle/dependency-locks/testCompile.lockfile @@ -10,11 +10,11 @@ com.fasterxml.jackson.core:jackson-annotations:2.9.10 com.fasterxml.jackson.core:jackson-core:2.9.10 com.fasterxml.jackson.core:jackson-databind:2.9.10 com.fasterxml:classmate:1.3.4 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -86,11 +86,11 @@ com.google.guava:guava-testlib:28.1-jre com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 @@ -98,11 +98,11 @@ com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:contrib:1.0.6 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -133,7 +133,7 @@ io.github.classgraph:classgraph:4.8.52 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-grpclb:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 @@ -155,10 +155,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -198,8 +198,8 @@ org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.6 org.apache.ftpserver:ftplet-api:1.0.6 org.apache.ftpserver:ftpserver-core:1.0.6 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.apache.mina:mina-core:2.0.4 org.apache.sshd:sshd-core:2.0.0 org.apache.sshd:sshd-scp:2.0.0 diff --git a/core/gradle/dependency-locks/testCompileClasspath.lockfile b/core/gradle/dependency-locks/testCompileClasspath.lockfile index 42a3fbc96..42c57ece2 100644 --- a/core/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/core/gradle/dependency-locks/testCompileClasspath.lockfile @@ -10,11 +10,11 @@ com.fasterxml.jackson.core:jackson-annotations:2.9.10 com.fasterxml.jackson.core:jackson-core:2.9.10 com.fasterxml.jackson.core:jackson-databind:2.9.10 com.fasterxml:classmate:1.3.4 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -85,11 +85,11 @@ com.google.guava:guava-testlib:28.1-jre com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 @@ -97,11 +97,11 @@ com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:contrib:1.0.6 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -132,7 +132,7 @@ io.github.classgraph:classgraph:4.8.52 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 io.grpc:grpc-netty:1.17.1 @@ -153,10 +153,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -196,8 +196,8 @@ org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.6 org.apache.ftpserver:ftplet-api:1.0.6 org.apache.ftpserver:ftpserver-core:1.0.6 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.apache.mina:mina-core:2.0.4 org.apache.sshd:sshd-core:2.0.0 org.apache.sshd:sshd-scp:2.0.0 diff --git a/core/gradle/dependency-locks/testRuntime.lockfile b/core/gradle/dependency-locks/testRuntime.lockfile index 55205f815..5dbb203ac 100644 --- a/core/gradle/dependency-locks/testRuntime.lockfile +++ b/core/gradle/dependency-locks/testRuntime.lockfile @@ -18,11 +18,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -97,11 +97,11 @@ com.google.guava:guava-testlib:28.1-jre com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 @@ -109,11 +109,11 @@ com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:contrib:1.0.6 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -145,7 +145,7 @@ io.github.java-diff-utils:java-diff-utils:4.0 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-grpclb:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 @@ -167,10 +167,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -210,8 +210,8 @@ org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.6 org.apache.ftpserver:ftplet-api:1.0.6 org.apache.ftpserver:ftpserver-core:1.0.6 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.apache.mina:mina-core:2.0.4 org.apache.sshd:sshd-core:2.0.0 org.apache.sshd:sshd-scp:2.0.0 diff --git a/core/gradle/dependency-locks/testRuntimeClasspath.lockfile b/core/gradle/dependency-locks/testRuntimeClasspath.lockfile index 55205f815..5dbb203ac 100644 --- a/core/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/core/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -18,11 +18,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -97,11 +97,11 @@ com.google.guava:guava-testlib:28.1-jre com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 @@ -109,11 +109,11 @@ com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:contrib:1.0.6 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -145,7 +145,7 @@ io.github.java-diff-utils:java-diff-utils:4.0 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-grpclb:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 @@ -167,10 +167,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -210,8 +210,8 @@ org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-text:1.6 org.apache.ftpserver:ftplet-api:1.0.6 org.apache.ftpserver:ftpserver-core:1.0.6 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.apache.mina:mina-core:2.0.4 org.apache.sshd:sshd-core:2.0.0 org.apache.sshd:sshd-scp:2.0.0 diff --git a/networking/build.gradle b/networking/build.gradle index f9609e217..8edc9fbfe 100644 --- a/networking/build.gradle +++ b/networking/build.gradle @@ -15,6 +15,7 @@ dependencies { def deps = rootProject.dependencyMap + compile deps['com.google.dagger:dagger'] compile deps['com.google.flogger:flogger'] compile deps['com.google.guava:guava'] compile deps['io.netty:netty-buffer'] @@ -24,6 +25,8 @@ dependencies { compile deps['io.netty:netty-handler'] compile deps['io.netty:netty-transport'] compile deps['javax.inject:javax.inject'] + compile deps['org.bouncycastle:bcpkix-jdk15on'] + compile deps['org.bouncycastle:bcprov-jdk15on'] compile project(':util') runtime deps['com.google.flogger:flogger-system-backend'] @@ -34,6 +37,9 @@ dependencies { testCompile deps['org.bouncycastle:bcpkix-jdk15on'] testCompile deps['org.bouncycastle:bcprov-jdk15on'] testCompile project(':third_party') + + annotationProcessor deps['com.google.dagger:dagger-compiler'] + testAnnotationProcessor deps['com.google.dagger:dagger-compiler'] } // Make testing artifacts available to be depended up on by other projects. diff --git a/networking/gradle/dependency-locks/annotationProcessor.lockfile b/networking/gradle/dependency-locks/annotationProcessor.lockfile index 0e2d9b8d4..1db853a97 100644 --- a/networking/gradle/dependency-locks/annotationProcessor.lockfile +++ b/networking/gradle/dependency-locks/annotationProcessor.lockfile @@ -6,17 +6,27 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1 com.google.auto:auto-common:0.10 com.google.code.findbugs:jFormatString:3.0.0 com.google.code.findbugs:jsr305:3.0.2 +com.google.dagger:dagger-compiler:2.21 +com.google.dagger:dagger-producers:2.21 +com.google.dagger:dagger-spi:2.21 +com.google.dagger:dagger:2.21 com.google.errorprone:error_prone_annotation:2.3.3 com.google.errorprone:error_prone_annotations:2.3.3 com.google.errorprone:error_prone_check_api:2.3.3 com.google.errorprone:error_prone_core:2.3.3 com.google.errorprone:error_prone_type_annotations:2.3.3 +com.google.errorprone:javac-shaded:9-dev-r4023-3 +com.google.googlejavaformat:google-java-format:1.5 com.google.guava:failureaccess:1.0.1 com.google.guava:guava:27.0.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.j2objc:j2objc-annotations:1.1 com.google.protobuf:protobuf-java:3.4.0 com.googlecode.java-diff-utils:diffutils:1.3.0 +com.squareup:javapoet:1.11.1 +javax.annotation:jsr250-api:1.0 +javax.inject:javax.inject:1 +org.checkerframework:checker-compat-qual:2.5.3 org.checkerframework:checker-qual:2.5.3 org.checkerframework:dataflow:2.5.3 org.checkerframework:javacutil:2.5.3 diff --git a/networking/gradle/dependency-locks/compile.lockfile b/networking/gradle/dependency-locks/compile.lockfile index 13bd5a865..59f0034e9 100644 --- a/networking/gradle/dependency-locks/compile.lockfile +++ b/networking/gradle/dependency-locks/compile.lockfile @@ -41,6 +41,8 @@ javax.xml.bind:jaxb-api:2.3.0 joda-time:joda-time:2.9.2 org.apache.httpcomponents:httpclient:4.5.8 org.apache.httpcomponents:httpcore:4.4.11 +org.bouncycastle:bcpkix-jdk15on:1.61 +org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 org.codehaus.mojo:animal-sniffer-annotations:1.18 org.yaml:snakeyaml:1.17 diff --git a/networking/gradle/dependency-locks/compileClasspath.lockfile b/networking/gradle/dependency-locks/compileClasspath.lockfile index 13bd5a865..59f0034e9 100644 --- a/networking/gradle/dependency-locks/compileClasspath.lockfile +++ b/networking/gradle/dependency-locks/compileClasspath.lockfile @@ -41,6 +41,8 @@ javax.xml.bind:jaxb-api:2.3.0 joda-time:joda-time:2.9.2 org.apache.httpcomponents:httpclient:4.5.8 org.apache.httpcomponents:httpcore:4.4.11 +org.bouncycastle:bcpkix-jdk15on:1.61 +org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 org.codehaus.mojo:animal-sniffer-annotations:1.18 org.yaml:snakeyaml:1.17 diff --git a/networking/gradle/dependency-locks/default.lockfile b/networking/gradle/dependency-locks/default.lockfile index ccbad5fb1..474a213a1 100644 --- a/networking/gradle/dependency-locks/default.lockfile +++ b/networking/gradle/dependency-locks/default.lockfile @@ -43,6 +43,8 @@ javax.xml.bind:jaxb-api:2.3.0 joda-time:joda-time:2.9.2 org.apache.httpcomponents:httpclient:4.5.8 org.apache.httpcomponents:httpcore:4.4.11 +org.bouncycastle:bcpkix-jdk15on:1.61 +org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 org.codehaus.mojo:animal-sniffer-annotations:1.18 org.yaml:snakeyaml:1.17 diff --git a/networking/gradle/dependency-locks/deploy_jar.lockfile b/networking/gradle/dependency-locks/deploy_jar.lockfile index ccbad5fb1..474a213a1 100644 --- a/networking/gradle/dependency-locks/deploy_jar.lockfile +++ b/networking/gradle/dependency-locks/deploy_jar.lockfile @@ -43,6 +43,8 @@ javax.xml.bind:jaxb-api:2.3.0 joda-time:joda-time:2.9.2 org.apache.httpcomponents:httpclient:4.5.8 org.apache.httpcomponents:httpcore:4.4.11 +org.bouncycastle:bcpkix-jdk15on:1.61 +org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 org.codehaus.mojo:animal-sniffer-annotations:1.18 org.yaml:snakeyaml:1.17 diff --git a/networking/gradle/dependency-locks/runtime.lockfile b/networking/gradle/dependency-locks/runtime.lockfile index ccbad5fb1..474a213a1 100644 --- a/networking/gradle/dependency-locks/runtime.lockfile +++ b/networking/gradle/dependency-locks/runtime.lockfile @@ -43,6 +43,8 @@ javax.xml.bind:jaxb-api:2.3.0 joda-time:joda-time:2.9.2 org.apache.httpcomponents:httpclient:4.5.8 org.apache.httpcomponents:httpcore:4.4.11 +org.bouncycastle:bcpkix-jdk15on:1.61 +org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 org.codehaus.mojo:animal-sniffer-annotations:1.18 org.yaml:snakeyaml:1.17 diff --git a/networking/gradle/dependency-locks/runtimeClasspath.lockfile b/networking/gradle/dependency-locks/runtimeClasspath.lockfile index ccbad5fb1..474a213a1 100644 --- a/networking/gradle/dependency-locks/runtimeClasspath.lockfile +++ b/networking/gradle/dependency-locks/runtimeClasspath.lockfile @@ -43,6 +43,8 @@ javax.xml.bind:jaxb-api:2.3.0 joda-time:joda-time:2.9.2 org.apache.httpcomponents:httpclient:4.5.8 org.apache.httpcomponents:httpcore:4.4.11 +org.bouncycastle:bcpkix-jdk15on:1.61 +org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 org.codehaus.mojo:animal-sniffer-annotations:1.18 org.yaml:snakeyaml:1.17 diff --git a/networking/gradle/dependency-locks/testAnnotationProcessor.lockfile b/networking/gradle/dependency-locks/testAnnotationProcessor.lockfile index 0e2d9b8d4..1db853a97 100644 --- a/networking/gradle/dependency-locks/testAnnotationProcessor.lockfile +++ b/networking/gradle/dependency-locks/testAnnotationProcessor.lockfile @@ -6,17 +6,27 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1 com.google.auto:auto-common:0.10 com.google.code.findbugs:jFormatString:3.0.0 com.google.code.findbugs:jsr305:3.0.2 +com.google.dagger:dagger-compiler:2.21 +com.google.dagger:dagger-producers:2.21 +com.google.dagger:dagger-spi:2.21 +com.google.dagger:dagger:2.21 com.google.errorprone:error_prone_annotation:2.3.3 com.google.errorprone:error_prone_annotations:2.3.3 com.google.errorprone:error_prone_check_api:2.3.3 com.google.errorprone:error_prone_core:2.3.3 com.google.errorprone:error_prone_type_annotations:2.3.3 +com.google.errorprone:javac-shaded:9-dev-r4023-3 +com.google.googlejavaformat:google-java-format:1.5 com.google.guava:failureaccess:1.0.1 com.google.guava:guava:27.0.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.j2objc:j2objc-annotations:1.1 com.google.protobuf:protobuf-java:3.4.0 com.googlecode.java-diff-utils:diffutils:1.3.0 +com.squareup:javapoet:1.11.1 +javax.annotation:jsr250-api:1.0 +javax.inject:javax.inject:1 +org.checkerframework:checker-compat-qual:2.5.3 org.checkerframework:checker-qual:2.5.3 org.checkerframework:dataflow:2.5.3 org.checkerframework:javacutil:2.5.3 diff --git a/proxy/src/main/java/google/registry/proxy/CertificateModule.java b/networking/src/main/java/google/registry/networking/module/CertificateSupplierModule.java similarity index 60% rename from proxy/src/main/java/google/registry/proxy/CertificateModule.java rename to networking/src/main/java/google/registry/networking/module/CertificateSupplierModule.java index 67c408bf2..ae43d7061 100644 --- a/proxy/src/main/java/google/registry/proxy/CertificateModule.java +++ b/networking/src/main/java/google/registry/networking/module/CertificateSupplierModule.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.proxy; +package google.registry.networking.module; import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Suppliers.memoizeWithExpiration; @@ -20,11 +20,11 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.concurrent.TimeUnit.SECONDS; +import com.google.common.base.Suppliers; import com.google.common.collect.ImmutableList; import dagger.Lazy; import dagger.Module; import dagger.Provides; -import google.registry.proxy.ProxyConfig.Environment; import io.netty.handler.ssl.util.SelfSignedCertificate; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -33,6 +33,7 @@ import java.security.PrivateKey; import java.security.Security; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; +import java.time.Duration; import java.util.function.Function; import java.util.function.Supplier; import javax.inject.Named; @@ -48,7 +49,12 @@ import org.bouncycastle.openssl.PEMParser; import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter; /** - * Dagger module that provides bindings needed to inject server certificate chain and private key. + * Dagger module that provides bindings needed to inject a certificate chain the corresponding + * private key. + * + *

There are several ways ({@link Mode}s) that the certificate/key can be provided (explained + * later), and the user of this module needs to provide the binding to the {@link Mode} in some + * other module to the component. * *

The production certificates and private key are stored in a .pem file that is encrypted by * Cloud KMS. The .pem file can be generated by concatenating the .crt certificate files on the @@ -62,31 +68,45 @@ import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter; * @see Cloud Key Management Service */ @Module -public final class CertificateModule { - - private CertificateModule() {} - - /** Dagger qualifier to provide bindings related to the certificates that the server provides. */ - @Qualifier - private @interface ServerCertificates {} - - /** Dagger qualifier to provide bindings when running locally. */ - @Qualifier - private @interface Local {} - - /** - * Dagger qualifier to provide bindings when running in production. - * - *

The "production" here means that the proxy runs on GKE, as apposed to on a local machine. It - * does not necessary mean the production environment. - */ - @Qualifier - @interface Prod {} +public final class CertificateSupplierModule { static { Security.addProvider(new BouncyCastleProvider()); } + private CertificateSupplierModule() {} + + public enum Mode { + + /** + * The certificate chain and the private key are stored in a single PEM file. + * + *

Both certificates and private key are Base64 encoded and the single PEM file is generated + * by concatenating each ASCII-armored block. The private key can appear anywhere in the list + * but the certificates must appear in order, i. e. the next certificate's subject is the + * previous certificates's issuer. + * + * @see Privacy-Enhanced Email + */ + PEM_FILE, + + P12_FILE, + + /** + * A single certificate/private key pair is generated in place and self signed. Used in tests. + */ + SELF_SIGNED + } + + @Qualifier + @interface PemFile {} + + @Qualifier + private @interface P12File {} + + @Qualifier + private @interface SelfSigned {} + /** * Select specific type from a given {@link ImmutableList} and convert them using the converter. * @@ -106,36 +126,39 @@ public final class CertificateModule { @Singleton @Provides static Supplier providePrivateKeySupplier( - @ServerCertificates Provider privateKeyProvider, ProxyConfig config) { - return memoizeWithExpiration( - privateKeyProvider::get, config.serverCertificateCacheSeconds, SECONDS); + Mode mode, + @PemFile Lazy> pemPrivateKeySupplier, + @P12File Lazy> p12PrivateKeySupplier, + @SelfSigned Lazy> selfSignedPrivateKeySupplier) { + switch (mode) { + case PEM_FILE: + return pemPrivateKeySupplier.get(); + case P12_FILE: + return p12PrivateKeySupplier.get(); + case SELF_SIGNED: + return selfSignedPrivateKeySupplier.get(); + default: + throw new RuntimeException("Certificate provider mode exhausted."); + } } @Singleton @Provides static Supplier> provideCertificatesSupplier( - @ServerCertificates Provider> certificatesProvider, - ProxyConfig config) { - return memoizeWithExpiration( - certificatesProvider::get, config.serverCertificateCacheSeconds, SECONDS); - } - - @Provides - @ServerCertificates - static ImmutableList provideCertificates( - Environment env, - @Local Lazy> localCertificates, - @Prod Lazy> prodCertificates) { - return env == Environment.LOCAL ? localCertificates.get() : prodCertificates.get(); - } - - @Provides - @ServerCertificates - static PrivateKey providePrivateKey( - Environment env, - @Local Lazy localPrivateKey, - @Prod Lazy prodPrivateKey) { - return env == Environment.LOCAL ? localPrivateKey.get() : prodPrivateKey.get(); + Mode mode, + @PemFile Lazy>> pemCertificatesSupplier, + @P12File Lazy>> p12CertificatesSupplier, + @SelfSigned Lazy>> selfSignedCertificatesSupplier) { + switch (mode) { + case PEM_FILE: + return pemCertificatesSupplier.get(); + case P12_FILE: + return p12CertificatesSupplier.get(); + case SELF_SIGNED: + return selfSignedCertificatesSupplier.get(); + default: + throw new RuntimeException("Certificate provider mode exhausted."); + } } @Singleton @@ -150,20 +173,21 @@ public final class CertificateModule { @Singleton @Provides - @Local - static PrivateKey provideLocalPrivateKey(SelfSignedCertificate ssc) { - return ssc.key(); + @SelfSigned + static Supplier provideSelfSignedPrivateKeySupplier(SelfSignedCertificate ssc) { + return Suppliers.ofInstance(ssc.key()); } @Singleton @Provides - @Local - static ImmutableList provideLocalCertificates(SelfSignedCertificate ssc) { - return ImmutableList.of(ssc.cert()); + @SelfSigned + static Supplier> provideSelfSignedCertificatesSupplier( + SelfSignedCertificate ssc) { + return Suppliers.ofInstance(ImmutableList.of(ssc.cert())); } @Provides - @Named("pemObjects") + @PemFile static ImmutableList providePemObjects(@Named("pemBytes") byte[] pemBytes) { PEMParser pemParser = new PEMParser(new InputStreamReader(new ByteArrayInputStream(pemBytes), UTF_8)); @@ -188,8 +212,8 @@ public final class CertificateModule { // This binding should not be used directly. Use the supplier binding instead. @Provides - @Prod - static PrivateKey provideProdPrivateKey(@Named("pemObjects") ImmutableList pemObjects) { + @PemFile + static PrivateKey providePemPrivateKey(@PemFile ImmutableList pemObjects) { JcaPEMKeyConverter converter = new JcaPEMKeyConverter().setProvider("BC"); Function privateKeyConverter = pemKeyPair -> { @@ -211,9 +235,9 @@ public final class CertificateModule { // This binding should not be used directly. Use the supplier binding instead. @Provides - @Prod - static ImmutableList provideProdCertificates( - @Named("pemObjects") ImmutableList pemObject) { + @PemFile + static ImmutableList providePemCertificates( + @PemFile ImmutableList pemObject) { JcaX509CertificateConverter converter = new JcaX509CertificateConverter().setProvider("BC"); Function certificateConverter = certificateHolder -> { @@ -240,4 +264,38 @@ public final class CertificateModule { } return certificates; } + + @Singleton + @Provides + @PemFile + static Supplier providePemPrivateKeySupplier( + @PemFile Provider privateKeyProvider, + @Named("remoteCertCachingDuration") Duration cachingDuration) { + return memoizeWithExpiration(privateKeyProvider::get, cachingDuration.getSeconds(), SECONDS); + } + + @Singleton + @Provides + @PemFile + static Supplier> providePemCertificatesSupplier( + @PemFile Provider> certificatesProvider, + @Named("remoteCertCachingDuration") Duration cachingDuration) { + return memoizeWithExpiration(certificatesProvider::get, cachingDuration.getSeconds(), SECONDS); + } + + // TODO(jianglai): Implement P12 supplier or convert the file to PEM format. + @Singleton + @Provides + @P12File + static Supplier provideP12PrivateKeySupplier() { + return Suppliers.ofInstance(null); + } + + // TODO(jianglai): Implement P12 supplier or convert the file to PEM format. + @Singleton + @Provides + @P12File + static Supplier> provideP12CertificatesSupplier() { + return Suppliers.ofInstance(null); + } } diff --git a/proxy/src/test/java/google/registry/proxy/CertificateModuleTest.java b/networking/src/test/java/google/registry/networking/module/CertificateSupplierModuleTest.java similarity index 51% rename from proxy/src/test/java/google/registry/proxy/CertificateModuleTest.java rename to networking/src/test/java/google/registry/networking/module/CertificateSupplierModuleTest.java index 91f0a3141..ef330c3cf 100644 --- a/proxy/src/test/java/google/registry/proxy/CertificateModuleTest.java +++ b/networking/src/test/java/google/registry/networking/module/CertificateSupplierModuleTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.proxy; +package google.registry.networking.module; import static com.google.common.truth.Truth.assertThat; import static google.registry.networking.handler.SslInitializerTestUtils.getKeyPair; @@ -21,10 +21,11 @@ import static google.registry.testing.JUnitBackports.assertThrows; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.collect.ImmutableList; +import dagger.BindsInstance; import dagger.Component; import dagger.Module; import dagger.Provides; -import google.registry.proxy.CertificateModule.Prod; +import google.registry.networking.module.CertificateSupplierModule.Mode; import io.netty.handler.ssl.util.SelfSignedCertificate; import java.io.ByteArrayOutputStream; import java.io.OutputStreamWriter; @@ -32,6 +33,8 @@ import java.security.KeyPair; import java.security.PrivateKey; import java.security.cert.Certificate; import java.security.cert.X509Certificate; +import java.time.Duration; +import java.util.function.Supplier; import javax.inject.Named; import javax.inject.Singleton; import org.bouncycastle.openssl.jcajce.JcaPEMWriter; @@ -40,30 +43,20 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -/** Unit tests for {@link CertificateModule}. */ +/** Unit tests for {@link CertificateSupplierModule}. */ @RunWith(JUnit4.class) -public class CertificateModuleTest { +public class CertificateSupplierModuleTest { private SelfSignedCertificate ssc; private PrivateKey key; private Certificate cert; private TestComponent component; - private static byte[] getPemBytes(Object... objects) throws Exception { - ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); - try (JcaPEMWriter pemWriter = - new JcaPEMWriter(new OutputStreamWriter(byteArrayOutputStream, UTF_8))) { - for (Object object : objects) { - pemWriter.writeObject(object); - } - } - return byteArrayOutputStream.toByteArray(); - } - - /** Create a component with bindings to the given bytes[] as the contents from a PEM file. */ - private static TestComponent createComponent(byte[] pemBytes) { - return DaggerCertificateModuleTest_TestComponent.builder() - .pemBytesModule(new PemBytesModule(pemBytes)) + /** Create a component with bindings to construct certificates and keys from a PEM file. */ + private static TestComponent createComponentForPem(Object... objects) throws Exception { + return DaggerCertificateSupplierModuleTest_TestComponent.builder() + .certificateModule(CertificateModule.createCertificateModuleForPem(objects)) + .useMode(Mode.PEM_FILE) .build(); } @@ -77,86 +70,112 @@ public class CertificateModuleTest { @Test public void testSuccess() throws Exception { - byte[] pemBytes = getPemBytes(cert, ssc.cert(), key); - component = createComponent(pemBytes); - assertThat(component.privateKey()).isEqualTo(key); - assertThat(component.certificates()).containsExactly(cert, ssc.cert()).inOrder(); + component = createComponentForPem(cert, ssc.cert(), key); + assertThat(component.privateKeySupplier().get()).isEqualTo(key); + assertThat(component.certificatesSupplier().get()).containsExactly(cert, ssc.cert()).inOrder(); } @Test public void testSuccess_certificateChainNotContinuous() throws Exception { - byte[] pemBytes = getPemBytes(cert, key, ssc.cert()); - component = createComponent(pemBytes); - assertThat(component.privateKey()).isEqualTo(key); - assertThat(component.certificates()).containsExactly(cert, ssc.cert()).inOrder(); + component = createComponentForPem(cert, key, ssc.cert()); + assertThat(component.privateKeySupplier().get()).isEqualTo(key); + assertThat(component.certificatesSupplier().get()).containsExactly(cert, ssc.cert()).inOrder(); } @Test + @SuppressWarnings("ReturnValueIgnored") public void testFailure_noPrivateKey() throws Exception { - byte[] pemBytes = getPemBytes(cert, ssc.cert()); - component = createComponent(pemBytes); + component = createComponentForPem(cert, ssc.cert()); IllegalStateException thrown = - assertThrows(IllegalStateException.class, () -> component.privateKey()); + assertThrows(IllegalStateException.class, () -> component.privateKeySupplier().get()); assertThat(thrown).hasMessageThat().contains("0 keys are found"); } @Test + @SuppressWarnings("ReturnValueIgnored") public void testFailure_twoPrivateKeys() throws Exception { - byte[] pemBytes = getPemBytes(cert, ssc.cert(), key, ssc.key()); - component = createComponent(pemBytes); + component = createComponentForPem(cert, ssc.cert(), key, ssc.key()); IllegalStateException thrown = - assertThrows(IllegalStateException.class, () -> component.privateKey()); + assertThrows(IllegalStateException.class, () -> component.privateKeySupplier().get()); assertThat(thrown).hasMessageThat().contains("2 keys are found"); } @Test + @SuppressWarnings("ReturnValueIgnored") public void testFailure_certificatesOutOfOrder() throws Exception { - byte[] pemBytes = getPemBytes(ssc.cert(), cert, key); - component = createComponent(pemBytes); + component = createComponentForPem(ssc.cert(), cert, key); IllegalStateException thrown = - assertThrows(IllegalStateException.class, () -> component.certificates()); + assertThrows(IllegalStateException.class, () -> component.certificatesSupplier().get()); assertThat(thrown).hasMessageThat().contains("is not signed by"); } @Test + @SuppressWarnings("ReturnValueIgnored") public void testFailure_noCertificates() throws Exception { - byte[] pemBytes = getPemBytes(key); - component = createComponent(pemBytes); + component = createComponentForPem(key); IllegalStateException thrown = - assertThrows(IllegalStateException.class, () -> component.certificates()); + assertThrows(IllegalStateException.class, () -> component.certificatesSupplier().get()); assertThat(thrown).hasMessageThat().contains("No certificates"); } @Module - static class PemBytesModule { + static class CertificateModule { + private final byte[] pemBytes; - PemBytesModule(byte[] pemBytes) { + private CertificateModule(byte[] pemBytes) { this.pemBytes = pemBytes.clone(); } + static CertificateModule createCertificateModuleForPem(Object... objects) throws Exception { + ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); + try (JcaPEMWriter pemWriter = + new JcaPEMWriter(new OutputStreamWriter(byteArrayOutputStream, UTF_8))) { + for (Object object : objects) { + pemWriter.writeObject(object); + } + } + return new CertificateModule(byteArrayOutputStream.toByteArray()); + } + @Provides @Named("pemBytes") byte[] providePemBytes() { return pemBytes.clone(); } + + @Provides + @Named("remoteCertCachingDuration") + Duration provideCachingDuration() { + // Make the supplier always return the save value for test to save time. + return Duration.ofDays(1); + } } /** - * Test component that exposes prod certificate and key. + * Test component that exposes the certificates and private key. * - *

Local certificate and key are not tested because they are directly extracted from a - * self-signed certificate. Here we want to test that we can correctly parse and create - * certificate and keys from a .pem file. + *

Depending on what {@link Mode} is provided to the component, it will return certificates and + * private key extracted from the correspondonig format. Self-signed mode is not tested as they + * are only used in tests. */ @Singleton - @Component(modules = {CertificateModule.class, PemBytesModule.class}) + @Component(modules = {CertificateSupplierModule.class, CertificateModule.class}) interface TestComponent { - @Prod - PrivateKey privateKey(); + Supplier privateKeySupplier(); - @Prod - ImmutableList certificates(); + Supplier> certificatesSupplier(); + + @Component.Builder + interface Builder { + + @BindsInstance + Builder useMode(Mode mode); + + Builder certificateModule(CertificateModule certificateModule); + + TestComponent build(); + } } } diff --git a/proxy/src/main/java/google/registry/proxy/ProxyModule.java b/proxy/src/main/java/google/registry/proxy/ProxyModule.java index e64ae64b3..6e36e6bf4 100644 --- a/proxy/src/main/java/google/registry/proxy/ProxyModule.java +++ b/proxy/src/main/java/google/registry/proxy/ProxyModule.java @@ -29,6 +29,8 @@ import com.google.monitoring.metrics.MetricReporter; import dagger.Component; import dagger.Module; import dagger.Provides; +import google.registry.networking.module.CertificateSupplierModule; +import google.registry.networking.module.CertificateSupplierModule.Mode; import google.registry.proxy.EppProtocolModule.EppProtocol; import google.registry.proxy.HealthCheckProtocolModule.HealthCheckProtocol; import google.registry.proxy.Protocol.FrontendProtocol; @@ -46,6 +48,7 @@ import io.netty.handler.ssl.OpenSsl; import io.netty.handler.ssl.SslProvider; import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.time.Duration; import java.util.Arrays; import java.util.Base64; import java.util.Optional; @@ -324,12 +327,29 @@ public class ProxyModule { return getProxyConfig(env); } + @Singleton + @Provides + static Mode provideMode(Environment env) { + if (env == Environment.LOCAL) { + return Mode.SELF_SIGNED; + } else { + return Mode.P12_FILE; + } + } + + @Singleton + @Provides + @Named("remoteCertCachingDuration") + static Duration provideCertCachingDuration(ProxyConfig config) { + return Duration.ofSeconds(config.serverCertificateCacheSeconds); + } + /** Root level component that exposes the port-to-protocol map. */ @Singleton @Component( modules = { ProxyModule.class, - CertificateModule.class, + CertificateSupplierModule.class, HttpsRelayProtocolModule.class, WhoisProtocolModule.class, WebWhoisProtocolsModule.class, diff --git a/proxy/src/test/java/google/registry/proxy/ProtocolModuleTest.java b/proxy/src/test/java/google/registry/proxy/ProtocolModuleTest.java index d516868cb..06e801440 100644 --- a/proxy/src/test/java/google/registry/proxy/ProtocolModuleTest.java +++ b/proxy/src/test/java/google/registry/proxy/ProtocolModuleTest.java @@ -27,6 +27,8 @@ import dagger.Module; import dagger.Provides; import google.registry.networking.handler.SslClientInitializer; import google.registry.networking.handler.SslServerInitializer; +import google.registry.networking.module.CertificateSupplierModule; +import google.registry.networking.module.CertificateSupplierModule.Mode; import google.registry.proxy.EppProtocolModule.EppProtocol; import google.registry.proxy.HealthCheckProtocolModule.HealthCheckProtocol; import google.registry.proxy.HttpsRelayProtocolModule.HttpsRelayProtocol; @@ -50,6 +52,7 @@ import io.netty.channel.embedded.EmbeddedChannel; import io.netty.handler.logging.LoggingHandler; import io.netty.handler.ssl.SslProvider; import io.netty.handler.timeout.ReadTimeoutHandler; +import java.time.Duration; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; @@ -141,8 +144,7 @@ public abstract class ProtocolModuleTest { /** Excludes handler providers that are not of interested for testing. */ private ImmutableList> excludeHandlerProvidersForTesting( ImmutableList> handlerProviders) { - return handlerProviders - .stream() + return handlerProviders.stream() .filter(handlerProvider -> !excludedHandlers.contains(handlerProvider.get().getClass())) .collect(toImmutableList()); } @@ -186,7 +188,7 @@ public abstract class ProtocolModuleTest { @Component( modules = { TestModule.class, - CertificateModule.class, + CertificateSupplierModule.class, WhoisProtocolModule.class, WebWhoisProtocolsModule.class, EppProtocolModule.class, @@ -281,6 +283,20 @@ public abstract class ProtocolModuleTest { return Environment.LOCAL; } + @Singleton + @Provides + static Mode provideMode() { + return Mode.SELF_SIGNED; + } + + @Singleton + @Provides + @Named("remoteCertCachingDuration") + static Duration provideCertCachingDuration() { + // Not used. + return Duration.ofHours(1); + } + // This method is only here to satisfy Dagger binding, but is never used. In test environment, // it is the self-signed certificate and its key that end up being used. @Singleton diff --git a/services/backend/gradle/dependency-locks/compile.lockfile b/services/backend/gradle/dependency-locks/compile.lockfile index d3e7ad1c9..186a1a743 100644 --- a/services/backend/gradle/dependency-locks/compile.lockfile +++ b/services/backend/gradle/dependency-locks/compile.lockfile @@ -18,11 +18,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -95,22 +95,22 @@ com.google.guava:failureaccess:1.0.1 com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -135,7 +135,7 @@ io.dropwizard.metrics:metrics-core:3.1.2 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-grpclb:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 @@ -157,10 +157,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -193,8 +193,8 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 diff --git a/services/backend/gradle/dependency-locks/compileClasspath.lockfile b/services/backend/gradle/dependency-locks/compileClasspath.lockfile index eecf6c503..2dfe5b3e3 100644 --- a/services/backend/gradle/dependency-locks/compileClasspath.lockfile +++ b/services/backend/gradle/dependency-locks/compileClasspath.lockfile @@ -18,11 +18,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -95,22 +95,22 @@ com.google.guava:failureaccess:1.0.1 com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -135,7 +135,7 @@ io.dropwizard.metrics:metrics-core:3.1.2 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 io.grpc:grpc-netty:1.17.1 @@ -156,10 +156,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -192,8 +192,8 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 diff --git a/services/backend/gradle/dependency-locks/default.lockfile b/services/backend/gradle/dependency-locks/default.lockfile index d3e7ad1c9..186a1a743 100644 --- a/services/backend/gradle/dependency-locks/default.lockfile +++ b/services/backend/gradle/dependency-locks/default.lockfile @@ -18,11 +18,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -95,22 +95,22 @@ com.google.guava:failureaccess:1.0.1 com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -135,7 +135,7 @@ io.dropwizard.metrics:metrics-core:3.1.2 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-grpclb:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 @@ -157,10 +157,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -193,8 +193,8 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 diff --git a/services/backend/gradle/dependency-locks/runtime.lockfile b/services/backend/gradle/dependency-locks/runtime.lockfile index d3e7ad1c9..186a1a743 100644 --- a/services/backend/gradle/dependency-locks/runtime.lockfile +++ b/services/backend/gradle/dependency-locks/runtime.lockfile @@ -18,11 +18,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -95,22 +95,22 @@ com.google.guava:failureaccess:1.0.1 com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -135,7 +135,7 @@ io.dropwizard.metrics:metrics-core:3.1.2 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-grpclb:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 @@ -157,10 +157,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -193,8 +193,8 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 diff --git a/services/backend/gradle/dependency-locks/runtimeClasspath.lockfile b/services/backend/gradle/dependency-locks/runtimeClasspath.lockfile index d3e7ad1c9..186a1a743 100644 --- a/services/backend/gradle/dependency-locks/runtimeClasspath.lockfile +++ b/services/backend/gradle/dependency-locks/runtimeClasspath.lockfile @@ -18,11 +18,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -95,22 +95,22 @@ com.google.guava:failureaccess:1.0.1 com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -135,7 +135,7 @@ io.dropwizard.metrics:metrics-core:3.1.2 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-grpclb:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 @@ -157,10 +157,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -193,8 +193,8 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 diff --git a/services/backend/gradle/dependency-locks/testCompile.lockfile b/services/backend/gradle/dependency-locks/testCompile.lockfile index d3e7ad1c9..186a1a743 100644 --- a/services/backend/gradle/dependency-locks/testCompile.lockfile +++ b/services/backend/gradle/dependency-locks/testCompile.lockfile @@ -18,11 +18,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -95,22 +95,22 @@ com.google.guava:failureaccess:1.0.1 com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -135,7 +135,7 @@ io.dropwizard.metrics:metrics-core:3.1.2 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-grpclb:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 @@ -157,10 +157,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -193,8 +193,8 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 diff --git a/services/backend/gradle/dependency-locks/testCompileClasspath.lockfile b/services/backend/gradle/dependency-locks/testCompileClasspath.lockfile index eecf6c503..2dfe5b3e3 100644 --- a/services/backend/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/services/backend/gradle/dependency-locks/testCompileClasspath.lockfile @@ -18,11 +18,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -95,22 +95,22 @@ com.google.guava:failureaccess:1.0.1 com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -135,7 +135,7 @@ io.dropwizard.metrics:metrics-core:3.1.2 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 io.grpc:grpc-netty:1.17.1 @@ -156,10 +156,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -192,8 +192,8 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 diff --git a/services/backend/gradle/dependency-locks/testRuntime.lockfile b/services/backend/gradle/dependency-locks/testRuntime.lockfile index d3e7ad1c9..186a1a743 100644 --- a/services/backend/gradle/dependency-locks/testRuntime.lockfile +++ b/services/backend/gradle/dependency-locks/testRuntime.lockfile @@ -18,11 +18,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -95,22 +95,22 @@ com.google.guava:failureaccess:1.0.1 com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -135,7 +135,7 @@ io.dropwizard.metrics:metrics-core:3.1.2 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-grpclb:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 @@ -157,10 +157,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -193,8 +193,8 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 diff --git a/services/backend/gradle/dependency-locks/testRuntimeClasspath.lockfile b/services/backend/gradle/dependency-locks/testRuntimeClasspath.lockfile index d3e7ad1c9..186a1a743 100644 --- a/services/backend/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/services/backend/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -18,11 +18,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -95,22 +95,22 @@ com.google.guava:failureaccess:1.0.1 com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -135,7 +135,7 @@ io.dropwizard.metrics:metrics-core:3.1.2 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-grpclb:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 @@ -157,10 +157,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -193,8 +193,8 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 diff --git a/services/default/gradle/dependency-locks/compile.lockfile b/services/default/gradle/dependency-locks/compile.lockfile index d3e7ad1c9..186a1a743 100644 --- a/services/default/gradle/dependency-locks/compile.lockfile +++ b/services/default/gradle/dependency-locks/compile.lockfile @@ -18,11 +18,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -95,22 +95,22 @@ com.google.guava:failureaccess:1.0.1 com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -135,7 +135,7 @@ io.dropwizard.metrics:metrics-core:3.1.2 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-grpclb:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 @@ -157,10 +157,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -193,8 +193,8 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 diff --git a/services/default/gradle/dependency-locks/compileClasspath.lockfile b/services/default/gradle/dependency-locks/compileClasspath.lockfile index eecf6c503..2dfe5b3e3 100644 --- a/services/default/gradle/dependency-locks/compileClasspath.lockfile +++ b/services/default/gradle/dependency-locks/compileClasspath.lockfile @@ -18,11 +18,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -95,22 +95,22 @@ com.google.guava:failureaccess:1.0.1 com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -135,7 +135,7 @@ io.dropwizard.metrics:metrics-core:3.1.2 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 io.grpc:grpc-netty:1.17.1 @@ -156,10 +156,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -192,8 +192,8 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 diff --git a/services/default/gradle/dependency-locks/default.lockfile b/services/default/gradle/dependency-locks/default.lockfile index d3e7ad1c9..186a1a743 100644 --- a/services/default/gradle/dependency-locks/default.lockfile +++ b/services/default/gradle/dependency-locks/default.lockfile @@ -18,11 +18,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -95,22 +95,22 @@ com.google.guava:failureaccess:1.0.1 com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -135,7 +135,7 @@ io.dropwizard.metrics:metrics-core:3.1.2 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-grpclb:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 @@ -157,10 +157,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -193,8 +193,8 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 diff --git a/services/default/gradle/dependency-locks/runtime.lockfile b/services/default/gradle/dependency-locks/runtime.lockfile index d3e7ad1c9..186a1a743 100644 --- a/services/default/gradle/dependency-locks/runtime.lockfile +++ b/services/default/gradle/dependency-locks/runtime.lockfile @@ -18,11 +18,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -95,22 +95,22 @@ com.google.guava:failureaccess:1.0.1 com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -135,7 +135,7 @@ io.dropwizard.metrics:metrics-core:3.1.2 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-grpclb:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 @@ -157,10 +157,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -193,8 +193,8 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 diff --git a/services/default/gradle/dependency-locks/runtimeClasspath.lockfile b/services/default/gradle/dependency-locks/runtimeClasspath.lockfile index d3e7ad1c9..186a1a743 100644 --- a/services/default/gradle/dependency-locks/runtimeClasspath.lockfile +++ b/services/default/gradle/dependency-locks/runtimeClasspath.lockfile @@ -18,11 +18,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -95,22 +95,22 @@ com.google.guava:failureaccess:1.0.1 com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -135,7 +135,7 @@ io.dropwizard.metrics:metrics-core:3.1.2 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-grpclb:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 @@ -157,10 +157,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -193,8 +193,8 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 diff --git a/services/default/gradle/dependency-locks/testCompile.lockfile b/services/default/gradle/dependency-locks/testCompile.lockfile index d3e7ad1c9..186a1a743 100644 --- a/services/default/gradle/dependency-locks/testCompile.lockfile +++ b/services/default/gradle/dependency-locks/testCompile.lockfile @@ -18,11 +18,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -95,22 +95,22 @@ com.google.guava:failureaccess:1.0.1 com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -135,7 +135,7 @@ io.dropwizard.metrics:metrics-core:3.1.2 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-grpclb:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 @@ -157,10 +157,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -193,8 +193,8 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 diff --git a/services/default/gradle/dependency-locks/testCompileClasspath.lockfile b/services/default/gradle/dependency-locks/testCompileClasspath.lockfile index eecf6c503..2dfe5b3e3 100644 --- a/services/default/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/services/default/gradle/dependency-locks/testCompileClasspath.lockfile @@ -18,11 +18,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -95,22 +95,22 @@ com.google.guava:failureaccess:1.0.1 com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -135,7 +135,7 @@ io.dropwizard.metrics:metrics-core:3.1.2 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 io.grpc:grpc-netty:1.17.1 @@ -156,10 +156,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -192,8 +192,8 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 diff --git a/services/default/gradle/dependency-locks/testRuntime.lockfile b/services/default/gradle/dependency-locks/testRuntime.lockfile index d3e7ad1c9..186a1a743 100644 --- a/services/default/gradle/dependency-locks/testRuntime.lockfile +++ b/services/default/gradle/dependency-locks/testRuntime.lockfile @@ -18,11 +18,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -95,22 +95,22 @@ com.google.guava:failureaccess:1.0.1 com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -135,7 +135,7 @@ io.dropwizard.metrics:metrics-core:3.1.2 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-grpclb:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 @@ -157,10 +157,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -193,8 +193,8 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 diff --git a/services/default/gradle/dependency-locks/testRuntimeClasspath.lockfile b/services/default/gradle/dependency-locks/testRuntimeClasspath.lockfile index d3e7ad1c9..186a1a743 100644 --- a/services/default/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/services/default/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -18,11 +18,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -95,22 +95,22 @@ com.google.guava:failureaccess:1.0.1 com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -135,7 +135,7 @@ io.dropwizard.metrics:metrics-core:3.1.2 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-grpclb:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 @@ -157,10 +157,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -193,8 +193,8 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 diff --git a/services/pubapi/gradle/dependency-locks/compile.lockfile b/services/pubapi/gradle/dependency-locks/compile.lockfile index d3e7ad1c9..186a1a743 100644 --- a/services/pubapi/gradle/dependency-locks/compile.lockfile +++ b/services/pubapi/gradle/dependency-locks/compile.lockfile @@ -18,11 +18,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -95,22 +95,22 @@ com.google.guava:failureaccess:1.0.1 com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -135,7 +135,7 @@ io.dropwizard.metrics:metrics-core:3.1.2 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-grpclb:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 @@ -157,10 +157,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -193,8 +193,8 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 diff --git a/services/pubapi/gradle/dependency-locks/compileClasspath.lockfile b/services/pubapi/gradle/dependency-locks/compileClasspath.lockfile index eecf6c503..2dfe5b3e3 100644 --- a/services/pubapi/gradle/dependency-locks/compileClasspath.lockfile +++ b/services/pubapi/gradle/dependency-locks/compileClasspath.lockfile @@ -18,11 +18,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -95,22 +95,22 @@ com.google.guava:failureaccess:1.0.1 com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -135,7 +135,7 @@ io.dropwizard.metrics:metrics-core:3.1.2 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 io.grpc:grpc-netty:1.17.1 @@ -156,10 +156,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -192,8 +192,8 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 diff --git a/services/pubapi/gradle/dependency-locks/default.lockfile b/services/pubapi/gradle/dependency-locks/default.lockfile index d3e7ad1c9..186a1a743 100644 --- a/services/pubapi/gradle/dependency-locks/default.lockfile +++ b/services/pubapi/gradle/dependency-locks/default.lockfile @@ -18,11 +18,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -95,22 +95,22 @@ com.google.guava:failureaccess:1.0.1 com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -135,7 +135,7 @@ io.dropwizard.metrics:metrics-core:3.1.2 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-grpclb:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 @@ -157,10 +157,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -193,8 +193,8 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 diff --git a/services/pubapi/gradle/dependency-locks/runtime.lockfile b/services/pubapi/gradle/dependency-locks/runtime.lockfile index d3e7ad1c9..186a1a743 100644 --- a/services/pubapi/gradle/dependency-locks/runtime.lockfile +++ b/services/pubapi/gradle/dependency-locks/runtime.lockfile @@ -18,11 +18,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -95,22 +95,22 @@ com.google.guava:failureaccess:1.0.1 com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -135,7 +135,7 @@ io.dropwizard.metrics:metrics-core:3.1.2 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-grpclb:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 @@ -157,10 +157,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -193,8 +193,8 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 diff --git a/services/pubapi/gradle/dependency-locks/runtimeClasspath.lockfile b/services/pubapi/gradle/dependency-locks/runtimeClasspath.lockfile index d3e7ad1c9..186a1a743 100644 --- a/services/pubapi/gradle/dependency-locks/runtimeClasspath.lockfile +++ b/services/pubapi/gradle/dependency-locks/runtimeClasspath.lockfile @@ -18,11 +18,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -95,22 +95,22 @@ com.google.guava:failureaccess:1.0.1 com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -135,7 +135,7 @@ io.dropwizard.metrics:metrics-core:3.1.2 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-grpclb:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 @@ -157,10 +157,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -193,8 +193,8 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 diff --git a/services/pubapi/gradle/dependency-locks/testCompile.lockfile b/services/pubapi/gradle/dependency-locks/testCompile.lockfile index d3e7ad1c9..186a1a743 100644 --- a/services/pubapi/gradle/dependency-locks/testCompile.lockfile +++ b/services/pubapi/gradle/dependency-locks/testCompile.lockfile @@ -18,11 +18,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -95,22 +95,22 @@ com.google.guava:failureaccess:1.0.1 com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -135,7 +135,7 @@ io.dropwizard.metrics:metrics-core:3.1.2 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-grpclb:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 @@ -157,10 +157,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -193,8 +193,8 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 diff --git a/services/pubapi/gradle/dependency-locks/testCompileClasspath.lockfile b/services/pubapi/gradle/dependency-locks/testCompileClasspath.lockfile index eecf6c503..2dfe5b3e3 100644 --- a/services/pubapi/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/services/pubapi/gradle/dependency-locks/testCompileClasspath.lockfile @@ -18,11 +18,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -95,22 +95,22 @@ com.google.guava:failureaccess:1.0.1 com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -135,7 +135,7 @@ io.dropwizard.metrics:metrics-core:3.1.2 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 io.grpc:grpc-netty:1.17.1 @@ -156,10 +156,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -192,8 +192,8 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 diff --git a/services/pubapi/gradle/dependency-locks/testRuntime.lockfile b/services/pubapi/gradle/dependency-locks/testRuntime.lockfile index d3e7ad1c9..186a1a743 100644 --- a/services/pubapi/gradle/dependency-locks/testRuntime.lockfile +++ b/services/pubapi/gradle/dependency-locks/testRuntime.lockfile @@ -18,11 +18,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -95,22 +95,22 @@ com.google.guava:failureaccess:1.0.1 com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -135,7 +135,7 @@ io.dropwizard.metrics:metrics-core:3.1.2 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-grpclb:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 @@ -157,10 +157,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -193,8 +193,8 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 diff --git a/services/pubapi/gradle/dependency-locks/testRuntimeClasspath.lockfile b/services/pubapi/gradle/dependency-locks/testRuntimeClasspath.lockfile index d3e7ad1c9..186a1a743 100644 --- a/services/pubapi/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/services/pubapi/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -18,11 +18,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -95,22 +95,22 @@ com.google.guava:failureaccess:1.0.1 com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -135,7 +135,7 @@ io.dropwizard.metrics:metrics-core:3.1.2 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-grpclb:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 @@ -157,10 +157,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -193,8 +193,8 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 diff --git a/services/tools/gradle/dependency-locks/compile.lockfile b/services/tools/gradle/dependency-locks/compile.lockfile index d3e7ad1c9..186a1a743 100644 --- a/services/tools/gradle/dependency-locks/compile.lockfile +++ b/services/tools/gradle/dependency-locks/compile.lockfile @@ -18,11 +18,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -95,22 +95,22 @@ com.google.guava:failureaccess:1.0.1 com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -135,7 +135,7 @@ io.dropwizard.metrics:metrics-core:3.1.2 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-grpclb:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 @@ -157,10 +157,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -193,8 +193,8 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 diff --git a/services/tools/gradle/dependency-locks/compileClasspath.lockfile b/services/tools/gradle/dependency-locks/compileClasspath.lockfile index eecf6c503..2dfe5b3e3 100644 --- a/services/tools/gradle/dependency-locks/compileClasspath.lockfile +++ b/services/tools/gradle/dependency-locks/compileClasspath.lockfile @@ -18,11 +18,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -95,22 +95,22 @@ com.google.guava:failureaccess:1.0.1 com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -135,7 +135,7 @@ io.dropwizard.metrics:metrics-core:3.1.2 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 io.grpc:grpc-netty:1.17.1 @@ -156,10 +156,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -192,8 +192,8 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 diff --git a/services/tools/gradle/dependency-locks/default.lockfile b/services/tools/gradle/dependency-locks/default.lockfile index d3e7ad1c9..186a1a743 100644 --- a/services/tools/gradle/dependency-locks/default.lockfile +++ b/services/tools/gradle/dependency-locks/default.lockfile @@ -18,11 +18,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -95,22 +95,22 @@ com.google.guava:failureaccess:1.0.1 com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -135,7 +135,7 @@ io.dropwizard.metrics:metrics-core:3.1.2 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-grpclb:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 @@ -157,10 +157,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -193,8 +193,8 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 diff --git a/services/tools/gradle/dependency-locks/runtime.lockfile b/services/tools/gradle/dependency-locks/runtime.lockfile index d3e7ad1c9..186a1a743 100644 --- a/services/tools/gradle/dependency-locks/runtime.lockfile +++ b/services/tools/gradle/dependency-locks/runtime.lockfile @@ -18,11 +18,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -95,22 +95,22 @@ com.google.guava:failureaccess:1.0.1 com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -135,7 +135,7 @@ io.dropwizard.metrics:metrics-core:3.1.2 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-grpclb:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 @@ -157,10 +157,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -193,8 +193,8 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 diff --git a/services/tools/gradle/dependency-locks/runtimeClasspath.lockfile b/services/tools/gradle/dependency-locks/runtimeClasspath.lockfile index d3e7ad1c9..186a1a743 100644 --- a/services/tools/gradle/dependency-locks/runtimeClasspath.lockfile +++ b/services/tools/gradle/dependency-locks/runtimeClasspath.lockfile @@ -18,11 +18,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -95,22 +95,22 @@ com.google.guava:failureaccess:1.0.1 com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -135,7 +135,7 @@ io.dropwizard.metrics:metrics-core:3.1.2 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-grpclb:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 @@ -157,10 +157,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -193,8 +193,8 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 diff --git a/services/tools/gradle/dependency-locks/testCompile.lockfile b/services/tools/gradle/dependency-locks/testCompile.lockfile index d3e7ad1c9..186a1a743 100644 --- a/services/tools/gradle/dependency-locks/testCompile.lockfile +++ b/services/tools/gradle/dependency-locks/testCompile.lockfile @@ -18,11 +18,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -95,22 +95,22 @@ com.google.guava:failureaccess:1.0.1 com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -135,7 +135,7 @@ io.dropwizard.metrics:metrics-core:3.1.2 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-grpclb:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 @@ -157,10 +157,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -193,8 +193,8 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 diff --git a/services/tools/gradle/dependency-locks/testCompileClasspath.lockfile b/services/tools/gradle/dependency-locks/testCompileClasspath.lockfile index eecf6c503..2dfe5b3e3 100644 --- a/services/tools/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/services/tools/gradle/dependency-locks/testCompileClasspath.lockfile @@ -18,11 +18,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -95,22 +95,22 @@ com.google.guava:failureaccess:1.0.1 com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -135,7 +135,7 @@ io.dropwizard.metrics:metrics-core:3.1.2 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 io.grpc:grpc-netty:1.17.1 @@ -156,10 +156,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -192,8 +192,8 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 diff --git a/services/tools/gradle/dependency-locks/testRuntime.lockfile b/services/tools/gradle/dependency-locks/testRuntime.lockfile index d3e7ad1c9..186a1a743 100644 --- a/services/tools/gradle/dependency-locks/testRuntime.lockfile +++ b/services/tools/gradle/dependency-locks/testRuntime.lockfile @@ -18,11 +18,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -95,22 +95,22 @@ com.google.guava:failureaccess:1.0.1 com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -135,7 +135,7 @@ io.dropwizard.metrics:metrics-core:3.1.2 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-grpclb:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 @@ -157,10 +157,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -193,8 +193,8 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1 diff --git a/services/tools/gradle/dependency-locks/testRuntimeClasspath.lockfile b/services/tools/gradle/dependency-locks/testRuntimeClasspath.lockfile index d3e7ad1c9..186a1a743 100644 --- a/services/tools/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/services/tools/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -18,11 +18,11 @@ com.github.jnr:jnr-ffi:2.1.9 com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-x86asm:1.0.2 -com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-appengine:1.29.0 com.google.api-client:google-api-client-jackson2:1.27.0 com.google.api-client:google-api-client-java6:1.27.0 -com.google.api-client:google-api-client-servlet:1.30.6 -com.google.api-client:google-api-client:1.30.6 +com.google.api-client:google-api-client-servlet:1.29.0 +com.google.api-client:google-api-client:1.29.2 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 @@ -95,22 +95,22 @@ com.google.guava:failureaccess:1.0.1 com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-user:2.8.2 -com.google.http-client:google-http-client-appengine:1.32.1 -com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-appengine:1.29.2 +com.google.http-client:google-http-client-jackson2:1.30.1 com.google.http-client:google-http-client-jackson:1.20.0 com.google.http-client:google-http-client-protobuf:1.20.0 -com.google.http-client:google-http-client:1.32.1 +com.google.http-client:google-http-client:1.30.1 com.google.inject.extensions:guice-multibindings:4.1.0 com.google.inject:guice:4.1.0 com.google.j2objc:j2objc-annotations:1.3 com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:stackdriver:1.0.6 -com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-appengine:1.29.0 com.google.oauth-client:google-oauth-client-java6:1.28.0 com.google.oauth-client:google-oauth-client-jetty:1.28.0 -com.google.oauth-client:google-oauth-client-servlet:1.30.4 -com.google.oauth-client:google-oauth-client:1.30.4 +com.google.oauth-client:google-oauth-client-servlet:1.29.0 +com.google.oauth-client:google-oauth-client:1.29.2 com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 com.google.protobuf:protobuf-java-util:3.6.1 com.google.protobuf:protobuf-java:3.6.1 @@ -135,7 +135,7 @@ io.dropwizard.metrics:metrics-core:3.1.2 io.grpc:grpc-all:1.17.1 io.grpc:grpc-alts:1.17.1 io.grpc:grpc-auth:1.17.1 -io.grpc:grpc-context:1.22.1 +io.grpc:grpc-context:1.19.0 io.grpc:grpc-core:1.17.1 io.grpc:grpc-grpclb:1.17.1 io.grpc:grpc-netty-shaded:1.17.1 @@ -157,10 +157,10 @@ io.netty:netty-handler:4.1.30.Final io.netty:netty-resolver:4.1.30.Final io.netty:netty-tcnative-boringssl-static:2.0.17.Final io.netty:netty-transport:4.1.30.Final -io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-api:0.21.0 io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 io.opencensus:opencensus-contrib-grpc-util:0.17.0 -io.opencensus:opencensus-contrib-http-util:0.24.0 +io.opencensus:opencensus-contrib-http-util:0.21.0 it.unimi.dsi:fastutil:6.5.16 javax.activation:activation:1.1 javax.activation:javax.activation-api:1.2.0 @@ -193,8 +193,8 @@ org.apache.beam:beam-vendor-grpc-1_21_0:0.1 org.apache.beam:beam-vendor-guava-26_0-jre:0.1 org.apache.commons:commons-compress:1.19 org.apache.commons:commons-lang3:3.5 -org.apache.httpcomponents:httpclient:4.5.10 -org.apache.httpcomponents:httpcore:4.4.12 +org.apache.httpcomponents:httpclient:4.5.8 +org.apache.httpcomponents:httpcore:4.4.11 org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61 org.checkerframework:checker-qual:2.8.1