Move JNA to org.argeo.tp and update Eclipse licenses

diff --git a/rebuild/org.argeo.tp.utils/Makefile b/rebuild/org.argeo.tp.utils/Makefile
index bc2dfdfc05d3bd6f07c6d732e9891bbd03996e32..d271eb9fc2fb16fa995403968ac7da921903749b 100644 (file)
--- a/rebuild/org.argeo.tp.utils/Makefile
+++ b/rebuild/org.argeo.tp.utils/Makefile
@@ -3,6 +3,8 @@ include ../../sdk.mk
 
 export NO_SDK_LEGAL := true
 
+A2_NATIVE_CATEGORY=$(A2_OUTPUT)/lib/linux/$(uname -m)/$(A2_CATEGORY)
+
 MBOX_JNI_SRC=jni/com_sun_mail_mbox
 MBOX_TARGET_EXEC=libmbox.so
 
@@ -27,8 +29,8 @@ retrieve-ee4j-mbox:
        rm -rf com.sun.mail.mbox/bin
 
 jni-ee4j-mbox:
-       mkdir -p $(A2_OUTPUT)/lib/linux/x86_64/$(A2_CATEGORY)
-       $(CC) -o $(A2_OUTPUT)/lib/linux/x86_64/$(A2_CATEGORY)/$(MBOX_TARGET_EXEC) \
+       mkdir -p $(A2_NATIVE_CATEGORY)
+       $(CC) -o $(A2_A2_NATIVE_CATEGORY)/$(MBOX_TARGET_EXEC) \
         -shared -fPIC -fpic -Wl,-soname,$(MBOX_TARGET_EXEC).1.6 \
         -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux $(MBOX_JNI_SRC)/*.c
 

diff --git a/repackage/Makefile b/repackage/Makefile
index 843a42c0e1547411517f1252a74d013e254ae36f..e846c0b51f208e1aa7b0fedd92f0d4ac805aca48 100644 (file)
--- a/repackage/Makefile
+++ b/repackage/Makefile
@@ -8,6 +8,10 @@ osgi/equinox/org.argeo.tp.eclipse \
 swt/rap/org.argeo.tp.swt \
 swt/rap/org.argeo.tp.swt.workbench \
 swt/rcp/org.argeo.tp.swt \
+lib/linux/x86_64/org.argeo.tp \
+lib/linux/aarch64/org.argeo.tp \
+lib/win32/x86_64/org.argeo.tp \
+lib/macosx/x86_64/org.argeo.tp \
 lib/linux/x86_64/swt/rcp/org.argeo.tp.swt \
 lib/linux/aarch64/swt/rcp/org.argeo.tp.swt \
 lib/win32/x86_64/swt/rcp/org.argeo.tp.swt \

diff --git a/repackage/lib/linux/aarch64/org.argeo.tp/eclipse-rcp/common.bnd b/repackage/lib/linux/aarch64/org.argeo.tp/eclipse-rcp/common.bnd
new file mode 100644 (file)
index 0000000..8c4c7a4
--- /dev/null
+++ b/repackage/lib/linux/aarch64/org.argeo.tp/eclipse-rcp/common.bnd
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1
+Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/lib/linux/aarch64/org.argeo.tp/eclipse-rcp/includes.properties b/repackage/lib/linux/aarch64/org.argeo.tp/eclipse-rcp/includes.properties
new file mode 100644 (file)
index 0000000..c5cebf3
--- /dev/null
+++ b/repackage/lib/linux/aarch64/org.argeo.tp/eclipse-rcp/includes.properties
@@ -0,0 +1 @@
+plugins/com.sun.jna*.jar=

diff --git a/repackage/lib/linux/aarch64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd b/repackage/lib/linux/aarch64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd
index 8f5fe7386999d3f85da25189bba38994bcb0832c..743e1d35b9bf18163748d8a0207963a83cab1ac4 100644 (file)
--- a/repackage/lib/linux/aarch64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd
+++ b/repackage/lib/linux/aarch64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd
@@ -1,2 +1,2 @@
-SPDX-License-Identifier: EPL-1.0
+SPDX-License-Identifier: EPL-2.0
 Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/lib/linux/aarch64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd b/repackage/lib/linux/aarch64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd
index 8f5fe7386999d3f85da25189bba38994bcb0832c..743e1d35b9bf18163748d8a0207963a83cab1ac4 100644 (file)
--- a/repackage/lib/linux/aarch64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd
+++ b/repackage/lib/linux/aarch64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd
@@ -1,2 +1,2 @@
-SPDX-License-Identifier: EPL-1.0
+SPDX-License-Identifier: EPL-2.0
 Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/lib/linux/aarch64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties b/repackage/lib/linux/aarch64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties
index d39a318cc0e081418f61e2295e07422bd4923f69..1fbffdc26fa520fdff4676623fa8df3a3d6c72b3 100644 (file)
--- a/repackage/lib/linux/aarch64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties
+++ b/repackage/lib/linux/aarch64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties
@@ -1,2 +1 @@
-plugins/com.sun.jna*.jar=
 plugins/org.eclipse.swt.gtk.linux.aarch64*=

diff --git a/repackage/lib/linux/x86_64/org.argeo.tp/eclipse-rcp/common.bnd b/repackage/lib/linux/x86_64/org.argeo.tp/eclipse-rcp/common.bnd
new file mode 100644 (file)
index 0000000..8c4c7a4
--- /dev/null
+++ b/repackage/lib/linux/x86_64/org.argeo.tp/eclipse-rcp/common.bnd
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1
+Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/lib/linux/x86_64/org.argeo.tp/eclipse-rcp/includes.properties b/repackage/lib/linux/x86_64/org.argeo.tp/eclipse-rcp/includes.properties
new file mode 100644 (file)
index 0000000..c5cebf3
--- /dev/null
+++ b/repackage/lib/linux/x86_64/org.argeo.tp/eclipse-rcp/includes.properties
@@ -0,0 +1 @@
+plugins/com.sun.jna*.jar=

diff --git a/repackage/lib/linux/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd b/repackage/lib/linux/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd
index 8f5fe7386999d3f85da25189bba38994bcb0832c..743e1d35b9bf18163748d8a0207963a83cab1ac4 100644 (file)
--- a/repackage/lib/linux/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd
+++ b/repackage/lib/linux/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd
@@ -1,2 +1,2 @@
-SPDX-License-Identifier: EPL-1.0
+SPDX-License-Identifier: EPL-2.0
 Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/lib/linux/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd b/repackage/lib/linux/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd
index 8f5fe7386999d3f85da25189bba38994bcb0832c..743e1d35b9bf18163748d8a0207963a83cab1ac4 100644 (file)
--- a/repackage/lib/linux/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd
+++ b/repackage/lib/linux/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd
@@ -1,2 +1,2 @@
-SPDX-License-Identifier: EPL-1.0
+SPDX-License-Identifier: EPL-2.0
 Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/lib/linux/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties b/repackage/lib/linux/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties
index 56af20515ec2c3ce1cef522a4af595200495320f..fbdfacf3684bf7f6a38a2652360b42a51b4630af 100644 (file)
--- a/repackage/lib/linux/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties
+++ b/repackage/lib/linux/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties
@@ -1,2 +1 @@
-plugins/com.sun.jna*.jar=
 plugins/org.eclipse.swt.gtk.linux.x86_64*=

diff --git a/repackage/lib/macosx/x86_64/org.argeo.tp/eclipse-rcp/common.bnd b/repackage/lib/macosx/x86_64/org.argeo.tp/eclipse-rcp/common.bnd
new file mode 100644 (file)
index 0000000..8c4c7a4
--- /dev/null
+++ b/repackage/lib/macosx/x86_64/org.argeo.tp/eclipse-rcp/common.bnd
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1
+Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/lib/macosx/x86_64/org.argeo.tp/eclipse-rcp/includes.properties b/repackage/lib/macosx/x86_64/org.argeo.tp/eclipse-rcp/includes.properties
new file mode 100644 (file)
index 0000000..c5cebf3
--- /dev/null
+++ b/repackage/lib/macosx/x86_64/org.argeo.tp/eclipse-rcp/includes.properties
@@ -0,0 +1 @@
+plugins/com.sun.jna*.jar=

diff --git a/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/common.bnd b/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/common.bnd
index 8f5fe7386999d3f85da25189bba38994bcb0832c..743e1d35b9bf18163748d8a0207963a83cab1ac4 100644 (file)
--- a/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/common.bnd
+++ b/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/common.bnd
@@ -1,2 +1,2 @@
-SPDX-License-Identifier: EPL-1.0
+SPDX-License-Identifier: EPL-2.0
 Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd b/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd
index 8f5fe7386999d3f85da25189bba38994bcb0832c..743e1d35b9bf18163748d8a0207963a83cab1ac4 100644 (file)
--- a/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd
+++ b/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd
@@ -1,2 +1,2 @@
-SPDX-License-Identifier: EPL-1.0
+SPDX-License-Identifier: EPL-2.0
 Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd b/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd
index 8f5fe7386999d3f85da25189bba38994bcb0832c..743e1d35b9bf18163748d8a0207963a83cab1ac4 100644 (file)
--- a/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd
+++ b/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd
@@ -1,2 +1,2 @@
-SPDX-License-Identifier: EPL-1.0
+SPDX-License-Identifier: EPL-2.0
 Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties b/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties
index 5405ab86dc88fff628143a81cb8b17543f13b8e6..48e954a1a40eab707f4fe7c4d4b7f7c04a6b30cb 100644 (file)
--- a/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties
+++ b/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties
@@ -1,2 +1 @@
-plugins/com.sun.jna*.jar=
 plugins/org.eclipse.swt.cocoa.macosx.x86_64*=

diff --git a/repackage/lib/win32/x86_64/org.argeo.tp/eclipse-rcp/common.bnd b/repackage/lib/win32/x86_64/org.argeo.tp/eclipse-rcp/common.bnd
new file mode 100644 (file)
index 0000000..8c4c7a4
--- /dev/null
+++ b/repackage/lib/win32/x86_64/org.argeo.tp/eclipse-rcp/common.bnd
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1
+Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/lib/win32/x86_64/org.argeo.tp/eclipse-rcp/includes.properties b/repackage/lib/win32/x86_64/org.argeo.tp/eclipse-rcp/includes.properties
new file mode 100644 (file)
index 0000000..c5cebf3
--- /dev/null
+++ b/repackage/lib/win32/x86_64/org.argeo.tp/eclipse-rcp/includes.properties
@@ -0,0 +1 @@
+plugins/com.sun.jna*.jar=

diff --git a/repackage/lib/win32/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd b/repackage/lib/win32/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd
index 8f5fe7386999d3f85da25189bba38994bcb0832c..743e1d35b9bf18163748d8a0207963a83cab1ac4 100644 (file)
--- a/repackage/lib/win32/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd
+++ b/repackage/lib/win32/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd
@@ -1,2 +1,2 @@
-SPDX-License-Identifier: EPL-1.0
+SPDX-License-Identifier: EPL-2.0
 Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/lib/win32/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd b/repackage/lib/win32/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd
index 8f5fe7386999d3f85da25189bba38994bcb0832c..743e1d35b9bf18163748d8a0207963a83cab1ac4 100644 (file)
--- a/repackage/lib/win32/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd
+++ b/repackage/lib/win32/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd
@@ -1,2 +1,2 @@
-SPDX-License-Identifier: EPL-1.0
+SPDX-License-Identifier: EPL-2.0
 Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/lib/win32/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties b/repackage/lib/win32/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties
index 7dff8c9bd04f86ff4764005fe05ec16abfa0ca00..24c11ddc02200f591133ba58a92753a8970a4645 100644 (file)
--- a/repackage/lib/win32/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties
+++ b/repackage/lib/win32/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties
@@ -1,2 +1 @@
-plugins/com.sun.jna*.jar=
 plugins/org.eclipse.swt.win32.win32.x86_64*=

diff --git a/repackage/org.argeo.tp.sdk/org.junit.bnd b/repackage/org.argeo.tp.sdk/org.junit.bnd
index 88261ef38ba1969cdc2552036921675effea3015..5d6cbfa02831c26b080ee32ddef9a570e9327066 100644 (file)
--- a/repackage/org.argeo.tp.sdk/org.junit.bnd
+++ b/repackage/org.argeo.tp.sdk/org.junit.bnd
@@ -1,4 +1,4 @@
-SPDX-License-Identifier: EPL-1.0
+SPDX-License-Identifier: EPL-2.0
 Import-Package: org.hamcrest;resolution:=optional,\
 org.hamcrest.core;resolution:=optional,\
 *

diff --git a/repackage/osgi/equinox/org.argeo.tp.eclipse/eclipse-equinox/common.bnd b/repackage/osgi/equinox/org.argeo.tp.eclipse/eclipse-equinox/common.bnd
index 8f5fe7386999d3f85da25189bba38994bcb0832c..743e1d35b9bf18163748d8a0207963a83cab1ac4 100644 (file)
--- a/repackage/osgi/equinox/org.argeo.tp.eclipse/eclipse-equinox/common.bnd
+++ b/repackage/osgi/equinox/org.argeo.tp.eclipse/eclipse-equinox/common.bnd
@@ -1,2 +1,2 @@
-SPDX-License-Identifier: EPL-1.0
+SPDX-License-Identifier: EPL-2.0
 Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/osgi/equinox/org.argeo.tp.osgi/eclipse-equinox/common.bnd b/repackage/osgi/equinox/org.argeo.tp.osgi/eclipse-equinox/common.bnd
index 8f5fe7386999d3f85da25189bba38994bcb0832c..743e1d35b9bf18163748d8a0207963a83cab1ac4 100644 (file)
--- a/repackage/osgi/equinox/org.argeo.tp.osgi/eclipse-equinox/common.bnd
+++ b/repackage/osgi/equinox/org.argeo.tp.osgi/eclipse-equinox/common.bnd
@@ -1,2 +1,2 @@
-SPDX-License-Identifier: EPL-1.0
+SPDX-License-Identifier: EPL-2.0
 Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/swt/rap/org.argeo.tp.swt.workbench/eclipse-rap/common.bnd b/repackage/swt/rap/org.argeo.tp.swt.workbench/eclipse-rap/common.bnd
index 8f5fe7386999d3f85da25189bba38994bcb0832c..743e1d35b9bf18163748d8a0207963a83cab1ac4 100644 (file)
--- a/repackage/swt/rap/org.argeo.tp.swt.workbench/eclipse-rap/common.bnd
+++ b/repackage/swt/rap/org.argeo.tp.swt.workbench/eclipse-rap/common.bnd
@@ -1,2 +1,2 @@
-SPDX-License-Identifier: EPL-1.0
+SPDX-License-Identifier: EPL-2.0
 Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/swt/rap/org.argeo.tp.swt/eclipse-rap/common.bnd b/repackage/swt/rap/org.argeo.tp.swt/eclipse-rap/common.bnd
index 8f5fe7386999d3f85da25189bba38994bcb0832c..743e1d35b9bf18163748d8a0207963a83cab1ac4 100644 (file)
--- a/repackage/swt/rap/org.argeo.tp.swt/eclipse-rap/common.bnd
+++ b/repackage/swt/rap/org.argeo.tp.swt/eclipse-rap/common.bnd
@@ -1,2 +1,2 @@
-SPDX-License-Identifier: EPL-1.0
+SPDX-License-Identifier: EPL-2.0
 Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/common.bnd b/repackage/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/common.bnd
index 8f5fe7386999d3f85da25189bba38994bcb0832c..743e1d35b9bf18163748d8a0207963a83cab1ac4 100644 (file)
--- a/repackage/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/common.bnd
+++ b/repackage/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/common.bnd
@@ -1,2 +1,2 @@
-SPDX-License-Identifier: EPL-1.0
+SPDX-License-Identifier: EPL-2.0
 Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd b/repackage/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd
index 8f5fe7386999d3f85da25189bba38994bcb0832c..743e1d35b9bf18163748d8a0207963a83cab1ac4 100644 (file)
--- a/repackage/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd
+++ b/repackage/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd
@@ -1,2 +1,2 @@
-SPDX-License-Identifier: EPL-1.0
+SPDX-License-Identifier: EPL-2.0
 Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd b/repackage/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd
index 8f5fe7386999d3f85da25189bba38994bcb0832c..743e1d35b9bf18163748d8a0207963a83cab1ac4 100644 (file)
--- a/repackage/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd
+++ b/repackage/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd
@@ -1,2 +1,2 @@
-SPDX-License-Identifier: EPL-1.0
+SPDX-License-Identifier: EPL-2.0
 Argeo-Origin-NoMetadataGeneration: true