diff --git a/BUILD.bazel b/BUILD.bazel index eca5171bd7..4f51d9073d 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -20,12 +20,12 @@ MAIN_DEPS = [ "@com_google_http_client_google_http_client//jar", "@com_google_protobuf//:protobuf_java", "@com_google_protobuf//:protobuf_java_util", - "@google_java_format_all_deps//jar", "@io_grpc_grpc_java//api", "@io_grpc_grpc_java//protobuf", "@io_grpc_grpc_java//stub", "@javax_annotation_javax_annotation_api//jar", "@junit_junit//jar", + "@maven//:com_google_googlejavaformat_google_java_format_all_deps", "@org_threeten_threetenbp//jar", "@org_yaml_snakeyaml//jar", ] @@ -197,7 +197,7 @@ java_binary( name = "google_java_format_binary", jvm_flags = ["-Xmx512m"], main_class = "com.google.googlejavaformat.java.Main", - runtime_deps = ["@google_java_format_all_deps//jar"], + runtime_deps = ["@maven//:com_google_googlejavaformat_google_java_format_all_deps"], ) genrule( diff --git a/PROPERTIES.bzl b/PROPERTIES.bzl index 8abf2dd26f..a6746d7a10 100644 --- a/PROPERTIES.bzl +++ b/PROPERTIES.bzl @@ -1,7 +1,5 @@ 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.io_grpc_java": "1.42.1", # Common deps. diff --git a/WORKSPACE b/WORKSPACE index 22744a67eb..1a63c4ecb8 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -1,7 +1,15 @@ workspace(name = "gapic_generator_java") load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") -load("@bazel_tools//tools/build_defs/repo:jvm.bzl", "jvm_maven_import_external") + +http_archive( + name = "rules_jvm_external", + strip_prefix = "rules_jvm_external-4.2", + sha256 = "cd1a77b7b02e8e008439ca76fd34f5b07aecb8c752961f9640dea15e9e5ba1ca", + url = "https://github.com/bazelbuild/rules_jvm_external/archive/4.2.zip", +) + +load("@rules_jvm_external//:defs.bzl", "maven_install") # DO NOT REMOVE. # This is needed to clobber any transitively-pulled in versions of bazel_skylib so that packages @@ -15,17 +23,9 @@ http_archive( ], ) -jvm_maven_import_external( - name = "google_java_format_all_deps", - artifact = "com.google.googlejavaformat:google-java-format:jar:all-deps:1.7", - licenses = [ - "notice", - "reciprocal", - ], - server_urls = [ - "https://repo.maven.apache.org/maven2/", - "http://repo1.maven.org/maven2/", - ], +maven_install( + artifacts = ["com.google.googlejavaformat:google-java-format:jar:all-deps:1.7"], + repositories = ["https://repo.maven.apache.org/maven2/"], ) # gax-java and its transitive dependencies must be imported before @@ -42,7 +42,6 @@ http_archive( ) load("@com_google_api_gax_java//:repository_rules.bzl", "com_google_api_gax_java_properties") - com_google_api_gax_java_properties( name = "com_google_api_gax_java_properties", file = "@com_google_api_gax_java//:dependencies.properties", @@ -57,26 +56,11 @@ load("//:repositories.bzl", "gapic_generator_java_repositories") gapic_generator_java_repositories() # protobuf -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/archive/%s.zip" % RULES_JVM_EXTERNAL_TAG, -) - load("@com_google_protobuf//:protobuf_deps.bzl", "PROTOBUF_MAVEN_ARTIFACTS", "protobuf_deps") -load("@rules_jvm_external//:defs.bzl", "maven_install") - maven_install( artifacts = PROTOBUF_MAVEN_ARTIFACTS, - generate_compat_repositories = True, - repositories = [ - "https://repo.maven.apache.org/maven2/", - ], + repositories = ["https://repo.maven.apache.org/maven2/"], ) protobuf_deps() diff --git a/repositories.bzl b/repositories.bzl index e3e263cad3..ec12956516 100644 --- a/repositories.bzl +++ b/repositories.bzl @@ -40,14 +40,6 @@ def gapic_generator_java_repositories(): strip_prefix = "protobuf-%s" % _protobuf_version, ) - _maybe( - jvm_maven_import_external, - name = "google_java_format_all_deps", - artifact = "com.google.googlejavaformat:google-java-format:jar:all-deps:%s" % PROPERTIES["version.google_java_format"], - server_urls = ["https://repo.maven.apache.org/maven2/", "http://repo1.maven.org/maven2/"], - licenses = ["notice", "reciprocal"], - ) - _maybe( http_archive, name = "bazel_skylib",