Replace dependency on javax.annotation:jsr250-api:1.0 with javax.anno…

…tation:javax.annotation-api:1.3.2. Fixes #3480. RELNOTES=Fix #3480. Replace dependency on javax.annotation:jsr250-api:1.0 with javax.annotation:javax.annotation-api:1.3.2. PiperOrigin-RevId: 463942838
google · Jul 28, 2022 · e9dc377 · e9dc377
1 parent b9413ba
commit e9dc377
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/BUILD b/BUILD
@@ -101,7 +101,7 @@ android_library(
     name = "android_local_test_exports",
     exports = [
         # TODO(bcorso): see if we can remove jsr250 dep from autovalue to prevent this.
-        "@maven//:javax_annotation_jsr250_api",  # For @Generated
+        "@maven//:javax_annotation_javax_annotation_api",  # For @Generated
         "@maven//:org_robolectric_shadows_framework",  # For ActivityController
         "@maven//:androidx_lifecycle_lifecycle_common",  # For Lifecycle.State
         "@maven//:androidx_activity_activity",  # For ComponentActivity

diff --git a/WORKSPACE b/WORKSPACE
@@ -251,7 +251,7 @@ maven_install(
         "io.grpc:grpc-netty:%s" % GRPC_VERSION,
         "io.grpc:grpc-protobuf:%s" % GRPC_VERSION,
         "jakarta.inject:jakarta.inject-api:2.0.1",
-        "javax.annotation:jsr250-api:1.0",
+        "javax.annotation:javax.annotation-api:1.3.2",
         "javax.inject:javax.inject:1",
         "javax.inject:javax.inject-tck:1",
         "junit:junit:4.13",

diff --git a/java/dagger/hilt/BUILD b/java/dagger/hilt/BUILD
@@ -232,7 +232,7 @@ gen_maven_artifact(
     ],
     artifact_target_maven_deps_banned = [
         "com.google.guava:guava",
-        "javax.annotation:jsr250-api",
+        "javax.annotation:javax.annotation-api",
     ],
     javadoc_exclude_packages = [
         "dagger.hilt.internal",

diff --git a/java/dagger/hilt/android/BUILD b/java/dagger/hilt/android/BUILD
@@ -214,7 +214,7 @@ gen_maven_artifact(
     ],
     artifact_target_maven_deps_banned = [
         "com.google.guava:guava",
-        "javax.annotation:jsr250-api",
+        "javax.annotation:javax.annotation-api",
     ],
     javadoc_android_api_level = 32,
     javadoc_exclude_packages = [

diff --git a/java/dagger/hilt/android/processor/BUILD b/java/dagger/hilt/android/processor/BUILD
@@ -84,7 +84,7 @@ gen_maven_artifact(
         "com.google.guava:failureaccess",
         "com.google.guava:guava",
         "com.squareup:javapoet",
-        "javax.annotation:jsr250-api",
+        "javax.annotation:javax.annotation-api",
         "javax.inject:javax.inject",
         "net.ltgt.gradle.incap:incap",
         "org.jetbrains.kotlin:kotlin-stdlib",

diff --git a/java/dagger/hilt/android/testing/BUILD b/java/dagger/hilt/android/testing/BUILD
@@ -235,7 +235,7 @@ gen_maven_artifact(
     ],
     artifact_target_maven_deps_banned = [
         "com.google.guava:guava",
-        "javax.annotation:jsr250-api",
+        "javax.annotation:javax.annotation-api",
     ],
     javadoc_android_api_level = 32,
     javadoc_exclude_packages = [

diff --git a/java/dagger/hilt/processor/BUILD b/java/dagger/hilt/processor/BUILD
@@ -106,7 +106,7 @@ gen_maven_artifact(
         "com.google.guava:failureaccess",
         "com.google.guava:guava",
         "com.squareup:javapoet",
-        "javax.annotation:jsr250-api",
+        "javax.annotation:javax.annotation-api",
         "javax.inject:javax.inject",
         "net.ltgt.gradle.incap:incap",
         "org.jetbrains.kotlin:kotlin-stdlib",

diff --git a/third_party/java/jsr250_annotations/BUILD b/third_party/java/jsr250_annotations/BUILD
@@ -18,5 +18,5 @@ package(default_visibility = ["//:src"])
 
 alias(
     name = "jsr250_annotations",
-    actual = "@maven//:javax_annotation_jsr250_api",
+    actual = "@maven//:javax_annotation_javax_annotation_api",
 )
diff --git a/workspace_defs.bzl b/workspace_defs.bzl
@@ -39,7 +39,7 @@ DAGGER_ANDROID_ARTIFACTS = [
 
 HILT_ANDROID_ARTIFACTS = [
     "androidx.test:core:1.1.0",  # Export for ApplicationProvider
-    "javax.annotation:jsr250-api:1.0",  # Export for @Generated
+    "javax.annotation:javax.annotation-api:1.3.2",  # Export for @Generated
     "androidx.annotation:annotation:1.1.0",  # Export for @CallSuper/@Nullable
     "com.google.dagger:dagger:" + _VERSION,
     "com.google.dagger:dagger-compiler:" + _VERSION,
@@ -183,7 +183,7 @@ def hilt_android_rules(repo_name = "@maven"):
             "%s//:androidx_annotation_annotation" % repo_name,  # For @CallSuper
             "%s//:com_google_dagger_hilt_android" % repo_name,
             "%s//:com_google_dagger_hilt_core" % repo_name,
-            "%s//:javax_annotation_jsr250_api" % repo_name,  # For @Generated
+            "%s//:javax_annotation_javax_annotation_api" % repo_name,  # For @Generated
         ],
     )