From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 12 Apr 2023 05:34:36 +0000 (+0200)
Subject: Make JVM provided imports optional
X-Git-Tag: v2.3.13~7
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-tp.git;a=commitdiff_plain;h=d5fe55fda6852109728b47fa14a0159b5a441698

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 e0554fa..3f403b0 100644
--- 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 0b75aa3..ae90d96 100644
--- 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 78a087f..6aa02c5 100644
--- 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 58cf352..d58bd33 100644
--- 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 429f0c1..f4cfa98 100644
--- 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 0808699..89da058 100644
--- 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 c62391f..9bc4753 100644
--- 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", \
+*