Inline the maven repos to share grpc version. (#46)

grpc-ecosystem · Oct 13, 2021 · 39ec03e · 39ec03e
1 parent 5f19fc7
commit 39ec03e
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 24 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -1,10 +1,13 @@
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
+GRPC_JAVA_VERSION = "1.29.0"
+GRPC_JAVA_SHA = "446ad7a2e85bbd05406dbf95232c7c49ed90de83b3b60cb2048b0c4c9f254d29"
+
 http_archive(
     name = "io_grpc_grpc_java",
-    sha256 = "446ad7a2e85bbd05406dbf95232c7c49ed90de83b3b60cb2048b0c4c9f254d29",
-    strip_prefix = "grpc-java-1.29.0",
-    url = "https://github.com/grpc/grpc-java/archive/v1.29.0.zip",
+    sha256 = GRPC_JAVA_SHA,
+    strip_prefix = "grpc-java-%s" % GRPC_JAVA_VERSION,
+    url = "https://github.com/grpc/grpc-java/archive/v%s.zip" % GRPC_JAVA_VERSION,
 )
 
 load("@io_grpc_grpc_java//:repositories.bzl", "IO_GRPC_GRPC_JAVA_ARTIFACTS")
@@ -23,7 +26,17 @@ load("@rules_jvm_external//:repositories.bzl", "rules_jvm_external_deps")
 rules_jvm_external_deps()
 
 load("@rules_jvm_external//:defs.bzl", "maven_install")
-load("//:repositories.bzl", "MAVEN_ARTIFACTS")
+
+MAVEN_ARTIFACTS = [
+    "com.google.cloud:google-cloud-core:1.93.10",
+    "com.google.cloud:google-cloud-storage:1.113.4",
+    "com.google.truth:truth:1.0.1",
+    "io.grpc:grpc-api:%s" % GRPC_JAVA_VERSION,
+    "io.grpc:grpc-stub:%s" % GRPC_JAVA_VERSION,
+    "io.prometheus:simpleclient:0.11.0",
+    "junit:junit:4.10",
+    "org.mockito:mockito-all:1.10.19",
+]
 
 maven_install(
     artifacts = MAVEN_ARTIFACTS + IO_GRPC_GRPC_JAVA_ARTIFACTS,

diff --git a/maven_install.json b/maven_install.json
@@ -1,17 +1,14 @@
 {
     "dependency_tree": {
         "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
-        "__INPUT_ARTIFACTS_HASH": -1095243038,
-        "__RESOLVED_ARTIFACTS_HASH": -1814005024,
+        "__INPUT_ARTIFACTS_HASH": 696777474,
+        "__RESOLVED_ARTIFACTS_HASH": 1458508528,
         "conflict_resolution": {
             "com.google.api.grpc:proto-google-common-protos:1.17.0": "com.google.api.grpc:proto-google-common-protos:2.0.1",
             "com.google.auth:google-auth-library-credentials:0.20.0": "com.google.auth:google-auth-library-credentials:0.22.0",
             "com.google.auth:google-auth-library-oauth2-http:0.20.0": "com.google.auth:google-auth-library-oauth2-http:0.22.0",
             "com.google.errorprone:error_prone_annotations:2.3.4": "com.google.errorprone:error_prone_annotations:2.4.0",
             "com.google.guava:guava:28.2-android": "com.google.guava:guava:30.0-android",
-            "com.google.guava:guava:29.0-jre": "com.google.guava:guava:30.0-android",
-            "com.google.protobuf:protobuf-java-util:3.12.1": "com.google.protobuf:protobuf-java-util:3.13.0",
-            "com.google.protobuf:protobuf-java:3.12.1": "com.google.protobuf:protobuf-java:3.13.0",
             "javax.annotation:javax.annotation-api:1.2": "javax.annotation:javax.annotation-api:1.3.2",
             "junit:junit:4.10": "junit:junit:4.12"
         },
@@ -747,11 +744,15 @@
             {
                 "coord": "io.grpc:grpc-api:1.29.0",
                 "dependencies": [
+                    "com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava",
                     "org.codehaus.mojo:animal-sniffer-annotations:1.18",
+                    "com.google.j2objc:j2objc-annotations:1.3",
                     "com.google.code.findbugs:jsr305:3.0.2",
                     "com.google.guava:guava:30.0-android",
+                    "com.google.guava:failureaccess:1.0.1",
                     "io.grpc:grpc-context:1.33.1",
-                    "com.google.errorprone:error_prone_annotations:2.4.0"
+                    "com.google.errorprone:error_prone_annotations:2.4.0",
+                    "org.checkerframework:checker-compat-qual:2.5.5"
                 ],
                 "directDependencies": [
                     "org.codehaus.mojo:animal-sniffer-annotations:1.18",
@@ -785,12 +786,16 @@
             {
                 "coord": "io.grpc:grpc-stub:1.29.0",
                 "dependencies": [
+                    "com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava",
                     "org.codehaus.mojo:animal-sniffer-annotations:1.18",
+                    "com.google.j2objc:j2objc-annotations:1.3",
                     "com.google.code.findbugs:jsr305:3.0.2",
                     "com.google.guava:guava:30.0-android",
                     "io.grpc:grpc-api:1.29.0",
+                    "com.google.guava:failureaccess:1.0.1",
                     "io.grpc:grpc-context:1.33.1",
-                    "com.google.errorprone:error_prone_annotations:2.4.0"
+                    "com.google.errorprone:error_prone_annotations:2.4.0",
+                    "org.checkerframework:checker-compat-qual:2.5.5"
                 ],
                 "directDependencies": [
                     "io.grpc:grpc-api:1.29.0"

diff --git a/repositories.bzl b/repositories.bzl