Make JVM provided imports optional

diff --git a/repackage/org.argeo.tp.jcr/org.apache.lucene.bnd b/repackage/org.argeo.tp.jcr/org.apache.lucene.bnd
index e0554fa6b841388b88132c309419542f4783d185..3f403b093ecd2879194ae099f21f499608010695 100644 (file)
--- a/repackage/org.argeo.tp.jcr/org.apache.lucene.bnd
+++ b/repackage/org.argeo.tp.jcr/org.apache.lucene.bnd
@@ -1,2 +1,7 @@
 SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: org.apache.lucene:lucene-core:3.6.2
\ No newline at end of file
+Argeo-Origin-M2: org.apache.lucene:lucene-core:3.6.2
+
+Import-Package: \
+sun.*;resolution:=optional, \
+com.sun.*;resolution:=optional, \
+*

diff --git a/repackage/org.argeo.tp.publish/de.rototor.pdfbox.graphics2d.bnd b/repackage/org.argeo.tp.publish/de.rototor.pdfbox.graphics2d.bnd
index 0b75aa3651f60b145817bbd2a327a7e6dd576fcc..ae90d962977c0335a2c200b9ca1b04664b663d84 100644 (file)
--- a/repackage/org.argeo.tp.publish/de.rototor.pdfbox.graphics2d.bnd
+++ b/repackage/org.argeo.tp.publish/de.rototor.pdfbox.graphics2d.bnd
@@ -1,2 +1,6 @@
 SPDX-License-Identifier: Apache-2.0
 Argeo-Origin-M2: de.rototor.pdfbox:graphics2d:0.42
+
+Import-Package: \
+sun.*;resolution:=optional, \
+*

diff --git a/repackage/org.argeo.tp.utils/net.sf.cglib.bnd b/repackage/org.argeo.tp.utils/net.sf.cglib.bnd
index 78a087f5677bf3cc43c005b8afc7c6c1648415d0..6aa02c517cec2e203d822a4b7bc142d50e2e73f2 100644 (file)
--- a/repackage/org.argeo.tp.utils/net.sf.cglib.bnd
+++ b/repackage/org.argeo.tp.utils/net.sf.cglib.bnd
@@ -2,5 +2,6 @@ SPDX-License-Identifier: Apache-2.0
 Argeo-Origin-M2: cglib:cglib:3.3.0
 
 Import-Package: \
-org.apache.tools.ant.*;resolution:=optional,\
+org.apache.tools.ant.*;resolution:=optional, \
+sun.*;resolution:=optional, \
 *

diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.jxpath.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.jxpath.bnd
index 58cf3525ec6d1bb323b23a6eebf3813cd6ffca2f..d58bd3356fb84d589ece3f66ac79e113a2ba02e2 100644 (file)
--- a/repackage/org.argeo.tp.utils/org.apache.commons.jxpath.bnd
+++ b/repackage/org.argeo.tp.utils/org.apache.commons.jxpath.bnd
@@ -2,5 +2,7 @@ SPDX-License-Identifier: Apache-2.0
 Argeo-Origin-M2: commons-jxpath:commons-jxpath:1.3
 
 Import-Package: \
+javax.xml.*;resolution:="optional", \
+org.w3c.*;resolution:="optional", \
 org.jdom.*;resolution:="optional", \
 *
\ No newline at end of file

diff --git a/repackage/org.argeo.tp/org.w3c.dom.smil.bnd b/repackage/org.argeo.tp/org.w3c.dom.smil.bnd
index 429f0c1df14547c82b3f33a990b6d894363b29eb..f4cfa986c986b27353a0282a14e0806735dc1bf6 100644 (file)
--- a/repackage/org.argeo.tp/org.w3c.dom.smil.bnd
+++ b/repackage/org.argeo.tp/org.w3c.dom.smil.bnd
@@ -1,3 +1,7 @@
 SPDX-License-Identifier: W3C
 Bundle-Version: 1.0
 Argeo-Origin-M2: org.axsl.org.w3c.dom.smil:smil-boston-dom-java:2000-02-25
+
+Import-Package: \
+org.w3c.*;resolution:="optional", \
+*

diff --git a/repackage/org.argeo.tp/org.w3c.dom.svg.bnd b/repackage/org.argeo.tp/org.w3c.dom.svg.bnd
index 08086991447955bf1c1d4a5b31c03d33317d1da4..89da058c6c0e1a2c2db32afc26916d5c03c2c133 100644 (file)
--- a/repackage/org.argeo.tp/org.w3c.dom.svg.bnd
+++ b/repackage/org.argeo.tp/org.w3c.dom.svg.bnd
@@ -1,2 +1,6 @@
 SPDX-License-Identifier: W3C
 Argeo-Origin-M2: org.axsl.org.w3c.dom.svg:svg-dom-java:1.1
+
+Import-Package: \
+org.w3c.*;resolution:="optional", \
+*

diff --git a/repackage/org.argeo.tp/xalan/merge.bnd b/repackage/org.argeo.tp/xalan/merge.bnd
index c62391ffe87fb21f181de961e6bb6fbd1289ce56..9bc4753630815e5dc56b6ab8861c45515b4bbca9 100644 (file)
--- a/repackage/org.argeo.tp/xalan/merge.bnd
+++ b/repackage/org.argeo.tp/xalan/merge.bnd
@@ -4,4 +4,10 @@ Argeo-Origin-M2: :2.7.2
 Export-Package: org.apache.*
 Argeo-Origin-M2-Merge: \
 xalan:xalan,\
-xalan:serializer,\
\ No newline at end of file
+xalan:serializer,\
+
+Import-Package: \
+javax.xml.*;resolution:="optional", \
+org.w3c.*;resolution:="optional", \
+org.xml.*;resolution:="optional", \
+*