Merge branch 'main' into release-please--branches--main

blakeli0 · web-flow · commit b9b961bf2683 · 2022-02-11T16:53:07.000-05:00
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -112,7 +112,7 @@ java_binary(
 java_binary(
     name = "protoc-gen-code_generator_request_dumper",
     main_class = "com.google.api.generator.debug.CodeGeneratorRequestDumper",
-    runtime_deps = [":protoc-gen-java_gapic"] + MAIN_DEPS_DEBUG_RUNTIME_ONLY,
+    runtime_deps = [":protoc-gen-java_gapic"] + MAIN_DEPS + MAIN_DEPS_DEBUG_RUNTIME_ONLY,
 )
 
 # A binary similar to protoc-gen-java_gapic but reads the CodeGeneratorRequest
@@ -125,7 +125,7 @@ java_binary(
 java_binary(
     name = "code_generator_request_file_to_gapic_main",
     main_class = "com.google.api.generator.debug.CodeGeneratorRequestFileToGapicMain",
-    runtime_deps = [":protoc-gen-java_gapic"] + MAIN_DEPS_DEBUG_RUNTIME_ONLY,
+    runtime_deps = [":protoc-gen-java_gapic"] + MAIN_DEPS + MAIN_DEPS_DEBUG_RUNTIME_ONLY,
 )
 
 # another test resource
diff --git a/PROPERTIES.bzl b/PROPERTIES.bzl
@@ -2,7 +2,6 @@ PROPERTIES = {
     "version.com_google_protobuf": "3.19.1",
     # Version of google-java-format is downgraded from 1.8 to 1.7, because 1.8 supports java 11 minimum, while our JRE is java 8.
     "version.google_java_format": "1.7",
-    "version.com_google_api_common_java": "1.9.3",
     "version.io_grpc_java": "1.42.1",
 
     # Common deps.
diff --git a/WORKSPACE b/WORKSPACE
@@ -8,10 +8,10 @@ load("@bazel_tools//tools/build_defs/repo:jvm.bzl", "jvm_maven_import_external")
 # like protobuf will build.
 http_archive(
     name = "bazel_skylib",
-    sha256 = "c6966ec828da198c5d9adbaa94c05e3a1c7f21bd012a0b29ba8ddbccb2c93b0d",
+    sha256 = "af87959afe497dc8dfd4c6cb66e1279cb98ccc84284619ebfec27d9c09a903de",
     urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.1.1/bazel-skylib-1.1.1.tar.gz",
-        "https://github.com/bazelbuild/bazel-skylib/releases/download/1.1.1/bazel-skylib-1.1.1.tar.gz",
+        "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.2.0/bazel-skylib-1.2.0.tar.gz",
+        "https://github.com/bazelbuild/bazel-skylib/releases/download/1.2.0/bazel-skylib-1.2.0.tar.gz",
     ],
 )
 
@@ -33,7 +33,7 @@ jvm_maven_import_external(
 # which in its turn, prioritizes actual generated clients runtime dependencies
 # over the generator dependencies.
 
-_gax_java_version = "2.11.0"
+_gax_java_version = "2.12.2"
 
 http_archive(
     name = "com_google_api_gax_java",
diff --git a/repositories.bzl b/repositories.bzl
@@ -77,14 +77,6 @@ def gapic_generator_java_repositories():
         actual = "@com_google_code_gson_gson//jar",
     )
 
-    _api_common_java_version = PROPERTIES["version.com_google_api_common_java"]
-    _maybe(
-        jvm_maven_import_external,
-        name = "com_google_api_api_common",
-        artifact = "com.google.api:api-common:%s" % _api_common_java_version,
-        server_urls = ["https://repo.maven.apache.org/maven2/"],
-    )
-
     # grpc-proto doesn't have releases, so we use hashes instead.
     _io_grpc_proto_prefix = "8e3fec8612bc0708e857950dccadfd5063703e04"  # Nov. 6, 2021.
     _maybe(
