Skip to content

Commit 38949b8

Browse files
cushonkchodorow
cushon
authored and
kchodorow
committed
Migrate off versioned javac and Error Prone targets
Change-Id: Iad1e07ad55d5304d7c3dbb8bdab856728a91432d PiperOrigin-RevId: 155375893
1 parent c964ad8 commit 38949b8

12 files changed

Lines changed: 34 additions & 34 deletions

File tree

‎src/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ filegroup(
130130
"//tools:embedded_tools_srcs",
131131
"//third_party:gpl-srcs",
132132
"//third_party/java/jarjar:embedded_tools_srcs",
133-
"//third_party/java/jdk/langtools:test-srcs-9-dev-r4023-1",
133+
"//third_party/java/jdk/langtools:test-srcs",
134134
"//third_party/py/concurrent:srcs",
135135
"//third_party/py/gflags:srcs",
136136
"//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper:srcs",

‎src/java_tools/buildjar/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ java_toolchain(
6969
genclass = ["bootstrap_genclass_deploy.jar"],
7070
ijar = ["//third_party/ijar"],
7171
javabuilder = ["bootstrap_deploy.jar"],
72-
javac = ["//third_party/java/jdk/langtools:javac_jar-9-dev-r4023-1"],
72+
javac = ["//third_party/java/jdk/langtools:javac_jar"],
7373
jvm_opts = [
7474
"-XX:+TieredCompilation",
7575
"-XX:TieredStopAtLevel=1",

‎src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BUILD‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ java_library(
4040
"//third_party:auto_value",
4141
"//third_party:guava",
4242
"//third_party:jsr305",
43-
"//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
43+
"//third_party/java/jdk/langtools:javac",
4444
],
4545
)
4646

@@ -71,7 +71,7 @@ java_library(
7171
"//src/main/protobuf:worker_protocol_java_proto",
7272
"//third_party:guava",
7373
"//third_party/java/jacoco:core",
74-
"//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
74+
"//third_party/java/jdk/langtools:javac",
7575
],
7676
)
7777

@@ -130,12 +130,12 @@ bootstrap_java_library(
130130
name = "skylark-deps",
131131
jars = [
132132
"//third_party:auto_value-jars",
133-
"//third_party:bootstrap_guava_and_error_prone-jars-2.0.20-SNAPSHOT",
133+
"//third_party:bootstrap_guava_and_error_prone-jars",
134134
"//third_party:jsr305-jars",
135135
"//third_party/protobuf:protobuf-jars",
136136
"//third_party/java/jacoco:core-jars",
137137
],
138-
neverlink_jars = ["//third_party/java/jdk/langtools:javac_jar-9-dev-r4023-1"],
138+
neverlink_jars = ["//third_party/java/jdk/langtools:javac_jar"],
139139
srcjars = [
140140
"//src/main/protobuf:deps_java_proto_srcjar",
141141
"//src/main/protobuf:worker_protocol_java_proto_srcjar",
@@ -172,7 +172,7 @@ bootstrap_java_library(
172172
jars = [
173173
"//third_party:jsr305-jars",
174174
"//third_party:auto_value-jars",
175-
"//third_party:bootstrap_guava_and_error_prone-jars-2.0.20-SNAPSHOT",
175+
"//third_party:bootstrap_guava_and_error_prone-jars",
176176
],
177177
)
178178

‎src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/BUILD‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ java_library(
1616
srcs = ["BlazeJavaCompilerPlugin.java"],
1717
deps = [
1818
"//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:invalid_command_line_exception",
19-
"//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
19+
"//third_party/java/jdk/langtools:javac",
2020
],
2121
)
2222

@@ -28,7 +28,7 @@ java_library(
2828
"//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:JarOwner",
2929
"//src/main/protobuf:deps_java_proto",
3030
"//third_party:guava",
31-
"//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
31+
"//third_party/java/jdk/langtools:javac",
3232
],
3333
)
3434

@@ -38,9 +38,9 @@ java_library(
3838
deps = [
3939
":plugins",
4040
"//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:invalid_command_line_exception",
41-
"//third_party:error_prone-2.0.20-SNAPSHOT",
41+
"//third_party:error_prone",
4242
"//third_party:guava",
43-
"//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
43+
"//third_party/java/jdk/langtools:javac",
4444
],
4545
)
4646

@@ -51,7 +51,7 @@ java_library(
5151
":plugins",
5252
"//src/main/protobuf:java_compilation_java_proto",
5353
"//third_party:guava",
54-
"//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
54+
"//third_party/java/jdk/langtools:javac",
5555
],
5656
)
5757

‎src/java_tools/buildjar/java/com/google/devtools/build/java/bazel/BUILD‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ java_library(
3333
# Exports the canonical javac jar location
3434
genrule(
3535
name = "java-langtools-location",
36-
srcs = ["//third_party/java/jdk/langtools:javac_jar-9-dev-r4023-1"],
36+
srcs = ["//third_party/java/jdk/langtools:javac_jar"],
3737
outs = ["JavaLangtoolsLocation.java"],
3838
cmd = "$(location java-langtools-location.sh) $@ $(GENDIR) io_bazel/ $(SRCS)",
3939
tools = ["java-langtools-location.sh"],
@@ -49,7 +49,7 @@ java_library(
4949
java_library(
5050
name = "JavaLangtools",
5151
srcs = ["JavaLangtools.java"],
52-
data = ["//third_party/java/jdk/langtools:javac_jar-9-dev-r4023-1"],
52+
data = ["//third_party/java/jdk/langtools:javac_jar"],
5353
visibility = ["//visibility:public"],
5454
deps = [":java-langtools-location-lib"],
5555
)
@@ -102,7 +102,7 @@ java_library(
102102
java_library(
103103
name = "BazelJavaCompiler",
104104
srcs = ["BazelJavaCompiler.java"],
105-
data = ["//third_party/java/jdk/langtools:javac_jar-9-dev-r4023-1"],
105+
data = ["//third_party/java/jdk/langtools:javac_jar"],
106106
visibility = [
107107
"//src:__subpackages__",
108108
"//third_party/ijar:__subpackages__",

‎src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac/BUILD‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ java_library(
2020
"//third_party:guava",
2121
"//third_party:jsr305",
2222
"//third_party:turbine",
23-
"//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
23+
"//third_party/java/jdk/langtools:javac",
2424
],
2525
)
2626

@@ -31,7 +31,7 @@ java_library(
3131
"//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins:dependency",
3232
"//third_party:guava",
3333
"//third_party:jsr305",
34-
"//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
34+
"//third_party/java/jdk/langtools:javac",
3535
],
3636
)
3737

@@ -41,7 +41,7 @@ java_library(
4141
deps = [
4242
"//third_party:guava",
4343
"//third_party:jsr305",
44-
"//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
44+
"//third_party/java/jdk/langtools:javac",
4545
],
4646
)
4747

@@ -56,7 +56,7 @@ java_library(
5656
"//third_party:guava",
5757
"//third_party:jimfs",
5858
"//third_party:jsr305",
59-
"//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
59+
"//third_party/java/jdk/langtools:javac",
6060
],
6161
)
6262

@@ -68,7 +68,7 @@ java_library(
6868
":tree_pruner",
6969
"//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins:dependency",
7070
"//third_party:jsr305",
71-
"//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
71+
"//third_party/java/jdk/langtools:javac",
7272
],
7373
)
7474

@@ -77,7 +77,7 @@ java_library(
7777
srcs = ["ZipUtil.java"],
7878
deps = [
7979
"//third_party:jsr305",
80-
"//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
80+
"//third_party/java/jdk/langtools:javac",
8181
],
8282
)
8383

@@ -87,7 +87,7 @@ java_library(
8787
deps = [
8888
"//third_party:guava",
8989
"//third_party:jsr305",
90-
"//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
90+
"//third_party/java/jdk/langtools:javac",
9191
],
9292
)
9393

‎src/java_tools/buildjar/javatests/com/google/devtools/build/buildjar/resourcejar/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ java_test(
1212
"//third_party:guava",
1313
"//third_party:junit4",
1414
"//third_party:truth",
15-
"//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
15+
"//third_party/java/jdk/langtools:javac",
1616
],
1717
)

‎src/java_tools/buildjar/javatests/com/google/devtools/build/java/bazel/BUILD‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ java_test(
99
size = "small",
1010
srcs = ["BazelJavaCompilerTest.java"],
1111
data = [
12-
"//third_party/java/jdk/langtools:javac_jar-9-dev-r4023-1",
12+
"//third_party/java/jdk/langtools:javac_jar",
1313
],
1414
jvm_flags = [
1515
# Simulates how Bazel invokes JavaBuilder
16-
"-Xbootclasspath/p:$(location //third_party/java/jdk/langtools:javac_jar-9-dev-r4023-1)",
16+
"-Xbootclasspath/p:$(location //third_party/java/jdk/langtools:javac_jar)",
1717
],
1818
tags = ["jdk8"],
1919
test_class = "com.google.devtools.build.java.bazel.BazelJavaCompilerTest",

‎src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/BUILD‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ java_test(
88
name = "JavacTurbineTest",
99
srcs = ["JavacTurbineTest.java"],
1010
data = [
11-
"//third_party/java/jdk/langtools:javac_jar-9-dev-r4023-1",
11+
"//third_party/java/jdk/langtools:javac_jar",
1212
],
1313
jvm_flags = [
1414
# Simulates how Bazel invokes turbine
15-
"-Xbootclasspath/p:$(location //third_party/java/jdk/langtools:javac_jar-9-dev-r4023-1)",
15+
"-Xbootclasspath/p:$(location //third_party/java/jdk/langtools:javac_jar)",
1616
],
1717
tags = ["jdk8"],
1818
deps = [
@@ -25,7 +25,7 @@ java_test(
2525
"//third_party:junit4",
2626
"//third_party:truth",
2727
"//third_party:turbine",
28-
"//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
28+
"//third_party/java/jdk/langtools:javac",
2929
],
3030
)
3131

@@ -45,6 +45,6 @@ java_test(
4545
"//third_party:guava",
4646
"//third_party:junit4",
4747
"//third_party:truth",
48-
"//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
48+
"//third_party/java/jdk/langtools:javac",
4949
],
5050
)

‎src/main/java/com/google/devtools/build/lib/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1310,7 +1310,7 @@ load("//tools/build_rules:java_rules_skylark.bzl", "bootstrap_java_library")
13101310
bootstrap_java_library(
13111311
name = "shell-skylark",
13121312
srcs = glob(["shell/*.java"]),
1313-
jars = ["//third_party:bootstrap_guava_and_error_prone-jars-2.0.20-SNAPSHOT"],
1313+
jars = ["//third_party:bootstrap_guava_and_error_prone-jars"],
13141314
)
13151315

13161316
########################################################################

0 commit comments

Comments
 (0)