Upgrade to javax-annotation 1.3.2

https://mvnrepository.com/artifact/javax.annotation/jsr250-api indicates that this artifact has moved to javax.annotation » javax.annotation-api
jflex-de · May 12, 2020 · f1afb4d · f1afb4d
1 parent 60b48a3
commit f1afb4d
Show file tree

Hide file tree

Showing 55 changed files with 93 additions and 77 deletions.
diff --git a/benchmark/pom.xml b/benchmark/pom.xml
@@ -13,7 +13,7 @@
   <dependencies>
     <dependency>
       <groupId>javax.annotation</groupId>
-      <artifactId>jsr250-api</artifactId>
+      <artifactId>javax.annotation-api</artifactId>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

diff --git a/java/jflex/testing/testsuite/BUILD.bazel b/java/jflex/testing/testsuite/BUILD.bazel
@@ -26,7 +26,7 @@ java_library(
 
 genrule(
     name = "jsr250_jar",
-    srcs = ["//third_party/java:jsr250"],
-    outs = ["jsr250.jar"],
+    srcs = ["//third_party/javax:annotation"],
+    outs = ["javax.annotation.jar"],
     cmd = "cp $< $@",
 )
diff --git a/java/jflex/testing/testsuite/JFlexTestRunner.java b/java/jflex/testing/testsuite/JFlexTestRunner.java
@@ -213,7 +213,7 @@ private void buildLexer(RunNotifier notifier, String lexerJavaFileName) {
       File runtimeDir = new File("java/jflex/testing/testsuite");
       JavacUtils.compile(
           ImmutableList.of(new File(lexerJavaFileName)),
-          ImmutableList.of(new File(runtimeDir, "jsr250.jar")));
+          ImmutableList.of(new File(runtimeDir, "javax.annotation.jar")));
       notifier.fireTestFinished(desc);
     } catch (Throwable th) {
       notifier.fireTestFailure(new Failure(desc, th));

diff --git a/javatests/jflex/testcase/action_pipe/BUILD.bazel b/javatests/jflex/testcase/action_pipe/BUILD.bazel
@@ -13,7 +13,7 @@ java_library(
         ":action_pipe_eof_flex",
     ],
     deps = [
-        "//third_party/java:jsr250",
+        "//third_party/javax:annotation",
     ],
 )
 
@@ -40,7 +40,7 @@ java_library(
         ":eof_pipe_action_flex",
     ],
     deps = [
-        "//third_party/java:jsr250",
+        "//third_party/javax:annotation",
     ],
 )
 

diff --git a/javatests/jflex/testcase/apipirivate/BUILD.bazel b/javatests/jflex/testcase/apipirivate/BUILD.bazel
@@ -16,7 +16,7 @@ jflex_testsuite(
 
 genrule(
     name = "jsr250_jar",
-    srcs = ["//third_party/java:jsr250"],
-    outs = ["jsr250.jar"],
+    srcs = ["//third_party/javax:annotation"],
+    outs = ["javax.annotation.jar"],
     cmd = "cp $< $@",
 )
diff --git a/javatests/jflex/testcase/bol/BUILD.bazel b/javatests/jflex/testcase/bol/BUILD.bazel
@@ -25,6 +25,6 @@ java_test(
     deps = [
         "//third_party/com/google/guava",
         "//third_party/com/google/truth",
-        "//third_party/java:jsr250",
+        "//third_party/javax:annotation",
     ],
 )
diff --git a/javatests/jflex/testcase/buffer/BUILD.bazel b/javatests/jflex/testcase/buffer/BUILD.bazel
@@ -16,6 +16,6 @@ java_test(
     deps = [
         "//third_party/com/google/guava",
         "//third_party/com/google/truth",
-        "//third_party/java:jsr250",
+        "//third_party/javax:annotation",
     ],
 )
diff --git a/javatests/jflex/testcase/caseless_jflex/BUILD.bazel b/javatests/jflex/testcase/caseless_jflex/BUILD.bazel
@@ -18,7 +18,7 @@ java_library(
     deps = [
         "//java/jflex/testing/testsuite/golden",
         "//third_party/com/google/guava",
-        "//third_party/java:jsr250",
+        "//third_party/javax:annotation",
     ],
 )
 
@@ -34,6 +34,6 @@ java_test(
         "//java/jflex/util/scanner:scanner_factory",
         "//third_party/com/google/guava",
         "//third_party/com/google/truth",
-        "//third_party/java:jsr250",
+        "//third_party/javax:annotation",
     ],
 )
diff --git a/javatests/jflex/testcase/caseless_jlex/BUILD.bazel b/javatests/jflex/testcase/caseless_jlex/BUILD.bazel
@@ -22,7 +22,7 @@ java_library(
     deps = [
         "//java/jflex/testing/testsuite/golden",
         "//third_party/com/google/guava",
-        "//third_party/java:jsr250",
+        "//third_party/javax:annotation",
     ],
 )
 

diff --git a/javatests/jflex/testcase/ccl_16/BUILD.bazel b/javatests/jflex/testcase/ccl_16/BUILD.bazel
@@ -15,6 +15,6 @@ java_test(
     ],
     deps = [
         "//third_party/com/google/truth",
-        "//third_party/java:jsr250",
+        "//third_party/javax:annotation",
     ],
 )
diff --git a/javatests/jflex/testcase/ccl_bug/BUILD.bazel b/javatests/jflex/testcase/ccl_bug/BUILD.bazel
@@ -20,7 +20,7 @@ java_library(
     deps = [
         "//java/jflex/testing/testsuite/golden",
         "//third_party/com/google/guava",
-        "//third_party/java:jsr250",
+        "//third_party/javax:annotation",
     ],
 )
 

diff --git a/javatests/jflex/testcase/ccl_esc/BUILD.bazel b/javatests/jflex/testcase/ccl_esc/BUILD.bazel
@@ -20,7 +20,7 @@ java_library(
     ],
     deps = [
         "//third_party/com/google/guava",
-        "//third_party/java:jsr250",
+        "//third_party/javax:annotation",
     ],
 )
 

diff --git a/javatests/jflex/testcase/ccl_macros/BUILD.bazel b/javatests/jflex/testcase/ccl_macros/BUILD.bazel
@@ -20,7 +20,7 @@ java_library(
     deps = [
         "//java/jflex/testing/testsuite/golden",
         "//third_party/com/google/guava",
-        "//third_party/java:jsr250",
+        "//third_party/javax:annotation",
     ],
 )
 

diff --git a/javatests/jflex/testcase/ccl_pre/BUILD.bazel b/javatests/jflex/testcase/ccl_pre/BUILD.bazel
@@ -20,7 +20,7 @@ java_library(
     deps = [
         "//java/jflex/testing/testsuite/golden",
         "//third_party/com/google/guava",
-        "//third_party/java:jsr250",
+        "//third_party/javax:annotation",
     ],
 )
 

diff --git a/javatests/jflex/testcase/charclass/BUILD.bazel b/javatests/jflex/testcase/charclass/BUILD.bazel
@@ -17,7 +17,7 @@ java_test(
     deps = [
         "//third_party/com/google/guava",
         "//third_party/com/google/truth",
-        "//third_party/java:jsr250",
+        "//third_party/javax:annotation",
     ],
 )
 

diff --git a/javatests/jflex/testcase/count/BUILD.bazel b/javatests/jflex/testcase/count/BUILD.bazel
@@ -20,7 +20,7 @@ java_library(
     deps = [
         "//java/jflex/testing/testsuite/golden",
         "//third_party/com/google/guava",
-        "//third_party/java:jsr250",
+        "//third_party/javax:annotation",
     ],
 )
 

diff --git a/javatests/jflex/testcase/ctorarg/BUILD.bazel b/javatests/jflex/testcase/ctorarg/BUILD.bazel
@@ -21,7 +21,7 @@ java_library(
     deps = [
         "//java/jflex/testing/testsuite/golden",
         "//third_party/com/google/guava",
-        "//third_party/java:jsr250",
+        "//third_party/javax:annotation",
     ],
 )
 

diff --git a/javatests/jflex/testcase/cup2private/BUILD.bazel b/javatests/jflex/testcase/cup2private/BUILD.bazel
@@ -22,7 +22,7 @@ java_library(
         "//java/jflex/testing/testsuite/golden",
         "//third_party/com/google/guava",
         "//third_party/edu/tum/cup2",
-        "//third_party/java:jsr250",
+        "//third_party/javax:annotation",
     ],
 )
 

diff --git a/javatests/jflex/testcase/cupsym/BUILD.bazel b/javatests/jflex/testcase/cupsym/BUILD.bazel
@@ -21,7 +21,7 @@ java_library(
     deps = [
         "//java/jflex/testing/testsuite/golden",
         "//third_party/com/google/guava",
-        "//third_party/java:jsr250",
+        "//third_party/javax:annotation",
         "//third_party/java_cup:runtime",
     ],
 )

diff --git a/javatests/jflex/testcase/dot_newline/BUILD.bazel b/javatests/jflex/testcase/dot_newline/BUILD.bazel
@@ -21,7 +21,7 @@ java_library(
     deps = [
         "//java/jflex/testing/testsuite/golden",
         "//third_party/com/google/guava",
-        "//third_party/java:jsr250",
+        "//third_party/javax:annotation",
     ],
 )
 

diff --git a/javatests/jflex/testcase/empty_match/BUILD.bazel b/javatests/jflex/testcase/empty_match/BUILD.bazel
@@ -20,7 +20,7 @@ java_library(
     deps = [
         "//java/jflex/testing/testsuite/golden",
         "//third_party/com/google/guava",
-        "//third_party/java:jsr250",
+        "//third_party/javax:annotation",
     ],
 )
 

diff --git a/javatests/jflex/testcase/eof/BUILD.bazel b/javatests/jflex/testcase/eof/BUILD.bazel
@@ -20,7 +20,7 @@ java_library(
     deps = [
         "//java/jflex/testing/testsuite/golden",
         "//third_party/com/google/guava",
-        "//third_party/java:jsr250",
+        "//third_party/javax:annotation",
     ],
 )
 

diff --git a/javatests/jflex/testcase/eof_min/BUILD.bazel b/javatests/jflex/testcase/eof_min/BUILD.bazel
@@ -20,7 +20,7 @@ java_library(
     deps = [
         "//java/jflex/testing/testsuite/golden",
         "//third_party/com/google/guava",
-        "//third_party/java:jsr250",
+        "//third_party/javax:annotation",
     ],
 )
 

diff --git a/javatests/jflex/testcase/eofclose/BUILD.bazel b/javatests/jflex/testcase/eofclose/BUILD.bazel
@@ -20,7 +20,7 @@ java_library(
     deps = [
         "//java/jflex/testing/testsuite/golden",
         "//third_party/com/google/guava",
-        "//third_party/java:jsr250",
+        "//third_party/javax:annotation",
     ],
 )
 
@@ -41,7 +41,7 @@ java_library(
     deps = [
         "//java/jflex/testing/testsuite/golden",
         "//third_party/com/google/guava",
-        "//third_party/java:jsr250",
+        "//third_party/javax:annotation",
     ],
 )
 

diff --git a/javatests/jflex/testcase/eol_comment/BUILD.bazel b/javatests/jflex/testcase/eol_comment/BUILD.bazel
@@ -20,7 +20,7 @@ java_library(
     deps = [
         "//java/jflex/testing/testsuite/golden",
         "//third_party/com/google/guava",
-        "//third_party/java:jsr250",
+        "//third_party/javax:annotation",
     ],
 )
 

diff --git a/javatests/jflex/testcase/eol_look/BUILD.bazel b/javatests/jflex/testcase/eol_look/BUILD.bazel
@@ -20,7 +20,7 @@ java_library(
     deps = [
         "//java/jflex/testing/testsuite/golden",
         "//third_party/com/google/guava",
-        "//third_party/java:jsr250",
+        "//third_party/javax:annotation",
     ],
 )
 

diff --git a/javatests/jflex/testcase/fixed_look/BUILD.bazel b/javatests/jflex/testcase/fixed_look/BUILD.bazel
@@ -20,7 +20,7 @@ java_library(
     deps = [
         "//java/jflex/testing/testsuite/golden",
         "//third_party/com/google/guava",
-        "//third_party/java:jsr250",
+        "//third_party/javax:annotation",
     ],
 )
 

diff --git a/javatests/jflex/testcase/generics/BUILD.bazel b/javatests/jflex/testcase/generics/BUILD.bazel
@@ -19,7 +19,7 @@ java_library(
     deps = [
         "//java/jflex/testing/testsuite/golden",
         "//third_party/com/google/guava",
-        "//third_party/java:jsr250",
+        "//third_party/javax:annotation",
     ],
 )
 
@@ -56,7 +56,7 @@ java_library(
     deps = [
         "//java/jflex/testing/testsuite/golden",
         "//third_party/com/google/guava",
-        "//third_party/java:jsr250",
+        "//third_party/javax:annotation",
     ],
 )
 
@@ -93,7 +93,7 @@ java_library(
     deps = [
         "//java/jflex/testing/testsuite/golden",
         "//third_party/com/google/guava",
-        "//third_party/java:jsr250",
+        "//third_party/javax:annotation",
     ],
 )
 
@@ -130,7 +130,7 @@ java_library(
     deps = [
         "//java/jflex/testing/testsuite/golden",
         "//third_party/com/google/guava",
-        "//third_party/java:jsr250",
+        "//third_party/javax:annotation",
     ],
 )
 

diff --git a/javatests/jflex/testcase/genlook/BUILD.bazel b/javatests/jflex/testcase/genlook/BUILD.bazel
@@ -20,7 +20,7 @@ java_library(
     deps = [
         "//java/jflex/testing/testsuite/golden",
         "//third_party/com/google/guava",
-        "//third_party/java:jsr250",
+        "//third_party/javax:annotation",
     ],
 )
 

diff --git a/javatests/jflex/testcase/genlook2/BUILD.bazel b/javatests/jflex/testcase/genlook2/BUILD.bazel
@@ -20,7 +20,7 @@ java_library(
     deps = [
         "//java/jflex/testing/testsuite/golden",
         "//third_party/com/google/guava",
-        "//third_party/java:jsr250",
+        "//third_party/javax:annotation",
     ],
 )
 

diff --git a/javatests/jflex/testcase/include/BUILD.bazel b/javatests/jflex/testcase/include/BUILD.bazel
@@ -21,7 +21,7 @@ java_library(
     deps = [
         "//java/jflex/testing/testsuite/golden",
         "//third_party/com/google/guava",
-        "//third_party/java:jsr250",
+        "//third_party/javax:annotation",
     ],
 )
 

diff --git a/javatests/jflex/testcase/include2/BUILD.bazel b/javatests/jflex/testcase/include2/BUILD.bazel
@@ -21,7 +21,7 @@ java_library(
     deps = [
         "//java/jflex/testing/testsuite/golden",
         "//third_party/com/google/guava",
-        "//third_party/java:jsr250",
+        "//third_party/javax:annotation",
     ],
 )
 

diff --git a/javatests/jflex/testcase/include_in_rules/BUILD.bazel b/javatests/jflex/testcase/include_in_rules/BUILD.bazel
@@ -21,7 +21,7 @@ java_library(
     deps = [
         "//java/jflex/testing/testsuite/golden",
         "//third_party/com/google/guava",
-        "//third_party/java:jsr250",
+        "//third_party/javax:annotation",
     ],
 )
 

diff --git a/javatests/jflex/testcase/initthrow_eol/BUILD.bazel b/javatests/jflex/testcase/initthrow_eol/BUILD.bazel
@@ -20,7 +20,7 @@ java_library(
     deps = [
         "//java/jflex/testing/testsuite/golden",
         "//third_party/com/google/guava",
-        "//third_party/java:jsr250",
+        "//third_party/javax:annotation",
     ],
 )
 

diff --git a/javatests/jflex/testcase/large_input/BUILD.bazel b/javatests/jflex/testcase/large_input/BUILD.bazel
@@ -26,7 +26,7 @@ java_library(
     deps = [
         "//java/jflex/testing/testsuite/golden",
         "//third_party/com/google/guava",
-        "//third_party/java:jsr250",
+        "//third_party/javax:annotation",
     ],
 )
 

diff --git a/javatests/jflex/testcase/look/BUILD.bazel b/javatests/jflex/testcase/look/BUILD.bazel
@@ -20,7 +20,7 @@ java_library(
     deps = [
         "//java/jflex/testing/testsuite/golden",
         "//third_party/com/google/guava",
-        "//third_party/java:jsr250",
+        "//third_party/javax:annotation",
     ],
 )
 

diff --git a/javatests/jflex/testcase/look_macro/BUILD.bazel b/javatests/jflex/testcase/look_macro/BUILD.bazel
@@ -20,7 +20,7 @@ java_library(
     deps = [
         "//java/jflex/testing/testsuite/golden",
         "//third_party/com/google/guava",
-        "//third_party/java:jsr250",
+        "//third_party/javax:annotation",
     ],
 )
 

diff --git a/javatests/jflex/testcase/macro_exp/BUILD.bazel b/javatests/jflex/testcase/macro_exp/BUILD.bazel
@@ -21,7 +21,7 @@ java_library(
     deps = [
         "//java/jflex/testing/testsuite/golden",
         "//third_party/com/google/guava",
-        "//third_party/java:jsr250",
+        "//third_party/javax:annotation",
     ],
 )