From be456cf0f7f7b9070eaae26fe1d3130e07e0d385 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20L=C3=A4ubrich?= Date: Thu, 30 Jan 2025 19:15:17 +0100 Subject: [PATCH] Make the import of com.google.errorprone optional (#2795) Fix https://github.com/google/gson/issues/2794 --- gson/pom.xml | 3 ++- .../java/com/google/gson/integration/OSGiManifestIT.java | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gson/pom.xml b/gson/pom.xml index 97d4a470a1..42876fc60e 100644 --- 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 index 9f6c5334aa..fd407279de 100644 --- 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