Improve JNA and Equinox packaging

diff --git a/repackage/lib/linux/aarch64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd b/repackage/lib/linux/aarch64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd
deleted file mode 100644 (file)
index 11a8eb3..0000000
--- a/repackage/lib/linux/aarch64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Argeo-Origin-M2: net.java.dev.jna:jna-platform
-Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/lib/linux/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd b/repackage/lib/linux/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd
deleted file mode 100644 (file)
index 11a8eb3..0000000
--- a/repackage/lib/linux/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Argeo-Origin-M2: net.java.dev.jna:jna-platform
-Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/lib/macosx/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd b/repackage/lib/macosx/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd
deleted file mode 100644 (file)
index 11a8eb3..0000000
--- a/repackage/lib/macosx/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Argeo-Origin-M2: net.java.dev.jna:jna-platform
-Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/lib/win32/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd b/repackage/lib/win32/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd
deleted file mode 100644 (file)
index 11a8eb3..0000000
--- a/repackage/lib/win32/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Argeo-Origin-M2: net.java.dev.jna:jna-platform
-Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp.sys/com.sun.jna.platform.bnd b/repackage/org.argeo.tp.sys/com.sun.jna.platform.bnd
new file mode 100644 (file)
index 0000000..a36ded7
--- /dev/null
+++ b/repackage/org.argeo.tp.sys/com.sun.jna.platform.bnd
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: net.java.dev.jna:jna-platform:5.13.0
+SPDX-License-Identifier: Apache-2.0

diff --git a/repackage/osgi/equinox/org.argeo.tp.eclipse/eclipse-equinox/includes.properties b/repackage/osgi/equinox/org.argeo.tp.eclipse/eclipse-equinox/includes.properties
index ac8b8b7a7393bb4367779810765e57d18da03b21..4aaa9470eb3164cbc538ee041afa42647f991099 100644 (file)
--- a/repackage/osgi/equinox/org.argeo.tp.eclipse/eclipse-equinox/includes.properties
+++ b/repackage/osgi/equinox/org.argeo.tp.eclipse/eclipse-equinox/includes.properties
@@ -1,6 +1,5 @@
 plugins/org.eclipse.equinox.app*.jar=
 plugins/org.eclipse.equinox.cm*.jar=
-plugins/org.eclipse.equinox.common*.jar=
 plugins/org.eclipse.equinox.ds*.jar=
 plugins/org.eclipse.equinox.metatype*.jar=
 plugins/org.eclipse.equinox.event*.jar=

diff --git a/repackage/osgi/equinox/org.argeo.tp.osgi/eclipse-equinox/includes.properties b/repackage/osgi/equinox/org.argeo.tp.osgi/eclipse-equinox/includes.properties
index e96922c7fe975c39b031a434b0b5cb2d698860ca..3ce71c63d3abbda01486b76bb073ff00efef682d 100644 (file)
--- a/repackage/osgi/equinox/org.argeo.tp.osgi/eclipse-equinox/includes.properties
+++ b/repackage/osgi/equinox/org.argeo.tp.osgi/eclipse-equinox/includes.properties
@@ -8,3 +8,4 @@ plugins/org.apache.felix.gogo.*.jar=
 plugins/org.apache.felix.scr*.jar=
 plugins/org.eclipse.equinox.console_*.jar=
 plugins/org.eclipse.equinox.console.source_*.jar=
+plugins/org.eclipse.equinox.common*.jar=

diff --git a/repackage/swt/rcp/org.argeo.tp.swt.workbench/com.sun.jna.bnd b/repackage/swt/rcp/org.argeo.tp.swt.workbench/com.sun.jna.bnd
new file mode 100644 (file)
index 0000000..ac2786b
--- /dev/null
+++ b/repackage/swt/rcp/org.argeo.tp.swt.workbench/com.sun.jna.bnd
@@ -0,0 +1,5 @@
+# Fake JNA bundle
+# FIXME make it smaller
+Argeo-Origin-M2: net.java.dev.jna:jna:5.13.0
+SPDX-License-Identifier: Apache-2.0
+Export-Package:

diff --git a/sdk/argeo-build b/sdk/argeo-build
index 6f8e29e850f9fcfa5149e296e650355fab930752..e021d17c09f8586a68177e9eb40d9caa088c37b1 160000 (submodule)
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit 6f8e29e850f9fcfa5149e296e650355fab930752
+Subproject commit e021d17c09f8586a68177e9eb40d9caa088c37b1