restore bazel configurations

googleapis · Oct 25, 2023 · 7774eb0 · 7774eb0
1 parent 4635dd5
commit 7774eb0
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 32 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -33,13 +33,15 @@ http_archive(
 )
 
 # protobuf
-RULES_JVM_EXTERNAL_TAG = "5.3"
-RULES_JVM_EXTERNAL_SHA = "d31e369b854322ca5098ea12c69d7175ded971435e55c18dd9dd5f29cc5249ac"
+RULES_JVM_EXTERNAL_TAG = "4.5"
+
+RULES_JVM_EXTERNAL_SHA = "b17d7388feb9bfa7f2fa09031b32707df529f26c91ab9e5d909eb1676badd9a6"
+
 http_archive(
     name = "rules_jvm_external",
-    strip_prefix = "rules_jvm_external-%s" % RULES_JVM_EXTERNAL_TAG,
     sha256 = RULES_JVM_EXTERNAL_SHA,
-    url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % (RULES_JVM_EXTERNAL_TAG, RULES_JVM_EXTERNAL_TAG)
+    strip_prefix = "rules_jvm_external-%s" % RULES_JVM_EXTERNAL_TAG,
+    url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % RULES_JVM_EXTERNAL_TAG,
 )
 
 load("@rules_jvm_external//:repositories.bzl", "rules_jvm_external_deps")
@@ -127,13 +129,3 @@ http_archive(
 load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
 
 rules_pkg_dependencies()
-
-maven_install(
-    artifacts = [
-        'com.google.api:api-common:2.15.1-SNAPSHOT'
-    ],
-    repositories = [
-        'm2Local',
-    ]
-)
-
diff --git a/gax-java/WORKSPACE b/gax-java/WORKSPACE
@@ -19,23 +19,15 @@ load("@com_google_protobuf//:protobuf_deps.bzl",
 # PROTOBUF_MAVEN_ARTIFACTS variable so that the Bazel users can resolve their
 # dependencies through maven_install.
 # https://github.com/protocolbuffers/protobuf/issues/9132
-RULES_JVM_EXTERNAL_TAG = "5.3"
-RULES_JVM_EXTERNAL_SHA = "d31e369b854322ca5098ea12c69d7175ded971435e55c18dd9dd5f29cc5249ac"
+RULES_JVM_EXTERNAL_TAG = "4.2"
+RULES_JVM_EXTERNAL_SHA = "cd1a77b7b02e8e008439ca76fd34f5b07aecb8c752961f9640dea15e9e5ba1ca"
 http_archive(
     name = "rules_jvm_external",
     strip_prefix = "rules_jvm_external-%s" % RULES_JVM_EXTERNAL_TAG,
     sha256 = RULES_JVM_EXTERNAL_SHA,
-    url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % (RULES_JVM_EXTERNAL_TAG, RULES_JVM_EXTERNAL_TAG)
+    url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % RULES_JVM_EXTERNAL_TAG,
 )
 
-load("@rules_jvm_external//:repositories.bzl", "rules_jvm_external_deps")
-
-rules_jvm_external_deps()
-
-load("@rules_jvm_external//:setup.bzl", "rules_jvm_external_setup")
-
-rules_jvm_external_setup()
-
 load("@rules_jvm_external//:defs.bzl", "maven_install")
 
 maven_install(

diff --git a/gax-java/dependencies.properties b/gax-java/dependencies.properties
@@ -66,7 +66,7 @@ maven.com_google_errorprone_error_prone_annotations=com.google.errorprone:error_
 maven.com_google_j2objc_j2objc_annotations=com.google.j2objc:j2objc-annotations:2.8
 maven.com_google_auto_value_auto_value=com.google.auto.value:auto-value:1.10.4
 maven.com_google_auto_value_auto_value_annotations=com.google.auto.value:auto-value-annotations:1.10.4
-maven.com_google_api_api_common=com.google.api:api-common:2.19.0
+maven.com_google_api_api_common=com.google.api:api-common:2.18.0
 maven.org_threeten_threetenbp=org.threeten:threetenbp:1.6.8
 maven.com_google_api_grpc_grpc_google_iam_v1=com.google.api.grpc:grpc-google-iam-v1:1.21.0
 maven.com_google_api_grpc_proto_google_iam_v1=com.google.api.grpc:proto-google-iam-v1:1.21.0

diff --git a/gax-java/gax-grpc/BUILD.bazel b/gax-java/gax-grpc/BUILD.bazel
@@ -20,7 +20,7 @@ _COMPILE_DEPS = [
     "@com_google_auth_google_auth_library_oauth2_http//jar",
     "@com_google_auth_google_auth_library_credentials//jar",
     "@com_google_api_grpc_proto_google_common_protos//jar",
-    "@maven//:com_google_api_api_common",
+    "@com_google_api_api_common//jar",
     "@com_google_auto_value_auto_value//jar",
     "@com_google_auto_value_auto_value_annotations//jar",
     "@com_google_http_client_google_http_client//jar",

diff --git a/gax-java/gax-httpjson/BUILD.bazel b/gax-java/gax-httpjson/BUILD.bazel
@@ -16,7 +16,7 @@ _COMPILE_DEPS = [
     "@com_google_http_client_google_http_client//jar",
     "@com_google_auth_google_auth_library_oauth2_http//jar",
     "@com_google_auth_google_auth_library_credentials//jar",
-    "@maven//:com_google_api_api_common",
+    "@com_google_api_api_common//jar",
     "@com_google_auto_value_auto_value//jar",
     "@com_google_auto_value_auto_value_annotations//jar",
     "@javax_annotation_javax_annotation_api//jar",

diff --git a/gax-java/gax/BUILD.bazel b/gax-java/gax/BUILD.bazel
@@ -8,6 +8,7 @@ _JAVA_COPTS = [
 ]
 
 _COMPILE_DEPS = [
+    "@com_google_api_api_common//jar",
     "@com_google_api_grpc_proto_google_common_protos//jar",
     "@com_google_protobuf_java//jar",
     "@com_google_auth_google_auth_library_credentials//jar",
@@ -26,8 +27,7 @@ _COMPILE_DEPS = [
     "@com_google_code_gson_gson//jar",
     "@com_google_guava_failureaccess//jar",
     "@javax_annotation_javax_annotation_api//jar",
-    "@org_graalvm_sdk//jar",
-    "@maven//:com_google_api_api_common",
+    "@org_graalvm_sdk//jar"
 ]
 
 _TEST_COMPILE_DEPS = [

diff --git a/rules_java_gapic/java_gapic.bzl b/rules_java_gapic/java_gapic.bzl
@@ -279,7 +279,7 @@ def java_gapic_library(
         name = resource_name_name,
         srcs = ["%s-resource-name.srcjar" % srcjar_name],
         deps = [
-            "@maven//:com_google_api_api_common",
+            "@com_google_api_api_common//jar",
             "@com_google_guava_guava//jar",
             "@javax_annotation_javax_annotation_api//jar",
         ],
@@ -291,7 +291,7 @@ def java_gapic_library(
         "@com_google_googleapis//google/rpc:rpc_java_proto",
         "@com_google_googleapis//google/longrunning:longrunning_java_proto",
         "@com_google_protobuf//:protobuf_java",
-        "@maven//:com_google_api_api_common",
+        "@com_google_api_api_common//jar",
         "@com_google_api_gax_java//gax:gax",
         "@com_google_guava_guava//jar",
         "@com_google_code_findbugs_jsr305//jar",