Pin empty deps

bazel-contrib · Nov 18, 2020 · 275c5b6 · 275c5b6
1 parent 466a35a
commit 275c5b6
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 29 deletions.
diff --git a/private/tools/BUILD b/private/tools/BUILD
@@ -1,5 +1,3 @@
-load("@rules_java//java:defs.bzl", "java_binary")
-
 licenses(["notice"])
 
 java_binary(

diff --git a/private/tools/java/rules/jvm/external/BUILD b/private/tools/java/rules/jvm/external/BUILD
@@ -1,5 +1,3 @@
-load("@rules_java//java:defs.bzl", "java_library", "java_test")
-
 java_library(
     name = "byte-streams",
     srcs = ["ByteStreams.java"],

diff --git a/private/tools/java/rules/jvm/external/jar/BUILD b/private/tools/java/rules/jvm/external/jar/BUILD
@@ -1,5 +1,3 @@
-load("@rules_java//java:defs.bzl", "java_binary")
-
 java_binary(
     name = "MergeJars",
     srcs = glob(["*.java"]),

diff --git a/private/tools/java/rules/jvm/external/javadoc/BUILD b/private/tools/java/rules/jvm/external/javadoc/BUILD
@@ -1,5 +1,3 @@
-load("@rules_java//java:defs.bzl", "java_binary")
-
 java_binary(
     name = "javadoc",
     srcs = glob(["*.java"]),

diff --git a/private/tools/java/rules/jvm/external/maven/BUILD b/private/tools/java/rules/jvm/external/maven/BUILD
@@ -1,5 +1,3 @@
-load("@rules_java//java:defs.bzl", "java_binary")
-
 java_binary(
     name = "MavenPublisher",
     srcs = ["MavenPublisher.java"],

diff --git a/private/tools/java/rules/jvm/external/zip/BUILD b/private/tools/java/rules/jvm/external/zip/BUILD
@@ -1,5 +1,3 @@
-load("@rules_java//java:defs.bzl", "java_library")
-
 java_library(
     name = "zip",
     srcs = glob(["*.java"]),

diff --git a/repositories.bzl b/repositories.bzl
@@ -1,10 +1,14 @@
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
+load("//:defs.bzl", "maven_install")
 
 def rules_jvm_external_deps():
-    maybe(
-        http_archive,
-        name = "rules_java",
-        url = "https://github.com/bazelbuild/rules_java/releases/download/0.1.1/rules_java-0.1.1.tar.gz",
-        sha256 = "220b87d8cfabd22d1c6d8e3cdb4249abd4c93dcc152e0667db061fb1b957ee68",
+    maven_install(
+        name = "rules_jvm_external_deps",
+        artifacts = [
+        ],
+        maven_install_json = "@rules_jvm_external//:rules_jvm_external_deps_install.json",
+        repositories = [
+            "https://repo1.maven.org/maven2",
+            "https://jcenter.bintray.com/",
+            "https://maven.google.com",
+        ],
     )
diff --git a/rules_jvm_external_deps_install.json b/rules_jvm_external_deps_install.json
@@ -0,0 +1,9 @@
+{
+    "dependency_tree": {
+        "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": 2914,
+        "conflict_resolution": {},
+        "dependencies": [
+        ],
+        "version": "0.1.0"
+    }
+}
diff --git a/setup.bzl b/setup.bzl
@@ -1,5 +1,4 @@
-load("@rules_java//java:repositories.bzl", "rules_java_dependencies", "rules_java_toolchains")
+load("@rules_jvm_external_deps//:defs.bzl", "pinned_maven_install")
 
 def rules_jvm_external_setup():
-    rules_java_dependencies()
-    rules_java_toolchains()
+    pinned_maven_install()
diff --git a/tests/com/jvm/external/BUILD b/tests/com/jvm/external/BUILD
@@ -1,5 +1,3 @@
-load("@rules_java//java:defs.bzl", "java_test")
-
 java_test(
     name = "ArtifactExclusionsTest",
     srcs = ["ArtifactExclusionsTest.java"],

diff --git a/tests/com/jvm/external/jar/BUILD b/tests/com/jvm/external/jar/BUILD
@@ -1,4 +1,3 @@
-load("@rules_java//java:defs.bzl", "java_test")
 load("//:defs.bzl", "artifact")
 
 java_test(

diff --git a/tests/com/jvm/external/javadoc/BUILD b/tests/com/jvm/external/javadoc/BUILD
@@ -1,5 +1,3 @@
-load("@rules_java//java:defs.bzl", "java_test")
-
 java_test(
     name = "VersionTest",
     srcs = ["VersionTest.java"],

diff --git a/tests/integration/BUILD b/tests/integration/BUILD
@@ -1,5 +1,4 @@
 load("@bazel_skylib//rules:diff_test.bzl", "diff_test")
-load("@rules_java//java:defs.bzl", "java_import")
 
 genquery(
     name = "testonly-deps",

diff --git a/tests/integration/java_export/BUILD b/tests/integration/java_export/BUILD
@@ -1,4 +1,3 @@
-load("@rules_java//java:defs.bzl", "java_library", "java_test")
 load("//:defs.bzl", "artifact")
 load("//private/rules:maven_project_jar.bzl", "maven_project_jar")