Skip to content

Commit 2dfd572

Browse files
cpovirkGoogle Java Core Libraries
authored andcommitted
Attempt to update OSGi metadata for JSpecify annotations.
The original OSGi metadata was added back in 53abadc, at which point it mentioned `javax.annotation`. Since then, we've added and removed various annotation dependencies, apparently without ill effects. (And when we tried to make a change that clearly _did_ require a change to the metadata in cl/103098597, we apparently got an error.) So it's possible that listing annotations has _never_ been necessary or at least that it became unnecessary in the 3.5 years between those two prior changes. Or maybe none of our users both use OSGi and try to read our nullness annotations (but if they did, they'd have problems)? Anyway, if listing annotations _is_ important, then we should probably be doing it for the Error Prone and J2ObjC annotations, too.... But for some reason, when I was [replying to an comment that mentioned OSGi on the Jackson issue tracker](FasterXML/jackson-future-ideas#87 (reply in thread)), I decided that it was worth dipping my toes in here, and I guess I figured I'd start small. RELNOTES=Listed the JSpecify annotations as an optional dependency in our OSGi metadata. PiperOrigin-RevId: 768209312
1 parent 93c4145 commit 2dfd572

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

android/guava/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
</Export-Package>
9797
<Import-Package>
9898
com.google.common.util.concurrent.internal,
99-
javax.annotation;resolution:=optional,
99+
org.jspecify.annotations;resolution:=optional,
100100
javax.crypto.*;resolution:=optional,
101101
sun.misc.*;resolution:=optional
102102
</Import-Package>

guava/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
</Export-Package>
9090
<Import-Package>
9191
com.google.common.util.concurrent.internal,
92-
javax.annotation;resolution:=optional,
92+
org.jspecify.annotations;resolution:=optional,
9393
javax.crypto.*;resolution:=optional,
9494
sun.misc.*;resolution:=optional
9595
</Import-Package>

0 commit comments

Comments
 (0)