Upgrade javax.mail to jakarta.mail. Fix Jetty.

diff --git a/rebuild/org.argeo.tp.utils/Makefile b/rebuild/org.argeo.tp.utils/Makefile
index 5a1fa46e815a27301ba8f5d21152b9d502f25f53..4b5bc2de340cd1022e3ba8869230278a4a1cbaa0 100644 (file)
--- a/rebuild/org.argeo.tp.utils/Makefile
+++ b/rebuild/org.argeo.tp.utils/Makefile
@@ -3,17 +3,20 @@ include ../../sdk.mk
 
 export NO_SDK_LEGAL := true
 
-MBOX_JNI_SRC=jni/com_sun_mail_mbox
+MBOX_JNI_SRC=jni/org_eclipse_angus_mail_mbox
 MBOX_TARGET_EXEC=libmbox.so
 
-all: retrieve-ee4j-mbox osgi jni-ee4j-mbox
+## FIXME - DON'T FORGET TO UPDATE THE VERSION IN THE RELATED bnd.bnd FILE!
+ANGUS_VERSION=2.0.2
+
+all: retrieve-angus-mbox osgi jni-angus-mbox
 
 install: osgi-install
        
 uninstall: osgi-uninstall
 
-retrieve-ee4j-mbox: SRC_DIR=src/ee4j-mail
-retrieve-ee4j-mbox:
+retrieve-angus-mbox: SRC_DIR=src/angus-mail
+retrieve-angus-mbox:
        rm -rf $(SRC_DIR)
        mkdir -p $(SRC_DIR)
        #git -C $(SRC_DIR) init
@@ -21,19 +24,19 @@ retrieve-ee4j-mbox:
        #git -C $(SRC_DIR) config core.sparseCheckout true
        #echo "mbox" >> $(SRC_DIR)/.git/info/sparse-checkout
        #git -C $(SRC_DIR) pull origin 1.6.7
-       git clone --branch 1.6.7 https://github.com/eclipse-ee4j/mail.git $(SRC_DIR)
+       git clone --branch $(ANGUS_VERSION) https://github.com/eclipse-ee4j/angus-mail.git $(SRC_DIR)
        rm -rf $(SRC_DIR)/.git
-       rsync -a --delete --exclude module-info.java $(SRC_DIR)/mbox/src/main/java/ com.sun.mail.mbox/src
+       rsync -a --delete --exclude module-info.java $(SRC_DIR)/providers/mbox/src/main/java/ org.eclipse.angus.mail.mbox/src
        # jni
-       rsync -a $(SRC_DIR)/mbox/src/main/cpp/com/sun/mail/mbox/ $(MBOX_JNI_SRC)
-       mkdir -p com.sun.mail.mbox/bin
-       javac -h jni/com_sun_mail_mbox/ -cp "$(A2_OUTPUT)/org.argeo.tp.sys/*" com.sun.mail.mbox/src/com/sun/mail/mbox/*.java
-       rm -rf com.sun.mail.mbox/bin
+       rsync -a $(SRC_DIR)/providers/mbox/src/main/cpp/org/eclipse/angus/mail/mbox/ $(MBOX_JNI_SRC)
+       mkdir -p org.eclipse.angus.mail.mbox/bin
+       javac -h $(MBOX_JNI_SRC) -cp "$(A2_OUTPUT)/org.argeo.tp.sys/*" org.eclipse.angus.mail.mbox/src/org/eclipse/angus/mail/mbox/*.java
+       rm -rf org.eclipse.angus.mail.mbox/bin
 
 A2_CATEGORY = org.argeo.tp.sys
 
 BUNDLES = \
-com.sun.mail.mbox \
+org.eclipse.angus.mail.mbox \
 
 clean:
        rm -rf $(BUILD_BASE)
@@ -44,7 +47,7 @@ include  $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
 
 A2_NATIVE_CATEGORY=$(A2_OUTPUT)/lib/linux/$(shell uname -m)/$(A2_CATEGORY)
 
-jni-ee4j-mbox:
+jni-angus-mbox:
        mkdir -p $(A2_NATIVE_CATEGORY)
        $(CC) -o $(A2_NATIVE_CATEGORY)/$(MBOX_TARGET_EXEC) \
         -shared -fPIC -fpic -Wl,-soname,$(MBOX_TARGET_EXEC).1.6 \

diff --git a/rebuild/org.argeo.tp.utils/com.sun.mail.mbox/.classpath b/rebuild/org.argeo.tp.utils/com.sun.mail.mbox/.classpath
deleted file mode 100644 (file)
index ca9ba96..0000000
--- a/rebuild/org.argeo.tp.utils/com.sun.mail.mbox/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-               <attributes>
-                       <attribute name="module" value="true"/>
-               </attributes>
-       </classpathentry>
-       <classpathentry kind="src" path="src"/>
-       <classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/rebuild/org.argeo.tp.utils/com.sun.mail.mbox/.gitignore b/rebuild/org.argeo.tp.utils/com.sun.mail.mbox/.gitignore
deleted file mode 100644 (file)
index 668266f..0000000
--- a/rebuild/org.argeo.tp.utils/com.sun.mail.mbox/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/src/
-/bin/
\ No newline at end of file

diff --git a/rebuild/org.argeo.tp.utils/com.sun.mail.mbox/.project b/rebuild/org.argeo.tp.utils/com.sun.mail.mbox/.project
deleted file mode 100644 (file)
index c003462..0000000
--- a/rebuild/org.argeo.tp.utils/com.sun.mail.mbox/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-       <name>com.sun.mail.mbox</name>
-       <comment></comment>
-       <projects>
-       </projects>
-       <buildSpec>
-               <buildCommand>
-                       <name>org.eclipse.jdt.core.javabuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.ManifestBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.SchemaBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-       </buildSpec>
-       <natures>
-               <nature>org.eclipse.pde.PluginNature</nature>
-               <nature>org.eclipse.jdt.core.javanature</nature>
-       </natures>
-</projectDescription>

diff --git a/rebuild/org.argeo.tp.utils/com.sun.mail.mbox/META-INF/.gitignore b/rebuild/org.argeo.tp.utils/com.sun.mail.mbox/META-INF/.gitignore
deleted file mode 100644 (file)
index 4854a41..0000000
--- a/rebuild/org.argeo.tp.utils/com.sun.mail.mbox/META-INF/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/MANIFEST.MF

diff --git a/rebuild/org.argeo.tp.utils/com.sun.mail.mbox/bnd.bnd b/rebuild/org.argeo.tp.utils/com.sun.mail.mbox/bnd.bnd
deleted file mode 100644 (file)
index 66fc6c7..0000000
--- a/rebuild/org.argeo.tp.utils/com.sun.mail.mbox/bnd.bnd
+++ /dev/null
@@ -1,9 +0,0 @@
-Export-Package: com.sun.mail.*;version="1.6.7"
-
-Import-Package: \
-javax.mail.event,\
-*
-
-major: 1
-minor: 6
-micro: 7
\ No newline at end of file

diff --git a/rebuild/org.argeo.tp.utils/com.sun.mail.mbox/build.properties b/rebuild/org.argeo.tp.utils/com.sun.mail.mbox/build.properties
deleted file mode 100644 (file)
index 34d2e4d..0000000
--- a/rebuild/org.argeo.tp.utils/com.sun.mail.mbox/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .

diff --git a/rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/.gitignore b/rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/.gitignore
deleted file mode 100644 (file)
index 9b838de..0000000
--- a/rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/*.h
-/*.c

diff --git a/rebuild/org.argeo.tp.utils/jni/org_eclipse_angus_mail_mbox/.gitignore b/rebuild/org.argeo.tp.utils/jni/org_eclipse_angus_mail_mbox/.gitignore
new file mode 100644 (file)
index 0000000..9b838de
--- /dev/null
+++ b/rebuild/org.argeo.tp.utils/jni/org_eclipse_angus_mail_mbox/.gitignore
@@ -0,0 +1,2 @@
+/*.h
+/*.c

diff --git a/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/.classpath b/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/.classpath
new file mode 100644 (file)
index 0000000..ca9ba96
--- /dev/null
+++ b/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/.classpath
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
+               <attributes>
+                       <attribute name="module" value="true"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="src" path="src"/>
+       <classpathentry kind="output" path="bin"/>
+</classpath>

diff --git a/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/.gitignore b/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/.gitignore
new file mode 100644 (file)
index 0000000..668266f
--- /dev/null
+++ b/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/.gitignore
@@ -0,0 +1,2 @@
+/src/
+/bin/
\ No newline at end of file

diff --git a/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/.project b/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/.project
new file mode 100644 (file)
index 0000000..c003462
--- /dev/null
+++ b/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>com.sun.mail.mbox</name>
+       <comment></comment>
+       <projects>
+       </projects>
+       <buildSpec>
+               <buildCommand>
+                       <name>org.eclipse.jdt.core.javabuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.ManifestBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.SchemaBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+       </buildSpec>
+       <natures>
+               <nature>org.eclipse.pde.PluginNature</nature>
+               <nature>org.eclipse.jdt.core.javanature</nature>
+       </natures>
+</projectDescription>

diff --git a/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/META-INF/.gitignore b/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/META-INF/.gitignore
new file mode 100644 (file)
index 0000000..4854a41
--- /dev/null
+++ b/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/META-INF/.gitignore
@@ -0,0 +1 @@
+/MANIFEST.MF

diff --git a/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/bnd.bnd b/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/bnd.bnd
new file mode 100644 (file)
index 0000000..b486982
--- /dev/null
+++ b/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/bnd.bnd
@@ -0,0 +1,10 @@
+Export-Package: org.eclipse.angus.mail.*
+
+Import-Package: \
+jakarta.mail.event,\
+org.graalvm.*;resolution:="optional",\
+*
+
+major: 2
+minor: 0
+micro: 2

diff --git a/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/build.properties b/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/build.properties
new file mode 100644 (file)
index 0000000..34d2e4d
--- /dev/null
+++ b/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .

diff --git a/rebuild/org.argeo.tp.utils/src/.gitignore b/rebuild/org.argeo.tp.utils/src/.gitignore
index ca46c967bca65ec39da055c9b579d971a415e64c..a738803d660f49c336e0d3890928cb3d4c6e2a23 100644 (file)
--- a/rebuild/org.argeo.tp.utils/src/.gitignore
+++ b/rebuild/org.argeo.tp.utils/src/.gitignore
@@ -1 +1 @@
-ee4j-mail/
\ No newline at end of file
+angus-mail/
\ No newline at end of file

diff --git a/repackage/org.argeo.tp.httpd/jakarta.servlet.bnd b/repackage/org.argeo.tp.httpd/jakarta.servlet.bnd
index c7611bdac97021b9dd2d4f9fdaacf9b32d97bdc4..57e156a1881c6dfc7a4f5d704551bc51716acb1c 100644 (file)
--- a/repackage/org.argeo.tp.httpd/jakarta.servlet.bnd
+++ b/repackage/org.argeo.tp.httpd/jakarta.servlet.bnd
@@ -1,3 +1,3 @@
 SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 OR EPL-2.0
-Argeo-Origin-M2: jakarta.servlet:jakarta.servlet-api:5.0.0
+Argeo-Origin-M2: jakarta.servlet:jakarta.servlet-api:6.0.0
 Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd b/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd
index d85d0daf48737ac18cf22531e4b45ea7da659a43..d82233849d58f992847657d901cebb065263710a 100644 (file)
--- a/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd
+++ b/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd
@@ -11,19 +11,23 @@ org.eclipse.jetty.websocket:jetty-websocket-jetty-client, \
 org.eclipse.jetty.websocket:jetty-websocket-jetty-common, \
 org.eclipse.jetty.websocket:jetty-websocket-jetty-server,\
 org.eclipse.jetty.ee8.websocket:jetty-ee8-websocket-servlet, \
+org.eclipse.jetty.ee8.websocket:jetty-ee8-websocket-jetty-common, \
+org.eclipse.jetty.ee8.websocket:jetty-ee8-websocket-jetty-api, \
 org.eclipse.jetty.ee8.websocket:jetty-ee8-websocket-javax-client, \
 org.eclipse.jetty.ee8.websocket:jetty-ee8-websocket-javax-common, \
 org.eclipse.jetty.ee8.websocket:jetty-ee8-websocket-javax-server,\
 org.eclipse.jetty.ee8.websocket:jetty-ee8-websocket-jetty-server, \
-org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-servlet, \
-org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-client, \
-org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-common, \
-org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-server,\
-org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jetty-server, \
+
+#org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-servlet, \
+#org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-client, \
+#org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-common, \
+#org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-server,\
+#org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jetty-server, \
 
 Export-Package: org.eclipse.jetty.*
 
 Import-Package: \
 !java.*, \
 org.eclipse.jetty.ee8.webapp;resolution:="optional", \
+org.eclipse.jetty.ee10.webapp;resolution:="optional", \
 *
\ No newline at end of file

diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee10.servlet.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee10.servlet.bnd
deleted file mode 100644 (file)
index bf2d413..0000000
--- a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee10.servlet.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Argeo-Origin-M2: org.eclipse.jetty.ee10:jetty-ee10-servlet
-Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee10.servlet.bnd.future b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee10.servlet.bnd.future
new file mode 100644 (file)
index 0000000..bf2d413
--- /dev/null
+++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee10.servlet.bnd.future
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.eclipse.jetty.ee10:jetty-ee10-servlet
+Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.quic.client.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.quic.client.bnd
new file mode 100644 (file)
index 0000000..28a2397
--- /dev/null
+++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.quic.client.bnd
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.eclipse.jetty.quic:jetty-quic-client
+Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.quic.common.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.quic.common.bnd
new file mode 100644 (file)
index 0000000..ca1da67
--- /dev/null
+++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.quic.common.bnd
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.eclipse.jetty.quic:jetty-quic-common
+Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.quic.quiche.common.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.quic.quiche.common.bnd
new file mode 100644 (file)
index 0000000..cabb222
--- /dev/null
+++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.quic.quiche.common.bnd
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.eclipse.jetty.quic:jetty-quic-quiche-common
+Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.quic.quiche.jna.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.quic.quiche.jna.bnd
new file mode 100644 (file)
index 0000000..93214e4
--- /dev/null
+++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.quic.quiche.jna.bnd
@@ -0,0 +1,5 @@
+Argeo-Origin-M2: org.eclipse.jetty.quic:jetty-quic-quiche-jna
+Argeo-Origin-NoMetadataGeneration: true
+Import-Package:\
+com.sun.jna*;resolution:="optional",\
+*
\ No newline at end of file

diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.quic.server.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.quic.server.bnd
new file mode 100644 (file)
index 0000000..3c93633
--- /dev/null
+++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.quic.server.bnd
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.eclipse.jetty.quic:jetty-quic-server
+Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp.sys/activation/merge.bnd b/repackage/org.argeo.tp.sys/activation/merge.bnd
new file mode 100644 (file)
index 0000000..46bae12
--- /dev/null
+++ b/repackage/org.argeo.tp.sys/activation/merge.bnd
@@ -0,0 +1,13 @@
+Bundle-SymbolicName: org.eclipse.angus.activation
+SPDX-License-Identifier: BSD-3-Clause
+Argeo-Origin-M2: :2.0.1
+Import-Package:\
+org.glassfish.hk2.osgiresourcelocator;resolution:="optional",\
+org.graalvm.*;resolution:="optional",\
+*
+
+Export-Package: org.eclipse.*, jakarta.*;version="2.1.2"
+
+Argeo-Origin-M2-Merge: \
+org.eclipse.angus:angus-activation,\
+jakarta.activation:jakarta.activation-api:2.1.2,\

diff --git a/repackage/org.argeo.tp.sys/jakarta.activation.bnd.deactivated b/repackage/org.argeo.tp.sys/jakarta.activation.bnd.deactivated
new file mode 100644 (file)
index 0000000..19df7c0
--- /dev/null
+++ b/repackage/org.argeo.tp.sys/jakarta.activation.bnd.deactivated
@@ -0,0 +1,3 @@
+SPDX-License-Identifier: BSD-3-Clause
+Argeo-Origin-M2: jakarta.activation:jakarta.activation-api:2.1.2
+Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp.sys/jakarta.mail.bnd b/repackage/org.argeo.tp.sys/jakarta.mail.bnd
new file mode 100644 (file)
index 0000000..a1df1b8
--- /dev/null
+++ b/repackage/org.argeo.tp.sys/jakarta.mail.bnd
@@ -0,0 +1,3 @@
+SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 OR EPL-2.0
+Argeo-Origin-M2: org.eclipse.angus:jakarta.mail:2.0.2
+Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp.sys/javax.mail.bnd b/repackage/org.argeo.tp.sys/javax.mail.bnd
deleted file mode 100644 (file)
index d20614b..0000000
--- a/repackage/org.argeo.tp.sys/javax.mail.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 OR EPL-2.0
-Argeo-Origin-M2: com.sun.mail:jakarta.mail:1.6.7
-Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp.sys/javax.xml.bind.bnd b/repackage/org.argeo.tp.sys/javax.xml.bind.bnd
new file mode 100644 (file)
index 0000000..37afe39
--- /dev/null
+++ b/repackage/org.argeo.tp.sys/javax.xml.bind.bnd
@@ -0,0 +1,7 @@
+SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 OR CDDL-1.0
+Argeo-Origin-M2: javax.xml.bind:jaxb-api:2.4.0-b180830.0359
+Bundle-Version: 2.4.0.b1808300359
+
+Import-Package: \
+org.glassfish.hk2.osgiresourcelocator;resolution:="optional",\
+*

diff --git a/repackage/org.argeo.tp.sys/org.glassfish.hk2.osgiresourcelocator.bnd b/repackage/org.argeo.tp.sys/org.glassfish.hk2.osgiresourcelocator.bnd
new file mode 100644 (file)
index 0000000..1426a20
--- /dev/null
+++ b/repackage/org.argeo.tp.sys/org.glassfish.hk2.osgiresourcelocator.bnd
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: GPL-2.0 WITH Classpath-exception-2.0 OR EPL-2.0
+Argeo-Origin-M2: org.glassfish.hk2:osgi-resource-locator:1.0.3

diff --git a/repackage/org.argeo.tp.utils/javax.xml.bind.bnd b/repackage/org.argeo.tp.utils/javax.xml.bind.bnd
deleted file mode 100644 (file)
index 37afe39..0000000
--- a/repackage/org.argeo.tp.utils/javax.xml.bind.bnd
+++ /dev/null
@@ -1,7 +0,0 @@
-SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 OR CDDL-1.0
-Argeo-Origin-M2: javax.xml.bind:jaxb-api:2.4.0-b180830.0359
-Bundle-Version: 2.4.0.b1808300359
-
-Import-Package: \
-org.glassfish.hk2.osgiresourcelocator;resolution:="optional",\
-*