From 7363acdd1456da197dff227bdc5eaf1847dbd737 Mon Sep 17 00:00:00 2001 From: Mathieu Date: Sun, 20 Nov 2022 12:07:05 +0100 Subject: [PATCH] Make some indirect dependencies optional --- .../org.argeo.tp.poi/log4j/org.apache.logging.log4j.core.bnd | 2 ++ repackage/org.argeo.tp.sql/org.h2.bnd | 1 + ...xhtmlrenderer.swt.bnd => org.xhtmlrenderer.swt.bnd.disabled} | 0 3 files changed, 3 insertions(+) rename repackage/org.argeo.tp.utils/flying-saucer/{org.xhtmlrenderer.swt.bnd => org.xhtmlrenderer.swt.bnd.disabled} (100%) diff --git a/repackage/org.argeo.tp.poi/log4j/org.apache.logging.log4j.core.bnd b/repackage/org.argeo.tp.poi/log4j/org.apache.logging.log4j.core.bnd index c315027..4864b50 100644 --- a/repackage/org.argeo.tp.poi/log4j/org.apache.logging.log4j.core.bnd +++ b/repackage/org.argeo.tp.poi/log4j/org.apache.logging.log4j.core.bnd @@ -1 +1,3 @@ SLC-Origin-M2: org.apache.logging.log4j:log4j-core +Import-Package:\ +*;resolution:="optional" diff --git a/repackage/org.argeo.tp.sql/org.h2.bnd b/repackage/org.argeo.tp.sql/org.h2.bnd index 3068392..2d6de4e 100644 --- a/repackage/org.argeo.tp.sql/org.h2.bnd +++ b/repackage/org.argeo.tp.sql/org.h2.bnd @@ -6,4 +6,5 @@ jakarta.*;resolution:=optional,\ org.apache.lucene.*;resolution:=optional,\ org.codehaus.groovy.*;resolution:=optional,\ org.osgi.*;resolution:=optional,\ +com.ibm.icu.*;resolution:=optional,\ * \ No newline at end of file diff --git a/repackage/org.argeo.tp.utils/flying-saucer/org.xhtmlrenderer.swt.bnd b/repackage/org.argeo.tp.utils/flying-saucer/org.xhtmlrenderer.swt.bnd.disabled similarity index 100% rename from repackage/org.argeo.tp.utils/flying-saucer/org.xhtmlrenderer.swt.bnd rename to repackage/org.argeo.tp.utils/flying-saucer/org.xhtmlrenderer.swt.bnd.disabled -- 2.30.2