Make some indirect dependencies optional

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 c31502719c022873b9e378d3fc23cf754acfe264..4864b50b3c71e8aa5de3b98ca1cf8b099a80612c 100644 (file)
--- 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 30683927c24f4f308b3876663915ba0a9460409c..2d6de4ead47cbe54afefd70cd8985d33bd76f852 100644 (file)
--- 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
deleted file mode 100644 (file)
index 6b89d64..0000000
--- a/repackage/org.argeo.tp.utils/flying-saucer/org.xhtmlrenderer.swt.bnd
+++ /dev/null
@@ -1,4 +0,0 @@
-SLC-Origin-M2: org.xhtmlrenderer:flying-saucer-swt
-Import-Package:\
-org.eclipse.swt.printing;resolution:="optional",\
-*
\ No newline at end of file

diff --git a/repackage/org.argeo.tp.utils/flying-saucer/org.xhtmlrenderer.swt.bnd.disabled b/repackage/org.argeo.tp.utils/flying-saucer/org.xhtmlrenderer.swt.bnd.disabled
new file mode 100644 (file)
index 0000000..6b89d64
--- /dev/null
+++ b/repackage/org.argeo.tp.utils/flying-saucer/org.xhtmlrenderer.swt.bnd.disabled
@@ -0,0 +1,4 @@
+SLC-Origin-M2: org.xhtmlrenderer:flying-saucer-swt
+Import-Package:\
+org.eclipse.swt.printing;resolution:="optional",\
+*
\ No newline at end of file