Skip to content

Commit 707246d

Browse files
comiusphilwo
comius
authored and
philwo
committed
Update to java_tools javac11 release 10.5 (#12647)
* Java_tools javac11 v10.5 rc1. * Regression tests for #12605 * Java_tools javac11 v10.5 release.
1 parent 075087b commit 707246d

File tree

6 files changed

+354
-51
lines changed

6 files changed

+354
-51
lines changed

‎WORKSPACE

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,9 @@ distdir_tar(
146146
# Keep in sync with the archives fetched as part of building bazel.
147147
archives = [
148148
"e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip",
149-
"java_tools_javac11_linux-v10.4.zip",
150-
"java_tools_javac11_windows-v10.4.zip",
151-
"java_tools_javac11_darwin-v10.4.zip",
149+
"java_tools_javac11_linux-v10.5.zip",
150+
"java_tools_javac11_windows-v10.5.zip",
151+
"java_tools_javac11_darwin-v10.5.zip",
152152
"coverage_output_generator-v2.5.zip",
153153
# bazelbuid/stardoc
154154
"1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz",
@@ -187,9 +187,9 @@ distdir_tar(
187187
dirname = "derived/distdir",
188188
sha256 = {
189189
"e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip": "fe2e04f91ce8c59d49d91b8102edc6627c6fa2906c1b0e7346f01419ec4f419d",
190-
"java_tools_javac11_linux-v10.4.zip": "7debb49457db2f10990f759b6984c6d4ccb4917a9a9fd402a6f224b5fb0e8e36",
191-
"java_tools_javac11_windows-v10.4.zip": "3a7d802ccefffa6ecf6e190aaae081cf27fc0275e2a8dad7d3a943c63a4d0edc",
192-
"java_tools_javac11_darwin-v10.4.zip": "587a7bc34c95a217a941b01a5a1f8ee48114fbe87e05872a41b7e019e5297a8a",
190+
"java_tools_javac11_linux-v10.5.zip": "355c27c603e8fc64bb0e2d7f809741f42576d5f4540f9ce28fd55922085af639",
191+
"java_tools_javac11_windows-v10.5.zip": "0b4469ca1a9b3f26cb82fb0f4fd00096f0d839ec2fae097e7bdbb982e3a95a59",
192+
"java_tools_javac11_darwin-v10.5.zip": "95aae0a32a170c72a68abb0b9dd6bac7ea3e08c504a5d8c6e8bf7ac51628c98f",
193193
"coverage_output_generator-v2.5.zip": "cd14f1cb4559e4723e63b7e7b06d09fcc3bd7ba58d03f354cdff1439bd936a7d",
194194
# bazelbuild/stardoc
195195
"1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz": "5a725b777976b77aa122b707d1b6f0f39b6020f66cd427bb111a585599c857b1",
@@ -230,14 +230,14 @@ distdir_tar(
230230
"https://mirror.bazel.build/github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip",
231231
"https://github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip",
232232
],
233-
"java_tools_javac11_linux-v10.4.zip": [
234-
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.4/java_tools_javac11_linux-v10.4.zip",
233+
"java_tools_javac11_linux-v10.5.zip": [
234+
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_linux-v10.5.zip",
235235
],
236-
"java_tools_javac11_windows-v10.4.zip": [
237-
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.4/java_tools_javac11_windows-v10.4.zip",
236+
"java_tools_javac11_windows-v10.5.zip": [
237+
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_windows-v10.5.zip",
238238
],
239-
"java_tools_javac11_darwin-v10.4.zip": [
240-
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.4/java_tools_javac11_darwin-v10.4.zip",
239+
"java_tools_javac11_darwin-v10.5.zip": [
240+
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_darwin-v10.5.zip",
241241
],
242242
"coverage_output_generator-v2.5.zip": [
243243
"https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.5.zip",
@@ -545,9 +545,9 @@ http_archive(
545545
distdir_tar(
546546
name = "test_WORKSPACE_files",
547547
archives = [
548-
"java_tools_javac11_linux-v10.4.zip",
549-
"java_tools_javac11_windows-v10.4.zip",
550-
"java_tools_javac11_darwin-v10.4.zip",
548+
"java_tools_javac11_linux-v10.5.zip",
549+
"java_tools_javac11_windows-v10.5.zip",
550+
"java_tools_javac11_darwin-v10.5.zip",
551551
"coverage_output_generator-v2.5.zip",
552552
"zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz",
553553
"zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz",
@@ -579,9 +579,9 @@ distdir_tar(
579579
],
580580
dirname = "test_WORKSPACE/distdir",
581581
sha256 = {
582-
"java_tools_javac11_linux-v10.4.zip": "7debb49457db2f10990f759b6984c6d4ccb4917a9a9fd402a6f224b5fb0e8e36",
583-
"java_tools_javac11_windows-v10.4.zip": "3a7d802ccefffa6ecf6e190aaae081cf27fc0275e2a8dad7d3a943c63a4d0edc",
584-
"java_tools_javac11_darwin-v10.4.zip": "587a7bc34c95a217a941b01a5a1f8ee48114fbe87e05872a41b7e019e5297a8a",
582+
"java_tools_javac11_linux-v10.5.zip": "355c27c603e8fc64bb0e2d7f809741f42576d5f4540f9ce28fd55922085af639",
583+
"java_tools_javac11_windows-v10.5.zip": "0b4469ca1a9b3f26cb82fb0f4fd00096f0d839ec2fae097e7bdbb982e3a95a59",
584+
"java_tools_javac11_darwin-v10.5.zip": "95aae0a32a170c72a68abb0b9dd6bac7ea3e08c504a5d8c6e8bf7ac51628c98f",
585585
"coverage_output_generator-v2.5.zip": "cd14f1cb4559e4723e63b7e7b06d09fcc3bd7ba58d03f354cdff1439bd936a7d",
586586
"zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz": "360626cc19063bc411bfed2914301b908a8f77a7919aaea007a977fa8fb3cde1",
587587
"zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz": "a452f1b9682d9f83c1c14e54d1446e1c51b5173a3a05dcb013d380f9508562e4",
@@ -612,9 +612,9 @@ distdir_tar(
612612
"df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz": "f368a8476f4e2e0eccf8a7318b98dafbe30b2600f4e3cf52636e5eb145aba06a",
613613
},
614614
urls = {
615-
"java_tools_javac11_linux-v10.4.zip": ["https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.4/java_tools_javac11_linux-v10.4.zip"],
616-
"java_tools_javac11_windows-v10.4.zip": ["https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.4/java_tools_javac11_windows-v10.4.zip"],
617-
"java_tools_javac11_darwin-v10.4.zip": ["https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.4/java_tools_javac11_darwin-v10.4.zip"],
615+
"java_tools_javac11_linux-v10.5.zip": ["https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_linux-v10.5.zip"],
616+
"java_tools_javac11_windows-v10.5.zip": ["https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_windows-v10.5.zip"],
617+
"java_tools_javac11_darwin-v10.5.zip": ["https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_darwin-v10.5.zip"],
618618
"coverage_output_generator-v2.5.zip": ["https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.5.zip"],
619619
"zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz": ["https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz"],
620620
"zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz": ["https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz"],
@@ -919,10 +919,10 @@ http_archive(
919919
name = "remote_java_tools_linux_for_testing",
920920
patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
921921
patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
922-
sha256 = "7debb49457db2f10990f759b6984c6d4ccb4917a9a9fd402a6f224b5fb0e8e36",
922+
sha256 = "355c27c603e8fc64bb0e2d7f809741f42576d5f4540f9ce28fd55922085af639",
923923
urls = [
924-
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.4/java_tools_javac11_linux-v10.4.zip",
925-
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.4/java_tools_javac11_linux-v10.4.zip",
924+
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_linux-v10.5.zip",
925+
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.5/java_tools_javac11_linux-v10.5.zip",
926926
],
927927
)
928928

@@ -931,10 +931,10 @@ http_archive(
931931
name = "remote_java_tools_windows_for_testing",
932932
patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
933933
patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
934-
sha256 = "3a7d802ccefffa6ecf6e190aaae081cf27fc0275e2a8dad7d3a943c63a4d0edc",
934+
sha256 = "0b4469ca1a9b3f26cb82fb0f4fd00096f0d839ec2fae097e7bdbb982e3a95a59",
935935
urls = [
936-
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.4/java_tools_javac11_windows-v10.4.zip",
937-
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.4/java_tools_javac11_windows-v10.4.zip",
936+
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_windows-v10.5.zip",
937+
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.5/java_tools_javac11_windows-v10.5.zip",
938938
],
939939
)
940940

@@ -943,10 +943,10 @@ http_archive(
943943
name = "remote_java_tools_darwin_for_testing",
944944
patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
945945
patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
946-
sha256 = "587a7bc34c95a217a941b01a5a1f8ee48114fbe87e05872a41b7e019e5297a8a",
946+
sha256 = "95aae0a32a170c72a68abb0b9dd6bac7ea3e08c504a5d8c6e8bf7ac51628c98f",
947947
urls = [
948-
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.4/java_tools_javac11_darwin-v10.4.zip",
949-
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.4/java_tools_javac11_darwin-v10.4.zip",
948+
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_darwin-v10.5.zip",
949+
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.5/java_tools_javac11_darwin-v10.5.zip",
950950
],
951951
)
952952

@@ -955,9 +955,9 @@ http_archive(
955955
name = "remote_java_tools_javac11_test_linux",
956956
patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
957957
patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
958-
sha256 = "7debb49457db2f10990f759b6984c6d4ccb4917a9a9fd402a6f224b5fb0e8e36",
958+
sha256 = "355c27c603e8fc64bb0e2d7f809741f42576d5f4540f9ce28fd55922085af639",
959959
urls = [
960-
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.4/java_tools_javac11_linux-v10.4.zip",
960+
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_linux-v10.5.zip",
961961
],
962962
)
963963

@@ -966,9 +966,9 @@ http_archive(
966966
name = "remote_java_tools_javac11_test_windows",
967967
patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
968968
patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
969-
sha256 = "3a7d802ccefffa6ecf6e190aaae081cf27fc0275e2a8dad7d3a943c63a4d0edc",
969+
sha256 = "0b4469ca1a9b3f26cb82fb0f4fd00096f0d839ec2fae097e7bdbb982e3a95a59",
970970
urls = [
971-
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.4/java_tools_javac11_windows-v10.4.zip",
971+
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_windows-v10.5.zip",
972972
],
973973
)
974974

@@ -977,9 +977,9 @@ http_archive(
977977
name = "remote_java_tools_javac11_test_darwin",
978978
patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
979979
patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
980-
sha256 = "587a7bc34c95a217a941b01a5a1f8ee48114fbe87e05872a41b7e019e5297a8a",
980+
sha256 = "95aae0a32a170c72a68abb0b9dd6bac7ea3e08c504a5d8c6e8bf7ac51628c98f",
981981
urls = [
982-
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.4/java_tools_javac11_darwin-v10.4.zip",
982+
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_darwin-v10.5.zip",
983983
],
984984
)
985985

‎src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -163,32 +163,32 @@ maybe(
163163
maybe(
164164
http_archive,
165165
name = "remote_java_tools_linux",
166-
sha256 = "7debb49457db2f10990f759b6984c6d4ccb4917a9a9fd402a6f224b5fb0e8e36",
166+
sha256 = "355c27c603e8fc64bb0e2d7f809741f42576d5f4540f9ce28fd55922085af639",
167167
urls = [
168-
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.4/java_tools_javac11_linux-v10.4.zip",
169-
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.4/java_tools_javac11_linux-v10.4.zip",
168+
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_linux-v10.5.zip",
169+
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.5/java_tools_javac11_linux-v10.5.zip",
170170
],
171171
)
172172

173173
# This must be kept in sync with the top-level WORKSPACE file.
174174
maybe(
175175
http_archive,
176176
name = "remote_java_tools_windows",
177-
sha256 = "3a7d802ccefffa6ecf6e190aaae081cf27fc0275e2a8dad7d3a943c63a4d0edc",
177+
sha256 = "0b4469ca1a9b3f26cb82fb0f4fd00096f0d839ec2fae097e7bdbb982e3a95a59",
178178
urls = [
179-
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.4/java_tools_javac11_windows-v10.4.zip",
180-
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.4/java_tools_javac11_windows-v10.4.zip",
179+
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_windows-v10.5.zip",
180+
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.5/java_tools_javac11_windows-v10.5.zip",
181181
],
182182
)
183183

184184
# This must be kept in sync with the top-level WORKSPACE file.
185185
maybe(
186186
http_archive,
187187
name = "remote_java_tools_darwin",
188-
sha256 = "587a7bc34c95a217a941b01a5a1f8ee48114fbe87e05872a41b7e019e5297a8a",
188+
sha256 = "95aae0a32a170c72a68abb0b9dd6bac7ea3e08c504a5d8c6e8bf7ac51628c98f",
189189
urls = [
190-
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.4/java_tools_javac11_darwin-v10.4.zip",
191-
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.4/java_tools_javac11_darwin-v10.4.zip",
190+
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_darwin-v10.5.zip",
191+
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.5/java_tools_javac11_darwin-v10.5.zip",
192192
],
193193
)
194194

‎src/test/shell/bazel/bazel_java14_test.sh

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,4 +113,104 @@ EOF
113113
expect_log "0"
114114
}
115115

116+
# Regression test for https://github.com/bazelbuild/bazel/issues/12605
117+
function test_java15_plugins() {
118+
mkdir -p java/main
119+
cat >java/main/BUILD <<EOF
120+
java_library(
121+
name = "Anno",
122+
srcs = ["Anno.java"],
123+
)
124+
125+
java_plugin(
126+
name = "Proc",
127+
srcs = ["Proc.java"],
128+
deps = [":Anno"],
129+
processor_class = "ex.Proc",
130+
generates_api = True,
131+
)
132+
133+
java_library(
134+
name = "C1",
135+
srcs = ["C1.java"],
136+
deps = [":Anno"],
137+
plugins = [":Proc"],
138+
)
139+
140+
java_library(
141+
name = "C2",
142+
srcs = ["C2.java"],
143+
deps = [":C1"],
144+
)
145+
EOF
146+
147+
cat >java/main/C1.java <<EOF
148+
package ex;
149+
150+
public class C1 {
151+
@Anno
152+
@Deprecated
153+
public void m() {}
154+
}
155+
EOF
156+
157+
158+
cat >java/main/C2.java <<EOF
159+
package ex;
160+
161+
public class C2 {
162+
public void m() {
163+
new C1().m();
164+
}
165+
}
166+
167+
EOF
168+
169+
cat >java/main/Anno.java <<EOF
170+
package ex;
171+
172+
import java.lang.annotation.ElementType;
173+
import java.lang.annotation.Retention;
174+
import java.lang.annotation.RetentionPolicy;
175+
import java.lang.annotation.Target;
176+
177+
@Retention(RetentionPolicy.RUNTIME)
178+
@Target({ElementType.METHOD})
179+
public @interface Anno {}
180+
EOF
181+
182+
cat >java/main/Proc.java <<EOF
183+
package ex;
184+
185+
import java.util.Set;
186+
187+
import javax.annotation.processing.AbstractProcessor;
188+
import javax.annotation.processing.RoundEnvironment;
189+
import javax.annotation.processing.SupportedAnnotationTypes;
190+
import javax.annotation.processing.SupportedSourceVersion;
191+
import javax.lang.model.SourceVersion;
192+
import javax.lang.model.element.Element;
193+
import javax.lang.model.element.TypeElement;
194+
import javax.lang.model.util.Elements;
195+
import javax.tools.Diagnostic.Kind;
196+
197+
@SupportedSourceVersion(SourceVersion.RELEASE_8)
198+
@SupportedAnnotationTypes("ex.Anno")
199+
public class Proc extends AbstractProcessor {
200+
@Override
201+
public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
202+
Elements els = processingEnv.getElementUtils();
203+
for (Element el : roundEnv.getElementsAnnotatedWith(Anno.class)) {
204+
if (els.isDeprecated(el)) {
205+
processingEnv.getMessager().printMessage(Kind.WARNING, "deprecated");
206+
}
207+
}
208+
return true;
209+
}
210+
}
211+
EOF
212+
213+
bazel build //java/main:C2 &>"${TEST_log}" || fail "Expected to build"
214+
}
215+
116216
run_suite "Tests new Java 14 language features"

0 commit comments

Comments
 (0)