Migrate off versioned javac and Error Prone targets

Change-Id: Iad1e07ad55d5304d7c3dbb8bdab856728a91432d
PiperOrigin-RevId: 155375893

12 files changed, 34 insertions, 34 deletions

diff --git a/src/BUILD b/src/BUILD
index ba5735be66..6fc3aeaffe 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -130,7 +130,7 @@ filegroup(
         "//tools:embedded_tools_srcs",
         "//third_party:gpl-srcs",
         "//third_party/java/jarjar:embedded_tools_srcs",
-        "//third_party/java/jdk/langtools:test-srcs-9-dev-r4023-1",
+        "//third_party/java/jdk/langtools:test-srcs",
         "//third_party/py/concurrent:srcs",
         "//third_party/py/gflags:srcs",
         "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper:srcs",
diff --git a/src/java_tools/buildjar/BUILD b/src/java_tools/buildjar/BUILD
index 08e297bc4c..87f74b2328 100644
--- a/src/java_tools/buildjar/BUILD
+++ b/src/java_tools/buildjar/BUILD
@@ -69,7 +69,7 @@ java_toolchain(
     genclass = ["bootstrap_genclass_deploy.jar"],
     ijar = ["//third_party/ijar"],
     javabuilder = ["bootstrap_deploy.jar"],
-    javac = ["//third_party/java/jdk/langtools:javac_jar-9-dev-r4023-1"],
+    javac = ["//third_party/java/jdk/langtools:javac_jar"],
     jvm_opts = [
         "-XX:+TieredCompilation",
         "-XX:TieredStopAtLevel=1",
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BUILD b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BUILD
index 20c875536c..fa724d1135 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BUILD
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BUILD
@@ -40,7 +40,7 @@ java_library(
         "//third_party:auto_value",
         "//third_party:guava",
         "//third_party:jsr305",
-        "//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
+        "//third_party/java/jdk/langtools:javac",
     ],
 )
 
@@ -71,7 +71,7 @@ java_library(
         "//src/main/protobuf:worker_protocol_java_proto",
         "//third_party:guava",
         "//third_party/java/jacoco:core",
-        "//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
+        "//third_party/java/jdk/langtools:javac",
     ],
 )
 
@@ -130,12 +130,12 @@ bootstrap_java_library(
     name = "skylark-deps",
     jars = [
         "//third_party:auto_value-jars",
-        "//third_party:bootstrap_guava_and_error_prone-jars-2.0.20-SNAPSHOT",
+        "//third_party:bootstrap_guava_and_error_prone-jars",
         "//third_party:jsr305-jars",
         "//third_party/protobuf:protobuf-jars",
         "//third_party/java/jacoco:core-jars",
     ],
-    neverlink_jars = ["//third_party/java/jdk/langtools:javac_jar-9-dev-r4023-1"],
+    neverlink_jars = ["//third_party/java/jdk/langtools:javac_jar"],
     srcjars = [
         "//src/main/protobuf:deps_java_proto_srcjar",
         "//src/main/protobuf:worker_protocol_java_proto_srcjar",
@@ -172,7 +172,7 @@ bootstrap_java_library(
     jars = [
         "//third_party:jsr305-jars",
         "//third_party:auto_value-jars",
-        "//third_party:bootstrap_guava_and_error_prone-jars-2.0.20-SNAPSHOT",
+        "//third_party:bootstrap_guava_and_error_prone-jars",
     ],
 )
 
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/BUILD b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/BUILD
index 5fea29133a..c7c76e4f01 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/BUILD
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/BUILD
@@ -16,7 +16,7 @@ java_library(
     srcs = ["BlazeJavaCompilerPlugin.java"],
     deps = [
         "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:invalid_command_line_exception",
-        "//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
+        "//third_party/java/jdk/langtools:javac",
     ],
 )
 
@@ -28,7 +28,7 @@ java_library(
         "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:JarOwner",
         "//src/main/protobuf:deps_java_proto",
         "//third_party:guava",
-        "//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
+        "//third_party/java/jdk/langtools:javac",
     ],
 )
 
@@ -38,9 +38,9 @@ java_library(
     deps = [
         ":plugins",
         "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:invalid_command_line_exception",
-        "//third_party:error_prone-2.0.20-SNAPSHOT",
+        "//third_party:error_prone",
         "//third_party:guava",
-        "//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
+        "//third_party/java/jdk/langtools:javac",
     ],
 )
 
@@ -51,7 +51,7 @@ java_library(
         ":plugins",
         "//src/main/protobuf:java_compilation_java_proto",
         "//third_party:guava",
-        "//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
+        "//third_party/java/jdk/langtools:javac",
     ],
 )
 
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/java/bazel/BUILD b/src/java_tools/buildjar/java/com/google/devtools/build/java/bazel/BUILD
index bbf950226e..d1f4e5c5f3 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/java/bazel/BUILD
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/java/bazel/BUILD
@@ -33,7 +33,7 @@ java_library(
 # Exports the canonical javac jar location
 genrule(
     name = "java-langtools-location",
-    srcs = ["//third_party/java/jdk/langtools:javac_jar-9-dev-r4023-1"],
+    srcs = ["//third_party/java/jdk/langtools:javac_jar"],
     outs = ["JavaLangtoolsLocation.java"],
     cmd = "$(location java-langtools-location.sh) $@ $(GENDIR) io_bazel/ $(SRCS)",
     tools = ["java-langtools-location.sh"],
@@ -49,7 +49,7 @@ java_library(
 java_library(
     name = "JavaLangtools",
     srcs = ["JavaLangtools.java"],
-    data = ["//third_party/java/jdk/langtools:javac_jar-9-dev-r4023-1"],
+    data = ["//third_party/java/jdk/langtools:javac_jar"],
     visibility = ["//visibility:public"],
     deps = [":java-langtools-location-lib"],
 )
@@ -102,7 +102,7 @@ java_library(
 java_library(
     name = "BazelJavaCompiler",
     srcs = ["BazelJavaCompiler.java"],
-    data = ["//third_party/java/jdk/langtools:javac_jar-9-dev-r4023-1"],
+    data = ["//third_party/java/jdk/langtools:javac_jar"],
     visibility = [
         "//src:__subpackages__",
         "//third_party/ijar:__subpackages__",
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac/BUILD b/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac/BUILD
index c21cf34019..d6c2c90f8d 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac/BUILD
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac/BUILD
@@ -20,7 +20,7 @@ java_library(
         "//third_party:guava",
         "//third_party:jsr305",
         "//third_party:turbine",
-        "//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
+        "//third_party/java/jdk/langtools:javac",
     ],
 )
 
@@ -31,7 +31,7 @@ java_library(
         "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins:dependency",
         "//third_party:guava",
         "//third_party:jsr305",
-        "//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
+        "//third_party/java/jdk/langtools:javac",
     ],
 )
 
@@ -41,7 +41,7 @@ java_library(
     deps = [
         "//third_party:guava",
         "//third_party:jsr305",
-        "//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
+        "//third_party/java/jdk/langtools:javac",
     ],
 )
 
@@ -56,7 +56,7 @@ java_library(
         "//third_party:guava",
         "//third_party:jimfs",
         "//third_party:jsr305",
-        "//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
+        "//third_party/java/jdk/langtools:javac",
     ],
 )
 
@@ -68,7 +68,7 @@ java_library(
         ":tree_pruner",
         "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins:dependency",
         "//third_party:jsr305",
-        "//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
+        "//third_party/java/jdk/langtools:javac",
     ],
 )
 
@@ -77,7 +77,7 @@ java_library(
     srcs = ["ZipUtil.java"],
     deps = [
         "//third_party:jsr305",
-        "//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
+        "//third_party/java/jdk/langtools:javac",
     ],
 )
 
@@ -87,7 +87,7 @@ java_library(
     deps = [
         "//third_party:guava",
         "//third_party:jsr305",
-        "//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
+        "//third_party/java/jdk/langtools:javac",
     ],
 )
 
diff --git a/src/java_tools/buildjar/javatests/com/google/devtools/build/buildjar/resourcejar/BUILD b/src/java_tools/buildjar/javatests/com/google/devtools/build/buildjar/resourcejar/BUILD
index f715928990..743a4933bd 100644
--- a/src/java_tools/buildjar/javatests/com/google/devtools/build/buildjar/resourcejar/BUILD
+++ b/src/java_tools/buildjar/javatests/com/google/devtools/build/buildjar/resourcejar/BUILD
@@ -12,6 +12,6 @@ java_test(
         "//third_party:guava",
         "//third_party:junit4",
         "//third_party:truth",
-        "//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
+        "//third_party/java/jdk/langtools:javac",
     ],
 )
diff --git a/src/java_tools/buildjar/javatests/com/google/devtools/build/java/bazel/BUILD b/src/java_tools/buildjar/javatests/com/google/devtools/build/java/bazel/BUILD
index a379582be8..4839134bee 100644
--- a/src/java_tools/buildjar/javatests/com/google/devtools/build/java/bazel/BUILD
+++ b/src/java_tools/buildjar/javatests/com/google/devtools/build/java/bazel/BUILD
@@ -9,11 +9,11 @@ java_test(
     size = "small",
     srcs = ["BazelJavaCompilerTest.java"],
     data = [
-        "//third_party/java/jdk/langtools:javac_jar-9-dev-r4023-1",
+        "//third_party/java/jdk/langtools:javac_jar",
     ],
     jvm_flags = [
         # Simulates how Bazel invokes JavaBuilder
-        "-Xbootclasspath/p:$(location //third_party/java/jdk/langtools:javac_jar-9-dev-r4023-1)",
+        "-Xbootclasspath/p:$(location //third_party/java/jdk/langtools:javac_jar)",
     ],
     tags = ["jdk8"],
     test_class = "com.google.devtools.build.java.bazel.BazelJavaCompilerTest",
diff --git a/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/BUILD b/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/BUILD
index 7d7d303810..233aa117b9 100644
--- a/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/BUILD
+++ b/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/BUILD
@@ -8,11 +8,11 @@ java_test(
     name = "JavacTurbineTest",
     srcs = ["JavacTurbineTest.java"],
     data = [
-        "//third_party/java/jdk/langtools:javac_jar-9-dev-r4023-1",
+        "//third_party/java/jdk/langtools:javac_jar",
     ],
     jvm_flags = [
         # Simulates how Bazel invokes turbine
-        "-Xbootclasspath/p:$(location //third_party/java/jdk/langtools:javac_jar-9-dev-r4023-1)",
+        "-Xbootclasspath/p:$(location //third_party/java/jdk/langtools:javac_jar)",
     ],
     tags = ["jdk8"],
     deps = [
@@ -25,7 +25,7 @@ java_test(
         "//third_party:junit4",
         "//third_party:truth",
         "//third_party:turbine",
-        "//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
+        "//third_party/java/jdk/langtools:javac",
     ],
 )
 
@@ -45,6 +45,6 @@ java_test(
         "//third_party:guava",
         "//third_party:junit4",
         "//third_party:truth",
-        "//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
+        "//third_party/java/jdk/langtools:javac",
     ],
 )
diff --git a/src/main/java/com/google/devtools/build/lib/BUILD b/src/main/java/com/google/devtools/build/lib/BUILD
index 8bd4cd63d8..07a5641dfa 100644
--- a/src/main/java/com/google/devtools/build/lib/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/BUILD
@@ -1310,7 +1310,7 @@ load("//tools/build_rules:java_rules_skylark.bzl", "bootstrap_java_library")
 bootstrap_java_library(
     name = "shell-skylark",
     srcs = glob(["shell/*.java"]),
-    jars = ["//third_party:bootstrap_guava_and_error_prone-jars-2.0.20-SNAPSHOT"],
+    jars = ["//third_party:bootstrap_guava_and_error_prone-jars"],
 )
 
 ########################################################################
diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD
index 26b92f3059..2d7863149b 100644
--- a/src/test/shell/bazel/BUILD
+++ b/src/test/shell/bazel/BUILD
@@ -13,7 +13,7 @@ filegroup(
 genrule(
     name = "langtools-copy",
     testonly = 1,
-    srcs = ["//third_party/java/jdk/langtools:javac_jar-9-dev-r4023-1"],
+    srcs = ["//third_party/java/jdk/langtools:javac_jar"],
     outs = ["langtools.jar"],
     cmd = "cp $< $@",
 )
@@ -39,7 +39,7 @@ filegroup(
         "//src/test/shell:testenv.sh",
         "//third_party:srcs",
         "//third_party/ijar",
-        "//third_party/java/jdk/langtools:test-srcs-9-dev-r4023-1",
+        "//third_party/java/jdk/langtools:test-srcs",
         "//tools:srcs",
         "@local_jdk//:bootclasspath",
         # TODO(cushon): migrate to extclasspath and delete
diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD
index 011689a90a..005ae91602 100644
--- a/tools/jdk/BUILD
+++ b/tools/jdk/BUILD
@@ -114,7 +114,7 @@ alias(
 
 filegroup(
     name = "langtools",
-    srcs = ["//third_party/java/jdk/langtools:javac_jar-9-dev-r4023-1"],
+    srcs = ["//third_party/java/jdk/langtools:javac_jar"],
 )
 
 java_import(
@@ -143,7 +143,7 @@ java_toolchain(
     header_compiler = ["@bazel_tools//tools/jdk:turbine"],
     ijar = ["@bazel_tools//tools/jdk:ijar"],
     javabuilder = ["@bazel_tools//tools/jdk:javabuilder"],
-    javac = ["//third_party/java/jdk/langtools:javac_jar-9-dev-r4023-1"],
+    javac = ["//third_party/java/jdk/langtools:javac_jar"],
     javac_supports_workers = 1,
     jvm_opts = [
         "-XX:+TieredCompilation",