Upgrade JNA and improve its packaging

diff --git a/repackage/lib/linux/aarch64/org.argeo.tp.sys/jna/common.bnd b/repackage/lib/linux/aarch64/org.argeo.tp.sys/jna/common.bnd
index 43794762ce26609c8b5e5ccb2673e2a8b19860df..454c4b2ab7361de5a23a0db391111fadf87c446a 100644 (file)
--- a/repackage/lib/linux/aarch64/org.argeo.tp.sys/jna/common.bnd
+++ b/repackage/lib/linux/aarch64/org.argeo.tp.sys/jna/common.bnd
@@ -1,2 +1,2 @@
-Argeo-Origin-M2: :5.13.0
+Argeo-Origin-M2: :5.14.0
 SPDX-License-Identifier: LGPL-2.1-or-later OR Apache-2.0

diff --git a/repackage/lib/linux/x86_64/org.argeo.tp.sys/jna/common.bnd b/repackage/lib/linux/x86_64/org.argeo.tp.sys/jna/common.bnd
index 43794762ce26609c8b5e5ccb2673e2a8b19860df..454c4b2ab7361de5a23a0db391111fadf87c446a 100644 (file)
--- a/repackage/lib/linux/x86_64/org.argeo.tp.sys/jna/common.bnd
+++ b/repackage/lib/linux/x86_64/org.argeo.tp.sys/jna/common.bnd
@@ -1,2 +1,2 @@
-Argeo-Origin-M2: :5.13.0
+Argeo-Origin-M2: :5.14.0
 SPDX-License-Identifier: LGPL-2.1-or-later OR Apache-2.0

diff --git a/repackage/lib/macosx/x86_64/org.argeo.tp.sys/jna/common.bnd b/repackage/lib/macosx/x86_64/org.argeo.tp.sys/jna/common.bnd
index 43794762ce26609c8b5e5ccb2673e2a8b19860df..454c4b2ab7361de5a23a0db391111fadf87c446a 100644 (file)
--- a/repackage/lib/macosx/x86_64/org.argeo.tp.sys/jna/common.bnd
+++ b/repackage/lib/macosx/x86_64/org.argeo.tp.sys/jna/common.bnd
@@ -1,2 +1,2 @@
-Argeo-Origin-M2: :5.13.0
+Argeo-Origin-M2: :5.14.0
 SPDX-License-Identifier: LGPL-2.1-or-later OR Apache-2.0

diff --git a/repackage/lib/win32/x86_64/org.argeo.tp.sys/jna/common.bnd b/repackage/lib/win32/x86_64/org.argeo.tp.sys/jna/common.bnd
index 43794762ce26609c8b5e5ccb2673e2a8b19860df..454c4b2ab7361de5a23a0db391111fadf87c446a 100644 (file)
--- a/repackage/lib/win32/x86_64/org.argeo.tp.sys/jna/common.bnd
+++ b/repackage/lib/win32/x86_64/org.argeo.tp.sys/jna/common.bnd
@@ -1,2 +1,2 @@
-Argeo-Origin-M2: :5.13.0
+Argeo-Origin-M2: :5.14.0
 SPDX-License-Identifier: LGPL-2.1-or-later OR Apache-2.0

diff --git a/repackage/org.argeo.tp.sys/com.sun.jna.platform.bnd b/repackage/org.argeo.tp.sys/com.sun.jna.platform.bnd
index a36ded7e5480f82bf7a86e17a4ff5de975c4032c..202f175decd3760f48aefa6c88216d3f3dfe85f4 100644 (file)
--- a/repackage/org.argeo.tp.sys/com.sun.jna.platform.bnd
+++ b/repackage/org.argeo.tp.sys/com.sun.jna.platform.bnd
@@ -1,2 +1,3 @@
-Argeo-Origin-M2: net.java.dev.jna:jna-platform:5.13.0
+Argeo-Origin-M2: net.java.dev.jna:jna-platform:5.14.0
 SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-NoMetadataGeneration: true

diff --git a/sdk/argeo-build b/sdk/argeo-build
index ec9a0b67c92105fc42ec14cdbec7ff9464c6cc3c..3473c4ec64851e97b6d0bb29fe41370c13af7b27 160000 (submodule)
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit ec9a0b67c92105fc42ec14cdbec7ff9464c6cc3c
+Subproject commit 3473c4ec64851e97b6d0bb29fe41370c13af7b27

diff --git a/sdk/output-argeo-tp-platform.target b/sdk/output-argeo-tp-platform.target
index d26be02afacb92bd5a49ffed5c8b454ba2928c97..65865cd7275641321acbb5f340dc685d60e916cd 100644 (file)
--- a/sdk/output-argeo-tp-platform.target
+++ b/sdk/output-argeo-tp-platform.target
@@ -13,6 +13,7 @@
                <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
                <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.sys" type="Directory"/>
                <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
+               <location path="${project_loc:argeo-tp}/../output/a2/lib/linux/x86_64/org.argeo.tp.sys" type="Directory"/>
        </locations>
        <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 </target>
\ No newline at end of file

diff --git a/sdk/output-argeo-tp-rcp.target b/sdk/output-argeo-tp-rcp.target
index 2f2d6acd11faf39c1b41d0210a78e779c2e82207..bd35257b202c4a307818af7f2ce5f5660da46335 100644 (file)
--- a/sdk/output-argeo-tp-rcp.target
+++ b/sdk/output-argeo-tp-rcp.target
@@ -3,7 +3,6 @@
 <target name="argeo-tp-rcp">
        <locations>
                <location path="${project_loc:argeo-tp}/../output/a2/swt/rcp/org.argeo.tp.swt.workbench" type="Directory"/>
-               <location path="${project_loc:argeo-tp}/../output/a2/lib/linux/x86_64/org.argeo.tp.sys" type="Directory"/>
                <location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-swt.target"/>
                <location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-apps.target"/>
        </locations>