From f1afb4dcd5393172b3a3a91f0ad6f12f0ef2ac6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Re=CC=81gis=20De=CC=81camps?= Date: Tue, 12 May 2020 23:09:35 +0200 Subject: [PATCH] Upgrade to javax-annotation 1.3.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://mvnrepository.com/artifact/javax.annotation/jsr250-api indicates that this artifact has moved to javax.annotation ยป javax.annotation-api --- benchmark/pom.xml | 2 +- java/jflex/testing/testsuite/BUILD.bazel | 4 ++-- .../jflex/testing/testsuite/JFlexTestRunner.java | 2 +- javatests/jflex/testcase/action_pipe/BUILD.bazel | 4 ++-- javatests/jflex/testcase/apipirivate/BUILD.bazel | 4 ++-- javatests/jflex/testcase/bol/BUILD.bazel | 2 +- javatests/jflex/testcase/buffer/BUILD.bazel | 2 +- .../jflex/testcase/caseless_jflex/BUILD.bazel | 4 ++-- .../jflex/testcase/caseless_jlex/BUILD.bazel | 2 +- javatests/jflex/testcase/ccl_16/BUILD.bazel | 2 +- javatests/jflex/testcase/ccl_bug/BUILD.bazel | 2 +- javatests/jflex/testcase/ccl_esc/BUILD.bazel | 2 +- javatests/jflex/testcase/ccl_macros/BUILD.bazel | 2 +- javatests/jflex/testcase/ccl_pre/BUILD.bazel | 2 +- javatests/jflex/testcase/charclass/BUILD.bazel | 2 +- javatests/jflex/testcase/count/BUILD.bazel | 2 +- javatests/jflex/testcase/ctorarg/BUILD.bazel | 2 +- javatests/jflex/testcase/cup2private/BUILD.bazel | 2 +- javatests/jflex/testcase/cupsym/BUILD.bazel | 2 +- javatests/jflex/testcase/dot_newline/BUILD.bazel | 2 +- javatests/jflex/testcase/empty_match/BUILD.bazel | 2 +- javatests/jflex/testcase/eof/BUILD.bazel | 2 +- javatests/jflex/testcase/eof_min/BUILD.bazel | 2 +- javatests/jflex/testcase/eofclose/BUILD.bazel | 4 ++-- javatests/jflex/testcase/eol_comment/BUILD.bazel | 2 +- javatests/jflex/testcase/eol_look/BUILD.bazel | 2 +- javatests/jflex/testcase/fixed_look/BUILD.bazel | 2 +- javatests/jflex/testcase/generics/BUILD.bazel | 8 ++++---- javatests/jflex/testcase/genlook/BUILD.bazel | 2 +- javatests/jflex/testcase/genlook2/BUILD.bazel | 2 +- javatests/jflex/testcase/include/BUILD.bazel | 2 +- javatests/jflex/testcase/include2/BUILD.bazel | 2 +- .../jflex/testcase/include_in_rules/BUILD.bazel | 2 +- .../jflex/testcase/initthrow_eol/BUILD.bazel | 2 +- javatests/jflex/testcase/large_input/BUILD.bazel | 2 +- javatests/jflex/testcase/look/BUILD.bazel | 2 +- javatests/jflex/testcase/look_macro/BUILD.bazel | 2 +- javatests/jflex/testcase/macro_exp/BUILD.bazel | 2 +- javatests/jflex/testcase/sevenbit/BUILD.bazel | 2 +- javatests/jflex/util/javac/BUILD.bazel | 4 ++-- jflex/examples/common/Makefile.inc | 8 ++++---- jflex/examples/common/ivy.xml | 2 +- jflex/examples/cup-interpreter/pom.xml | 4 ++-- jflex/examples/cup-java-minijava/pom.xml | 5 +++++ jflex/examples/cup-java/pom.xml | 4 ++-- jflex/examples/cup-lcalc/pom.xml | 5 +++++ jflex/examples/simple/pom.xml | 4 ++-- jflex/examples/standalone/pom.xml | 4 ++-- jflex/examples/zero-reader/pom.xml | 5 +++++ pom.xml | 4 ++-- testsuite/jflex-testsuite-maven-plugin/pom.xml | 2 +- .../plugin/testsuite/JFlexTestsuiteMojo.java | 3 ++- third_party/deps.bzl | 2 +- third_party/{java => javax}/BUILD.bazel | 4 ++-- third_party/maven_install.json | 16 ++++++++-------- 55 files changed, 93 insertions(+), 77 deletions(-) rename third_party/{java => javax}/BUILD.bazel (55%) diff --git a/benchmark/pom.xml b/benchmark/pom.xml index 2f29a58a6..df3fe94ec 100644 --- a/benchmark/pom.xml +++ b/benchmark/pom.xml @@ -13,7 +13,7 @@ javax.annotation - jsr250-api + javax.annotation-api junit diff --git a/java/jflex/testing/testsuite/BUILD.bazel b/java/jflex/testing/testsuite/BUILD.bazel index 7a759008d..a603ec667 100644 --- 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 index 522bad1fd..7de495016 100644 --- 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 index 7123e892e..241130ff4 100644 --- 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 index e5f99e5bc..4ecd0dc5c 100644 --- 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 index 6853e23bc..2c6e23d49 100644 --- 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 index cfad57fc2..510477ade 100644 --- 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 index bd0d67e11..80a8b1071 100644 --- 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 index 6901a736e..98d0d277f 100644 --- 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 index 59195e73e..96ac7eb51 100644 --- 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 index 570ea860d..1689cdf67 100644 --- 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 index 15713277d..1ecd979c7 100644 --- 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 index ed4af43da..2a5eed40c 100644 --- 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 index a99409b16..dd59aeb69 100644 --- 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 index f368ae622..c07784d2e 100644 --- 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 index b68d63e10..1535ccf10 100644 --- 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 index ae8b744fb..a76e0f957 100644 --- 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 index b003a3ea7..37445c27a 100644 --- 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 index 3346bfa76..f35602cf0 100644 --- 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 index 07645599e..5f922abc4 100644 --- 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 index b20484319..a11a99647 100644 --- 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 index 659213022..a71c32ce9 100644 --- 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 index d863811e2..6efb2827e 100644 --- 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 index 7179f9a49..04d4aab70 100644 --- 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 index 967bd5b54..c2b0ba24f 100644 --- 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 index b1c2c05fb..cd640d603 100644 --- 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 index 13a54e4d9..0f682d5f2 100644 --- 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 index b58639692..fbff10198 100644 --- 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 index fc0c9f986..8d28d8bb4 100644 --- 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 index 348c1e5ce..01fbea309 100644 --- 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 index 39adb65f8..34056a17b 100644 --- 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 index a05e771a6..d10c2c78b 100644 --- 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 index b124cae4f..5fa49cda9 100644 --- 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 index 4ab939beb..d0c6a68c8 100644 --- 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 index 129ac90be..8936475de 100644 --- 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 index 39a7d4fd9..e725adcfb 100644 --- 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 index 89c503d37..c86a01593 100644 --- 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 index 6cba023d7..0a254797c 100644 --- 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", ], ) diff --git a/javatests/jflex/testcase/sevenbit/BUILD.bazel b/javatests/jflex/testcase/sevenbit/BUILD.bazel index b96eadfdf..7f0fd77f5 100644 --- a/javatests/jflex/testcase/sevenbit/BUILD.bazel +++ b/javatests/jflex/testcase/sevenbit/BUILD.bazel @@ -13,7 +13,7 @@ java_library( ":sevenbit_flex", ], deps = [ - "//third_party/java:jsr250", + "//third_party/javax:annotation", ], ) diff --git a/javatests/jflex/util/javac/BUILD.bazel b/javatests/jflex/util/javac/BUILD.bazel index e24d002f5..9a2958e4d 100644 --- a/javatests/jflex/util/javac/BUILD.bazel +++ b/javatests/jflex/util/javac/BUILD.bazel @@ -14,8 +14,8 @@ java_test( 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/jflex/examples/common/Makefile.inc b/jflex/examples/common/Makefile.inc index e29b7836d..347f54ebe 100644 --- a/jflex/examples/common/Makefile.inc +++ b/jflex/examples/common/Makefile.inc @@ -11,11 +11,11 @@ CURL = curl -L -O -C - CUPVERSION = 11b-20160615 CUPJAR = java-cup-$(CUPVERSION).jar CUPURL = https://repo1.maven.org/maven2/com/github/vbmacher/java-cup/$(CUPVERSION)/$(CUPJAR) -CUP = java -jar $(LIB)/$(CUPJAR) +CUP = java -cp $(LIB)/$(CUPJAR) java_cup.Main -JSR250VERSION = 1.0 -JSR250JAR = jsr250-api-$(JSR250VERSION).jar -JSR250URL = https://repo1.maven.org/maven2/javax/annotation/jsr250-api/$(JSR250VERSION)/$(JSR250JAR) +JSR250VERSION = 1.3.2 +JSR250JAR = javax.annotation-api-$(JSR250VERSION).jar +JSR250URL = https://repo1.maven.org/maven2/javax/annotation/javax.annotation-api/$(JSR250VERSION)/$(JSR250JAR) OUT = out GEN = $(OUT)/genfiles diff --git a/jflex/examples/common/ivy.xml b/jflex/examples/common/ivy.xml index 23505a985..8e815c7fe 100644 --- a/jflex/examples/common/ivy.xml +++ b/jflex/examples/common/ivy.xml @@ -6,7 +6,7 @@ - +