Skip to content

Commit

Permalink
Consolidate certificate supplier module (#410)
Browse files Browse the repository at this point in the history 
* 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
  • Loading branch information
@jianglai
jianglai committed Dec 23, 2019
1 parent 24d671c commit dd0e3b7
Show file tree
Hide file tree
Showing 59 changed files with 906 additions and 755 deletions.
28 changes: 14 additions & 14 deletions core/gradle/dependency-locks/compile.lockfile
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -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-core:2.9.10
com.fasterxml.jackson.core:jackson-databind:2.9.10 com.fasterxml.jackson.core:jackson-databind:2.9.10
com.fasterxml:classmate:1.3.4 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-jackson2:1.27.0
com.google.api-client:google-api-client-java6: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-servlet:1.29.0
com.google.api-client:google-api-client:1.30.6 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-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-admin-v2:0.38.0
com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0
Expand Down Expand Up @@ -84,22 +84,22 @@ com.google.guava:failureaccess:1.0.1
com.google.guava:guava:28.1-jre com.google.guava:guava:28.1-jre
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.gwt:gwt-user:2.8.2 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-appengine:1.29.2
com.google.http-client:google-http-client-jackson2:1.32.1 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-jackson:1.20.0
com.google.http-client:google-http-client-protobuf: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.extensions:guice-multibindings:4.1.0
com.google.inject:guice:4.1.0 com.google.inject:guice:4.1.0
com.google.j2objc:j2objc-annotations:1.3 com.google.j2objc:j2objc-annotations:1.3
com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.jsinterop:jsinterop-annotations:1.0.2
com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:metrics:1.0.6
com.google.monitoring-client:stackdriver: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-java6:1.28.0
com.google.oauth-client:google-oauth-client-jetty: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-servlet:1.29.0
com.google.oauth-client:google-oauth-client:1.30.4 com.google.oauth-client:google-oauth-client:1.29.2
com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 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-util:3.6.1
com.google.protobuf:protobuf-java:3.6.1 com.google.protobuf:protobuf-java:3.6.1
Expand All @@ -124,7 +124,7 @@ io.dropwizard.metrics:metrics-core:3.1.2
io.grpc:grpc-all:1.17.1 io.grpc:grpc-all:1.17.1
io.grpc:grpc-alts:1.17.1 io.grpc:grpc-alts:1.17.1
io.grpc:grpc-auth: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-core:1.17.1
io.grpc:grpc-grpclb:1.17.1 io.grpc:grpc-grpclb:1.17.1
io.grpc:grpc-netty-shaded:1.17.1 io.grpc:grpc-netty-shaded:1.17.1
Expand All @@ -146,10 +146,10 @@ io.netty:netty-handler:4.1.30.Final
io.netty:netty-resolver: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-tcnative-boringssl-static:2.0.17.Final
io.netty:netty-transport:4.1.30.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-metrics:0.17.0
io.opencensus:opencensus-contrib-grpc-util: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 it.unimi.dsi:fastutil:6.5.16
javax.activation:activation:1.1 javax.activation:activation:1.1
javax.activation:javax.activation-api:1.2.0 javax.activation:javax.activation-api:1.2.0
Expand Down Expand Up @@ -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.beam:beam-vendor-guava-26_0-jre:0.1
org.apache.commons:commons-compress:1.19 org.apache.commons:commons-compress:1.19
org.apache.commons:commons-lang3:3.5 org.apache.commons:commons-lang3:3.5
org.apache.httpcomponents:httpclient:4.5.10 org.apache.httpcomponents:httpclient:4.5.8
org.apache.httpcomponents:httpcore:4.4.12 org.apache.httpcomponents:httpcore:4.4.11
org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcpg-jdk15on:1.61
org.bouncycastle:bcprov-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61
org.checkerframework:checker-qual:2.8.1 org.checkerframework:checker-qual:2.8.1
Expand Down
28 changes: 14 additions & 14 deletions core/gradle/dependency-locks/compileClasspath.lockfile
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -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-core:2.9.10
com.fasterxml.jackson.core:jackson-databind:2.9.10 com.fasterxml.jackson.core:jackson-databind:2.9.10
com.fasterxml:classmate:1.3.4 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-jackson2:1.27.0
com.google.api-client:google-api-client-java6: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-servlet:1.29.0
com.google.api-client:google-api-client:1.30.6 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-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-admin-v2:0.38.0
com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0
Expand Down Expand Up @@ -83,22 +83,22 @@ com.google.guava:failureaccess:1.0.1
com.google.guava:guava:28.1-jre com.google.guava:guava:28.1-jre
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.gwt:gwt-user:2.8.2 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-appengine:1.29.2
com.google.http-client:google-http-client-jackson2:1.32.1 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-jackson:1.20.0
com.google.http-client:google-http-client-protobuf: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.extensions:guice-multibindings:4.1.0
com.google.inject:guice:4.1.0 com.google.inject:guice:4.1.0
com.google.j2objc:j2objc-annotations:1.3 com.google.j2objc:j2objc-annotations:1.3
com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.jsinterop:jsinterop-annotations:1.0.2
com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:metrics:1.0.6
com.google.monitoring-client:stackdriver: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-java6:1.28.0
com.google.oauth-client:google-oauth-client-jetty: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-servlet:1.29.0
com.google.oauth-client:google-oauth-client:1.30.4 com.google.oauth-client:google-oauth-client:1.29.2
com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 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-util:3.6.1
com.google.protobuf:protobuf-java:3.6.1 com.google.protobuf:protobuf-java:3.6.1
Expand All @@ -123,7 +123,7 @@ io.dropwizard.metrics:metrics-core:3.1.2
io.grpc:grpc-all:1.17.1 io.grpc:grpc-all:1.17.1
io.grpc:grpc-alts:1.17.1 io.grpc:grpc-alts:1.17.1
io.grpc:grpc-auth: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-core:1.17.1
io.grpc:grpc-netty-shaded:1.17.1 io.grpc:grpc-netty-shaded:1.17.1
io.grpc:grpc-netty:1.17.1 io.grpc:grpc-netty:1.17.1
Expand All @@ -144,10 +144,10 @@ io.netty:netty-handler:4.1.30.Final
io.netty:netty-resolver: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-tcnative-boringssl-static:2.0.17.Final
io.netty:netty-transport:4.1.30.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-metrics:0.17.0
io.opencensus:opencensus-contrib-grpc-util: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 it.unimi.dsi:fastutil:6.5.16
javax.activation:activation:1.1 javax.activation:activation:1.1
javax.activation:javax.activation-api:1.2.0 javax.activation:javax.activation-api:1.2.0
Expand Down Expand Up @@ -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.beam:beam-vendor-guava-26_0-jre:0.1
org.apache.commons:commons-compress:1.19 org.apache.commons:commons-compress:1.19
org.apache.commons:commons-lang3:3.5 org.apache.commons:commons-lang3:3.5
org.apache.httpcomponents:httpclient:4.5.10 org.apache.httpcomponents:httpclient:4.5.8
org.apache.httpcomponents:httpcore:4.4.12 org.apache.httpcomponents:httpcore:4.4.11
org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcpg-jdk15on:1.61
org.bouncycastle:bcprov-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61
org.checkerframework:checker-qual:2.8.1 org.checkerframework:checker-qual:2.8.1
Expand Down
28 changes: 14 additions & 14 deletions core/gradle/dependency-locks/default.lockfile
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ com.github.jnr:jnr-ffi:2.1.9
com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-posix:3.0.47
com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-unixsocket:0.21
com.github.jnr:jnr-x86asm:1.0.2 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-jackson2:1.27.0
com.google.api-client:google-api-client-java6: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-servlet:1.29.0
com.google.api-client:google-api-client:1.30.6 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-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-admin-v2:0.38.0
com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0
Expand Down Expand Up @@ -95,22 +95,22 @@ com.google.guava:failureaccess:1.0.1
com.google.guava:guava:28.1-jre com.google.guava:guava:28.1-jre
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.gwt:gwt-user:2.8.2 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-appengine:1.29.2
com.google.http-client:google-http-client-jackson2:1.32.1 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-jackson:1.20.0
com.google.http-client:google-http-client-protobuf: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.extensions:guice-multibindings:4.1.0
com.google.inject:guice:4.1.0 com.google.inject:guice:4.1.0
com.google.j2objc:j2objc-annotations:1.3 com.google.j2objc:j2objc-annotations:1.3
com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.jsinterop:jsinterop-annotations:1.0.2
com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:metrics:1.0.6
com.google.monitoring-client:stackdriver: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-java6:1.28.0
com.google.oauth-client:google-oauth-client-jetty: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-servlet:1.29.0
com.google.oauth-client:google-oauth-client:1.30.4 com.google.oauth-client:google-oauth-client:1.29.2
com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 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-util:3.6.1
com.google.protobuf:protobuf-java:3.6.1 com.google.protobuf:protobuf-java:3.6.1
Expand All @@ -135,7 +135,7 @@ io.dropwizard.metrics:metrics-core:3.1.2
io.grpc:grpc-all:1.17.1 io.grpc:grpc-all:1.17.1
io.grpc:grpc-alts:1.17.1 io.grpc:grpc-alts:1.17.1
io.grpc:grpc-auth: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-core:1.17.1
io.grpc:grpc-grpclb:1.17.1 io.grpc:grpc-grpclb:1.17.1
io.grpc:grpc-netty-shaded:1.17.1 io.grpc:grpc-netty-shaded:1.17.1
Expand All @@ -157,10 +157,10 @@ io.netty:netty-handler:4.1.30.Final
io.netty:netty-resolver: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-tcnative-boringssl-static:2.0.17.Final
io.netty:netty-transport:4.1.30.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-metrics:0.17.0
io.opencensus:opencensus-contrib-grpc-util: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 it.unimi.dsi:fastutil:6.5.16
javax.activation:activation:1.1 javax.activation:activation:1.1
javax.activation:javax.activation-api:1.2.0 javax.activation:javax.activation-api:1.2.0
Expand Down Expand Up @@ -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.beam:beam-vendor-guava-26_0-jre:0.1
org.apache.commons:commons-compress:1.19 org.apache.commons:commons-compress:1.19
org.apache.commons:commons-lang3:3.5 org.apache.commons:commons-lang3:3.5
org.apache.httpcomponents:httpclient:4.5.10 org.apache.httpcomponents:httpclient:4.5.8
org.apache.httpcomponents:httpcore:4.4.12 org.apache.httpcomponents:httpcore:4.4.11
org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcpg-jdk15on:1.61
org.bouncycastle:bcprov-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61
org.checkerframework:checker-qual:2.8.1 org.checkerframework:checker-qual:2.8.1
Expand Down
28 changes: 14 additions & 14 deletions core/gradle/dependency-locks/deploy_jar.lockfile
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ com.github.jnr:jnr-ffi:2.1.9
com.github.jnr:jnr-posix:3.0.47 com.github.jnr:jnr-posix:3.0.47
com.github.jnr:jnr-unixsocket:0.21 com.github.jnr:jnr-unixsocket:0.21
com.github.jnr:jnr-x86asm:1.0.2 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-jackson2:1.27.0
com.google.api-client:google-api-client-java6: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-servlet:1.29.0
com.google.api-client:google-api-client:1.30.6 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-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-admin-v2:0.38.0
com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0
Expand Down Expand Up @@ -95,22 +95,22 @@ com.google.guava:failureaccess:1.0.1
com.google.guava:guava:28.1-jre com.google.guava:guava:28.1-jre
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.gwt:gwt-user:2.8.2 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-appengine:1.29.2
com.google.http-client:google-http-client-jackson2:1.32.1 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-jackson:1.20.0
com.google.http-client:google-http-client-protobuf: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.extensions:guice-multibindings:4.1.0
com.google.inject:guice:4.1.0 com.google.inject:guice:4.1.0
com.google.j2objc:j2objc-annotations:1.3 com.google.j2objc:j2objc-annotations:1.3
com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.jsinterop:jsinterop-annotations:1.0.2
com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:metrics:1.0.6
com.google.monitoring-client:stackdriver: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-java6:1.28.0
com.google.oauth-client:google-oauth-client-jetty: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-servlet:1.29.0
com.google.oauth-client:google-oauth-client:1.30.4 com.google.oauth-client:google-oauth-client:1.29.2
com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 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-util:3.6.1
com.google.protobuf:protobuf-java:3.6.1 com.google.protobuf:protobuf-java:3.6.1
Expand All @@ -135,7 +135,7 @@ io.dropwizard.metrics:metrics-core:3.1.2
io.grpc:grpc-all:1.17.1 io.grpc:grpc-all:1.17.1
io.grpc:grpc-alts:1.17.1 io.grpc:grpc-alts:1.17.1
io.grpc:grpc-auth: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-core:1.17.1
io.grpc:grpc-grpclb:1.17.1 io.grpc:grpc-grpclb:1.17.1
io.grpc:grpc-netty-shaded:1.17.1 io.grpc:grpc-netty-shaded:1.17.1
Expand All @@ -157,10 +157,10 @@ io.netty:netty-handler:4.1.30.Final
io.netty:netty-resolver: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-tcnative-boringssl-static:2.0.17.Final
io.netty:netty-transport:4.1.30.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-metrics:0.17.0
io.opencensus:opencensus-contrib-grpc-util: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 it.unimi.dsi:fastutil:6.5.16
javax.activation:activation:1.1 javax.activation:activation:1.1
javax.activation:javax.activation-api:1.2.0 javax.activation:javax.activation-api:1.2.0
Expand Down Expand Up @@ -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.beam:beam-vendor-guava-26_0-jre:0.1
org.apache.commons:commons-compress:1.19 org.apache.commons:commons-compress:1.19
org.apache.commons:commons-lang3:3.5 org.apache.commons:commons-lang3:3.5
org.apache.httpcomponents:httpclient:4.5.10 org.apache.httpcomponents:httpclient:4.5.8
org.apache.httpcomponents:httpcore:4.4.12 org.apache.httpcomponents:httpcore:4.4.11
org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcpg-jdk15on:1.61
org.bouncycastle:bcprov-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61
org.checkerframework:checker-qual:2.8.1 org.checkerframework:checker-qual:2.8.1
Expand Down
28 changes: 14 additions & 14 deletions core/gradle/dependency-locks/runtime.lockfile
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -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-core:2.9.10
com.fasterxml.jackson.core:jackson-databind:2.9.10 com.fasterxml.jackson.core:jackson-databind:2.9.10
com.fasterxml:classmate:1.3.4 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-jackson2:1.27.0
com.google.api-client:google-api-client-java6: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-servlet:1.29.0
com.google.api-client:google-api-client:1.30.6 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-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-admin-v2:0.38.0
com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0
Expand Down Expand Up @@ -84,22 +84,22 @@ com.google.guava:failureaccess:1.0.1
com.google.guava:guava:28.1-jre com.google.guava:guava:28.1-jre
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.gwt:gwt-user:2.8.2 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-appengine:1.29.2
com.google.http-client:google-http-client-jackson2:1.32.1 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-jackson:1.20.0
com.google.http-client:google-http-client-protobuf: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.extensions:guice-multibindings:4.1.0
com.google.inject:guice:4.1.0 com.google.inject:guice:4.1.0
com.google.j2objc:j2objc-annotations:1.3 com.google.j2objc:j2objc-annotations:1.3
com.google.jsinterop:jsinterop-annotations:1.0.2 com.google.jsinterop:jsinterop-annotations:1.0.2
com.google.monitoring-client:metrics:1.0.6 com.google.monitoring-client:metrics:1.0.6
com.google.monitoring-client:stackdriver: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-java6:1.28.0
com.google.oauth-client:google-oauth-client-jetty: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-servlet:1.29.0
com.google.oauth-client:google-oauth-client:1.30.4 com.google.oauth-client:google-oauth-client:1.29.2
com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 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-util:3.6.1
com.google.protobuf:protobuf-java:3.6.1 com.google.protobuf:protobuf-java:3.6.1
Expand All @@ -124,7 +124,7 @@ io.dropwizard.metrics:metrics-core:3.1.2
io.grpc:grpc-all:1.17.1 io.grpc:grpc-all:1.17.1
io.grpc:grpc-alts:1.17.1 io.grpc:grpc-alts:1.17.1
io.grpc:grpc-auth: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-core:1.17.1
io.grpc:grpc-grpclb:1.17.1 io.grpc:grpc-grpclb:1.17.1
io.grpc:grpc-netty-shaded:1.17.1 io.grpc:grpc-netty-shaded:1.17.1
Expand All @@ -146,10 +146,10 @@ io.netty:netty-handler:4.1.30.Final
io.netty:netty-resolver: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-tcnative-boringssl-static:2.0.17.Final
io.netty:netty-transport:4.1.30.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-metrics:0.17.0
io.opencensus:opencensus-contrib-grpc-util: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 it.unimi.dsi:fastutil:6.5.16
javax.activation:activation:1.1 javax.activation:activation:1.1
javax.activation:javax.activation-api:1.2.0 javax.activation:javax.activation-api:1.2.0
Expand Down Expand Up @@ -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.beam:beam-vendor-guava-26_0-jre:0.1
org.apache.commons:commons-compress:1.19 org.apache.commons:commons-compress:1.19
org.apache.commons:commons-lang3:3.5 org.apache.commons:commons-lang3:3.5
org.apache.httpcomponents:httpclient:4.5.10 org.apache.httpcomponents:httpclient:4.5.8
org.apache.httpcomponents:httpcore:4.4.12 org.apache.httpcomponents:httpcore:4.4.11
org.bouncycastle:bcpg-jdk15on:1.61 org.bouncycastle:bcpg-jdk15on:1.61
org.bouncycastle:bcprov-jdk15on:1.61 org.bouncycastle:bcprov-jdk15on:1.61
org.checkerframework:checker-qual:2.8.1 org.checkerframework:checker-qual:2.8.1
Expand Down
Loading

0 comments on commit dd0e3b7

Please sign in to comment.