additional renames

Author: pcj

.bazelrc

@@ -6,19 +6,20 @@ common --repository_cache=bazel-cache/repo
 # ----------------------------------------------
 # java configuration
 # ----------------------------------------------
+
 build:java11 --java_language_version=11
 build:java11 --tool_java_language_version=11
 build:java11 --java_runtime_version=remotejdk_11
 build:java11 --tool_java_runtime_version=remotejdk_11
-build:java11 --java_toolchain=//tools/java:java11_toolchain
-build:java11 --host_java_toolchain=//tools/java:java11_toolchain
+build:java11 --java_toolchain=//tools/jdk:toolchain_java11_definition
+build:java11 --host_java_toolchain=//tools/jdk:toolchain_java11_definition
 
 build:java17 --java_language_version=17
 build:java17 --tool_java_language_version=17
 build:java17 --java_runtime_version=remotejdk_17
 build:java17 --tool_java_runtime_version=remotejdk_17
-build:java17 --java_toolchain=//tools/java:java17_toolchain
-build:java17 --host_java_toolchain=//tools/java:java17_toolchain
+build:java17 --java_toolchain=//tools/jdk:toolchain_jdk_17_definition
+build:java17 --host_java_toolchain=//tools/jdk:toolchain_jdk_17_definition
 
 build --config=java11
 

WORKSPACE

@@ -86,5 +86,5 @@ perl_register_toolchains()
 register_toolchains(
     "//tools/scala:compile_toolchain",
     "//tools/scala:testing_toolchain",
-    "//tools/java:java11_toolchain",
+    "//tools/jdk:toolchain_java11_definition",
 )

build_stack_rules_scala_coverage_maven_install.json renamed to build_stack_bazel_jacocorunner_maven_install.json

@@ -1,9 +1,3 @@
-# Bazel custom Jacoco runner used to provide proper initialization and lcov
-# report generation when using offline Jacoco instrumentation.
-# This target should not be used as a dependency (except when writing tests for
-# it).
-#
-# An implicit dependency of all "java_binary" rules.
 java_binary(
     name = "JacocoCoverage",
     srcs = ["JacocoCoverageRunner.java"],

java/com/google/testing/coverage/BUILD.bazel

@@ -1,16 +1,15 @@
 # jarjar
 
-The bazel rule `genrule rule
-//src/java_tools/junitrunner/java/com/google/testing/coverage:Jacoco_jarjar`
-requires jarjar for building the final jar.  I'm not sure why renaming classes
-within the coverage jar is needed, but preserving it.
+The bazel genrule
+`//src/java_tools/junitrunner/java/com/google/testing/coverage:Jacoco_jarjar`
+uses jarjar for building the final jar (with shading of some dependencies).  I'm
+not sure why renaming classes within the coverage jar is needed, but preserving
+this behavior regardless.
 
-Unfortunately jarjar is not exposed in `@bazel_tools` and I'd rather not take on
-additional dependencies to build it from source here.  Instead, the deploy jar
-is vendored here.
+Unfortunately, `jarjar` is not exposed in `@bazel_tools` and I'd rather not take
+on additional dependencies to build it from source.  Instead, the deploy jar is
+vendored here.
 
-To rebuild, check out the bazel source and `bazel build
+To rebuild it, check out the bazel source and `bazel build
 //third_party/jarjar:jarjar_command_deploy.jar`, then replace the artifact here
 with the appropriately named bazel tag version that it was built from.
-
-Other option would be to use github.com/johnynek/bazel_jar_jar.

third_party/jarjar/README.md

@@ -1,6 +1,9 @@
-# This file was produced via `bazel query --output build
-# @bazel_tools//tools/jdk:all` and keeping the `java_toolchain` and `toolchain`
-# rules.
+# This file was produced via the following procedure:
+#
+# - `bazel query --output build @bazel_tools//tools/jdk:all | pbcopy`
+# - delete all rules other than the `java_toolchain` related rules.
+# - replace `jacocorunner` attribute with the filegroup defined here.
+# - make all `toolchain` rules public.
 
 filegroup(
     name = "jacocorunner",
@@ -15,7 +18,7 @@ java_toolchain(
     header_compiler = ["@remote_java_tools//:TurbineDirect"],
     header_compiler_direct = ["@remote_java_tools//:TurbineDirect"],
     ijar = ["@bazel_tools//tools/jdk:ijar_prebuilt_binary"],
-    jacocorunner = "@remote_java_tools//:jacoco_coverage_runner_filegroup",
+    jacocorunner = ":jacocorunner",
     java_runtime = "@bazel_tools//tools/jdk:remote_jdk11",
     javabuilder = ["@remote_java_tools//:JavaBuilder"],
     javac_supports_workers = True,
@@ -58,7 +61,7 @@ java_toolchain(
     header_compiler = ["@remote_java_tools//:TurbineDirect"],
     header_compiler_direct = ["@remote_java_tools//:TurbineDirect"],
     ijar = ["@bazel_tools//tools/jdk:ijar"],
-    jacocorunner = "@remote_java_tools//:jacoco_coverage_runner_filegroup",
+    jacocorunner = ":jacocorunner",
     java_runtime = "@bazel_tools//tools/jdk:remote_jdk11",
     javabuilder = ["@remote_java_tools//:JavaBuilder"],
     javac_supports_workers = True,
@@ -101,7 +104,7 @@ java_toolchain(
     header_compiler = ["@remote_java_tools//:TurbineDirect"],
     header_compiler_direct = ["@remote_java_tools//:TurbineDirect"],
     ijar = ["@bazel_tools//tools/jdk:ijar"],
-    jacocorunner = "@remote_java_tools//:jacoco_coverage_runner_filegroup",
+    jacocorunner = ":jacocorunner",
     java_runtime = "@bazel_tools//tools/jdk:remote_jdk11",
     javabuilder = ["@remote_java_tools//:JavaBuilder"],
     javac_supports_workers = True,
@@ -138,8 +141,8 @@ java_toolchain(
 
 toolchain(
     name = "toolchain_java10_definition",
-    target_settings = ["@bazel_tools//tools/jdk:toolchain_java10_version_setting"],
-    toolchain = "@bazel_tools//tools/jdk:toolchain_java10",
+    target_settings = ["//tools/jdk:toolchain_java10_version_setting"],
+    toolchain = "//tools/jdk:toolchain_java10",
     toolchain_type = "@bazel_tools//tools/jdk:toolchain_type",
     visibility = ["//visibility:public"],
 )
@@ -158,7 +161,7 @@ java_toolchain(
     header_compiler = ["@remote_java_tools//:TurbineDirect"],
     header_compiler_direct = ["@remote_java_tools//:TurbineDirect"],
     ijar = ["@bazel_tools//tools/jdk:ijar"],
-    jacocorunner = "@remote_java_tools//:jacoco_coverage_runner_filegroup",
+    jacocorunner = ":jacocorunner",
     java_runtime = "@bazel_tools//tools/jdk:remote_jdk11",
     javabuilder = ["@remote_java_tools//:JavaBuilder"],
     javac_supports_workers = True,
@@ -195,8 +198,8 @@ java_toolchain(
 
 toolchain(
     name = "toolchain_java11_definition",
-    target_settings = ["@bazel_tools//tools/jdk:toolchain_java11_version_setting"],
-    toolchain = "@bazel_tools//tools/jdk:toolchain_java11",
+    target_settings = ["//tools/jdk:toolchain_java11_version_setting"],
+    toolchain = "//tools/jdk:toolchain_java11",
     toolchain_type = "@bazel_tools//tools/jdk:toolchain_type",
     visibility = ["//visibility:public"],
 )
@@ -215,7 +218,7 @@ java_toolchain(
     header_compiler = ["@remote_java_tools//:TurbineDirect"],
     header_compiler_direct = ["@remote_java_tools//:TurbineDirect"],
     ijar = ["@bazel_tools//tools/jdk:ijar"],
-    jacocorunner = "@remote_java_tools//:jacoco_coverage_runner_filegroup",
+    jacocorunner = ":jacocorunner",
     java_runtime = "@bazel_tools//tools/jdk:remote_jdk11",
     javabuilder = ["@remote_java_tools//:JavaBuilder"],
     javac_supports_workers = True,
@@ -252,8 +255,8 @@ java_toolchain(
 
 toolchain(
     name = "toolchain_java8_definition",
-    target_settings = ["@bazel_tools//tools/jdk:toolchain_java8_version_setting"],
-    toolchain = "@bazel_tools//tools/jdk:toolchain_java8",
+    target_settings = ["//tools/jdk:toolchain_java8_version_setting"],
+    toolchain = "//tools/jdk:toolchain_java8",
     toolchain_type = "@bazel_tools//tools/jdk:toolchain_type",
     visibility = ["//visibility:public"],
 )
@@ -272,7 +275,7 @@ java_toolchain(
     header_compiler = ["@remote_java_tools//:TurbineDirect"],
     header_compiler_direct = ["@remote_java_tools//:TurbineDirect"],
     ijar = ["@bazel_tools//tools/jdk:ijar"],
-    jacocorunner = "@remote_java_tools//:jacoco_coverage_runner_filegroup",
+    jacocorunner = ":jacocorunner",
     java_runtime = "@bazel_tools//tools/jdk:remote_jdk11",
     javabuilder = ["@remote_java_tools//:JavaBuilder"],
     javac_supports_workers = True,
@@ -309,8 +312,8 @@ java_toolchain(
 
 toolchain(
     name = "toolchain_java9_definition",
-    target_settings = ["@bazel_tools//tools/jdk:toolchain_java9_version_setting"],
-    toolchain = "@bazel_tools//tools/jdk:toolchain_java9",
+    target_settings = ["//tools/jdk:toolchain_java9_version_setting"],
+    toolchain = "//tools/jdk:toolchain_java9",
     toolchain_type = "@bazel_tools//tools/jdk:toolchain_type",
     visibility = ["//visibility:public"],
 )
@@ -329,7 +332,7 @@ java_toolchain(
     header_compiler = ["@remote_java_tools//:TurbineDirect"],
     header_compiler_direct = ["@remote_java_tools//:TurbineDirect"],
     ijar = ["@bazel_tools//tools/jdk:ijar"],
-    jacocorunner = "@remote_java_tools//:jacoco_coverage_runner_filegroup",
+    jacocorunner = ":jacocorunner",
     java_runtime = "@bazel_tools//tools/jdk:remotejdk_14",
     javabuilder = ["@remote_java_tools//:JavaBuilder"],
     javac_supports_workers = True,
@@ -364,8 +367,8 @@ java_toolchain(
 
 toolchain(
     name = "toolchain_jdk_14_definition",
-    target_settings = ["@bazel_tools//tools/jdk:toolchain_jdk_14_version_setting"],
-    toolchain = "@bazel_tools//tools/jdk:toolchain_jdk_14",
+    target_settings = ["//tools/jdk:toolchain_jdk_14_version_setting"],
+    toolchain = "//tools/jdk:toolchain_jdk_14",
     toolchain_type = "@bazel_tools//tools/jdk:toolchain_type",
     visibility = ["//visibility:public"],
 )
@@ -384,7 +387,7 @@ java_toolchain(
     header_compiler = ["@remote_java_tools//:TurbineDirect"],
     header_compiler_direct = ["@remote_java_tools//:TurbineDirect"],
     ijar = ["@bazel_tools//tools/jdk:ijar"],
-    jacocorunner = "@remote_java_tools//:jacoco_coverage_runner_filegroup",
+    jacocorunner = ":jacocorunner",
     java_runtime = "@bazel_tools//tools/jdk:remotejdk_15",
     javabuilder = ["@remote_java_tools//:JavaBuilder"],
     javac_supports_workers = True,
@@ -419,8 +422,8 @@ java_toolchain(
 
 toolchain(
     name = "toolchain_jdk_15_definition",
-    target_settings = ["@bazel_tools//tools/jdk:toolchain_jdk_15_version_setting"],
-    toolchain = "@bazel_tools//tools/jdk:toolchain_jdk_15",
+    target_settings = ["//tools/jdk:toolchain_jdk_15_version_setting"],
+    toolchain = "//tools/jdk:toolchain_jdk_15",
     toolchain_type = "@bazel_tools//tools/jdk:toolchain_type",
     visibility = ["//visibility:public"],
 )
@@ -439,7 +442,7 @@ java_toolchain(
     header_compiler = ["@remote_java_tools//:TurbineDirect"],
     header_compiler_direct = ["@remote_java_tools//:TurbineDirect"],
     ijar = ["@bazel_tools//tools/jdk:ijar"],
-    jacocorunner = "@remote_java_tools//:jacoco_coverage_runner_filegroup",
+    jacocorunner = ":jacocorunner",
     java_runtime = "@bazel_tools//tools/jdk:remotejdk_16",
     javabuilder = ["@remote_java_tools//:JavaBuilder"],
     javac_supports_workers = True,
@@ -474,8 +477,8 @@ java_toolchain(
 
 toolchain(
     name = "toolchain_jdk_16_definition",
-    target_settings = ["@bazel_tools//tools/jdk:toolchain_jdk_16_version_setting"],
-    toolchain = "@bazel_tools//tools/jdk:toolchain_jdk_16",
+    target_settings = ["//tools/jdk:toolchain_jdk_16_version_setting"],
+    toolchain = "//tools/jdk:toolchain_jdk_16",
     toolchain_type = "@bazel_tools//tools/jdk:toolchain_type",
     visibility = ["//visibility:public"],
 )
@@ -494,7 +497,7 @@ java_toolchain(
     header_compiler = ["@remote_java_tools//:TurbineDirect"],
     header_compiler_direct = ["@remote_java_tools//:TurbineDirect"],
     ijar = ["@bazel_tools//tools/jdk:ijar"],
-    jacocorunner = "@remote_java_tools//:jacoco_coverage_runner_filegroup",
+    jacocorunner = ":jacocorunner",
     java_runtime = "@bazel_tools//tools/jdk:remotejdk_17",
     javabuilder = ["@remote_java_tools//:JavaBuilder"],
     javac_supports_workers = True,
@@ -529,8 +532,8 @@ java_toolchain(
 
 toolchain(
     name = "toolchain_jdk_17_definition",
-    target_settings = ["@bazel_tools//tools/jdk:toolchain_jdk_17_version_setting"],
-    toolchain = "@bazel_tools//tools/jdk:toolchain_jdk_17",
+    target_settings = ["//tools/jdk:toolchain_jdk_17_version_setting"],
+    toolchain = "//tools/jdk:toolchain_jdk_17",
     toolchain_type = "@bazel_tools//tools/jdk:toolchain_type",
     visibility = ["//visibility:public"],
 )
@@ -549,7 +552,7 @@ java_toolchain(
     header_compiler = ["@remote_java_tools//:TurbineDirect"],
     header_compiler_direct = ["@remote_java_tools//:TurbineDirect"],
     ijar = ["@bazel_tools//tools/jdk:ijar"],
-    jacocorunner = "@remote_java_tools//:jacoco_coverage_runner_filegroup",
+    jacocorunner = ":jacocorunner",
     java_runtime = "@bazel_tools//tools/jdk:remotejdk_18",
     javabuilder = ["@remote_java_tools//:JavaBuilder"],
     javac_supports_workers = True,
@@ -584,8 +587,8 @@ java_toolchain(
 
 toolchain(
     name = "toolchain_jdk_18_definition",
-    target_settings = ["@bazel_tools//tools/jdk:toolchain_jdk_18_version_setting"],
-    toolchain = "@bazel_tools//tools/jdk:toolchain_jdk_18",
+    target_settings = ["//tools/jdk:toolchain_jdk_18_version_setting"],
+    toolchain = "//tools/jdk:toolchain_jdk_18",
     toolchain_type = "@bazel_tools//tools/jdk:toolchain_type",
     visibility = ["//visibility:public"],
 )