Make the import of com.google.errorprone optional (#2795)

Fix #2794
google · Jan 30, 2025 · be456cf · be456cf
1 parent b2e26fa
commit be456cf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/gson/pom.xml b/gson/pom.xml
@@ -146,8 +146,9 @@
                 Bundle-ContactAddress: ${project.parent.url}
 
                 # Optional dependency for JDK's sun.misc.Unsafe
+                # Optional dependency to google.errorprone
                 # https://bnd.bndtools.org/chapters/920-faq.html#remove-unwanted-imports-
-                Import-Package: sun.misc;resolution:=optional, *
+                Import-Package: sun.misc;resolution:=optional, com.google.errorprone.*;resolution:=optional, *
 
                 -removeheaders: Private-Package
 

diff --git a/gson/src/test/java/com/google/gson/integration/OSGiManifestIT.java b/gson/src/test/java/com/google/gson/integration/OSGiManifestIT.java
@@ -114,7 +114,10 @@ public void testImports() throws Exception {
         .containsExactly(
             // Dependency on JDK's sun.misc.Unsafe should be optional
             "sun.misc;resolution:=optional",
-            "com.google.errorprone.annotations;version=\"" + errorProneVersionRange + "\"");
+            // Dependency on error prone should be optional
+            "com.google.errorprone.annotations;resolution:=optional;version=\""
+                + errorProneVersionRange
+                + "\"");
 
     // Should not contain any import for Gson's own packages, see
     // https://github.com/google/gson/pull/2735#issuecomment-2330047410