From 8bc3f03bf67391e38a3ed681bc147ec01000033b Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 23 Mar 2023 09:20:47 +0100 Subject: [PATCH 01/16] Improve Apache Commons in TP utils --- repackage/org.argeo.tp.earth/geotools/merge.bnd | 2 -- repackage/org.argeo.tp.utils/asm/common.bnd | 2 ++ repackage/org.argeo.tp.utils/asm/org.objectweb.asm.bnd | 1 + .../asm/org.objectweb.asm.tree.analysis.bnd | 1 + repackage/org.argeo.tp.utils/asm/org.objectweb.asm.tree.bnd | 1 + repackage/org.argeo.tp.utils/asm/org.objectweb.asm.util.bnd | 1 + repackage/org.argeo.tp.utils/net.sf.cglib.bnd | 6 ++++++ .../org.apache.commons.dbcp.bnd | 1 + repackage/org.argeo.tp.utils/org.apache.commons.dbcp2.bnd | 5 +++++ .../org.argeo.tp.utils/org.apache.commons.digester.bnd | 2 ++ .../org.apache.commons.pool.bnd | 0 repackage/org.argeo.tp.utils/org.apache.commons.pool2.bnd | 2 ++ sdk/output-argeo-tp-apps.target | 4 +++- sdk/output-argeo-tp-platform.target | 2 +- 14 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 repackage/org.argeo.tp.utils/asm/common.bnd create mode 100644 repackage/org.argeo.tp.utils/asm/org.objectweb.asm.bnd create mode 100644 repackage/org.argeo.tp.utils/asm/org.objectweb.asm.tree.analysis.bnd create mode 100644 repackage/org.argeo.tp.utils/asm/org.objectweb.asm.tree.bnd create mode 100644 repackage/org.argeo.tp.utils/asm/org.objectweb.asm.util.bnd create mode 100644 repackage/org.argeo.tp.utils/net.sf.cglib.bnd rename repackage/{org.argeo.tp.jcr => org.argeo.tp.utils}/org.apache.commons.dbcp.bnd (99%) create mode 100644 repackage/org.argeo.tp.utils/org.apache.commons.dbcp2.bnd create mode 100644 repackage/org.argeo.tp.utils/org.apache.commons.digester.bnd rename repackage/{org.argeo.tp.jcr => org.argeo.tp.utils}/org.apache.commons.pool.bnd (100%) create mode 100644 repackage/org.argeo.tp.utils/org.apache.commons.pool2.bnd diff --git a/repackage/org.argeo.tp.earth/geotools/merge.bnd b/repackage/org.argeo.tp.earth/geotools/merge.bnd index 72c3760..ba066ea 100644 --- a/repackage/org.argeo.tp.earth/geotools/merge.bnd +++ b/repackage/org.argeo.tp.earth/geotools/merge.bnd @@ -38,8 +38,6 @@ org.jdom2.*;resolution:="optional",\ org.junit.*;resolution:="optional",\ org.parboiled.*;resolution:="optional",\ org.picocontainer.*;resolution:="optional",\ -org.apache.commons.digester.*;resolution:="optional",\ -org.apache.commons.pool.*;resolution:="optional",\ * Argeo-Origin-M2-Merge: \ diff --git a/repackage/org.argeo.tp.utils/asm/common.bnd b/repackage/org.argeo.tp.utils/asm/common.bnd new file mode 100644 index 0000000..cc32d2b --- /dev/null +++ b/repackage/org.argeo.tp.utils/asm/common.bnd @@ -0,0 +1,2 @@ +SPDX-License-Identifier: BSD-3-Clause +Argeo-Origin-M2: :9.4 diff --git a/repackage/org.argeo.tp.utils/asm/org.objectweb.asm.bnd b/repackage/org.argeo.tp.utils/asm/org.objectweb.asm.bnd new file mode 100644 index 0000000..c5eac67 --- /dev/null +++ b/repackage/org.argeo.tp.utils/asm/org.objectweb.asm.bnd @@ -0,0 +1 @@ +Argeo-Origin-M2: org.ow2.asm:asm diff --git a/repackage/org.argeo.tp.utils/asm/org.objectweb.asm.tree.analysis.bnd b/repackage/org.argeo.tp.utils/asm/org.objectweb.asm.tree.analysis.bnd new file mode 100644 index 0000000..c76963a --- /dev/null +++ b/repackage/org.argeo.tp.utils/asm/org.objectweb.asm.tree.analysis.bnd @@ -0,0 +1 @@ +Argeo-Origin-M2: org.ow2.asm:asm-analysis diff --git a/repackage/org.argeo.tp.utils/asm/org.objectweb.asm.tree.bnd b/repackage/org.argeo.tp.utils/asm/org.objectweb.asm.tree.bnd new file mode 100644 index 0000000..9ab0bbf --- /dev/null +++ b/repackage/org.argeo.tp.utils/asm/org.objectweb.asm.tree.bnd @@ -0,0 +1 @@ +Argeo-Origin-M2: org.ow2.asm:asm-tree diff --git a/repackage/org.argeo.tp.utils/asm/org.objectweb.asm.util.bnd b/repackage/org.argeo.tp.utils/asm/org.objectweb.asm.util.bnd new file mode 100644 index 0000000..84e6979 --- /dev/null +++ b/repackage/org.argeo.tp.utils/asm/org.objectweb.asm.util.bnd @@ -0,0 +1 @@ +Argeo-Origin-M2: org.ow2.asm:asm-util diff --git a/repackage/org.argeo.tp.utils/net.sf.cglib.bnd b/repackage/org.argeo.tp.utils/net.sf.cglib.bnd new file mode 100644 index 0000000..78a087f --- /dev/null +++ b/repackage/org.argeo.tp.utils/net.sf.cglib.bnd @@ -0,0 +1,6 @@ +SPDX-License-Identifier: Apache-2.0 +Argeo-Origin-M2: cglib:cglib:3.3.0 + +Import-Package: \ +org.apache.tools.ant.*;resolution:=optional,\ +* diff --git a/repackage/org.argeo.tp.jcr/org.apache.commons.dbcp.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.dbcp.bnd similarity index 99% rename from repackage/org.argeo.tp.jcr/org.apache.commons.dbcp.bnd rename to repackage/org.argeo.tp.utils/org.apache.commons.dbcp.bnd index b2af1db..2fea39f 100644 --- a/repackage/org.argeo.tp.jcr/org.apache.commons.dbcp.bnd +++ b/repackage/org.argeo.tp.utils/org.apache.commons.dbcp.bnd @@ -1,4 +1,5 @@ SPDX-License-Identifier: Apache-2.0 Argeo-Origin-M2: commons-dbcp:commons-dbcp:1.4 + Import-Package: javax.transaction.*; resolution:="optional",\ * diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.dbcp2.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.dbcp2.bnd new file mode 100644 index 0000000..1f6e450 --- /dev/null +++ b/repackage/org.argeo.tp.utils/org.apache.commons.dbcp2.bnd @@ -0,0 +1,5 @@ +SPDX-License-Identifier: Apache-2.0 +Argeo-Origin-M2: org.apache.commons:commons-dbcp2:2.9.0 + +Import-Package: javax.transaction.*; resolution:="optional",\ +* diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.digester.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.digester.bnd new file mode 100644 index 0000000..3936876 --- /dev/null +++ b/repackage/org.argeo.tp.utils/org.apache.commons.digester.bnd @@ -0,0 +1,2 @@ +SPDX-License-Identifier: Apache-2.0 +Argeo-Origin-M2: commons-digester:commons-digester:2.1 diff --git a/repackage/org.argeo.tp.jcr/org.apache.commons.pool.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.pool.bnd similarity index 100% rename from repackage/org.argeo.tp.jcr/org.apache.commons.pool.bnd rename to repackage/org.argeo.tp.utils/org.apache.commons.pool.bnd diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.pool2.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.pool2.bnd new file mode 100644 index 0000000..6826cea --- /dev/null +++ b/repackage/org.argeo.tp.utils/org.apache.commons.pool2.bnd @@ -0,0 +1,2 @@ +SPDX-License-Identifier: Apache-2.0 +Argeo-Origin-M2: org.apache.commons:commons-pool2:2.11.1 diff --git a/sdk/output-argeo-tp-apps.target b/sdk/output-argeo-tp-apps.target index 644d044..412a3a5 100644 --- a/sdk/output-argeo-tp-apps.target +++ b/sdk/output-argeo-tp-apps.target @@ -3,7 +3,9 @@ - + + + diff --git a/sdk/output-argeo-tp-platform.target b/sdk/output-argeo-tp-platform.target index d63ff29..39755d1 100644 --- a/sdk/output-argeo-tp-platform.target +++ b/sdk/output-argeo-tp-platform.target @@ -7,7 +7,7 @@ - + -- 2.39.2 From 818ba16532c5ae62e0210aaa36197c9a23cea40b Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 23 Mar 2023 13:41:40 +0100 Subject: [PATCH 02/16] Update Argeo Build --- sdk/argeo-build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/argeo-build b/sdk/argeo-build index cab0665..31d1ce9 160000 --- a/sdk/argeo-build +++ b/sdk/argeo-build @@ -1 +1 @@ -Subproject commit cab066508159fd10461f057209d73113e059b10d +Subproject commit 31d1ce9a4e1fd7bacfbf30612f8ad496f8ba2232 -- 2.39.2 From 6208758dc935cefe5a84667e748c89ee6249cab6 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 23 Mar 2023 14:34:17 +0100 Subject: [PATCH 03/16] Update Argeo Build --- sdk/argeo-build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/argeo-build b/sdk/argeo-build index 31d1ce9..d8d5040 160000 --- a/sdk/argeo-build +++ b/sdk/argeo-build @@ -1 +1 @@ -Subproject commit 31d1ce9a4e1fd7bacfbf30612f8ad496f8ba2232 +Subproject commit d8d504000631c6670df4f12373532b76326353cb -- 2.39.2 From d7df6d3f0ab624ebe7268e8c8601826c1c2bb8b2 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 23 Mar 2023 15:15:27 +0100 Subject: [PATCH 04/16] Put proper version for Bouncy Castle FIPS, even if it is not in Maven central --- .../crypto/fips/org.argeo.tp.crypto/bouncycastle/common.bnd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/common.bnd b/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/common.bnd index 3658686..c924a57 100644 --- a/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/common.bnd +++ b/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/common.bnd @@ -1,4 +1,4 @@ SPDX-License-Identifier: MIT Argeo-Origin-NoMetadataGeneration: true Argeo-Origin-Do-Not-Modify: true -Argeo-Origin-M2: :1.0.2.3 \ No newline at end of file +Argeo-Origin-M2: :1.0.2.4 \ No newline at end of file -- 2.39.2 From 94e429e366aa7ce5348f88a976942c01ea352162 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 28 Mar 2023 14:00:25 +0200 Subject: [PATCH 05/16] Update Argeo Build --- sdk/argeo-build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/argeo-build b/sdk/argeo-build index d8d5040..ed15533 160000 --- a/sdk/argeo-build +++ b/sdk/argeo-build @@ -1 +1 @@ -Subproject commit d8d504000631c6670df4f12373532b76326353cb +Subproject commit ed15533e22c54f3781bc0c53cae84c83c61d6761 -- 2.39.2 From ee5bf86cf34222c4c22585552e1bd64c1b83d9cf Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 29 Mar 2023 06:39:57 +0200 Subject: [PATCH 06/16] Rename target platforms --- sdk/output-argeo-tp-apps.target | 2 +- sdk/output-argeo-tp-platform.target | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/output-argeo-tp-apps.target b/sdk/output-argeo-tp-apps.target index 412a3a5..ab4040a 100644 --- a/sdk/output-argeo-tp-apps.target +++ b/sdk/output-argeo-tp-apps.target @@ -1,6 +1,6 @@ - + diff --git a/sdk/output-argeo-tp-platform.target b/sdk/output-argeo-tp-platform.target index 39755d1..dbc4ae4 100644 --- a/sdk/output-argeo-tp-platform.target +++ b/sdk/output-argeo-tp-platform.target @@ -1,6 +1,6 @@ - + -- 2.39.2 From 513696efb491beaf21b60588fb4f965586f76cfb Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 29 Mar 2023 06:40:29 +0200 Subject: [PATCH 07/16] Move OpenPDF to TP Publish --- .../com.github.librepdf.openpdf.bnd | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename repackage/{org.argeo.tp.utils => org.argeo.tp.publish}/com.github.librepdf.openpdf.bnd (100%) diff --git a/repackage/org.argeo.tp.utils/com.github.librepdf.openpdf.bnd b/repackage/org.argeo.tp.publish/com.github.librepdf.openpdf.bnd similarity index 100% rename from repackage/org.argeo.tp.utils/com.github.librepdf.openpdf.bnd rename to repackage/org.argeo.tp.publish/com.github.librepdf.openpdf.bnd -- 2.39.2 From 8d3576d95958618a17a2c6fd2d17b712ba1592bb Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 29 Mar 2023 07:34:02 +0200 Subject: [PATCH 08/16] Work on mbox native --- rebuild/org.argeo.tp.utils/Makefile | 6 ++++++ .../jni/com_sun_mail_mbox/.gitignore | 2 ++ .../org.argeo.tp.utils/jni/com_sun_mail_mbox/Makefile | 11 +++++++++++ 3 files changed, 19 insertions(+) create mode 100644 rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/.gitignore create mode 100644 rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/Makefile diff --git a/rebuild/org.argeo.tp.utils/Makefile b/rebuild/org.argeo.tp.utils/Makefile index 689838f..aeede2e 100644 --- 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 +MBOX_JNI_SRC=jni/com_sun_mail_mbox + all: retrieve-ee4j-mbox osgi retrieve-ee4j-mbox: SRC_DIR=src/ee4j-mail @@ -17,6 +19,10 @@ retrieve-ee4j-mbox: git clone --branch 1.6.7 https://github.com/eclipse-ee4j/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 $(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.utils/*" com.sun.mail.mbox/src/com/sun/mail/mbox/*.java + rm -rf com.sun.mail.mbox/bin A2_CATEGORY = org.argeo.tp.utils 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 new file mode 100644 index 0000000..bf4c7b2 --- /dev/null +++ b/rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/.gitignore @@ -0,0 +1,2 @@ +/*.h +/*.c \ No newline at end of file diff --git a/rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/Makefile b/rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/Makefile new file mode 100644 index 0000000..4eb8341 --- /dev/null +++ b/rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/Makefile @@ -0,0 +1,11 @@ +include ../../../../sdk.mk + +NATIVE_PACKAGE := com_sun_mail_mbox + +TARGET_EXEC := libJava_$(NATIVE_PACKAGE).so + +# sudo apt install liblockfile-dev + +build: + mkdir -p $(SDK_BUILD_BASE)/jni + $(CC) -o $(SDK_BUILD_BASE)/jni/$(TARGET_EXEC) -shared -fPIC -fpic -Wl,-soname,$(TARGET_EXEC).1.6 -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux *.c -- 2.39.2 From b04bac9902e4bbb6ac97ae47a133a7b40a33f764 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 29 Mar 2023 08:02:56 +0200 Subject: [PATCH 09/16] Simplify mbox native build --- Makefile | 4 +++- rebuild/org.argeo.tp.utils/Makefile | 9 ++++++++- .../jni/com_sun_mail_mbox/.gitignore | 2 -- .../org.argeo.tp.utils/jni/com_sun_mail_mbox/Makefile | 11 ----------- 4 files changed, 11 insertions(+), 15 deletions(-) delete mode 100644 rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/.gitignore delete mode 100644 rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/Makefile diff --git a/Makefile b/Makefile index bdab034..1136d20 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,9 @@ distribution: clean: make -C repackage clean make -C rebuild clean - + +native-deps-debian: + sudo apt install liblockfile-dev clean-origin-cache: rm -rf $(HOME)/.cache/argeo/build diff --git a/rebuild/org.argeo.tp.utils/Makefile b/rebuild/org.argeo.tp.utils/Makefile index aeede2e..f2fb376 100644 --- a/rebuild/org.argeo.tp.utils/Makefile +++ b/rebuild/org.argeo.tp.utils/Makefile @@ -4,8 +4,9 @@ include ../../sdk.mk export NO_SDK_LEGAL := true MBOX_JNI_SRC=jni/com_sun_mail_mbox +MBOX_TARGET_EXEC=libmbox.so -all: retrieve-ee4j-mbox osgi +all: retrieve-ee4j-mbox osgi jni-ee4j-mbox retrieve-ee4j-mbox: SRC_DIR=src/ee4j-mail retrieve-ee4j-mbox: @@ -24,6 +25,12 @@ retrieve-ee4j-mbox: javac -h jni/com_sun_mail_mbox/ -cp "$(A2_OUTPUT)/org.argeo.tp.utils/*" com.sun.mail.mbox/src/com/sun/mail/mbox/*.java 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) \ + -shared -fPIC -fpic -Wl,-soname,$(MBOX_TARGET_EXEC).1.6 \ + -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux $(MBOX_JNI_SRC)/*.c + A2_CATEGORY = org.argeo.tp.utils BUNDLES = \ 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 index bf4c7b2..0000000 --- a/rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/*.h -/*.c \ No newline at end of file diff --git a/rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/Makefile b/rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/Makefile deleted file mode 100644 index 4eb8341..0000000 --- a/rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -include ../../../../sdk.mk - -NATIVE_PACKAGE := com_sun_mail_mbox - -TARGET_EXEC := libJava_$(NATIVE_PACKAGE).so - -# sudo apt install liblockfile-dev - -build: - mkdir -p $(SDK_BUILD_BASE)/jni - $(CC) -o $(SDK_BUILD_BASE)/jni/$(TARGET_EXEC) -shared -fPIC -fpic -Wl,-soname,$(TARGET_EXEC).1.6 -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux *.c -- 2.39.2 From c3083c5a97e3e4175abda83a0dc7062e0cae3408 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 29 Mar 2023 08:04:36 +0200 Subject: [PATCH 10/16] Simplify mbox native build --- rebuild/org.argeo.tp.utils/Makefile | 3 ++- rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/.gitignore | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/.gitignore diff --git a/rebuild/org.argeo.tp.utils/Makefile b/rebuild/org.argeo.tp.utils/Makefile index f2fb376..bc2dfdf 100644 --- a/rebuild/org.argeo.tp.utils/Makefile +++ b/rebuild/org.argeo.tp.utils/Makefile @@ -20,7 +20,8 @@ retrieve-ee4j-mbox: git clone --branch 1.6.7 https://github.com/eclipse-ee4j/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 $(SRC_DIR)/mbox/src/main/cpp/com/sun/mail/mbox/ $(MBOX_JNI_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.utils/*" com.sun.mail.mbox/src/com/sun/mail/mbox/*.java rm -rf com.sun.mail.mbox/bin 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 new file mode 100644 index 0000000..9b838de --- /dev/null +++ b/rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/.gitignore @@ -0,0 +1,2 @@ +/*.h +/*.c -- 2.39.2 From 189e09096d5663f2d40eee792362a0724b5c0900 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 29 Mar 2023 09:53:37 +0200 Subject: [PATCH 11/16] Move JNA to org.argeo.tp and update Eclipse licenses --- rebuild/org.argeo.tp.utils/Makefile | 6 ++++-- repackage/Makefile | 4 ++++ .../lib/linux/aarch64/org.argeo.tp/eclipse-rcp/common.bnd | 2 ++ .../aarch64/org.argeo.tp/eclipse-rcp/includes.properties | 1 + .../swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd | 2 +- .../aarch64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd | 2 +- .../rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties | 1 - .../lib/linux/x86_64/org.argeo.tp/eclipse-rcp/common.bnd | 2 ++ .../x86_64/org.argeo.tp/eclipse-rcp/includes.properties | 1 + .../swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd | 2 +- .../x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd | 2 +- .../rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties | 1 - .../lib/macosx/x86_64/org.argeo.tp/eclipse-rcp/common.bnd | 2 ++ .../x86_64/org.argeo.tp/eclipse-rcp/includes.properties | 1 + .../rcp/org.argeo.tp.swt.workbench/eclipse-rcp/common.bnd | 2 +- .../swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd | 2 +- .../x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd | 2 +- .../rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties | 1 - .../lib/win32/x86_64/org.argeo.tp/eclipse-rcp/common.bnd | 2 ++ .../x86_64/org.argeo.tp/eclipse-rcp/includes.properties | 1 + .../swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd | 2 +- .../x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd | 2 +- .../rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties | 1 - repackage/org.argeo.tp.sdk/org.junit.bnd | 2 +- .../equinox/org.argeo.tp.eclipse/eclipse-equinox/common.bnd | 2 +- .../equinox/org.argeo.tp.osgi/eclipse-equinox/common.bnd | 2 +- .../rap/org.argeo.tp.swt.workbench/eclipse-rap/common.bnd | 2 +- repackage/swt/rap/org.argeo.tp.swt/eclipse-rap/common.bnd | 2 +- .../rcp/org.argeo.tp.swt.workbench/eclipse-rcp/common.bnd | 2 +- .../swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd | 2 +- repackage/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd | 2 +- 31 files changed, 37 insertions(+), 23 deletions(-) create mode 100644 repackage/lib/linux/aarch64/org.argeo.tp/eclipse-rcp/common.bnd create mode 100644 repackage/lib/linux/aarch64/org.argeo.tp/eclipse-rcp/includes.properties create mode 100644 repackage/lib/linux/x86_64/org.argeo.tp/eclipse-rcp/common.bnd create mode 100644 repackage/lib/linux/x86_64/org.argeo.tp/eclipse-rcp/includes.properties create mode 100644 repackage/lib/macosx/x86_64/org.argeo.tp/eclipse-rcp/common.bnd create mode 100644 repackage/lib/macosx/x86_64/org.argeo.tp/eclipse-rcp/includes.properties create mode 100644 repackage/lib/win32/x86_64/org.argeo.tp/eclipse-rcp/common.bnd create mode 100644 repackage/lib/win32/x86_64/org.argeo.tp/eclipse-rcp/includes.properties diff --git a/rebuild/org.argeo.tp.utils/Makefile b/rebuild/org.argeo.tp.utils/Makefile index bc2dfdf..d271eb9 100644 --- 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 843a42c..e846c0b 100644 --- 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 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 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 8f5fe73..743e1d3 100644 --- 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 8f5fe73..743e1d3 100644 --- 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 d39a318..1fbffdc 100644 --- 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 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 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 8f5fe73..743e1d3 100644 --- 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 8f5fe73..743e1d3 100644 --- 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 56af205..fbdfacf 100644 --- 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 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 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 8f5fe73..743e1d3 100644 --- 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 8f5fe73..743e1d3 100644 --- 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 8f5fe73..743e1d3 100644 --- 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 5405ab8..48e954a 100644 --- 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 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 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 8f5fe73..743e1d3 100644 --- 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 8f5fe73..743e1d3 100644 --- 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 7dff8c9..24c11dd 100644 --- 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 88261ef..5d6cbfa 100644 --- 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 8f5fe73..743e1d3 100644 --- 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 8f5fe73..743e1d3 100644 --- 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 8f5fe73..743e1d3 100644 --- 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 8f5fe73..743e1d3 100644 --- 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 8f5fe73..743e1d3 100644 --- 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 8f5fe73..743e1d3 100644 --- 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 8f5fe73..743e1d3 100644 --- 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 -- 2.39.2 From bbd2f326a44fdb04592af571866693f70ffaeed8 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 29 Mar 2023 09:56:21 +0200 Subject: [PATCH 12/16] Fix mbox native build --- rebuild/org.argeo.tp.utils/Makefile | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/rebuild/org.argeo.tp.utils/Makefile b/rebuild/org.argeo.tp.utils/Makefile index d271eb9..72d581c 100644 --- a/rebuild/org.argeo.tp.utils/Makefile +++ b/rebuild/org.argeo.tp.utils/Makefile @@ -3,8 +3,6 @@ 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 @@ -28,12 +26,6 @@ retrieve-ee4j-mbox: javac -h jni/com_sun_mail_mbox/ -cp "$(A2_OUTPUT)/org.argeo.tp.utils/*" com.sun.mail.mbox/src/com/sun/mail/mbox/*.java rm -rf com.sun.mail.mbox/bin -jni-ee4j-mbox: - 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 - A2_CATEGORY = org.argeo.tp.utils BUNDLES = \ @@ -44,4 +36,13 @@ clean: DEP_CATEGORIES = org.argeo.tp.utils -include $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk \ No newline at end of file +include $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk + +A2_NATIVE_CATEGORY=$(A2_OUTPUT)/lib/linux/$(shell uname -m)/$(A2_CATEGORY) + +jni-ee4j-mbox: + mkdir -p $(A2_NATIVE_CATEGORY) + $(CC) -o $(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 + -- 2.39.2 From d6a387216dce741d0afe05d7a3515d7fbcc17a98 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 5 Apr 2023 05:55:55 +0200 Subject: [PATCH 13/16] Releasing --- sdk/argeo-build | 2 +- sdk/branches/unstable.bnd | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/argeo-build b/sdk/argeo-build index ed15533..ecd3445 160000 --- a/sdk/argeo-build +++ b/sdk/argeo-build @@ -1 +1 @@ -Subproject commit ed15533e22c54f3781bc0c53cae84c83c61d6761 +Subproject commit ecd3445094f8c28ae55f8e431fec300fa2575fd7 diff --git a/sdk/branches/unstable.bnd b/sdk/branches/unstable.bnd index 6480816..3d54812 100644 --- a/sdk/branches/unstable.bnd +++ b/sdk/branches/unstable.bnd @@ -1,4 +1,4 @@ major=2 minor=3 -micro=11 -qualifier=.next \ No newline at end of file +micro=12 +qualifier= \ No newline at end of file -- 2.39.2 From f76bade5744d5432536a2f318a60eb51d1f25bab Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 5 Apr 2023 11:28:09 +0200 Subject: [PATCH 14/16] Prepare next development cycle --- sdk/branches/unstable.bnd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/branches/unstable.bnd b/sdk/branches/unstable.bnd index 3d54812..549bddd 100644 --- a/sdk/branches/unstable.bnd +++ b/sdk/branches/unstable.bnd @@ -1,4 +1,4 @@ major=2 minor=3 micro=12 -qualifier= \ No newline at end of file +qualifier=.next -- 2.39.2 From 258cb46f231035ca280d966b11dabcc84bbf64d5 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 11 Apr 2023 19:12:53 +0200 Subject: [PATCH 15/16] Update GeoTools to v29.0 --- repackage/org.argeo.tp.earth/geotools/merge.bnd | 2 +- repackage/org.argeo.tp.math/units/merge.bnd | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/repackage/org.argeo.tp.earth/geotools/merge.bnd b/repackage/org.argeo.tp.earth/geotools/merge.bnd index ba066ea..d7d5600 100644 --- a/repackage/org.argeo.tp.earth/geotools/merge.bnd +++ b/repackage/org.argeo.tp.earth/geotools/merge.bnd @@ -1,6 +1,6 @@ SPDX-License-Identifier: LGPL-2.1-only Bundle-SymbolicName: org.geotools -Argeo-Origin-M2: :28.2 +Argeo-Origin-M2: :29.0 Argeo-Origin-M2-Repo: https://repo.osgeo.org/repository/release/ Export-Package: org.geotools.*, org.opengis.*, net.opengis.*, org.w3.xlink.* diff --git a/repackage/org.argeo.tp.math/units/merge.bnd b/repackage/org.argeo.tp.math/units/merge.bnd index efdf074..3b9b42a 100644 --- a/repackage/org.argeo.tp.math/units/merge.bnd +++ b/repackage/org.argeo.tp.math/units/merge.bnd @@ -1,14 +1,14 @@ SPDX-License-Identifier: BSD-3-Clause Bundle-SymbolicName: tech.units.indriya -Argeo-Origin-M2: :2.0.4 +Argeo-Origin-M2: :2.1.4 Export-Package: javax.measure.*, tech.units.indriya.*, si.uom.*, systems.uom.* Import-Package: \ *;resolution:="optional" Argeo-Origin-M2-Merge: \ -javax.measure:unit-api:2.0, \ +javax.measure:unit-api:2.1.3, \ tech.units:indriya, \ -tech.uom.lib:uom-lib-common:2.0.1, \ -si.uom:si-units:2.0.1, \ -si.uom:si-quantity:2.0.1, \ -systems.uom:systems-common:2.0.2, \ -systems.uom:systems-quantity:2.0.2, \ +tech.uom.lib:uom-lib-common:2.1, \ +si.uom:si-units:2.1, \ +si.uom:si-quantity:2.1, \ +systems.uom:systems-common:2.1, \ +systems.uom:systems-quantity:2.1, \ -- 2.39.2 From d5fe55fda6852109728b47fa14a0159b5a441698 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 12 Apr 2023 07:34:36 +0200 Subject: [PATCH 16/16] Make JVM provided imports optional --- repackage/org.argeo.tp.jcr/org.apache.lucene.bnd | 7 ++++++- .../org.argeo.tp.publish/de.rototor.pdfbox.graphics2d.bnd | 4 ++++ repackage/org.argeo.tp.utils/net.sf.cglib.bnd | 3 ++- .../org.argeo.tp.utils/org.apache.commons.jxpath.bnd | 2 ++ repackage/org.argeo.tp/org.w3c.dom.smil.bnd | 4 ++++ repackage/org.argeo.tp/org.w3c.dom.svg.bnd | 4 ++++ repackage/org.argeo.tp/xalan/merge.bnd | 8 +++++++- 7 files changed, 29 insertions(+), 3 deletions(-) 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", \ +* -- 2.39.2