From: Mathieu Date: Tue, 6 Dec 2022 05:12:15 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/unstable' into testing X-Git-Tag: v2.1.32~3 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=700afff62b5e511986bd256ef47d503e43e787c2;hp=6ae30d8f0364ff921d8d50011228ac4247df59e9;p=gpl%2Fargeo-tp.git Merge remote-tracking branch 'origin/unstable' into testing --- diff --git a/rebuild/Makefile b/rebuild/Makefile index f062f2a..bbf429c 100644 --- a/rebuild/Makefile +++ b/rebuild/Makefile @@ -2,7 +2,9 @@ all: make -C org.argeo.tp all + make -C org.argeo.tp.formats all clean: make -C org.argeo.tp clean + make -C org.argeo.tp.formats clean \ No newline at end of file diff --git a/rebuild/org.argeo.tp.formats/Makefile b/rebuild/org.argeo.tp.formats/Makefile new file mode 100644 index 0000000..99dff70 --- /dev/null +++ b/rebuild/org.argeo.tp.formats/Makefile @@ -0,0 +1,29 @@ +include ../../sdk.mk +.PHONY: clean all osgi + +all: retrieve-ee4j-mbox osgi + +retrieve-ee4j-mbox: SRC_DIR=src/ee4j-mail +retrieve-ee4j-mbox: + rm -rf $(SRC_DIR) + mkdir -p $(SRC_DIR) + #git -C $(SRC_DIR) init + #git -C $(SRC_DIR) remote add -f origin https://github.com/eclipse-ee4j/mail.git + #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) + rm -rf $(SRC_DIR)/.git + rsync -a --delete --exclude module-info.java $(SRC_DIR)/mbox/src/main/java/ com.sun.mail.mbox/src + +A2_CATEGORY = org.argeo.tp.utils + +BUNDLES = \ +com.sun.mail.mbox \ + +clean: + rm -rf $(BUILD_BASE) + +DEP_CATEGORIES = org.argeo.tp.utils + +include $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk \ No newline at end of file diff --git a/rebuild/org.argeo.tp.formats/com.sun.mail.mbox/.classpath b/rebuild/org.argeo.tp.formats/com.sun.mail.mbox/.classpath new file mode 100644 index 0000000..ca9ba96 --- /dev/null +++ b/rebuild/org.argeo.tp.formats/com.sun.mail.mbox/.classpath @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/rebuild/org.argeo.tp.formats/com.sun.mail.mbox/.gitignore b/rebuild/org.argeo.tp.formats/com.sun.mail.mbox/.gitignore new file mode 100644 index 0000000..668266f --- /dev/null +++ b/rebuild/org.argeo.tp.formats/com.sun.mail.mbox/.gitignore @@ -0,0 +1,2 @@ +/src/ +/bin/ \ No newline at end of file diff --git a/rebuild/org.argeo.tp.formats/com.sun.mail.mbox/.project b/rebuild/org.argeo.tp.formats/com.sun.mail.mbox/.project new file mode 100644 index 0000000..c003462 --- /dev/null +++ b/rebuild/org.argeo.tp.formats/com.sun.mail.mbox/.project @@ -0,0 +1,28 @@ + + + com.sun.mail.mbox + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/rebuild/org.argeo.tp.formats/com.sun.mail.mbox/META-INF/.gitignore b/rebuild/org.argeo.tp.formats/com.sun.mail.mbox/META-INF/.gitignore new file mode 100644 index 0000000..4854a41 --- /dev/null +++ b/rebuild/org.argeo.tp.formats/com.sun.mail.mbox/META-INF/.gitignore @@ -0,0 +1 @@ +/MANIFEST.MF diff --git a/rebuild/org.argeo.tp.formats/com.sun.mail.mbox/bnd.bnd b/rebuild/org.argeo.tp.formats/com.sun.mail.mbox/bnd.bnd new file mode 100644 index 0000000..66fc6c7 --- /dev/null +++ b/rebuild/org.argeo.tp.formats/com.sun.mail.mbox/bnd.bnd @@ -0,0 +1,9 @@ +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.formats/com.sun.mail.mbox/build.properties b/rebuild/org.argeo.tp.formats/com.sun.mail.mbox/build.properties new file mode 100644 index 0000000..34d2e4d --- /dev/null +++ b/rebuild/org.argeo.tp.formats/com.sun.mail.mbox/build.properties @@ -0,0 +1,4 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + . diff --git a/rebuild/org.argeo.tp.formats/src/.gitignore b/rebuild/org.argeo.tp.formats/src/.gitignore new file mode 100644 index 0000000..ca46c96 --- /dev/null +++ b/rebuild/org.argeo.tp.formats/src/.gitignore @@ -0,0 +1 @@ +ee4j-mail/ \ No newline at end of file diff --git a/rebuild/org.argeo.tp/Makefile b/rebuild/org.argeo.tp/Makefile index c152353..6dbcfa4 100644 --- a/rebuild/org.argeo.tp/Makefile +++ b/rebuild/org.argeo.tp/Makefile @@ -1,26 +1,12 @@ include ../../sdk.mk .PHONY: clean all osgi -all: retrieve-ee4j-mbox osgi - -retrieve-ee4j-mbox: SRC_DIR=src/ee4j-mail -retrieve-ee4j-mbox: - rm -rf $(SRC_DIR) - mkdir -p $(SRC_DIR) - #git -C $(SRC_DIR) init - #git -C $(SRC_DIR) remote add -f origin https://github.com/eclipse-ee4j/mail.git - #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) - rm -rf $(SRC_DIR)/.git - rsync -a --delete --exclude module-info.java $(SRC_DIR)/mbox/src/main/java/ com.sun.mail.mbox/src +all: osgi A2_CATEGORY = org.argeo.tp BUNDLES = \ org.argeo.ext.slf4j \ -com.sun.mail.mbox \ clean: rm -rf $(BUILD_BASE) diff --git a/rebuild/org.argeo.tp/com.sun.mail.mbox/.classpath b/rebuild/org.argeo.tp/com.sun.mail.mbox/.classpath deleted file mode 100644 index ca9ba96..0000000 --- a/rebuild/org.argeo.tp/com.sun.mail.mbox/.classpath +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/rebuild/org.argeo.tp/com.sun.mail.mbox/.gitignore b/rebuild/org.argeo.tp/com.sun.mail.mbox/.gitignore deleted file mode 100644 index 668266f..0000000 --- a/rebuild/org.argeo.tp/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/com.sun.mail.mbox/.project b/rebuild/org.argeo.tp/com.sun.mail.mbox/.project deleted file mode 100644 index c003462..0000000 --- a/rebuild/org.argeo.tp/com.sun.mail.mbox/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - com.sun.mail.mbox - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/rebuild/org.argeo.tp/com.sun.mail.mbox/META-INF/.gitignore b/rebuild/org.argeo.tp/com.sun.mail.mbox/META-INF/.gitignore deleted file mode 100644 index 4854a41..0000000 --- a/rebuild/org.argeo.tp/com.sun.mail.mbox/META-INF/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/MANIFEST.MF diff --git a/rebuild/org.argeo.tp/com.sun.mail.mbox/bnd.bnd b/rebuild/org.argeo.tp/com.sun.mail.mbox/bnd.bnd deleted file mode 100644 index 66fc6c7..0000000 --- a/rebuild/org.argeo.tp/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/com.sun.mail.mbox/build.properties b/rebuild/org.argeo.tp/com.sun.mail.mbox/build.properties deleted file mode 100644 index 34d2e4d..0000000 --- a/rebuild/org.argeo.tp/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/src/.gitignore b/rebuild/org.argeo.tp/src/.gitignore deleted file mode 100644 index ca46c96..0000000 --- a/rebuild/org.argeo.tp/src/.gitignore +++ /dev/null @@ -1 +0,0 @@ -ee4j-mail/ \ No newline at end of file diff --git a/repackage/Makefile b/repackage/Makefile index 2985e0d..e555f39 100644 --- a/repackage/Makefile +++ b/repackage/Makefile @@ -17,13 +17,15 @@ 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 \ lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt \ +lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt.workbench \ swt/rcp/org.argeo.tp.swt \ swt/rcp/org.argeo.tp.swt.workbench \ org.argeo.tp \ -org.argeo.tp.apache \ +org.argeo.tp.crypto \ org.argeo.tp.jetty \ +org.argeo.tp.utils \ +org.argeo.tp.sql \ org.argeo.tp.jcr \ -org.argeo.tp.formats \ org.argeo.tp.poi \ org.argeo.tp.gis \ diff --git a/repackage/eclipse.mirrors.txt b/repackage/eclipse.mirrors.txt new file mode 100644 index 0000000..0a29aeb --- /dev/null +++ b/repackage/eclipse.mirrors.txt @@ -0,0 +1,4 @@ +https://mirror.ibcp.fr/pub/eclipse +http://ftp-stud.hs-esslingen.de/Mirrors/eclipse +http://ftp.fau.de/eclipse +https://mirror.dogado.de/eclipse \ No newline at end of file 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 new file mode 100644 index 0000000..9a7ae1d --- /dev/null +++ b/repackage/lib/linux/aarch64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd @@ -0,0 +1,2 @@ +Bundle-License: EPL-1.0 +SLC-Origin-ManifestNotModified: true diff --git a/repackage/lib/linux/aarch64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/includes.properties b/repackage/lib/linux/aarch64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/includes.properties new file mode 100644 index 0000000..3f9705c --- /dev/null +++ b/repackage/lib/linux/aarch64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/includes.properties @@ -0,0 +1 @@ +plugins/org.eclipse.equinox.security.linux_*.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 new file mode 100644 index 0000000..9a7ae1d --- /dev/null +++ b/repackage/lib/linux/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd @@ -0,0 +1,2 @@ +Bundle-License: EPL-1.0 +SLC-Origin-ManifestNotModified: true diff --git a/repackage/lib/linux/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/includes.properties b/repackage/lib/linux/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/includes.properties new file mode 100644 index 0000000..3f9705c --- /dev/null +++ b/repackage/lib/linux/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/includes.properties @@ -0,0 +1 @@ +plugins/org.eclipse.equinox.security.linux_*.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 new file mode 100644 index 0000000..9a7ae1d --- /dev/null +++ b/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/common.bnd @@ -0,0 +1,2 @@ +Bundle-License: EPL-1.0 +SLC-Origin-ManifestNotModified: true diff --git a/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/includes.properties b/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/includes.properties new file mode 100644 index 0000000..09daa56 --- /dev/null +++ b/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/includes.properties @@ -0,0 +1,3 @@ +plugins/org.eclipse.ui.cocoa_*.jar= +plugins/org.eclipse.e4.ui.workbench.renderers.swt.cocoa_*.jar= + 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 new file mode 100644 index 0000000..9a7ae1d --- /dev/null +++ b/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd @@ -0,0 +1,2 @@ +Bundle-License: EPL-1.0 +SLC-Origin-ManifestNotModified: true diff --git a/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/includes.properties b/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/includes.properties new file mode 100644 index 0000000..dd6fc02 --- /dev/null +++ b/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/includes.properties @@ -0,0 +1 @@ +plugins/org.eclipse.equinox.security.macosx_*.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 new file mode 100644 index 0000000..9a7ae1d --- /dev/null +++ b/repackage/lib/win32/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd @@ -0,0 +1,2 @@ +Bundle-License: EPL-1.0 +SLC-Origin-ManifestNotModified: true diff --git a/repackage/lib/win32/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/includes.properties b/repackage/lib/win32/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/includes.properties new file mode 100644 index 0000000..ae97b60 --- /dev/null +++ b/repackage/lib/win32/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/includes.properties @@ -0,0 +1 @@ +plugins/org.eclipse.equinox.security.win32.x86_64_*.jar= diff --git a/repackage/org.argeo.tp.apache/apache-sshd/common.bnd b/repackage/org.argeo.tp.apache/apache-sshd/common.bnd deleted file mode 100644 index f3f8597..0000000 --- a/repackage/org.argeo.tp.apache/apache-sshd/common.bnd +++ /dev/null @@ -1,2 +0,0 @@ -Bundle-License: Apache-2.0 -SLC-Origin-M2: :2.8.0 \ No newline at end of file diff --git a/repackage/org.argeo.tp.apache/apache-sshd/merge.bnd b/repackage/org.argeo.tp.apache/apache-sshd/merge.bnd deleted file mode 100644 index ce57733..0000000 --- a/repackage/org.argeo.tp.apache/apache-sshd/merge.bnd +++ /dev/null @@ -1,16 +0,0 @@ -Bundle-License: Apache-2.0 -Bundle-SymbolicName: org.apache.sshd -SLC-Origin-M2: :2.8.0 -Export-Package: org.apache.* -Import-Package: \ -org.apache.tomcat.jni.*;resolution:=optional,\ -org.bouncycastle.crypto.prng,\ -org.bouncycastle.jce.provider.*;resolution:=optional,\ -net.i2p.crypto.eddsa.*;resolution:=optional,\ -org.slf4j,\ -org.slf4j.event,\ -org.slf4j.helpers,\ -* -SLC-Origin-M2-Merge: \ -org.apache.sshd:sshd-core, \ -org.apache.sshd:sshd-common diff --git a/repackage/org.argeo.tp.apache/apache-sshd/org.apache.sshd.cli.bnd b/repackage/org.argeo.tp.apache/apache-sshd/org.apache.sshd.cli.bnd deleted file mode 100644 index 7b00c2c..0000000 --- a/repackage/org.argeo.tp.apache/apache-sshd/org.apache.sshd.cli.bnd +++ /dev/null @@ -1,2 +0,0 @@ -Bundle-SymbolicName: org.apache.sshd.cli -SLC-Origin-M2: org.apache.sshd:sshd-cli diff --git a/repackage/org.argeo.tp.apache/apache-sshd/org.apache.sshd.common.bnd.retired b/repackage/org.argeo.tp.apache/apache-sshd/org.apache.sshd.common.bnd.retired deleted file mode 100644 index 02377e2..0000000 --- a/repackage/org.argeo.tp.apache/apache-sshd/org.apache.sshd.common.bnd.retired +++ /dev/null @@ -1,11 +0,0 @@ -Bundle-SymbolicName: org.apache.sshd.common -Fragment-Host: org.apache.sshd.core -Import-Package: \ -org.bouncycastle.jce.provider.*;resolution:=optional,\ -net.i2p.crypto.eddsa.*;resolution:=optional,\ -org.slf4j,\ -org.slf4j.event,\ -org.slf4j.helpers,\ -* - -SLC-Origin-M2: org.apache.sshd:sshd-common diff --git a/repackage/org.argeo.tp.apache/apache-sshd/org.apache.sshd.core.bnd.retired b/repackage/org.argeo.tp.apache/apache-sshd/org.apache.sshd.core.bnd.retired deleted file mode 100644 index c3e183a..0000000 --- a/repackage/org.argeo.tp.apache/apache-sshd/org.apache.sshd.core.bnd.retired +++ /dev/null @@ -1,6 +0,0 @@ -Bundle-SymbolicName: org.apache.sshd.core -SLC-Origin-M2: org.apache.sshd:sshd-core -Import-Package: \ -org.apache.tomcat.jni.*;resolution:=optional,\ -org.bouncycastle.crypto.prng,\ -* \ No newline at end of file diff --git a/repackage/org.argeo.tp.apache/apache-sshd/org.apache.sshd.git.bnd b/repackage/org.argeo.tp.apache/apache-sshd/org.apache.sshd.git.bnd deleted file mode 100644 index 7d9ef2b..0000000 --- a/repackage/org.argeo.tp.apache/apache-sshd/org.apache.sshd.git.bnd +++ /dev/null @@ -1,6 +0,0 @@ -Bundle-SymbolicName: org.apache.sshd.git -SLC-Origin-M2: org.apache.sshd:sshd-git -Import-Package: \ -org.eclipse.jgit.pgm.*;resolution:=optional,\ -org.kohsuke.*;resolution:=optional,\ -* \ No newline at end of file diff --git a/repackage/org.argeo.tp.apache/apache-sshd/org.apache.sshd.putty.bnd b/repackage/org.argeo.tp.apache/apache-sshd/org.apache.sshd.putty.bnd deleted file mode 100644 index cf8a99a..0000000 --- a/repackage/org.argeo.tp.apache/apache-sshd/org.apache.sshd.putty.bnd +++ /dev/null @@ -1,5 +0,0 @@ -Bundle-SymbolicName: org.apache.sshd.putty -SLC-Origin-M2: org.apache.sshd:sshd-putty -Import-Package: \ -net.i2p.*;resolution:=optional,\ -* \ No newline at end of file diff --git a/repackage/org.argeo.tp.apache/apache-sshd/org.apache.sshd.scp.bnd b/repackage/org.argeo.tp.apache/apache-sshd/org.apache.sshd.scp.bnd deleted file mode 100644 index 6744473..0000000 --- a/repackage/org.argeo.tp.apache/apache-sshd/org.apache.sshd.scp.bnd +++ /dev/null @@ -1,2 +0,0 @@ -Bundle-SymbolicName: org.apache.sshd.scp -SLC-Origin-M2: org.apache.sshd:sshd-scp diff --git a/repackage/org.argeo.tp.apache/apache-sshd/org.apache.sshd.sftp.bnd b/repackage/org.argeo.tp.apache/apache-sshd/org.apache.sshd.sftp.bnd deleted file mode 100644 index b6b8b0d..0000000 --- a/repackage/org.argeo.tp.apache/apache-sshd/org.apache.sshd.sftp.bnd +++ /dev/null @@ -1,2 +0,0 @@ -Bundle-SymbolicName: org.apache.sshd.sftp -SLC-Origin-M2: org.apache.sshd:sshd-sftp diff --git a/repackage/org.argeo.tp.apache/batik/common.bnd b/repackage/org.argeo.tp.apache/batik/common.bnd deleted file mode 100644 index bc76a97..0000000 --- a/repackage/org.argeo.tp.apache/batik/common.bnd +++ /dev/null @@ -1,2 +0,0 @@ -Bundle-License: Apache-2.0 -SLC-Origin-M2: :1.14 \ No newline at end of file diff --git a/repackage/org.argeo.tp.apache/batik/merge.bnd b/repackage/org.argeo.tp.apache/batik/merge.bnd deleted file mode 100644 index 6c303ef..0000000 --- a/repackage/org.argeo.tp.apache/batik/merge.bnd +++ /dev/null @@ -1,28 +0,0 @@ -Bundle-License: Apache-2.0 -Bundle-SymbolicName: org.apache.batik -SLC-Origin-M2: :1.14 -Export-Package: org.apache.* -Import-Package: \ -org.apache.batik.script.*;resolution:="optional",\ -org.apache.batik.*,\ -org.apache.xmlgraphics.*,\ -org.w3c.*,\ -*;resolution:="optional" -SLC-Origin-M2-Merge: \ -org.apache.xmlgraphics:batik-anim, \ -org.apache.xmlgraphics:batik-awt-util, \ -org.apache.xmlgraphics:batik-bridge, \ -org.apache.xmlgraphics:batik-codec, \ -org.apache.xmlgraphics:batik-dom, \ -org.apache.xmlgraphics:batik-ext, \ -org.apache.xmlgraphics:batik-extension, \ -org.apache.xmlgraphics:batik-gui-util, \ -org.apache.xmlgraphics:batik-gvt, \ -org.apache.xmlgraphics:batik-parser, \ -org.apache.xmlgraphics:batik-shared-resources, \ -org.apache.xmlgraphics:batik-script, \ -org.apache.xmlgraphics:batik-svg-dom, \ -org.apache.xmlgraphics:batik-svggen, \ -org.apache.xmlgraphics:batik-swing, \ -org.apache.xmlgraphics:batik-transcoder, \ -org.apache.xmlgraphics:batik-xml \ No newline at end of file diff --git a/repackage/org.argeo.tp.apache/batik/org.apache.batik.constants.bnd b/repackage/org.argeo.tp.apache/batik/org.apache.batik.constants.bnd deleted file mode 100644 index fea69fa..0000000 --- a/repackage/org.argeo.tp.apache/batik/org.apache.batik.constants.bnd +++ /dev/null @@ -1,2 +0,0 @@ -Bundle-SymbolicName: org.apache.batik.constants -SLC-Origin-M2: org.apache.xmlgraphics:batik-constants diff --git a/repackage/org.argeo.tp.apache/batik/org.apache.batik.css.bnd b/repackage/org.argeo.tp.apache/batik/org.apache.batik.css.bnd deleted file mode 100644 index 8ec1225..0000000 --- a/repackage/org.argeo.tp.apache/batik/org.apache.batik.css.bnd +++ /dev/null @@ -1,2 +0,0 @@ -Bundle-SymbolicName: org.apache.batik.css -SLC-Origin-M2: org.apache.xmlgraphics:batik-css diff --git a/repackage/org.argeo.tp.apache/batik/org.apache.batik.i18n.bnd b/repackage/org.argeo.tp.apache/batik/org.apache.batik.i18n.bnd deleted file mode 100644 index 321ae88..0000000 --- a/repackage/org.argeo.tp.apache/batik/org.apache.batik.i18n.bnd +++ /dev/null @@ -1,2 +0,0 @@ -Bundle-SymbolicName: org.apache.batik.i18n -SLC-Origin-M2: org.apache.xmlgraphics:batik-i18n diff --git a/repackage/org.argeo.tp.apache/batik/org.apache.batik.util.bnd b/repackage/org.argeo.tp.apache/batik/org.apache.batik.util.bnd deleted file mode 100644 index 0b672dc..0000000 --- a/repackage/org.argeo.tp.apache/batik/org.apache.batik.util.bnd +++ /dev/null @@ -1,2 +0,0 @@ -Bundle-SymbolicName: org.apache.batik.util -SLC-Origin-M2: org.apache.xmlgraphics:batik-util diff --git a/repackage/org.argeo.tp.apache/org.apache.commons.cli.bnd b/repackage/org.argeo.tp.apache/org.apache.commons.cli.bnd deleted file mode 100644 index 7e34d59..0000000 --- a/repackage/org.argeo.tp.apache/org.apache.commons.cli.bnd +++ /dev/null @@ -1,3 +0,0 @@ -Bundle-License: Apache-2.0 -Bundle-SymbolicName: org.apache.commons.cli -SLC-Origin-M2: commons-cli:commons-cli:1.5.0 diff --git a/repackage/org.argeo.tp.apache/org.apache.commons.codec.bnd b/repackage/org.argeo.tp.apache/org.apache.commons.codec.bnd deleted file mode 100644 index fe4bfa6..0000000 --- a/repackage/org.argeo.tp.apache/org.apache.commons.codec.bnd +++ /dev/null @@ -1,3 +0,0 @@ -Bundle-License: Apache-2.0 -Bundle-SymbolicName: org.apache.commons.codec -SLC-Origin-M2: commons-codec:commons-codec:1.15 diff --git a/repackage/org.argeo.tp.apache/org.apache.commons.compress.bnd b/repackage/org.argeo.tp.apache/org.apache.commons.compress.bnd deleted file mode 100644 index e126b0a..0000000 --- a/repackage/org.argeo.tp.apache/org.apache.commons.compress.bnd +++ /dev/null @@ -1,8 +0,0 @@ -Bundle-License: Apache-2.0 -Bundle-SymbolicName: org.apache.commons.compress -SLC-Origin-M2: org.apache.commons:commons-compress:1.21 -Import-Package: \ -org.brotli.*;resolution:=optional, -org.tukaani.*;resolution:=optional, -com.github.luben.zstd;resolution:=optional, -* \ No newline at end of file diff --git a/repackage/org.argeo.tp.apache/org.apache.commons.exec.bnd b/repackage/org.argeo.tp.apache/org.apache.commons.exec.bnd deleted file mode 100644 index b188587..0000000 --- a/repackage/org.argeo.tp.apache/org.apache.commons.exec.bnd +++ /dev/null @@ -1,3 +0,0 @@ -Bundle-License: Apache-2.0 -Bundle-SymbolicName: org.apache.commons.exec -SLC-Origin-M2: org.apache.commons:commons-exec:1.3 \ No newline at end of file diff --git a/repackage/org.argeo.tp.apache/org.apache.commons.fileupload.bnd b/repackage/org.argeo.tp.apache/org.apache.commons.fileupload.bnd deleted file mode 100644 index 73b19d4..0000000 --- a/repackage/org.argeo.tp.apache/org.apache.commons.fileupload.bnd +++ /dev/null @@ -1,6 +0,0 @@ -Bundle-License: Apache-2.0 -Import-Package:\ -javax.portlet;resolution:=optional,\ -javax.servlet.*;resolution:=optional,\ -* -SLC-Origin-M2: commons-fileupload:commons-fileupload:1.4 diff --git a/repackage/org.argeo.tp.apache/org.apache.commons.httpclient.bnd b/repackage/org.argeo.tp.apache/org.apache.commons.httpclient.bnd deleted file mode 100644 index a064d48..0000000 --- a/repackage/org.argeo.tp.apache/org.apache.commons.httpclient.bnd +++ /dev/null @@ -1,3 +0,0 @@ -Bundle-License: Apache-2.0 -Bundle-SymbolicName: org.apache.commons.httpclient -SLC-Origin-M2: commons-httpclient:commons-httpclient:3.1 diff --git a/repackage/org.argeo.tp.apache/org.apache.commons.io.bnd b/repackage/org.argeo.tp.apache/org.apache.commons.io.bnd deleted file mode 100644 index e1e25b3..0000000 --- a/repackage/org.argeo.tp.apache/org.apache.commons.io.bnd +++ /dev/null @@ -1,4 +0,0 @@ -Bundle-License: Apache-2.0 -Bundle-SymbolicName: org.apache.commons.io -SLC-Origin-M2: commons-io:commons-io:2.11.0 -Import-Package: sun.*;resolution:=optional, * diff --git a/repackage/org.argeo.tp.apache/org.apache.commons.vfs.bnd b/repackage/org.argeo.tp.apache/org.apache.commons.vfs.bnd deleted file mode 100644 index 3a73689..0000000 --- a/repackage/org.argeo.tp.apache/org.apache.commons.vfs.bnd +++ /dev/null @@ -1,5 +0,0 @@ -Bundle-License: Apache-2.0 -Bundle-SymbolicName: org.apache.commons.vfs -Import-Package: org.apache.tools.ant.*;resolution:=optional, -* -SLC-Origin-M2: org.apache.commons:commons-vfs2:2.9.0 \ No newline at end of file diff --git a/repackage/org.argeo.tp.apache/org.apache.httpcomponents.httpclient.bnd b/repackage/org.argeo.tp.apache/org.apache.httpcomponents.httpclient.bnd deleted file mode 100644 index eead3b2..0000000 --- a/repackage/org.argeo.tp.apache/org.apache.httpcomponents.httpclient.bnd +++ /dev/null @@ -1,3 +0,0 @@ -Bundle-License: Apache-2.0 -Bundle-SymbolicName: org.apache.httpcomponents.httpclient -SLC-Origin-M2: org.apache.httpcomponents:httpclient:4.5.13 \ No newline at end of file diff --git a/repackage/org.argeo.tp.apache/org.apache.httpcomponents.httpcore.bnd b/repackage/org.argeo.tp.apache/org.apache.httpcomponents.httpcore.bnd deleted file mode 100644 index b0d0c7a..0000000 --- a/repackage/org.argeo.tp.apache/org.apache.httpcomponents.httpcore.bnd +++ /dev/null @@ -1,3 +0,0 @@ -Bundle-License: Apache-2.0 -Bundle-SymbolicName: org.apache.httpcomponents.httpcore -SLC-Origin-M2: org.apache.httpcomponents:httpcore:4.4.15 \ No newline at end of file diff --git a/repackage/org.argeo.tp.apache/org.apache.httpcomponents.httpmime.bnd b/repackage/org.argeo.tp.apache/org.apache.httpcomponents.httpmime.bnd deleted file mode 100644 index 1623fb5..0000000 --- a/repackage/org.argeo.tp.apache/org.apache.httpcomponents.httpmime.bnd +++ /dev/null @@ -1,3 +0,0 @@ -Bundle-License: Apache-2.0 -Bundle-SymbolicName: org.apache.httpcomponents.httpmime -SLC-Origin-M2: org.apache.httpcomponents:httpmime:4.5.13 \ No newline at end of file diff --git a/repackage/org.argeo.tp.apache/org.apache.tika.core.bnd b/repackage/org.argeo.tp.apache/org.apache.tika.core.bnd deleted file mode 100644 index cfe157a..0000000 --- a/repackage/org.argeo.tp.apache/org.apache.tika.core.bnd +++ /dev/null @@ -1,4 +0,0 @@ -Bundle-License: Apache-2.0 -Bundle-SymbolicName: org.apache.tika.core -SLC-Origin-M2: org.apache.tika:tika-core:1.28.2 -SLC-Origin-ManifestNotModified: true diff --git a/repackage/org.argeo.tp.apache/org.apache.tika.parsers.bnd b/repackage/org.argeo.tp.apache/org.apache.tika.parsers.bnd deleted file mode 100644 index 90489d3..0000000 --- a/repackage/org.argeo.tp.apache/org.apache.tika.parsers.bnd +++ /dev/null @@ -1,5 +0,0 @@ -Bundle-Activator: org.apache.tika.parser.internal.Activator -Bundle-License: Apache-2.0 -Bundle-SymbolicName: org.apache.tika.parsers -Import-Package: *;resolution:=optional -SLC-Origin-M2: org.apache.tika:tika-parsers:1.28.2 \ No newline at end of file diff --git a/repackage/org.argeo.tp.apache/org.apache.tomcat.jni.bnd b/repackage/org.argeo.tp.apache/org.apache.tomcat.jni.bnd deleted file mode 100644 index 99cb821..0000000 --- a/repackage/org.argeo.tp.apache/org.apache.tomcat.jni.bnd +++ /dev/null @@ -1,3 +0,0 @@ -Bundle-License: Apache-2.0 -# Use Tomcat v9 to stay compatible with JNI library v1.2 provided by Debian 11 -SLC-Origin-M2: org.apache.tomcat:tomcat-jni:9.0.43 \ No newline at end of file diff --git a/repackage/org.argeo.tp.apache/org.apache.xalan.bnd.retired b/repackage/org.argeo.tp.apache/org.apache.xalan.bnd.retired deleted file mode 100644 index 1d2106b..0000000 --- a/repackage/org.argeo.tp.apache/org.apache.xalan.bnd.retired +++ /dev/null @@ -1,3 +0,0 @@ -Bundle-License: Apache-2.0 -Bundle-SymbolicName: org.apache.xalan -SLC-Origin-M2: xalan:xalan:2.7.2 \ No newline at end of file diff --git a/repackage/org.argeo.tp.apache/org.apache.xalan.serializer.bnd.retired b/repackage/org.argeo.tp.apache/org.apache.xalan.serializer.bnd.retired deleted file mode 100644 index e0fb19c..0000000 --- a/repackage/org.argeo.tp.apache/org.apache.xalan.serializer.bnd.retired +++ /dev/null @@ -1,3 +0,0 @@ -Bundle-License: Apache-2.0 -Bundle-SymbolicName: org.apache.xalan.serializer -SLC-Origin-M2: xalan:serializer:2.7.2 \ No newline at end of file diff --git a/repackage/org.argeo.tp.apache/org.apache.xerces.bnd b/repackage/org.argeo.tp.apache/org.apache.xerces.bnd deleted file mode 100644 index 6cb8646..0000000 --- a/repackage/org.argeo.tp.apache/org.apache.xerces.bnd +++ /dev/null @@ -1,6 +0,0 @@ -Bundle-License: Apache-2.0 -Bundle-SymbolicName: org.apache.xerces -Import-Package:\ -sun.*;resolution:=optional,\ -* -SLC-Origin-M2: xerces:xercesImpl:2.12.2 \ No newline at end of file diff --git a/repackage/org.argeo.tp.apache/org.apache.xml.resolver.bnd b/repackage/org.argeo.tp.apache/org.apache.xml.resolver.bnd deleted file mode 100644 index 95f9a5e..0000000 --- a/repackage/org.argeo.tp.apache/org.apache.xml.resolver.bnd +++ /dev/null @@ -1,3 +0,0 @@ -Bundle-License: Apache-2.0 -Bundle-SymbolicName: org.apache.xml.resolver -SLC-Origin-M2: xml-resolver:xml-resolver:1.2 \ No newline at end of file diff --git a/repackage/org.argeo.tp.apache/org.apache.xmlgraphics.bnd.retired b/repackage/org.argeo.tp.apache/org.apache.xmlgraphics.bnd.retired deleted file mode 100644 index 254a0af..0000000 --- a/repackage/org.argeo.tp.apache/org.apache.xmlgraphics.bnd.retired +++ /dev/null @@ -1,3 +0,0 @@ -Bundle-License: Apache-2.0 -Bundle-SymbolicName: org.apache.xmlgraphics -SLC-Origin-M2: org.apache.xmlgraphics:xmlgraphics-commons:2.7 diff --git a/repackage/org.argeo.tp.apache/xalan/merge.bnd b/repackage/org.argeo.tp.apache/xalan/merge.bnd deleted file mode 100644 index 4c36a94..0000000 --- a/repackage/org.argeo.tp.apache/xalan/merge.bnd +++ /dev/null @@ -1,6 +0,0 @@ -Bundle-SymbolicName: org.apache.xalan -SLC-Origin-M2: :2.7.2 -Export-Package: org.apache.* -SLC-Origin-M2-Merge: \ -xalan:xalan,\ -xalan:serializer,\ \ No newline at end of file diff --git a/repackage/org.argeo.tp.apache/xmlgraphics/merge.bnd b/repackage/org.argeo.tp.apache/xmlgraphics/merge.bnd deleted file mode 100644 index 8cb1d14..0000000 --- a/repackage/org.argeo.tp.apache/xmlgraphics/merge.bnd +++ /dev/null @@ -1,11 +0,0 @@ -Bundle-License: Apache-2.0 -Bundle-SymbolicName: org.apache.xmlgraphics -SLC-Origin-M2: :2.7 -SLC-Origin-M2-Merge: \ -org.apache.xmlgraphics:xmlgraphics-commons -Export-Package: org.apache.xmlgraphics.* -Import-Package: \ -org.apache.fop.image.loader.batik;resolution:="optional", \ -org.apache.fop.render.pdf.pdfbox;resolution:="optional", \ -* - diff --git a/repackage/org.argeo.tp.apache/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageConverter b/repackage/org.argeo.tp.apache/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageConverter deleted file mode 100644 index 292f716..0000000 --- a/repackage/org.argeo.tp.apache/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageConverter +++ /dev/null @@ -1,5 +0,0 @@ -org.apache.fop.image.loader.batik.ImageConverterSVG2G2D -org.apache.fop.image.loader.batik.ImageConverterG2D2SVG -org.apache.fop.image.loader.batik.ImageConverterWMF2G2D -org.apache.fop.render.pdf.pdfbox.ImageConverterPDF2AFP -org.apache.fop.render.pdf.pdfbox.ImageConverterPDF2G2D \ No newline at end of file diff --git a/repackage/org.argeo.tp.apache/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory b/repackage/org.argeo.tp.apache/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory deleted file mode 100644 index 27dc74a..0000000 --- a/repackage/org.argeo.tp.apache/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory +++ /dev/null @@ -1,4 +0,0 @@ -org.apache.fop.image.loader.batik.ImageLoaderFactorySVG -org.apache.fop.image.loader.batik.ImageLoaderFactoryWMF -org.apache.fop.render.pdf.pdfbox.ImageLoaderFactoryPDF -org.apache.fop.render.pdf.pdfbox.ImageLoaderFactoryImageRawData \ No newline at end of file diff --git a/repackage/org.argeo.tp.apache/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImagePreloader b/repackage/org.argeo.tp.apache/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImagePreloader deleted file mode 100644 index 82f7977..0000000 --- a/repackage/org.argeo.tp.apache/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImagePreloader +++ /dev/null @@ -1,5 +0,0 @@ -org.apache.fop.image.loader.batik.PreloaderWMF -org.apache.fop.image.loader.batik.PreloaderSVG -org.apache.fop.render.pdf.pdfbox.PreloaderPDF -org.apache.fop.render.pdf.pdfbox.PreloaderImageRawData -org.apache.fop.render.pdf.pdfbox.LastResortPreloaderPDF \ No newline at end of file diff --git a/repackage/org.argeo.tp.crypto/apache-sshd/common.bnd b/repackage/org.argeo.tp.crypto/apache-sshd/common.bnd new file mode 100644 index 0000000..d73cbb3 --- /dev/null +++ b/repackage/org.argeo.tp.crypto/apache-sshd/common.bnd @@ -0,0 +1,2 @@ +Bundle-License: Apache-2.0 +SLC-Origin-M2: :2.9.1 \ No newline at end of file diff --git a/repackage/org.argeo.tp.crypto/apache-sshd/merge.bnd b/repackage/org.argeo.tp.crypto/apache-sshd/merge.bnd new file mode 100644 index 0000000..0af7209 --- /dev/null +++ b/repackage/org.argeo.tp.crypto/apache-sshd/merge.bnd @@ -0,0 +1,16 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: org.apache.sshd +SLC-Origin-M2: :2.9.1 +Export-Package: org.apache.* +Import-Package: \ +org.apache.tomcat.jni.*;resolution:=optional,\ +org.bouncycastle.crypto.prng,\ +org.bouncycastle.jce.provider.*;resolution:=optional,\ +net.i2p.crypto.eddsa.*;resolution:=optional,\ +org.slf4j,\ +org.slf4j.event,\ +org.slf4j.helpers,\ +* +SLC-Origin-M2-Merge: \ +org.apache.sshd:sshd-core, \ +org.apache.sshd:sshd-common diff --git a/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.cli.bnd b/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.cli.bnd new file mode 100644 index 0000000..7b00c2c --- /dev/null +++ b/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.cli.bnd @@ -0,0 +1,2 @@ +Bundle-SymbolicName: org.apache.sshd.cli +SLC-Origin-M2: org.apache.sshd:sshd-cli diff --git a/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.git.bnd b/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.git.bnd new file mode 100644 index 0000000..7d9ef2b --- /dev/null +++ b/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.git.bnd @@ -0,0 +1,6 @@ +Bundle-SymbolicName: org.apache.sshd.git +SLC-Origin-M2: org.apache.sshd:sshd-git +Import-Package: \ +org.eclipse.jgit.pgm.*;resolution:=optional,\ +org.kohsuke.*;resolution:=optional,\ +* \ No newline at end of file diff --git a/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.putty.bnd b/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.putty.bnd new file mode 100644 index 0000000..cf8a99a --- /dev/null +++ b/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.putty.bnd @@ -0,0 +1,5 @@ +Bundle-SymbolicName: org.apache.sshd.putty +SLC-Origin-M2: org.apache.sshd:sshd-putty +Import-Package: \ +net.i2p.*;resolution:=optional,\ +* \ No newline at end of file diff --git a/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.scp.bnd b/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.scp.bnd new file mode 100644 index 0000000..6744473 --- /dev/null +++ b/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.scp.bnd @@ -0,0 +1,2 @@ +Bundle-SymbolicName: org.apache.sshd.scp +SLC-Origin-M2: org.apache.sshd:sshd-scp diff --git a/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.sftp.bnd b/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.sftp.bnd new file mode 100644 index 0000000..b6b8b0d --- /dev/null +++ b/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.sftp.bnd @@ -0,0 +1,2 @@ +Bundle-SymbolicName: org.apache.sshd.sftp +SLC-Origin-M2: org.apache.sshd:sshd-sftp diff --git a/repackage/org.argeo.tp.crypto/bouncycastle/bcmail.bnd b/repackage/org.argeo.tp.crypto/bouncycastle/bcmail.bnd new file mode 100644 index 0000000..38ba77b --- /dev/null +++ b/repackage/org.argeo.tp.crypto/bouncycastle/bcmail.bnd @@ -0,0 +1,3 @@ +Bundle-SymbolicName: bcmail +SLC-Origin-ManifestNotModified: true +SLC-Origin-M2: org.bouncycastle:bcmail-jdk18on diff --git a/repackage/org.argeo.tp.crypto/bouncycastle/bcpg.bnd b/repackage/org.argeo.tp.crypto/bouncycastle/bcpg.bnd new file mode 100644 index 0000000..6e6f8af --- /dev/null +++ b/repackage/org.argeo.tp.crypto/bouncycastle/bcpg.bnd @@ -0,0 +1,3 @@ +Bundle-SymbolicName: bcpg +SLC-Origin-ManifestNotModified: true +SLC-Origin-M2: org.bouncycastle:bcpg-jdk18on diff --git a/repackage/org.argeo.tp.crypto/bouncycastle/bcpkix.bnd b/repackage/org.argeo.tp.crypto/bouncycastle/bcpkix.bnd new file mode 100644 index 0000000..50b64bc --- /dev/null +++ b/repackage/org.argeo.tp.crypto/bouncycastle/bcpkix.bnd @@ -0,0 +1,3 @@ +Bundle-SymbolicName: bcpkix +SLC-Origin-ManifestNotModified: true +SLC-Origin-M2: org.bouncycastle:bcpkix-jdk18on diff --git a/repackage/org.argeo.tp.crypto/bouncycastle/bcprov.bnd b/repackage/org.argeo.tp.crypto/bouncycastle/bcprov.bnd new file mode 100644 index 0000000..b507d5e --- /dev/null +++ b/repackage/org.argeo.tp.crypto/bouncycastle/bcprov.bnd @@ -0,0 +1,3 @@ +Bundle-SymbolicName: bcprov +SLC-Origin-ManifestNotModified: true +SLC-Origin-M2: org.bouncycastle:bcprov-jdk18on diff --git a/repackage/org.argeo.tp.crypto/bouncycastle/bcutil.bnd b/repackage/org.argeo.tp.crypto/bouncycastle/bcutil.bnd new file mode 100644 index 0000000..778c309 --- /dev/null +++ b/repackage/org.argeo.tp.crypto/bouncycastle/bcutil.bnd @@ -0,0 +1,3 @@ +Bundle-SymbolicName: bcutil +SLC-Origin-ManifestNotModified: true +SLC-Origin-M2: org.bouncycastle:bcutil-jdk18on diff --git a/repackage/org.argeo.tp.crypto/bouncycastle/common.bnd b/repackage/org.argeo.tp.crypto/bouncycastle/common.bnd new file mode 100644 index 0000000..b860aa5 --- /dev/null +++ b/repackage/org.argeo.tp.crypto/bouncycastle/common.bnd @@ -0,0 +1,2 @@ +Bundle-License: MIT +SLC-Origin-M2: :1.72 diff --git a/repackage/org.argeo.tp.crypto/net.i2p.crypto.eddsa.bnd b/repackage/org.argeo.tp.crypto/net.i2p.crypto.eddsa.bnd new file mode 100644 index 0000000..2eea764 --- /dev/null +++ b/repackage/org.argeo.tp.crypto/net.i2p.crypto.eddsa.bnd @@ -0,0 +1,5 @@ +Bundle-License: CC0-1.0 +SLC-Origin-M2: net.i2p.crypto:eddsa:0.3.0 +Import-Package: \ +sun.*;resolution:="optional", \ +* diff --git a/repackage/org.argeo.tp.crypto/org.apache.tomcat.jni.bnd b/repackage/org.argeo.tp.crypto/org.apache.tomcat.jni.bnd new file mode 100644 index 0000000..dafe848 --- /dev/null +++ b/repackage/org.argeo.tp.crypto/org.apache.tomcat.jni.bnd @@ -0,0 +1,3 @@ +Bundle-License: Apache-2.0 +# Use Tomcat v9 to stay compatible with JNI library v1.2 provided by Debian 11 +SLC-Origin-M2: org.apache.tomcat:tomcat-jni:9.0.68 \ No newline at end of file diff --git a/repackage/org.argeo.tp.formats/com.adobe.xmp.xmpcore.bnd b/repackage/org.argeo.tp.formats/com.adobe.xmp.xmpcore.bnd deleted file mode 100644 index e706659..0000000 --- a/repackage/org.argeo.tp.formats/com.adobe.xmp.xmpcore.bnd +++ /dev/null @@ -1,4 +0,0 @@ -Bundle-License: BSD-3-Clause -Bundle-SymbolicName: com.adobe.xmp.xmpcore -# No source available in Maven Central for 6.1.11 -SLC-Origin-M2: com.adobe.xmp:xmpcore:6.1.10 diff --git a/repackage/org.argeo.tp.formats/com.drew.metadata.bnd b/repackage/org.argeo.tp.formats/com.drew.metadata.bnd deleted file mode 100644 index f32421a..0000000 --- a/repackage/org.argeo.tp.formats/com.drew.metadata.bnd +++ /dev/null @@ -1,3 +0,0 @@ -Bundle-License: Apache-2.0 -Bundle-SymbolicName: com.drew.metadata -SLC-Origin-M2: com.drewnoakes:metadata-extractor:2.16.0 diff --git a/repackage/org.argeo.tp.formats/com.github.mangstadt.biweekly.bnd b/repackage/org.argeo.tp.formats/com.github.mangstadt.biweekly.bnd deleted file mode 100644 index 395c233..0000000 --- a/repackage/org.argeo.tp.formats/com.github.mangstadt.biweekly.bnd +++ /dev/null @@ -1,3 +0,0 @@ -Bundle-License: BSD-2-Clause -Bundle-SymbolicName: com.github.mangstadt.beweekly -SLC-Origin-M2: net.sf.biweekly:biweekly:0.6.6 \ No newline at end of file diff --git a/repackage/org.argeo.tp.formats/com.github.mangstadt.ezvcard.bnd b/repackage/org.argeo.tp.formats/com.github.mangstadt.ezvcard.bnd deleted file mode 100644 index 8aa1e6e..0000000 --- a/repackage/org.argeo.tp.formats/com.github.mangstadt.ezvcard.bnd +++ /dev/null @@ -1,8 +0,0 @@ -Bundle-License: BSD-2-Clause -Bundle-SymbolicName: com.github.mangstadt.ezvcard -SLC-Origin-M2: com.googlecode.ez-vcard:ez-vcard:0.11.3 -Import-Package: \ -freemarker.*;resolution:="optional", \ -com.fasterxml.jackson.*;resolution:="optional", \ -org.jsoup.*;resolution:="optional", \ -* \ No newline at end of file diff --git a/repackage/org.argeo.tp.formats/com.github.mangstadt.vinnie.bnd b/repackage/org.argeo.tp.formats/com.github.mangstadt.vinnie.bnd deleted file mode 100644 index eded65b..0000000 --- a/repackage/org.argeo.tp.formats/com.github.mangstadt.vinnie.bnd +++ /dev/null @@ -1,3 +0,0 @@ -Bundle-License: MIT -Bundle-SymbolicName: com.github.mangstadt.vinnie -SLC-Origin-M2: com.github.mangstadt:vinnie:2.0.2 \ No newline at end of file diff --git a/repackage/org.argeo.tp.formats/com.graphbuilder.bnd b/repackage/org.argeo.tp.formats/com.graphbuilder.bnd deleted file mode 100644 index d400fd7..0000000 --- a/repackage/org.argeo.tp.formats/com.graphbuilder.bnd +++ /dev/null @@ -1,3 +0,0 @@ -Bundle-License: BSD-3-Clause -Bundle-SymbolicName: com.graphbuilder -SLC-Origin-M2: com.github.virtuald:curvesapi:1.07 diff --git a/repackage/org.argeo.tp.formats/com.lowagie.bnd b/repackage/org.argeo.tp.formats/com.lowagie.bnd deleted file mode 100644 index b8bd293..0000000 --- a/repackage/org.argeo.tp.formats/com.lowagie.bnd +++ /dev/null @@ -1,3 +0,0 @@ -Bundle-License: LGPL-2.1 -Bundle-SymbolicName: com.lowagie -SLC-Origin-M2: com.github.librepdf:openpdf:1.3.27 diff --git a/repackage/org.argeo.tp.formats/de.rototor.pdfbox.graphics2d.bnd b/repackage/org.argeo.tp.formats/de.rototor.pdfbox.graphics2d.bnd deleted file mode 100644 index b6f5736..0000000 --- a/repackage/org.argeo.tp.formats/de.rototor.pdfbox.graphics2d.bnd +++ /dev/null @@ -1,3 +0,0 @@ -Bundle-License: Apache-2.0 -Bundle-SymbolicName: de.rototor.pdfbox.graphics2d -SLC-Origin-M2: de.rototor.pdfbox:graphics2d:0.35 diff --git a/repackage/org.argeo.tp.formats/flying-saucer/common.bnd b/repackage/org.argeo.tp.formats/flying-saucer/common.bnd deleted file mode 100644 index 8fc898c..0000000 --- a/repackage/org.argeo.tp.formats/flying-saucer/common.bnd +++ /dev/null @@ -1,2 +0,0 @@ -Bundle-License: LGPL-3 -SLC-Origin-M2: :9.1.22 \ No newline at end of file diff --git a/repackage/org.argeo.tp.formats/flying-saucer/org.xhtmlrenderer.core.bnd b/repackage/org.argeo.tp.formats/flying-saucer/org.xhtmlrenderer.core.bnd deleted file mode 100644 index 19312ee..0000000 --- a/repackage/org.argeo.tp.formats/flying-saucer/org.xhtmlrenderer.core.bnd +++ /dev/null @@ -1 +0,0 @@ -SLC-Origin-M2: org.xhtmlrenderer:flying-saucer-core diff --git a/repackage/org.argeo.tp.formats/flying-saucer/org.xhtmlrenderer.openpdf.bnd b/repackage/org.argeo.tp.formats/flying-saucer/org.xhtmlrenderer.openpdf.bnd deleted file mode 100644 index 0c241bd..0000000 --- a/repackage/org.argeo.tp.formats/flying-saucer/org.xhtmlrenderer.openpdf.bnd +++ /dev/null @@ -1 +0,0 @@ -SLC-Origin-M2: org.xhtmlrenderer:flying-saucer-pdf-openpdf diff --git a/repackage/org.argeo.tp.formats/flying-saucer/org.xhtmlrenderer.swt.bnd b/repackage/org.argeo.tp.formats/flying-saucer/org.xhtmlrenderer.swt.bnd deleted file mode 100644 index 6b89d64..0000000 --- a/repackage/org.argeo.tp.formats/flying-saucer/org.xhtmlrenderer.swt.bnd +++ /dev/null @@ -1,4 +0,0 @@ -SLC-Origin-M2: org.xhtmlrenderer:flying-saucer-swt -Import-Package:\ -org.eclipse.swt.printing;resolution:="optional",\ -* \ No newline at end of file diff --git a/repackage/org.argeo.tp.formats/fop/merge.bnd b/repackage/org.argeo.tp.formats/fop/merge.bnd deleted file mode 100644 index b8f6548..0000000 --- a/repackage/org.argeo.tp.formats/fop/merge.bnd +++ /dev/null @@ -1,16 +0,0 @@ -Bundle-License: Apache-2.0 -Bundle-SymbolicName: org.apache.fop -SLC-Origin-M2: :2.7 -SLC-Origin-M2-Merge: \ -org.apache.xmlgraphics:fop-core,\ -org.apache.xmlgraphics:fop-util,\ -org.apache.xmlgraphics:fop-events,\ -org.apache.xmlgraphics:fop-pdf-images,\ - -Export-Package: org.apache.fop.* - -Import-Package: \ -javax.media.jai;resolution:="optional",\ -com.thoughtworks.qdox.*;resolution:="optional",\ -org.apache.tools.ant.*;resolution:="optional",\ -* diff --git a/repackage/org.argeo.tp.formats/io.nayuki.qrcodegen.bnd b/repackage/org.argeo.tp.formats/io.nayuki.qrcodegen.bnd deleted file mode 100644 index 34445b6..0000000 --- a/repackage/org.argeo.tp.formats/io.nayuki.qrcodegen.bnd +++ /dev/null @@ -1,2 +0,0 @@ -Bundle-License: MIT -SLC-Origin-M2: io.nayuki:qrcodegen:1.8.0 diff --git a/repackage/org.argeo.tp.formats/javax.xml.bind.bnd b/repackage/org.argeo.tp.formats/javax.xml.bind.bnd deleted file mode 100644 index a827549..0000000 --- a/repackage/org.argeo.tp.formats/javax.xml.bind.bnd +++ /dev/null @@ -1,7 +0,0 @@ -Bundle-License: CDDL-1.0 OR GPL-2.0 WITH Classpath-exception-2.0 -Bundle-SymbolicName: javax.xml.bind -Bundle-Version: 2.4.0 -SLC-Origin-M2: javax.xml.bind:jaxb-api:2.4.0-b180830.0359 -Import-Package: \ -org.glassfish.hk2.osgiresourcelocator;resolution:="optional",\ -* diff --git a/repackage/org.argeo.tp.formats/org.apache.commons.collections4.bnd b/repackage/org.argeo.tp.formats/org.apache.commons.collections4.bnd deleted file mode 100644 index 4379a19..0000000 --- a/repackage/org.argeo.tp.formats/org.apache.commons.collections4.bnd +++ /dev/null @@ -1,3 +0,0 @@ -Bundle-License: Apache-2.0 -Bundle-SymbolicName: org.apache.commons.collections4 -SLC-Origin-M2: org.apache.commons:commons-collections4:4.4 \ No newline at end of file diff --git a/repackage/org.argeo.tp.formats/org.apache.commons.csv.bnd b/repackage/org.argeo.tp.formats/org.apache.commons.csv.bnd deleted file mode 100644 index 94f8301..0000000 --- a/repackage/org.argeo.tp.formats/org.apache.commons.csv.bnd +++ /dev/null @@ -1,3 +0,0 @@ -Bundle-License: Apache-2.0 -Bundle-SymbolicName: org.apache.commons.csv -SLC-Origin-M2: org.apache.commons:commons-csv:1.9.0 diff --git a/repackage/org.argeo.tp.formats/org.apache.commons.imaging.bnd b/repackage/org.argeo.tp.formats/org.apache.commons.imaging.bnd deleted file mode 100644 index 16e0882..0000000 --- a/repackage/org.argeo.tp.formats/org.apache.commons.imaging.bnd +++ /dev/null @@ -1,4 +0,0 @@ -Bundle-License: Apache-2.0 -Bundle-SymbolicName: org.apache.commons.imaging -Bundle-Version: 0.99.2 -SLC-Origin-M2: org.apache.commons:commons-imaging:1.0-alpha2 diff --git a/repackage/org.argeo.tp.formats/org.apache.commons.lang3.bnd b/repackage/org.argeo.tp.formats/org.apache.commons.lang3.bnd deleted file mode 100644 index 373f647..0000000 --- a/repackage/org.argeo.tp.formats/org.apache.commons.lang3.bnd +++ /dev/null @@ -1,3 +0,0 @@ -Bundle-License: Apache-2.0 -Bundle-SymbolicName: org.apache.commons.lang3 -SLC-Origin-M2: org.apache.commons:commons-lang3:3.12.0 diff --git a/repackage/org.argeo.tp.formats/org.apache.commons.math3.bnd b/repackage/org.argeo.tp.formats/org.apache.commons.math3.bnd deleted file mode 100644 index cc8d131..0000000 --- a/repackage/org.argeo.tp.formats/org.apache.commons.math3.bnd +++ /dev/null @@ -1,3 +0,0 @@ -Bundle-License: Apache-2.0 -Bundle-SymbolicName: org.apache.commons.math3 -SLC-Origin-M2: org.apache.commons:commons-math3:3.5 diff --git a/repackage/org.argeo.tp.formats/org.apache.commons.text.bnd b/repackage/org.argeo.tp.formats/org.apache.commons.text.bnd deleted file mode 100644 index b85c146..0000000 --- a/repackage/org.argeo.tp.formats/org.apache.commons.text.bnd +++ /dev/null @@ -1,3 +0,0 @@ -Bundle-License: Apache-2.0 -Bundle-SymbolicName: org.apache.commons.text -SLC-Origin-M2: org.apache.commons:commons-text:1.9 diff --git a/repackage/org.argeo.tp.formats/org.apache.pdfbox.jempbox.bnd b/repackage/org.argeo.tp.formats/org.apache.pdfbox.jempbox.bnd deleted file mode 100644 index 0689779..0000000 --- a/repackage/org.argeo.tp.formats/org.apache.pdfbox.jempbox.bnd +++ /dev/null @@ -1,3 +0,0 @@ -Bundle-License: Apache-2.0 -Bundle-SymbolicName: org.apache.pdfbox.jempbox -SLC-Origin-M2: org.apache.pdfbox:jempbox:1.8.16 diff --git a/repackage/org.argeo.tp.formats/org.apache.xml.security.bnd b/repackage/org.argeo.tp.formats/org.apache.xml.security.bnd deleted file mode 100644 index 8600cbb..0000000 --- a/repackage/org.argeo.tp.formats/org.apache.xml.security.bnd +++ /dev/null @@ -1,3 +0,0 @@ -Bundle-License: Apache-2.0 -Bundle-SymbolicName: org.apache.xml.security -SLC-Origin-M2: org.apache.santuario:xmlsec:2.1.2 diff --git a/repackage/org.argeo.tp.formats/org.mozilla.javascript.bnd b/repackage/org.argeo.tp.formats/org.mozilla.javascript.bnd deleted file mode 100644 index 277db30..0000000 --- a/repackage/org.argeo.tp.formats/org.mozilla.javascript.bnd +++ /dev/null @@ -1,4 +0,0 @@ -Bundle-License: MPL-2.0 -Bundle-SymbolicName: org.mozilla.javascript -SLC-Origin-M2: org.mozilla:rhino:1.7.14 -SLC-Origin-ManifestNotModified: true diff --git a/repackage/org.argeo.tp.formats/pdfbox/common.bnd b/repackage/org.argeo.tp.formats/pdfbox/common.bnd deleted file mode 100644 index 165d7c4..0000000 --- a/repackage/org.argeo.tp.formats/pdfbox/common.bnd +++ /dev/null @@ -1,2 +0,0 @@ -Bundle-License: Apache-2.0 -SLC-Origin-M2: :2.0.25 \ No newline at end of file diff --git a/repackage/org.argeo.tp.formats/pdfbox/org.apache.pdfbox.bnd b/repackage/org.argeo.tp.formats/pdfbox/org.apache.pdfbox.bnd deleted file mode 100644 index 1adc204..0000000 --- a/repackage/org.argeo.tp.formats/pdfbox/org.apache.pdfbox.bnd +++ /dev/null @@ -1,5 +0,0 @@ -Bundle-SymbolicName: org.apache.pdfbox -SLC-Origin-M2: org.apache.pdfbox:pdfbox -Import-Package: \ -sun.java2d.cmm.kcms;resolution:="optional",\ -* \ No newline at end of file diff --git a/repackage/org.argeo.tp.formats/pdfbox/org.apache.pdfbox.fontbox.bnd b/repackage/org.argeo.tp.formats/pdfbox/org.apache.pdfbox.fontbox.bnd deleted file mode 100644 index 519f90f..0000000 --- a/repackage/org.argeo.tp.formats/pdfbox/org.apache.pdfbox.fontbox.bnd +++ /dev/null @@ -1,2 +0,0 @@ -Bundle-SymbolicName: org.apache.pdfbox.fontbox -SLC-Origin-M2: org.apache.pdfbox:fontbox diff --git a/repackage/org.argeo.tp.formats/pdfbox/org.apache.pdfbox.xmpbox.bnd b/repackage/org.argeo.tp.formats/pdfbox/org.apache.pdfbox.xmpbox.bnd deleted file mode 100644 index 8a0c26c..0000000 --- a/repackage/org.argeo.tp.formats/pdfbox/org.apache.pdfbox.xmpbox.bnd +++ /dev/null @@ -1,2 +0,0 @@ -Bundle-SymbolicName: org.apache.pdfbox.xmpbox -SLC-Origin-M2: org.apache.pdfbox:xmpbox diff --git a/repackage/org.argeo.tp.gis/Repackage.java b/repackage/org.argeo.tp.gis/Repackage.java deleted file mode 100644 index d902efb..0000000 --- a/repackage/org.argeo.tp.gis/Repackage.java +++ /dev/null @@ -1,1174 +0,0 @@ -package org.argeo.build; - -import static java.lang.System.Logger.Level.DEBUG; -import static org.argeo.build.Repackage.ManifestConstants.BUNDLE_SYMBOLICNAME; -import static org.argeo.build.Repackage.ManifestConstants.BUNDLE_VERSION; -import static org.argeo.build.Repackage.ManifestConstants.EXPORT_PACKAGE; -import static org.argeo.build.Repackage.ManifestConstants.SLC_ORIGIN_M2; -import static org.argeo.build.Repackage.ManifestConstants.SLC_ORIGIN_M2_REPO; - -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.lang.System.Logger; -import java.lang.System.Logger.Level; -import java.net.MalformedURLException; -import java.net.URL; -import java.nio.file.DirectoryStream; -import java.nio.file.FileSystem; -import java.nio.file.FileSystems; -import java.nio.file.FileVisitResult; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.PathMatcher; -import java.nio.file.Paths; -import java.nio.file.SimpleFileVisitor; -import java.nio.file.StandardOpenOption; -import java.nio.file.attribute.BasicFileAttributes; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Properties; -import java.util.TreeMap; -import java.util.jar.Attributes; -import java.util.jar.JarEntry; -import java.util.jar.JarInputStream; -import java.util.jar.JarOutputStream; -import java.util.jar.Manifest; -import java.util.zip.Deflater; - -import aQute.bnd.osgi.Analyzer; -import aQute.bnd.osgi.Jar; - -/** The central class for A2 packaging. */ -public class Repackage { - private final static Logger logger = System.getLogger(Repackage.class.getName()); - - /** Main entry point. */ - public static void main(String[] args) { - if (args.length < 2) { - System.err.println("Usage: ..."); - System.exit(1); - } - Path a2Base = Paths.get(args[0]).toAbsolutePath().normalize(); - Path descriptorsBase = Paths.get(".").toAbsolutePath().normalize(); - Repackage factory = new Repackage(a2Base, descriptorsBase, true); - - for (int i = 1; i < args.length; i++) { - Path p = Paths.get(args[i]); - factory.processCategory(p); - } - } - - private final static String COMMON_BND = "common.bnd"; - private final static String MERGE_BND = "merge.bnd"; - - private Path originBase; - private Path a2Base; - private Path a2LibBase; - private Path descriptorsBase; - - private Properties uris = new Properties(); - - private boolean includeSources = true; - - /** key is URI prefix, value list of base URLs */ - private Map> mirrors = new HashMap>(); - - public Repackage(Path a2Base, Path descriptorsBase, boolean includeSources) { - Objects.requireNonNull(a2Base); - Objects.requireNonNull(descriptorsBase); - this.originBase = Paths.get(System.getProperty("user.home"), ".cache", "argeo/build/origin"); - // TODO define and use a build base - this.a2Base = a2Base; - this.a2LibBase = a2Base.resolve("lib"); - this.descriptorsBase = descriptorsBase; - if (!Files.exists(this.descriptorsBase)) - throw new IllegalArgumentException(this.descriptorsBase + " does not exist"); - this.includeSources = includeSources; - - Path urisPath = this.descriptorsBase.resolve("uris.properties"); - if (Files.exists(urisPath)) { - try (InputStream in = Files.newInputStream(urisPath)) { - uris.load(in); - } catch (IOException e) { - throw new IllegalStateException("Cannot load " + urisPath, e); - } - } - - // TODO make it configurable - List eclipseMirrors = new ArrayList<>(); - eclipseMirrors.add("https://archive.eclipse.org/"); - eclipseMirrors.add("http://ftp-stud.hs-esslingen.de/Mirrors/eclipse/"); - eclipseMirrors.add("http://ftp.fau.de/eclipse/"); - - mirrors.put("http://www.eclipse.org/downloads", eclipseMirrors); - } - - /* - * MAVEN ORIGIN - */ - - /** Process a whole category/group id. */ - public void processCategory(Path categoryRelativePath) { - try { - Path targetCategoryBase = descriptorsBase.resolve(categoryRelativePath); - DirectoryStream bnds = Files.newDirectoryStream(targetCategoryBase, - (p) -> p.getFileName().toString().endsWith(".bnd") && !p.getFileName().toString().equals(COMMON_BND) - && !p.getFileName().toString().equals(MERGE_BND)); - for (Path p : bnds) { - processSingleM2ArtifactDistributionUnit(p); - } - - DirectoryStream dus = Files.newDirectoryStream(targetCategoryBase, (p) -> Files.isDirectory(p)); - for (Path duDir : dus) { - if (duDir.getFileName().toString().startsWith("eclipse-")) { - processEclipseArchive(duDir); - } else { - processM2BasedDistributionUnit(duDir); - } - } - } catch (IOException e) { - throw new RuntimeException("Cannot process category " + categoryRelativePath, e); - } - } - - /** Process a standalone Maven artifact. */ - public void processSingleM2ArtifactDistributionUnit(Path bndFile) { - try { -// String category = bndFile.getParent().getFileName().toString(); - Path categoryRelativePath = descriptorsBase.relativize(bndFile.getParent()); - Path targetCategoryBase = a2Base.resolve(categoryRelativePath); - - Properties fileProps = new Properties(); - try (InputStream in = Files.newInputStream(bndFile)) { - fileProps.load(in); - } - String repoStr = fileProps.containsKey(SLC_ORIGIN_M2_REPO.toString()) - ? fileProps.getProperty(SLC_ORIGIN_M2_REPO.toString()) - : null; - - if (!fileProps.containsKey(BUNDLE_SYMBOLICNAME.toString())) { - // use file name as symbolic name - String symbolicName = bndFile.getFileName().toString(); - symbolicName = symbolicName.substring(0, symbolicName.length() - ".bnd".length()); - fileProps.put(BUNDLE_SYMBOLICNAME.toString(), symbolicName); - } - - String m2Coordinates = fileProps.getProperty(SLC_ORIGIN_M2.toString()); - if (m2Coordinates == null) - throw new IllegalArgumentException("No M2 coordinates available for " + bndFile); - M2Artifact artifact = new M2Artifact(m2Coordinates); - URL url = M2ConventionsUtils.mavenRepoUrl(repoStr, artifact); - Path downloaded = download(url, originBase, artifact); - - Path targetBundleDir = processBndJar(downloaded, targetCategoryBase, fileProps, artifact); - - downloadAndProcessM2Sources(repoStr, artifact, targetBundleDir); - - createJar(targetBundleDir); - } catch (Exception e) { - throw new RuntimeException("Cannot process " + bndFile, e); - } - } - - /** Process multiple Maven artifacts. */ - public void processM2BasedDistributionUnit(Path duDir) { - try { - // String category = duDir.getParent().getFileName().toString(); - Path categoryRelativePath = descriptorsBase.relativize(duDir.getParent()); - Path targetCategoryBase = a2Base.resolve(categoryRelativePath); - - // merge - Path mergeBnd = duDir.resolve(MERGE_BND); - if (Files.exists(mergeBnd)) { - mergeM2Artifacts(mergeBnd); -// return; - } - - Path commonBnd = duDir.resolve(COMMON_BND); - if (!Files.exists(commonBnd)) { - return; - } - Properties commonProps = new Properties(); - try (InputStream in = Files.newInputStream(commonBnd)) { - commonProps.load(in); - } - - String m2Version = commonProps.getProperty(SLC_ORIGIN_M2.toString()); - if (m2Version == null) { - logger.log(Level.WARNING, "Ignoring " + duDir + " as it is not an M2-based distribution unit"); - return;// ignore, this is probably an Eclipse archive - } - if (!m2Version.startsWith(":")) { - throw new IllegalStateException("Only the M2 version can be specified: " + m2Version); - } - m2Version = m2Version.substring(1); - - DirectoryStream ds = Files.newDirectoryStream(duDir, - (p) -> p.getFileName().toString().endsWith(".bnd") && !p.getFileName().toString().equals(COMMON_BND) - && !p.getFileName().toString().equals(MERGE_BND)); - for (Path p : ds) { - Properties fileProps = new Properties(); - try (InputStream in = Files.newInputStream(p)) { - fileProps.load(in); - } - String m2Coordinates = fileProps.getProperty(SLC_ORIGIN_M2.toString()); - M2Artifact artifact = new M2Artifact(m2Coordinates); - - artifact.setVersion(m2Version); - - // prepare manifest entries - Properties mergeProps = new Properties(); - mergeProps.putAll(commonProps); - - fileEntries: for (Object key : fileProps.keySet()) { - if (ManifestConstants.SLC_ORIGIN_M2.toString().equals(key)) - continue fileEntries; - String value = fileProps.getProperty(key.toString()); - Object previousValue = mergeProps.put(key.toString(), value); - if (previousValue != null) { - logger.log(Level.WARNING, - commonBnd + ": " + key + " was " + previousValue + ", overridden with " + value); - } - } - mergeProps.put(ManifestConstants.SLC_ORIGIN_M2.toString(), artifact.toM2Coordinates()); - if (!mergeProps.containsKey(BUNDLE_SYMBOLICNAME.toString())) { - // use file name as symbolic name - String symbolicName = p.getFileName().toString(); - symbolicName = symbolicName.substring(0, symbolicName.length() - ".bnd".length()); - mergeProps.put(BUNDLE_SYMBOLICNAME.toString(), symbolicName); - } - - String repoStr = mergeProps.containsKey(SLC_ORIGIN_M2_REPO.toString()) - ? mergeProps.getProperty(SLC_ORIGIN_M2_REPO.toString()) - : null; - - // download - URL url = M2ConventionsUtils.mavenRepoUrl(repoStr, artifact); - Path downloaded = download(url, originBase, artifact); - - Path targetBundleDir = processBndJar(downloaded, targetCategoryBase, mergeProps, artifact); -// logger.log(Level.DEBUG, () -> "Processed " + downloaded); - - // sources - downloadAndProcessM2Sources(repoStr, artifact, targetBundleDir); - - createJar(targetBundleDir); - } - } catch (IOException e) { - throw new RuntimeException("Cannot process " + duDir, e); - } - - } - - /** Merge multiple Maven artifacts. */ - protected void mergeM2Artifacts(Path mergeBnd) throws IOException { - Path duDir = mergeBnd.getParent(); - String category = duDir.getParent().getFileName().toString(); - Path targetCategoryBase = a2Base.resolve(category); - - Properties mergeProps = new Properties(); - try (InputStream in = Files.newInputStream(mergeBnd)) { - mergeProps.load(in); - } - - // Version - String m2Version = mergeProps.getProperty(SLC_ORIGIN_M2.toString()); - if (m2Version == null) { - logger.log(Level.WARNING, "Ignoring " + duDir + " as it is not an M2-based distribution unit"); - return;// ignore, this is probably an Eclipse archive - } - if (!m2Version.startsWith(":")) { - throw new IllegalStateException("Only the M2 version can be specified: " + m2Version); - } - m2Version = m2Version.substring(1); - mergeProps.put(ManifestConstants.BUNDLE_VERSION.toString(), m2Version); - - String artifactsStr = mergeProps.getProperty(ManifestConstants.SLC_ORIGIN_M2_MERGE.toString()); - String repoStr = mergeProps.containsKey(SLC_ORIGIN_M2_REPO.toString()) - ? mergeProps.getProperty(SLC_ORIGIN_M2_REPO.toString()) - : null; - - String bundleSymbolicName = mergeProps.getProperty(ManifestConstants.BUNDLE_SYMBOLICNAME.toString()); - if (bundleSymbolicName == null) - throw new IllegalArgumentException("Bundle-SymbolicName must be set in " + mergeBnd); - CategoryNameVersion nameVersion = new M2Artifact(category + ":" + bundleSymbolicName + ":" + m2Version); - Path targetBundleDir = targetCategoryBase.resolve(bundleSymbolicName + "." + nameVersion.getBranch()); - - String[] artifacts = artifactsStr.split(","); - artifacts: for (String str : artifacts) { - String m2Coordinates = str.trim(); - if ("".equals(m2Coordinates)) - continue artifacts; - M2Artifact artifact = new M2Artifact(m2Coordinates.trim()); - if (artifact.getVersion() == null) - artifact.setVersion(m2Version); - URL url = M2ConventionsUtils.mavenRepoUrl(repoStr, artifact); - Path downloaded = download(url, originBase, artifact); - JarEntry entry; - try (JarInputStream jarIn = new JarInputStream(Files.newInputStream(downloaded), false)) { - entries: while ((entry = jarIn.getNextJarEntry()) != null) { - if (entry.isDirectory()) - continue entries; - else if (entry.getName().endsWith(".RSA") || entry.getName().endsWith(".SF")) - continue entries; - else if (entry.getName().startsWith("META-INF/versions/")) - continue entries; - else if (entry.getName().startsWith("META-INF/maven/")) - continue entries; - else if (entry.getName().equals("module-info.class")) - continue entries; - else if (entry.getName().equals("META-INF/NOTICE")) - continue entries; - else if (entry.getName().equals("META-INF/NOTICE.txt")) - continue entries; - else if (entry.getName().equals("META-INF/LICENSE")) - continue entries; - else if (entry.getName().equals("META-INF/LICENSE.md")) - continue entries; - else if (entry.getName().equals("META-INF/LICENSE-notice.md")) - continue entries; - else if (entry.getName().equals("META-INF/DEPENDENCIES")) - continue entries; - if (entry.getName().startsWith(".cache/")) // Apache SSHD - continue entries; - Path target = targetBundleDir.resolve(entry.getName()); - Files.createDirectories(target.getParent()); - if (!Files.exists(target)) { - Files.copy(jarIn, target); - } else { - if (entry.getName().startsWith("META-INF/services/")) { - try (OutputStream out = Files.newOutputStream(target, StandardOpenOption.APPEND)) { - out.write("\n".getBytes()); - jarIn.transferTo(out); - if (logger.isLoggable(DEBUG)) - logger.log(DEBUG, artifact.getArtifactId() + " - Appended " + entry.getName()); - } - } else if (entry.getName().startsWith("org/apache/batik/")) { - logger.log(Level.WARNING, "Skip " + entry.getName()); - continue entries; - } else { - throw new IllegalStateException("File " + target + " from " + artifact + " already exists"); - } - } - logger.log(Level.TRACE, () -> "Copied " + target); - } - - } - downloadAndProcessM2Sources(repoStr, artifact, targetBundleDir); - } - - // additional service files - Path servicesDir = duDir.resolve("services"); - if (Files.exists(servicesDir)) { - for (Path p : Files.newDirectoryStream(servicesDir)) { - Path target = targetBundleDir.resolve("META-INF/services/").resolve(p.getFileName()); - try (InputStream in = Files.newInputStream(p); - OutputStream out = Files.newOutputStream(target, StandardOpenOption.APPEND);) { - out.write("\n".getBytes()); - in.transferTo(out); - if (logger.isLoggable(DEBUG)) - logger.log(DEBUG, "Appended " + p); - } - } - } - - Map entries = new TreeMap<>(); - try (Analyzer bndAnalyzer = new Analyzer()) { - bndAnalyzer.setProperties(mergeProps); - Jar jar = new Jar(targetBundleDir.toFile()); - bndAnalyzer.setJar(jar); - Manifest manifest = bndAnalyzer.calcManifest(); - - keys: for (Object key : manifest.getMainAttributes().keySet()) { - Object value = manifest.getMainAttributes().get(key); - - switch (key.toString()) { - case "Tool": - case "Bnd-LastModified": - case "Created-By": - continue keys; - } - if ("Require-Capability".equals(key.toString()) - && value.toString().equals("osgi.ee;filter:=\"(&(osgi.ee=JavaSE)(version=1.1))\"")) - continue keys;// hack for very old classes - entries.put(key.toString(), value.toString()); - // logger.log(DEBUG, () -> key + "=" + value); - - } - } catch (Exception e) { - throw new RuntimeException("Cannot process " + mergeBnd, e); - } - - Manifest manifest = new Manifest(); - Path manifestPath = targetBundleDir.resolve("META-INF/MANIFEST.MF"); - Files.createDirectories(manifestPath.getParent()); - for (String key : entries.keySet()) { - String value = entries.get(key); - manifest.getMainAttributes().putValue(key, value); - } - - try (OutputStream out = Files.newOutputStream(manifestPath)) { - manifest.write(out); - } - createJar(targetBundleDir); - } - - /** Generate MANIFEST using BND. */ - protected Path processBndJar(Path downloaded, Path targetCategoryBase, Properties fileProps, M2Artifact artifact) { - - try { - Map additionalEntries = new TreeMap<>(); - boolean doNotModify = Boolean.parseBoolean(fileProps - .getOrDefault(ManifestConstants.SLC_ORIGIN_MANIFEST_NOT_MODIFIED.toString(), "false").toString()); - - // we always force the symbolic name - - if (doNotModify) { - fileEntries: for (Object key : fileProps.keySet()) { - if (ManifestConstants.SLC_ORIGIN_M2.toString().equals(key)) - continue fileEntries; - String value = fileProps.getProperty(key.toString()); - additionalEntries.put(key.toString(), value); - } - } else { - if (artifact != null) { - if (!fileProps.containsKey(BUNDLE_SYMBOLICNAME.toString())) { - fileProps.put(BUNDLE_SYMBOLICNAME.toString(), artifact.getName()); - } - if (!fileProps.containsKey(BUNDLE_VERSION.toString())) { - fileProps.put(BUNDLE_VERSION.toString(), artifact.getVersion()); - } - } - - if (!fileProps.containsKey(EXPORT_PACKAGE.toString())) { - fileProps.put(EXPORT_PACKAGE.toString(), - "*;version=\"" + fileProps.getProperty(BUNDLE_VERSION.toString()) + "\""); - } - - try (Analyzer bndAnalyzer = new Analyzer()) { - bndAnalyzer.setProperties(fileProps); - Jar jar = new Jar(downloaded.toFile()); - bndAnalyzer.setJar(jar); - Manifest manifest = bndAnalyzer.calcManifest(); - - keys: for (Object key : manifest.getMainAttributes().keySet()) { - Object value = manifest.getMainAttributes().get(key); - - switch (key.toString()) { - case "Tool": - case "Bnd-LastModified": - case "Created-By": - continue keys; - } - if ("Require-Capability".equals(key.toString()) - && value.toString().equals("osgi.ee;filter:=\"(&(osgi.ee=JavaSE)(version=1.1))\"")) - continue keys;// hack for very old classes - additionalEntries.put(key.toString(), value.toString()); - // logger.log(DEBUG, () -> key + "=" + value); - - } - } - } - Path targetBundleDir = processBundleJar(downloaded, targetCategoryBase, additionalEntries); - logger.log(Level.DEBUG, () -> "Processed " + downloaded); - return targetBundleDir; - } catch (Exception e) { - throw new RuntimeException("Cannot BND process " + downloaded, e); - } - - } - - /** Download and integrates sources for a single Maven artifact. */ - protected void downloadAndProcessM2Sources(String repoStr, M2Artifact artifact, Path targetBundleDir) - throws IOException { - if (!includeSources) - return; - M2Artifact sourcesArtifact = new M2Artifact(artifact.toM2Coordinates(), "sources"); - URL sourcesUrl = M2ConventionsUtils.mavenRepoUrl(repoStr, sourcesArtifact); - Path sourcesDownloaded = download(sourcesUrl, originBase, artifact, true); - processM2SourceJar(sourcesDownloaded, targetBundleDir); - logger.log(Level.TRACE, () -> "Processed source " + sourcesDownloaded); - - } - - /** Integrate sources from a downloaded jar file. */ - protected void processM2SourceJar(Path file, Path targetBundleDir) throws IOException { - try (JarInputStream jarIn = new JarInputStream(Files.newInputStream(file), false)) { - Path targetSourceDir = targetBundleDir.resolve("OSGI-OPT/src"); - - // TODO make it less dangerous? - if (Files.exists(targetSourceDir)) { -// deleteDirectory(targetSourceDir); - } else { - Files.createDirectories(targetSourceDir); - } - - // copy entries - JarEntry entry; - entries: while ((entry = jarIn.getNextJarEntry()) != null) { - if (entry.isDirectory()) - continue entries; - if (entry.getName().startsWith("META-INF"))// skip META-INF entries - continue entries; - if (entry.getName().startsWith("module-info.java"))// skip META-INF entries - continue entries; - if (entry.getName().startsWith("/")) // absolute paths - continue entries; - Path target = targetSourceDir.resolve(entry.getName()); - Files.createDirectories(target.getParent()); - if (!Files.exists(target)) { - Files.copy(jarIn, target); - logger.log(Level.TRACE, () -> "Copied source " + target); - } else { - logger.log(Level.WARNING, () -> target + " already exists, skipping..."); - } - } - } - - } - - /** Download a Maven artifact. */ - protected Path download(URL url, Path dir, M2Artifact artifact) throws IOException { - return download(url, dir, artifact, false); - } - - /** Download a Maven artifact. */ - protected Path download(URL url, Path dir, M2Artifact artifact, boolean sources) throws IOException { - return download(url, dir, artifact.getGroupId() + '/' + artifact.getArtifactId() + "-" + artifact.getVersion() - + (sources ? "-sources" : "") + ".jar"); - } - - /* - * ECLIPSE ORIGIN - */ - - /** Process an archive in Eclipse format. */ - public void processEclipseArchive(Path duDir) { - try { - Path categoryRelativePath = descriptorsBase.relativize(duDir.getParent()); - // String category = categoryRelativePath.getFileName().toString(); - Path targetCategoryBase = a2Base.resolve(categoryRelativePath); - Files.createDirectories(targetCategoryBase); - // first delete all directories from previous builds - for (Path dir : Files.newDirectoryStream(targetCategoryBase, (p) -> Files.isDirectory(p))) { - deleteDirectory(dir); - } - - Files.createDirectories(originBase); - - Path commonBnd = duDir.resolve(COMMON_BND); - Properties commonProps = new Properties(); - try (InputStream in = Files.newInputStream(commonBnd)) { - commonProps.load(in); - } - String url = commonProps.getProperty(ManifestConstants.SLC_ORIGIN_URI.toString()); - if (url == null) { - url = uris.getProperty(duDir.getFileName().toString()); - if (url == null) - throw new IllegalStateException("No url available for " + duDir); - commonProps.put(ManifestConstants.SLC_ORIGIN_URI.toString(), url); - } - Path downloaded = tryDownload(url, originBase); - - FileSystem zipFs = FileSystems.newFileSystem(downloaded, (ClassLoader) null); - - // filters - List includeMatchers = new ArrayList<>(); - Properties includes = new Properties(); - try (InputStream in = Files.newInputStream(duDir.resolve("includes.properties"))) { - includes.load(in); - } - for (Object pattern : includes.keySet()) { - PathMatcher pathMatcher = zipFs.getPathMatcher("glob:/" + pattern); - includeMatchers.add(pathMatcher); - } - - List excludeMatchers = new ArrayList<>(); - Path excludeFile = duDir.resolve("excludes.properties"); - if (Files.exists(excludeFile)) { - Properties excludes = new Properties(); - try (InputStream in = Files.newInputStream(excludeFile)) { - excludes.load(in); - } - for (Object pattern : excludes.keySet()) { - PathMatcher pathMatcher = zipFs.getPathMatcher("glob:/" + pattern); - excludeMatchers.add(pathMatcher); - } - } - - Files.walkFileTree(zipFs.getRootDirectories().iterator().next(), new SimpleFileVisitor() { - - @Override - public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { - includeMatchers: for (PathMatcher includeMatcher : includeMatchers) { - if (includeMatcher.matches(file)) { - for (PathMatcher excludeMatcher : excludeMatchers) { - if (excludeMatcher.matches(file)) { - logger.log(Level.WARNING, "Skipping excluded " + file); - return FileVisitResult.CONTINUE; - } - } - if (includeSources && file.getFileName().toString().contains(".source_")) { - processEclipseSourceJar(file, targetCategoryBase); - logger.log(Level.DEBUG, () -> "Processed source " + file); - - } else { - Map map = new HashMap<>(); - for (Object key : commonProps.keySet()) - map.put(key.toString(), commonProps.getProperty(key.toString())); - processBundleJar(file, targetCategoryBase, map); - logger.log(Level.DEBUG, () -> "Processed " + file); - } - break includeMatchers; - } - } - return FileVisitResult.CONTINUE; - } - }); - - DirectoryStream dirs = Files.newDirectoryStream(targetCategoryBase, - (p) -> Files.isDirectory(p) && p.getFileName().toString().indexOf('.') >= 0); - for (Path dir : dirs) { - createJar(dir); - } - } catch (IOException e) { - throw new RuntimeException("Cannot process " + duDir, e); - } - - } - - /** Process sources in Eclipse format. */ - protected void processEclipseSourceJar(Path file, Path targetBase) throws IOException { - try { - Path targetBundleDir; - try (JarInputStream jarIn = new JarInputStream(Files.newInputStream(file), false)) { - Manifest manifest = jarIn.getManifest(); - - String[] relatedBundle = manifest.getMainAttributes().getValue("Eclipse-SourceBundle").split(";"); - String version = relatedBundle[1].substring("version=\"".length()); - version = version.substring(0, version.length() - 1); - NameVersion nameVersion = new NameVersion(relatedBundle[0], version); - targetBundleDir = targetBase.resolve(nameVersion.getName() + "." + nameVersion.getBranch()); - - Path targetSourceDir = targetBundleDir.resolve("OSGI-OPT/src"); - - // TODO make it less dangerous? - if (Files.exists(targetSourceDir)) { -// deleteDirectory(targetSourceDir); - } else { - Files.createDirectories(targetSourceDir); - } - - // copy entries - JarEntry entry; - entries: while ((entry = jarIn.getNextJarEntry()) != null) { - if (entry.isDirectory()) - continue entries; - if (entry.getName().startsWith("META-INF"))// skip META-INF entries - continue entries; - Path target = targetSourceDir.resolve(entry.getName()); - Files.createDirectories(target.getParent()); - Files.copy(jarIn, target); - logger.log(Level.TRACE, () -> "Copied source " + target); - } - - // copy MANIFEST - } - } catch (IOException e) { - throw new IllegalStateException("Cannot process " + file, e); - } - - } - - /* - * COMMON PROCESSING - */ - /** Normalise a bundle. */ - protected Path processBundleJar(Path file, Path targetBase, Map entries) throws IOException { - NameVersion nameVersion; - Path targetBundleDir; - try (JarInputStream jarIn = new JarInputStream(Files.newInputStream(file), false)) { - Manifest sourceManifest = jarIn.getManifest(); - Manifest manifest = sourceManifest != null ? new Manifest(sourceManifest) : new Manifest(); - - // remove problematic entries in MANIFEST - manifest.getEntries().clear(); - - String ourSymbolicName = entries.get(BUNDLE_SYMBOLICNAME.toString()); - String ourVersion = entries.get(BUNDLE_VERSION.toString()); - - if (ourSymbolicName != null && ourVersion != null) { - nameVersion = new NameVersion(ourSymbolicName, ourVersion); - } else { - nameVersion = nameVersionFromManifest(manifest); - if (ourVersion != null && !nameVersion.getVersion().equals(ourVersion)) { - logger.log(Level.WARNING, - "Original version is " + nameVersion.getVersion() + " while new version is " + ourVersion); - entries.put(BUNDLE_VERSION.toString(), ourVersion); - } - if (ourSymbolicName != null) { - // we always force our symbolic name - nameVersion.setName(ourSymbolicName); - } - } - targetBundleDir = targetBase.resolve(nameVersion.getName() + "." + nameVersion.getBranch()); - - // force Java 9 module name - entries.put(ManifestConstants.AUTOMATIC_MODULE_NAME.toString(), nameVersion.getName()); - - boolean isNative = false; - String os = null; - String arch = null; - if (targetBundleDir.startsWith(a2LibBase)) { - isNative = true; - Path libRelativePath = a2LibBase.relativize(targetBundleDir); - os = libRelativePath.getName(0).toString(); - arch = libRelativePath.getName(1).toString(); - } - - // copy entries - JarEntry entry; - entries: while ((entry = jarIn.getNextJarEntry()) != null) { - if (entry.isDirectory()) - continue entries; - if (entry.getName().endsWith(".RSA") || entry.getName().endsWith(".SF")) - continue entries; - if (entry.getName().endsWith("module-info.class")) // skip Java 9 module info - continue entries; - if (entry.getName().startsWith("META-INF/versions/")) // skip multi-version - continue entries; - // skip file system providers as they cause issues with native image - if (entry.getName().startsWith("META-INF/services/java.nio.file.spi.FileSystemProvider")) - continue entries; - if (entry.getName().startsWith("OSGI-OPT/src/")) // skip embedded sources - continue entries; - Path target = targetBundleDir.resolve(entry.getName()); - Files.createDirectories(target.getParent()); - Files.copy(jarIn, target); - - // native libraries - if (isNative && (entry.getName().endsWith(".so") || entry.getName().endsWith(".dll") - || entry.getName().endsWith(".jnilib"))) { - Path categoryDir = targetBundleDir.getParent(); -// String[] segments = categoryDir.getFileName().toString().split("\\."); -// String arch = segments[segments.length - 1]; -// String os = segments[segments.length - 2]; - boolean copyDll = false; - Path targetDll = categoryDir.resolve(targetBundleDir.relativize(target)); - if (nameVersion.getName().equals("com.sun.jna")) { - if (arch.equals("x86_64")) - arch = "x86-64"; - if (os.equals("macosx")) - os = "darwin"; - if (target.getParent().getFileName().toString().equals(os + "-" + arch)) { - copyDll = true; - } - targetDll = categoryDir.resolve(target.getFileName()); - } else { - copyDll = true; - } - if (copyDll) { - Files.createDirectories(targetDll.getParent()); - if (Files.exists(targetDll)) - Files.delete(targetDll); - Files.copy(target, targetDll); - } - Files.delete(target); - } - logger.log(Level.TRACE, () -> "Copied " + target); - } - - // copy MANIFEST - Path manifestPath = targetBundleDir.resolve("META-INF/MANIFEST.MF"); - Files.createDirectories(manifestPath.getParent()); - for (String key : entries.keySet()) { - String value = entries.get(key); - Object previousValue = manifest.getMainAttributes().putValue(key, value); - if (previousValue != null && !previousValue.equals(value)) { - if (ManifestConstants.IMPORT_PACKAGE.toString().equals(key) - || ManifestConstants.EXPORT_PACKAGE.toString().equals(key)) - logger.log(Level.TRACE, file.getFileName() + ": " + key + " was modified"); - else - logger.log(Level.WARNING, file.getFileName() + ": " + key + " was " + previousValue - + ", overridden with " + value); - } - - // hack to remove unresolvable - if (key.equals("Provide-Capability") || key.equals("Require-Capability")) - if (nameVersion.getName().equals("osgi.core") || nameVersion.getName().equals("osgi.cmpn")) { - manifest.getMainAttributes().remove(key); - } - } - try (OutputStream out = Files.newOutputStream(manifestPath)) { - manifest.write(out); - } - } - return targetBundleDir; - } - - /* - * UTILITIES - */ - - /** Recursively deletes a directory. */ - private static void deleteDirectory(Path path) throws IOException { - if (!Files.exists(path)) - return; - Files.walkFileTree(path, new SimpleFileVisitor() { - @Override - public FileVisitResult postVisitDirectory(Path directory, IOException e) throws IOException { - if (e != null) - throw e; - Files.delete(directory); - return FileVisitResult.CONTINUE; - } - - @Override - public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { - Files.delete(file); - return FileVisitResult.CONTINUE; - } - }); - } - - /** Extract name/version from a MANIFEST. */ - protected NameVersion nameVersionFromManifest(Manifest manifest) { - Attributes attrs = manifest.getMainAttributes(); - // symbolic name - String symbolicName = attrs.getValue(ManifestConstants.BUNDLE_SYMBOLICNAME.toString()); - if (symbolicName == null) - return null; - // make sure there is no directive - symbolicName = symbolicName.split(";")[0]; - - String version = attrs.getValue(ManifestConstants.BUNDLE_VERSION.toString()); - return new NameVersion(symbolicName, version); - } - - /** Try to download from an URI. */ - protected Path tryDownload(String uri, Path dir) throws IOException { - // find mirror - List urlBases = null; - String uriPrefix = null; - uriPrefixes: for (String uriPref : mirrors.keySet()) { - if (uri.startsWith(uriPref)) { - if (mirrors.get(uriPref).size() > 0) { - urlBases = mirrors.get(uriPref); - uriPrefix = uriPref; - break uriPrefixes; - } - } - } - if (urlBases == null) - try { - return download(new URL(uri), dir); - } catch (FileNotFoundException e) { - throw new FileNotFoundException("Cannot find " + uri); - } - - // try to download - for (String urlBase : urlBases) { - String relativePath = uri.substring(uriPrefix.length()); - URL url = new URL(urlBase + relativePath); - try { - return download(url, dir); - } catch (FileNotFoundException e) { - logger.log(Level.WARNING, "Cannot download " + url + ", trying another mirror"); - } - } - throw new FileNotFoundException("Cannot find " + uri); - } - - /** Effectively download. */ - protected Path download(URL url, Path dir) throws IOException { - return download(url, dir, (String) null); - } - - /** Effectively download. */ - protected Path download(URL url, Path dir, String name) throws IOException { - - Path dest; - if (name == null) { - name = url.getPath().substring(url.getPath().lastIndexOf('/') + 1); - } - - dest = dir.resolve(name); - if (Files.exists(dest)) { - logger.log(Level.TRACE, () -> "File " + dest + " already exists for " + url + ", not downloading again"); - return dest; - } else { - Files.createDirectories(dest.getParent()); - } - - try (InputStream in = url.openStream()) { - Files.copy(in, dest); - logger.log(Level.DEBUG, () -> "Downloaded " + dest + " from " + url); - } - return dest; - } - - /** Create a JAR file from a directory. */ - protected Path createJar(Path bundleDir) throws IOException { - // Create the jar - Path jarPath = bundleDir.getParent().resolve(bundleDir.getFileName() + ".jar"); - Path manifestPath = bundleDir.resolve("META-INF/MANIFEST.MF"); - Manifest manifest; - try (InputStream in = Files.newInputStream(manifestPath)) { - manifest = new Manifest(in); - } - try (JarOutputStream jarOut = new JarOutputStream(Files.newOutputStream(jarPath), manifest)) { - jarOut.setLevel(Deflater.DEFAULT_COMPRESSION); - Files.walkFileTree(bundleDir, new SimpleFileVisitor() { - - @Override - public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { - if (file.getFileName().toString().equals("MANIFEST.MF")) - return super.visitFile(file, attrs); - JarEntry entry = new JarEntry(bundleDir.relativize(file).toString()); - jarOut.putNextEntry(entry); - Files.copy(file, jarOut); - return super.visitFile(file, attrs); - } - - }); - } - deleteDirectory(bundleDir); - return jarPath; - } - - enum ManifestConstants { - // OSGi - BUNDLE_SYMBOLICNAME("Bundle-SymbolicName"), // - BUNDLE_VERSION("Bundle-Version"), // - BUNDLE_LICENSE("Bundle-License"), // - EXPORT_PACKAGE("Export-Package"), // - IMPORT_PACKAGE("Import-Package"), // - // JAVA - AUTOMATIC_MODULE_NAME("Automatic-Module-Name"), // - // SLC - SLC_CATEGORY("SLC-Category"), // - SLC_ORIGIN_M2("SLC-Origin-M2"), // - SLC_ORIGIN_M2_MERGE("SLC-Origin-M2-Merge"), // - SLC_ORIGIN_M2_REPO("SLC-Origin-M2-Repo"), // - SLC_ORIGIN_MANIFEST_NOT_MODIFIED("SLC-Origin-ManifestNotModified"), // - SLC_ORIGIN_URI("SLC-Origin-URI"),// - ; - - final String value; - - private ManifestConstants(String value) { - this.value = value; - } - - @Override - public String toString() { - return value; - } - - } - -} - -/** Simple representation of an M2 artifact. */ -class M2Artifact extends CategoryNameVersion { - private String classifier; - - M2Artifact(String m2coordinates) { - this(m2coordinates, null); - } - - M2Artifact(String m2coordinates, String classifier) { - String[] parts = m2coordinates.split(":"); - setCategory(parts[0]); - setName(parts[1]); - if (parts.length > 2) { - setVersion(parts[2]); - } - this.classifier = classifier; - } - - String getGroupId() { - return super.getCategory(); - } - - String getArtifactId() { - return super.getName(); - } - - String toM2Coordinates() { - return getCategory() + ":" + getName() + (getVersion() != null ? ":" + getVersion() : ""); - } - - String getClassifier() { - return classifier != null ? classifier : ""; - } - - String getExtension() { - return "jar"; - } -} - -/** Utilities around Maven (conventions based). */ -class M2ConventionsUtils { - final static String MAVEN_CENTRAL_BASE_URL = "https://repo1.maven.org/maven2/"; - - /** The file name of this artifact when stored */ - static String artifactFileName(M2Artifact artifact) { - return artifact.getArtifactId() + '-' + artifact.getVersion() - + (artifact.getClassifier().equals("") ? "" : '-' + artifact.getClassifier()) + '.' - + artifact.getExtension(); - } - - /** Absolute path to the file */ - static String artifactPath(String artifactBasePath, M2Artifact artifact) { - return artifactParentPath(artifactBasePath, artifact) + '/' + artifactFileName(artifact); - } - - /** Absolute path to the file */ - static String artifactUrl(String repoUrl, M2Artifact artifact) { - if (repoUrl.endsWith("/")) - return repoUrl + artifactPath("/", artifact).substring(1); - else - return repoUrl + artifactPath("/", artifact); - } - - /** Absolute path to the file */ - static URL mavenRepoUrl(String repoBase, M2Artifact artifact) { - String url = artifactUrl(repoBase == null ? MAVEN_CENTRAL_BASE_URL : repoBase, artifact); - try { - return new URL(url); - } catch (MalformedURLException e) { - // it should not happen - throw new IllegalStateException(e); - } - } - - /** Absolute path to the directories where the files will be stored */ - static String artifactParentPath(String artifactBasePath, M2Artifact artifact) { - return artifactBasePath + (artifactBasePath.endsWith("/") ? "" : "/") + artifactParentPath(artifact); - } - - /** Relative path to the directories where the files will be stored */ - static String artifactParentPath(M2Artifact artifact) { - return artifact.getGroupId().replace('.', '/') + '/' + artifact.getArtifactId() + '/' + artifact.getVersion(); - } - - /** Singleton */ - private M2ConventionsUtils() { - } -} - -class CategoryNameVersion extends NameVersion { - private String category; - - CategoryNameVersion() { - } - - CategoryNameVersion(String category, String name, String version) { - super(name, version); - this.category = category; - } - - CategoryNameVersion(String category, NameVersion nameVersion) { - super(nameVersion); - this.category = category; - } - - String getCategory() { - return category; - } - - void setCategory(String category) { - this.category = category; - } - - @Override - public String toString() { - return category + ":" + super.toString(); - } - -} - -class NameVersion implements Comparable { - private String name; - private String version; - - NameVersion() { - } - - /** Interprets string in OSGi-like format my.module.name;version=0.0.0 */ - NameVersion(String nameVersion) { - int index = nameVersion.indexOf(";version="); - if (index < 0) { - setName(nameVersion); - setVersion(null); - } else { - setName(nameVersion.substring(0, index)); - setVersion(nameVersion.substring(index + ";version=".length())); - } - } - - NameVersion(String name, String version) { - this.name = name; - this.version = version; - } - - NameVersion(NameVersion nameVersion) { - this.name = nameVersion.getName(); - this.version = nameVersion.getVersion(); - } - - String getName() { - return name; - } - - void setName(String name) { - this.name = name; - } - - String getVersion() { - return version; - } - - void setVersion(String version) { - this.version = version; - } - - String getBranch() { - String[] parts = getVersion().split("\\."); - if (parts.length < 2) - throw new IllegalStateException("Version " + getVersion() + " cannot be interpreted as branch."); - return parts[0] + "." + parts[1]; - } - - @Override - public boolean equals(Object obj) { - if (obj instanceof NameVersion) { - NameVersion nameVersion = (NameVersion) obj; - return name.equals(nameVersion.getName()) && version.equals(nameVersion.getVersion()); - } else - return false; - } - - @Override - public int hashCode() { - return name.hashCode(); - } - - @Override - public String toString() { - return name + ":" + version; - } - - public int compareTo(NameVersion o) { - if (o.getName().equals(name)) - return version.compareTo(o.getVersion()); - else - return name.compareTo(o.getName()); - } -} diff --git a/repackage/org.argeo.tp.gis/geotools/merge.bnd b/repackage/org.argeo.tp.gis/geotools/merge.bnd index 60ceeb0..77156e1 100644 --- a/repackage/org.argeo.tp.gis/geotools/merge.bnd +++ b/repackage/org.argeo.tp.gis/geotools/merge.bnd @@ -1,6 +1,6 @@ Bundle-License: LGPL-2.1-only Bundle-SymbolicName: org.geotools -SLC-Origin-M2: :27.0 +SLC-Origin-M2: :27.2 SLC-Origin-M2-Repo: https://repo.osgeo.org/repository/release/ Export-Package: org.geotools.*, org.opengis.*, net.opengis.*, org.w3.xlink.* Import-Package: \ @@ -28,7 +28,8 @@ org.geotools:gt-process, \ org.geotools:gt-epsg-extension, \ org.geotools:gt-epsg-wkt, \ org.geotools:gt-transform, \ -org.geotools:gt-geojson, \ +org.geotools:gt-geojson-core, \ +org.geotools:gt-geojson-store, \ org.geotools:gt-shapefile, \ org.geotools:gt-xml, \ org.geotools:gt-svg, \ diff --git a/repackage/org.argeo.tp.gis/h2gis/common.bnd b/repackage/org.argeo.tp.gis/h2gis/common.bnd new file mode 100644 index 0000000..52b4af1 --- /dev/null +++ b/repackage/org.argeo.tp.gis/h2gis/common.bnd @@ -0,0 +1,2 @@ +Bundle-License: LGPL-3.0-or-later +SLC-Origin-M2: :2.1.0 diff --git a/repackage/org.argeo.tp.gis/h2gis/org.h2gis.api.bnd b/repackage/org.argeo.tp.gis/h2gis/org.h2gis.api.bnd new file mode 100644 index 0000000..f343ffd --- /dev/null +++ b/repackage/org.argeo.tp.gis/h2gis/org.h2gis.api.bnd @@ -0,0 +1 @@ +SLC-Origin-M2: org.orbisgis:h2gis-api \ No newline at end of file diff --git a/repackage/org.argeo.tp.gis/h2gis/org.h2gis.bnd b/repackage/org.argeo.tp.gis/h2gis/org.h2gis.bnd new file mode 100644 index 0000000..ec85e3a --- /dev/null +++ b/repackage/org.argeo.tp.gis/h2gis/org.h2gis.bnd @@ -0,0 +1,2 @@ +SLC-Origin-M2: org.orbisgis:h2gis +Fragment-Host: org.h2 \ No newline at end of file diff --git a/repackage/org.argeo.tp.gis/h2gis/org.h2gis.postgis_jts.bnd b/repackage/org.argeo.tp.gis/h2gis/org.h2gis.postgis_jts.bnd new file mode 100644 index 0000000..b15c334 --- /dev/null +++ b/repackage/org.argeo.tp.gis/h2gis/org.h2gis.postgis_jts.bnd @@ -0,0 +1,2 @@ +SLC-Origin-M2: org.orbisgis:postgis-jts +Fragment-Host: org.h2 \ No newline at end of file diff --git a/repackage/org.argeo.tp.gis/h2gis/org.h2gis.utilities.bnd b/repackage/org.argeo.tp.gis/h2gis/org.h2gis.utilities.bnd new file mode 100644 index 0000000..4f7d45d --- /dev/null +++ b/repackage/org.argeo.tp.gis/h2gis/org.h2gis.utilities.bnd @@ -0,0 +1 @@ +SLC-Origin-M2: org.orbisgis:h2gis-utilities \ No newline at end of file diff --git a/repackage/org.argeo.tp.gis/org.cts.bnd b/repackage/org.argeo.tp.gis/org.cts.bnd new file mode 100644 index 0000000..c535e54 --- /dev/null +++ b/repackage/org.argeo.tp.gis/org.cts.bnd @@ -0,0 +1,3 @@ +Bundle-License: LGPL-3.0-or-later +SLC-Origin-M2: org.orbisgis:cts:1.6.0 +# 1.6.0 sources are missing in Maven central diff --git a/repackage/org.argeo.tp.gis/org.json.simple.bnd b/repackage/org.argeo.tp.gis/org.json.simple.bnd deleted file mode 100644 index 71ce052..0000000 --- a/repackage/org.argeo.tp.gis/org.json.simple.bnd +++ /dev/null @@ -1,2 +0,0 @@ -Bundle-license: Apache-2.0 -SLC-Origin-M2: com.googlecode.json-simple:json-simple:1.1.1 \ No newline at end of file diff --git a/repackage/org.argeo.tp.gis/org.locationtech.jts.bnd b/repackage/org.argeo.tp.gis/org.locationtech.jts.bnd index 8e2e958..cdf0a19 100644 --- a/repackage/org.argeo.tp.gis/org.locationtech.jts.bnd +++ b/repackage/org.argeo.tp.gis/org.locationtech.jts.bnd @@ -1,2 +1,2 @@ Bundle-License: BSD-3-Clause -SLC-Origin-M2: org.locationtech.jts:jts-core:1.18.2 \ No newline at end of file +SLC-Origin-M2: org.locationtech.jts:jts-core:1.19.0 \ No newline at end of file diff --git a/repackage/org.argeo.tp.gis/org.locationtech.spatial4j.bnd b/repackage/org.argeo.tp.gis/org.locationtech.spatial4j.bnd new file mode 100644 index 0000000..46c5d8e --- /dev/null +++ b/repackage/org.argeo.tp.gis/org.locationtech.spatial4j.bnd @@ -0,0 +1,5 @@ +Bundle-License: Apache-2.0 +SLC-Origin-M2: org.locationtech.spatial4j:spatial4j:0.8 +Import-Package:\ +org.noggit;resolution:="optional",\ +* \ No newline at end of file diff --git a/repackage/org.argeo.tp.gis/org.poly2tri.bnd b/repackage/org.argeo.tp.gis/org.poly2tri.bnd new file mode 100644 index 0000000..7972450 --- /dev/null +++ b/repackage/org.argeo.tp.gis/org.poly2tri.bnd @@ -0,0 +1,2 @@ +Bundle-License: BSD-3-Clause +SLC-Origin-M2: org.orbisgis:poly2tri:0.4.0 \ No newline at end of file diff --git a/repackage/org.argeo.tp.gis/postgis/common.bnd b/repackage/org.argeo.tp.gis/postgis/common.bnd new file mode 100644 index 0000000..f49155e --- /dev/null +++ b/repackage/org.argeo.tp.gis/postgis/common.bnd @@ -0,0 +1,3 @@ +Bundle-License: LGPL-2.1-only +SLC-Origin-M2: :2021.1.0 +Export-Package: net.postgis.* \ No newline at end of file diff --git a/repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.bnd b/repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.bnd new file mode 100644 index 0000000..e373a7b --- /dev/null +++ b/repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.bnd @@ -0,0 +1 @@ +SLC-Origin-M2: net.postgis:postgis-jdbc \ No newline at end of file diff --git a/repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.geometry.bnd b/repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.geometry.bnd new file mode 100644 index 0000000..92b8f63 --- /dev/null +++ b/repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.geometry.bnd @@ -0,0 +1 @@ +SLC-Origin-M2: net.postgis:postgis-geometry \ No newline at end of file diff --git a/repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.java2d.bnd b/repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.java2d.bnd new file mode 100644 index 0000000..03dd804 --- /dev/null +++ b/repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.java2d.bnd @@ -0,0 +1 @@ +SLC-Origin-M2: net.postgis:postgis-jdbc-java2d \ No newline at end of file diff --git a/repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.jts.bnd b/repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.jts.bnd new file mode 100644 index 0000000..7329fa0 --- /dev/null +++ b/repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.jts.bnd @@ -0,0 +1 @@ +SLC-Origin-M2: net.postgis:postgis-jdbc-jts \ No newline at end of file diff --git a/repackage/org.argeo.tp.gis/units/merge.bnd b/repackage/org.argeo.tp.gis/units/merge.bnd index 75ecae1..b9bcadd 100644 --- a/repackage/org.argeo.tp.gis/units/merge.bnd +++ b/repackage/org.argeo.tp.gis/units/merge.bnd @@ -8,7 +8,7 @@ SLC-Origin-M2-Merge: \ javax.measure:unit-api:2.0, \ tech.units:indriya, \ tech.uom.lib:uom-lib-common:2.0.1, \ -si.uom:si-units:2.0, \ +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, \ diff --git a/repackage/org.argeo.tp.jcr/com.google.guava.bnd.retired b/repackage/org.argeo.tp.jcr/com.google.guava.bnd.retired deleted file mode 100644 index a8a926f..0000000 --- a/repackage/org.argeo.tp.jcr/com.google.guava.bnd.retired +++ /dev/null @@ -1,5 +0,0 @@ -Bundle-License: Apache-2.0 -Bundle-SymbolicName: com.google.guava -Bundle-Version: 27.1.0.jre -SLC-Origin-M2: com.google.guava:guava:27.1-jre -SLC-Origin-ManifestNotModified: true diff --git a/repackage/org.argeo.tp.jcr/com.google.guava.failureaccess.bnd.retired b/repackage/org.argeo.tp.jcr/com.google.guava.failureaccess.bnd.retired deleted file mode 100644 index e7c19ce..0000000 --- a/repackage/org.argeo.tp.jcr/com.google.guava.failureaccess.bnd.retired +++ /dev/null @@ -1,4 +0,0 @@ -Bundle-License: Apache-2.0 -Bundle-SymbolicName: com.google.guava.failureaccess -SLC-Origin-M2: com.google.guava:failureaccess:1.0.1 -SLC-Origin-ManifestNotModified: true diff --git a/repackage/org.argeo.tp.jcr/jackrabbit/common.bnd b/repackage/org.argeo.tp.jcr/jackrabbit/common.bnd index c2bda37..5d259b2 100644 --- a/repackage/org.argeo.tp.jcr/jackrabbit/common.bnd +++ b/repackage/org.argeo.tp.jcr/jackrabbit/common.bnd @@ -1,2 +1,2 @@ Bundle-License: Apache-2.0 -SLC-Origin-M2: :2.20.5 \ No newline at end of file +SLC-Origin-M2: :2.20.6 \ No newline at end of file diff --git a/repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.api.bnd.retired b/repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.api.bnd.retired deleted file mode 100644 index 6ebc779..0000000 --- a/repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.api.bnd.retired +++ /dev/null @@ -1,3 +0,0 @@ -SLC-Origin-M2: org.apache.jackrabbit:jackrabbit-api -Bundle-SymbolicName: org.apache.jackrabbit.api -Export-Package: org.apache.jackrabbit.* diff --git a/repackage/org.argeo.tp.jcr/oak/common.bnd b/repackage/org.argeo.tp.jcr/oak/common.bnd index 02fa45a..02eafb7 100644 --- a/repackage/org.argeo.tp.jcr/oak/common.bnd +++ b/repackage/org.argeo.tp.jcr/oak/common.bnd @@ -1,2 +1,2 @@ Bundle-License: Apache-2.0 -SLC-Origin-M2: :1.42.0 \ No newline at end of file +SLC-Origin-M2: :1.44.0 \ No newline at end of file diff --git a/repackage/org.argeo.tp.jetty/jetty-websocket/merge.bnd b/repackage/org.argeo.tp.jetty/jetty-websocket/merge.bnd index 309a9e7..abaada7 100644 --- a/repackage/org.argeo.tp.jetty/jetty-websocket/merge.bnd +++ b/repackage/org.argeo.tp.jetty/jetty-websocket/merge.bnd @@ -1,6 +1,6 @@ Bundle-SymbolicName: org.eclipse.jetty.websocket Bundle-License: Apache-2.0 -SLC-Origin-M2: :10.0.9 +SLC-Origin-M2: :10.0.12 SLC-Origin-M2-Merge: \ org.eclipse.jetty.websocket:websocket-core-client, \ org.eclipse.jetty.websocket:websocket-core-common, \ diff --git a/repackage/org.argeo.tp.jetty/jetty/common.bnd b/repackage/org.argeo.tp.jetty/jetty/common.bnd index 25c6ff9..27fd8a9 100644 --- a/repackage/org.argeo.tp.jetty/jetty/common.bnd +++ b/repackage/org.argeo.tp.jetty/jetty/common.bnd @@ -1,2 +1,2 @@ Bundle-License: Apache-2.0 -SLC-Origin-M2: :10.0.9 +SLC-Origin-M2: :10.0.12 diff --git a/repackage/org.argeo.tp.poi/com.healthmarketscience.jackcess.bnd b/repackage/org.argeo.tp.poi/com.healthmarketscience.jackcess.bnd new file mode 100644 index 0000000..028a094 --- /dev/null +++ b/repackage/org.argeo.tp.poi/com.healthmarketscience.jackcess.bnd @@ -0,0 +1,2 @@ +Bundle-License: Apache-2.0 +SLC-Origin-M2: com.healthmarketscience.jackcess:jackcess:4.0.4 \ No newline at end of file diff --git a/repackage/org.argeo.tp.poi/log4j/common.bnd b/repackage/org.argeo.tp.poi/log4j/common.bnd new file mode 100644 index 0000000..f9e517b --- /dev/null +++ b/repackage/org.argeo.tp.poi/log4j/common.bnd @@ -0,0 +1,2 @@ +Bundle-License: Apache-2.0 +SLC-Origin-M2: :2.19.0 diff --git a/repackage/org.argeo.tp.poi/log4j/org.apache.logging.log4j.api.bnd b/repackage/org.argeo.tp.poi/log4j/org.apache.logging.log4j.api.bnd new file mode 100644 index 0000000..c29a8e4 --- /dev/null +++ b/repackage/org.argeo.tp.poi/log4j/org.apache.logging.log4j.api.bnd @@ -0,0 +1,3 @@ +SLC-Origin-M2: org.apache.logging.log4j:log4j-api +Bundle-ActivationPolicy: lazy +Import-Package: *;resolution:=optional diff --git a/repackage/org.argeo.tp.poi/log4j/org.apache.logging.log4j.core.bnd b/repackage/org.argeo.tp.poi/log4j/org.apache.logging.log4j.core.bnd new file mode 100644 index 0000000..4864b50 --- /dev/null +++ b/repackage/org.argeo.tp.poi/log4j/org.apache.logging.log4j.core.bnd @@ -0,0 +1,3 @@ +SLC-Origin-M2: org.apache.logging.log4j:log4j-core +Import-Package:\ +*;resolution:="optional" diff --git a/repackage/org.argeo.tp.poi/org.apache.xmlbeans.bnd b/repackage/org.argeo.tp.poi/org.apache.xmlbeans.bnd index 83d6d31..8905324 100644 --- a/repackage/org.argeo.tp.poi/org.apache.xmlbeans.bnd +++ b/repackage/org.argeo.tp.poi/org.apache.xmlbeans.bnd @@ -5,4 +5,4 @@ Import-Package: org.apache.tools.ant.*;resolution:=optional, net.sf.saxon.*;resolution:=optional, com.sun.*;resolution:=optional, * -SLC-Origin-M2: org.apache.xmlbeans:xmlbeans:3.1.0 \ No newline at end of file +SLC-Origin-M2: org.apache.xmlbeans:xmlbeans:5.1.1 \ No newline at end of file diff --git a/repackage/org.argeo.tp.poi/poi/common.bnd b/repackage/org.argeo.tp.poi/poi/common.bnd index b3e3996..b2394bd 100644 --- a/repackage/org.argeo.tp.poi/poi/common.bnd +++ b/repackage/org.argeo.tp.poi/poi/common.bnd @@ -1,2 +1,2 @@ Bundle-License: Apache-2.0 -SLC-Origin-M2: :5.2.2 \ No newline at end of file +SLC-Origin-M2: :5.2.3 \ No newline at end of file diff --git a/repackage/org.argeo.tp.sdk/junit-jupiter/merge.bnd b/repackage/org.argeo.tp.sdk/junit-jupiter/merge.bnd index 312584e..6eaa07c 100644 --- a/repackage/org.argeo.tp.sdk/junit-jupiter/merge.bnd +++ b/repackage/org.argeo.tp.sdk/junit-jupiter/merge.bnd @@ -1,6 +1,6 @@ Bundle-License: EPL-2.0 Bundle-SymbolicName: org.junit.jupiter -SLC-Origin-M2: :5.8.2 +SLC-Origin-M2: :5.9.1 SLC-Origin-M2-Merge: \ org.junit.jupiter:junit-jupiter-api, \ org.junit.jupiter:junit-jupiter-engine, \ diff --git a/repackage/org.argeo.tp.sdk/junit-platform/merge.bnd b/repackage/org.argeo.tp.sdk/junit-platform/merge.bnd index 502ffa6..110a32e 100644 --- a/repackage/org.argeo.tp.sdk/junit-platform/merge.bnd +++ b/repackage/org.argeo.tp.sdk/junit-platform/merge.bnd @@ -1,6 +1,6 @@ Bundle-License: EPL-2.0 Bundle-SymbolicName: org.junit.platform -SLC-Origin-M2: :1.8.2 +SLC-Origin-M2: :1.9.1 SLC-Origin-M2-Merge: \ org.junit.platform:junit-platform-commons, \ org.junit.platform:junit-platform-console, \ diff --git a/repackage/org.argeo.tp.sdk/org.eclipse.jdt.core.compiler.batch.bnd b/repackage/org.argeo.tp.sdk/org.eclipse.jdt.core.compiler.batch.bnd index 27f4f43..70b5ac0 100644 --- a/repackage/org.argeo.tp.sdk/org.eclipse.jdt.core.compiler.batch.bnd +++ b/repackage/org.argeo.tp.sdk/org.eclipse.jdt.core.compiler.batch.bnd @@ -1,4 +1,4 @@ Bundle-License: EPL-2.0 -SLC-Origin-M2: org.eclipse.jdt:ecj:3.29.0 +SLC-Origin-M2: org.eclipse.jdt:ecj:3.31.0 SLC-Origin-ManifestNotModified: true Main-Class: org.eclipse.jdt.internal.compiler.batch.Main \ No newline at end of file diff --git a/repackage/org.argeo.tp.sdk/org.eclipse.jgit.bnd b/repackage/org.argeo.tp.sdk/org.eclipse.jgit.bnd deleted file mode 100644 index c4df6b9..0000000 --- a/repackage/org.argeo.tp.sdk/org.eclipse.jgit.bnd +++ /dev/null @@ -1,6 +0,0 @@ -Bundle-License: BSD-3-Clause -SLC-Origin-M2: org.eclipse.jgit:org.eclipse.jgit:5.13.0.202109080827-r -Import-Package: \ -sun.*;resolution:=optional, \ -com.jcraft.jsch;resolution:=optional, \ -* diff --git a/repackage/org.argeo.tp.sdk/org.graalvm.bnd.retired b/repackage/org.argeo.tp.sdk/org.graalvm.bnd.retired deleted file mode 100644 index dd55db9..0000000 --- a/repackage/org.argeo.tp.sdk/org.graalvm.bnd.retired +++ /dev/null @@ -1,4 +0,0 @@ -Bundle-License: UPL-1.0 -SLC-Origin-M2: org.graalvm.sdk:graal-sdk:22.1.0.1 -# Workaround for errors in Eclipse PDE when using GraalVM as JCM -Import-Package: java.*;resolution:="optional", * \ No newline at end of file diff --git a/repackage/org.argeo.tp.sdk/org.junit.vintage.bnd b/repackage/org.argeo.tp.sdk/org.junit.vintage.bnd index c063891..df674e4 100644 --- a/repackage/org.argeo.tp.sdk/org.junit.vintage.bnd +++ b/repackage/org.argeo.tp.sdk/org.junit.vintage.bnd @@ -1,2 +1,2 @@ Bundle-License: EPL-2.0 -SLC-Origin-M2: org.junit.vintage:junit-vintage-engine:5.8.2 \ No newline at end of file +SLC-Origin-M2: org.junit.vintage:junit-vintage-engine:5.9.1 \ No newline at end of file diff --git a/repackage/org.argeo.tp.sql/org.h2.bnd b/repackage/org.argeo.tp.sql/org.h2.bnd new file mode 100644 index 0000000..2d6de4e --- /dev/null +++ b/repackage/org.argeo.tp.sql/org.h2.bnd @@ -0,0 +1,10 @@ +Bundle-License: MPL-2.0 +Bundle-SymbolicName: org.h2 +SLC-Origin-M2: com.h2database:h2:2.1.214 +Import-Package:\ +jakarta.*;resolution:=optional,\ +org.apache.lucene.*;resolution:=optional,\ +org.codehaus.groovy.*;resolution:=optional,\ +org.osgi.*;resolution:=optional,\ +com.ibm.icu.*;resolution:=optional,\ +* \ No newline at end of file diff --git a/repackage/org.argeo.tp.sql/org.postgresql.bnd b/repackage/org.argeo.tp.sql/org.postgresql.bnd new file mode 100644 index 0000000..6e68b97 --- /dev/null +++ b/repackage/org.argeo.tp.sql/org.postgresql.bnd @@ -0,0 +1,8 @@ +Bundle-License: BSD-2-Clause +SLC-Origin-M2: org.postgresql:postgresql:42.5.0 +Import-Package:\ +org.osgi.service.jdbc;resolution:="optional",\ +com.sun.jna.*;resolution:="optional",\ +org.checkerframework.*;resolution:="optional",\ +waffle.*;resolution:="optional",\ +* \ No newline at end of file diff --git a/repackage/org.argeo.tp.utils/com.adobe.xmp.xmpcore.bnd b/repackage/org.argeo.tp.utils/com.adobe.xmp.xmpcore.bnd new file mode 100644 index 0000000..e706659 --- /dev/null +++ b/repackage/org.argeo.tp.utils/com.adobe.xmp.xmpcore.bnd @@ -0,0 +1,4 @@ +Bundle-License: BSD-3-Clause +Bundle-SymbolicName: com.adobe.xmp.xmpcore +# No source available in Maven Central for 6.1.11 +SLC-Origin-M2: com.adobe.xmp:xmpcore:6.1.10 diff --git a/repackage/org.argeo.tp.utils/com.dd.plist.bnd b/repackage/org.argeo.tp.utils/com.dd.plist.bnd new file mode 100644 index 0000000..b1713f0 --- /dev/null +++ b/repackage/org.argeo.tp.utils/com.dd.plist.bnd @@ -0,0 +1,2 @@ +Bundle-License: MIT +SLC-Origin-M2: com.googlecode.plist:dd-plist:1.26 \ No newline at end of file diff --git a/repackage/org.argeo.tp.utils/com.drew.metadata.bnd b/repackage/org.argeo.tp.utils/com.drew.metadata.bnd new file mode 100644 index 0000000..ddb5ffd --- /dev/null +++ b/repackage/org.argeo.tp.utils/com.drew.metadata.bnd @@ -0,0 +1,3 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: com.drew.metadata +SLC-Origin-M2: com.drewnoakes:metadata-extractor:2.18.0 diff --git a/repackage/org.argeo.tp.utils/com.github.mangstadt.biweekly.bnd b/repackage/org.argeo.tp.utils/com.github.mangstadt.biweekly.bnd new file mode 100644 index 0000000..395c233 --- /dev/null +++ b/repackage/org.argeo.tp.utils/com.github.mangstadt.biweekly.bnd @@ -0,0 +1,3 @@ +Bundle-License: BSD-2-Clause +Bundle-SymbolicName: com.github.mangstadt.beweekly +SLC-Origin-M2: net.sf.biweekly:biweekly:0.6.6 \ No newline at end of file diff --git a/repackage/org.argeo.tp.utils/com.github.mangstadt.ezvcard.bnd b/repackage/org.argeo.tp.utils/com.github.mangstadt.ezvcard.bnd new file mode 100644 index 0000000..8aa1e6e --- /dev/null +++ b/repackage/org.argeo.tp.utils/com.github.mangstadt.ezvcard.bnd @@ -0,0 +1,8 @@ +Bundle-License: BSD-2-Clause +Bundle-SymbolicName: com.github.mangstadt.ezvcard +SLC-Origin-M2: com.googlecode.ez-vcard:ez-vcard:0.11.3 +Import-Package: \ +freemarker.*;resolution:="optional", \ +com.fasterxml.jackson.*;resolution:="optional", \ +org.jsoup.*;resolution:="optional", \ +* \ No newline at end of file diff --git a/repackage/org.argeo.tp.utils/com.github.mangstadt.vinnie.bnd b/repackage/org.argeo.tp.utils/com.github.mangstadt.vinnie.bnd new file mode 100644 index 0000000..eded65b --- /dev/null +++ b/repackage/org.argeo.tp.utils/com.github.mangstadt.vinnie.bnd @@ -0,0 +1,3 @@ +Bundle-License: MIT +Bundle-SymbolicName: com.github.mangstadt.vinnie +SLC-Origin-M2: com.github.mangstadt:vinnie:2.0.2 \ No newline at end of file diff --git a/repackage/org.argeo.tp.utils/com.graphbuilder.bnd b/repackage/org.argeo.tp.utils/com.graphbuilder.bnd new file mode 100644 index 0000000..d400fd7 --- /dev/null +++ b/repackage/org.argeo.tp.utils/com.graphbuilder.bnd @@ -0,0 +1,3 @@ +Bundle-License: BSD-3-Clause +Bundle-SymbolicName: com.graphbuilder +SLC-Origin-M2: com.github.virtuald:curvesapi:1.07 diff --git a/repackage/org.argeo.tp.utils/com.lowagie.bnd b/repackage/org.argeo.tp.utils/com.lowagie.bnd new file mode 100644 index 0000000..8b7f1c5 --- /dev/null +++ b/repackage/org.argeo.tp.utils/com.lowagie.bnd @@ -0,0 +1,6 @@ +Bundle-License: LGPL-2.1 +Bundle-SymbolicName: com.lowagie +SLC-Origin-M2: com.github.librepdf:openpdf:1.3.30 +Import-Package: \ +com.ibm.icu.*;resolution:=optional,\ +* \ No newline at end of file diff --git a/repackage/org.argeo.tp.utils/com.pff.bnd b/repackage/org.argeo.tp.utils/com.pff.bnd new file mode 100644 index 0000000..4d2a3be --- /dev/null +++ b/repackage/org.argeo.tp.utils/com.pff.bnd @@ -0,0 +1,2 @@ +Bundle-License: Apache-2.0 +SLC-Origin-M2: com.pff:java-libpst:0.9.3 \ No newline at end of file diff --git a/repackage/org.argeo.tp.utils/com.zaxxer.sparsebits.bnd b/repackage/org.argeo.tp.utils/com.zaxxer.sparsebits.bnd new file mode 100644 index 0000000..0f72baf --- /dev/null +++ b/repackage/org.argeo.tp.utils/com.zaxxer.sparsebits.bnd @@ -0,0 +1,3 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: com.zaxxer.sparsebits +SLC-Origin-M2: com.zaxxer:SparseBitSet:1.2 diff --git a/repackage/org.argeo.tp.utils/de.rototor.pdfbox.graphics2d.bnd b/repackage/org.argeo.tp.utils/de.rototor.pdfbox.graphics2d.bnd new file mode 100644 index 0000000..08f2139 --- /dev/null +++ b/repackage/org.argeo.tp.utils/de.rototor.pdfbox.graphics2d.bnd @@ -0,0 +1,3 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: de.rototor.pdfbox.graphics2d +SLC-Origin-M2: de.rototor.pdfbox:graphics2d:0.41 diff --git a/repackage/org.argeo.tp.utils/flying-saucer/common.bnd b/repackage/org.argeo.tp.utils/flying-saucer/common.bnd new file mode 100644 index 0000000..8fc898c --- /dev/null +++ b/repackage/org.argeo.tp.utils/flying-saucer/common.bnd @@ -0,0 +1,2 @@ +Bundle-License: LGPL-3 +SLC-Origin-M2: :9.1.22 \ No newline at end of file diff --git a/repackage/org.argeo.tp.utils/flying-saucer/org.xhtmlrenderer.core.bnd b/repackage/org.argeo.tp.utils/flying-saucer/org.xhtmlrenderer.core.bnd new file mode 100644 index 0000000..19312ee --- /dev/null +++ b/repackage/org.argeo.tp.utils/flying-saucer/org.xhtmlrenderer.core.bnd @@ -0,0 +1 @@ +SLC-Origin-M2: org.xhtmlrenderer:flying-saucer-core diff --git a/repackage/org.argeo.tp.utils/flying-saucer/org.xhtmlrenderer.openpdf.bnd b/repackage/org.argeo.tp.utils/flying-saucer/org.xhtmlrenderer.openpdf.bnd new file mode 100644 index 0000000..0c241bd --- /dev/null +++ b/repackage/org.argeo.tp.utils/flying-saucer/org.xhtmlrenderer.openpdf.bnd @@ -0,0 +1 @@ +SLC-Origin-M2: org.xhtmlrenderer:flying-saucer-pdf-openpdf diff --git a/repackage/org.argeo.tp.utils/flying-saucer/org.xhtmlrenderer.swt.bnd.disabled b/repackage/org.argeo.tp.utils/flying-saucer/org.xhtmlrenderer.swt.bnd.disabled new file mode 100644 index 0000000..6b89d64 --- /dev/null +++ b/repackage/org.argeo.tp.utils/flying-saucer/org.xhtmlrenderer.swt.bnd.disabled @@ -0,0 +1,4 @@ +SLC-Origin-M2: org.xhtmlrenderer:flying-saucer-swt +Import-Package:\ +org.eclipse.swt.printing;resolution:="optional",\ +* \ No newline at end of file diff --git a/repackage/org.argeo.tp.utils/fop/merge.bnd b/repackage/org.argeo.tp.utils/fop/merge.bnd new file mode 100644 index 0000000..b8f6548 --- /dev/null +++ b/repackage/org.argeo.tp.utils/fop/merge.bnd @@ -0,0 +1,16 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: org.apache.fop +SLC-Origin-M2: :2.7 +SLC-Origin-M2-Merge: \ +org.apache.xmlgraphics:fop-core,\ +org.apache.xmlgraphics:fop-util,\ +org.apache.xmlgraphics:fop-events,\ +org.apache.xmlgraphics:fop-pdf-images,\ + +Export-Package: org.apache.fop.* + +Import-Package: \ +javax.media.jai;resolution:="optional",\ +com.thoughtworks.qdox.*;resolution:="optional",\ +org.apache.tools.ant.*;resolution:="optional",\ +* diff --git a/repackage/org.argeo.tp.utils/io.nayuki.qrcodegen.bnd b/repackage/org.argeo.tp.utils/io.nayuki.qrcodegen.bnd new file mode 100644 index 0000000..34445b6 --- /dev/null +++ b/repackage/org.argeo.tp.utils/io.nayuki.qrcodegen.bnd @@ -0,0 +1,2 @@ +Bundle-License: MIT +SLC-Origin-M2: io.nayuki:qrcodegen:1.8.0 diff --git a/repackage/org.argeo.tp.utils/javax.activation.bnd b/repackage/org.argeo.tp.utils/javax.activation.bnd new file mode 100644 index 0000000..167bd5f --- /dev/null +++ b/repackage/org.argeo.tp.utils/javax.activation.bnd @@ -0,0 +1,3 @@ +Bundle-License: BSD-3-Clause +SLC-Origin-M2: jakarta.activation:jakarta.activation-api:1.2.2 +SLC-Origin-ManifestNotModified: true diff --git a/repackage/org.argeo.tp.utils/javax.mail.bnd b/repackage/org.argeo.tp.utils/javax.mail.bnd new file mode 100644 index 0000000..15093a7 --- /dev/null +++ b/repackage/org.argeo.tp.utils/javax.mail.bnd @@ -0,0 +1,4 @@ +Bundle-License: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 +Bundle-SymbolicName: jakarta.mail +SLC-Origin-M2: com.sun.mail:jakarta.mail:1.6.7 +SLC-Origin-ManifestNotModified: true diff --git a/repackage/org.argeo.tp.utils/javax.xml.bind.bnd b/repackage/org.argeo.tp.utils/javax.xml.bind.bnd new file mode 100644 index 0000000..a827549 --- /dev/null +++ b/repackage/org.argeo.tp.utils/javax.xml.bind.bnd @@ -0,0 +1,7 @@ +Bundle-License: CDDL-1.0 OR GPL-2.0 WITH Classpath-exception-2.0 +Bundle-SymbolicName: javax.xml.bind +Bundle-Version: 2.4.0 +SLC-Origin-M2: javax.xml.bind:jaxb-api:2.4.0-b180830.0359 +Import-Package: \ +org.glassfish.hk2.osgiresourcelocator;resolution:="optional",\ +* diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.codec.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.codec.bnd new file mode 100644 index 0000000..fe4bfa6 --- /dev/null +++ b/repackage/org.argeo.tp.utils/org.apache.commons.codec.bnd @@ -0,0 +1,3 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: org.apache.commons.codec +SLC-Origin-M2: commons-codec:commons-codec:1.15 diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.collections4.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.collections4.bnd new file mode 100644 index 0000000..4379a19 --- /dev/null +++ b/repackage/org.argeo.tp.utils/org.apache.commons.collections4.bnd @@ -0,0 +1,3 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: org.apache.commons.collections4 +SLC-Origin-M2: org.apache.commons:commons-collections4:4.4 \ No newline at end of file diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.compress.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.compress.bnd new file mode 100644 index 0000000..5a045bd --- /dev/null +++ b/repackage/org.argeo.tp.utils/org.apache.commons.compress.bnd @@ -0,0 +1,8 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: org.apache.commons.compress +SLC-Origin-M2: org.apache.commons:commons-compress:1.22 +Import-Package: \ +org.brotli.*;resolution:=optional, +org.tukaani.*;resolution:=optional, +com.github.luben.zstd;resolution:=optional, +* \ No newline at end of file diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.csv.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.csv.bnd new file mode 100644 index 0000000..94f8301 --- /dev/null +++ b/repackage/org.argeo.tp.utils/org.apache.commons.csv.bnd @@ -0,0 +1,3 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: org.apache.commons.csv +SLC-Origin-M2: org.apache.commons:commons-csv:1.9.0 diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.exec.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.exec.bnd new file mode 100644 index 0000000..b188587 --- /dev/null +++ b/repackage/org.argeo.tp.utils/org.apache.commons.exec.bnd @@ -0,0 +1,3 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: org.apache.commons.exec +SLC-Origin-M2: org.apache.commons:commons-exec:1.3 \ No newline at end of file diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.imaging.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.imaging.bnd new file mode 100644 index 0000000..f0d2123 --- /dev/null +++ b/repackage/org.argeo.tp.utils/org.apache.commons.imaging.bnd @@ -0,0 +1,4 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: org.apache.commons.imaging +Bundle-Version: 0.99.3 +SLC-Origin-M2: org.apache.commons:commons-imaging:1.0-alpha3 diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.lang3.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.lang3.bnd new file mode 100644 index 0000000..373f647 --- /dev/null +++ b/repackage/org.argeo.tp.utils/org.apache.commons.lang3.bnd @@ -0,0 +1,3 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: org.apache.commons.lang3 +SLC-Origin-M2: org.apache.commons:commons-lang3:3.12.0 diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.math3.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.math3.bnd new file mode 100644 index 0000000..9ce7741 --- /dev/null +++ b/repackage/org.argeo.tp.utils/org.apache.commons.math3.bnd @@ -0,0 +1,3 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: org.apache.commons.math3 +SLC-Origin-M2: org.apache.commons:commons-math3:3.6.1 diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.text.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.text.bnd new file mode 100644 index 0000000..b14d9b5 --- /dev/null +++ b/repackage/org.argeo.tp.utils/org.apache.commons.text.bnd @@ -0,0 +1,3 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: org.apache.commons.text +SLC-Origin-M2: org.apache.commons:commons-text:1.10.0 diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.vfs.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.vfs.bnd new file mode 100644 index 0000000..3a73689 --- /dev/null +++ b/repackage/org.argeo.tp.utils/org.apache.commons.vfs.bnd @@ -0,0 +1,5 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: org.apache.commons.vfs +Import-Package: org.apache.tools.ant.*;resolution:=optional, +* +SLC-Origin-M2: org.apache.commons:commons-vfs2:2.9.0 \ No newline at end of file diff --git a/repackage/org.argeo.tp.utils/org.apache.pdfbox.jempbox.bnd b/repackage/org.argeo.tp.utils/org.apache.pdfbox.jempbox.bnd new file mode 100644 index 0000000..4edfaa5 --- /dev/null +++ b/repackage/org.argeo.tp.utils/org.apache.pdfbox.jempbox.bnd @@ -0,0 +1,3 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: org.apache.pdfbox.jempbox +SLC-Origin-M2: org.apache.pdfbox:jempbox:1.8.17 diff --git a/repackage/org.argeo.tp.utils/org.apache.xml.security.bnd b/repackage/org.argeo.tp.utils/org.apache.xml.security.bnd new file mode 100644 index 0000000..caf6de4 --- /dev/null +++ b/repackage/org.argeo.tp.utils/org.apache.xml.security.bnd @@ -0,0 +1,3 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: org.apache.xml.security +SLC-Origin-M2: org.apache.santuario:xmlsec:2.3.2 diff --git a/repackage/org.argeo.tp.utils/org.mozilla.javascript.bnd b/repackage/org.argeo.tp.utils/org.mozilla.javascript.bnd new file mode 100644 index 0000000..277db30 --- /dev/null +++ b/repackage/org.argeo.tp.utils/org.mozilla.javascript.bnd @@ -0,0 +1,4 @@ +Bundle-License: MPL-2.0 +Bundle-SymbolicName: org.mozilla.javascript +SLC-Origin-M2: org.mozilla:rhino:1.7.14 +SLC-Origin-ManifestNotModified: true diff --git a/repackage/org.argeo.tp.utils/org.tukaani.xz.bnd b/repackage/org.argeo.tp.utils/org.tukaani.xz.bnd new file mode 100644 index 0000000..d4a6821 --- /dev/null +++ b/repackage/org.argeo.tp.utils/org.tukaani.xz.bnd @@ -0,0 +1,2 @@ +Bundle-License: CC0-1.0 +SLC-Origin-M2: org.tukaani:xz:1.9 diff --git a/repackage/org.argeo.tp.utils/pdfbox/common.bnd b/repackage/org.argeo.tp.utils/pdfbox/common.bnd new file mode 100644 index 0000000..9dcfa6c --- /dev/null +++ b/repackage/org.argeo.tp.utils/pdfbox/common.bnd @@ -0,0 +1,2 @@ +Bundle-License: Apache-2.0 +SLC-Origin-M2: :2.0.27 \ No newline at end of file diff --git a/repackage/org.argeo.tp.utils/pdfbox/org.apache.pdfbox.bnd b/repackage/org.argeo.tp.utils/pdfbox/org.apache.pdfbox.bnd new file mode 100644 index 0000000..1adc204 --- /dev/null +++ b/repackage/org.argeo.tp.utils/pdfbox/org.apache.pdfbox.bnd @@ -0,0 +1,5 @@ +Bundle-SymbolicName: org.apache.pdfbox +SLC-Origin-M2: org.apache.pdfbox:pdfbox +Import-Package: \ +sun.java2d.cmm.kcms;resolution:="optional",\ +* \ No newline at end of file diff --git a/repackage/org.argeo.tp.utils/pdfbox/org.apache.pdfbox.fontbox.bnd b/repackage/org.argeo.tp.utils/pdfbox/org.apache.pdfbox.fontbox.bnd new file mode 100644 index 0000000..519f90f --- /dev/null +++ b/repackage/org.argeo.tp.utils/pdfbox/org.apache.pdfbox.fontbox.bnd @@ -0,0 +1,2 @@ +Bundle-SymbolicName: org.apache.pdfbox.fontbox +SLC-Origin-M2: org.apache.pdfbox:fontbox diff --git a/repackage/org.argeo.tp.utils/pdfbox/org.apache.pdfbox.xmpbox.bnd b/repackage/org.argeo.tp.utils/pdfbox/org.apache.pdfbox.xmpbox.bnd new file mode 100644 index 0000000..8a0c26c --- /dev/null +++ b/repackage/org.argeo.tp.utils/pdfbox/org.apache.pdfbox.xmpbox.bnd @@ -0,0 +1,2 @@ +Bundle-SymbolicName: org.apache.pdfbox.xmpbox +SLC-Origin-M2: org.apache.pdfbox:xmpbox diff --git a/repackage/org.argeo.tp.utils/tika/merge.bnd b/repackage/org.argeo.tp.utils/tika/merge.bnd new file mode 100644 index 0000000..7a5b16f --- /dev/null +++ b/repackage/org.argeo.tp.utils/tika/merge.bnd @@ -0,0 +1,14 @@ +Bundle-SymbolicName: org.apache.tika +Bundle-License: Apache-2.0 +SLC-Origin-M2: :2.5.0 +Export-Package: org.apache.* +Import-Package: *;resolution:=optional +SLC-Origin-M2-Merge: \ +org.apache.tika:tika-core,\ +org.apache.tika:tika-parser-zip-commons,\ +org.apache.tika:tika-parser-xmp-commons,\ +org.apache.tika:tika-parser-digest-commons,\ +org.apache.tika:tika-parser-pdf-module,\ +org.apache.tika:tika-parser-image-module,\ +org.apache.tika:tika-parser-text-module,\ +org.apache.tika:tika-parser-xml-module,\ diff --git a/repackage/org.argeo.tp/batik/common.bnd b/repackage/org.argeo.tp/batik/common.bnd new file mode 100644 index 0000000..cc68031 --- /dev/null +++ b/repackage/org.argeo.tp/batik/common.bnd @@ -0,0 +1,2 @@ +Bundle-License: Apache-2.0 +SLC-Origin-M2: :1.16 \ No newline at end of file diff --git a/repackage/org.argeo.tp/batik/merge.bnd b/repackage/org.argeo.tp/batik/merge.bnd new file mode 100644 index 0000000..3c1a85d --- /dev/null +++ b/repackage/org.argeo.tp/batik/merge.bnd @@ -0,0 +1,28 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: org.apache.batik +SLC-Origin-M2: :1.16 +Export-Package: org.apache.* +Import-Package: \ +org.apache.batik.script.*;resolution:="optional",\ +org.apache.batik.*,\ +org.apache.xmlgraphics.*,\ +org.w3c.*,\ +*;resolution:="optional" +SLC-Origin-M2-Merge: \ +org.apache.xmlgraphics:batik-anim, \ +org.apache.xmlgraphics:batik-awt-util, \ +org.apache.xmlgraphics:batik-bridge, \ +org.apache.xmlgraphics:batik-codec, \ +org.apache.xmlgraphics:batik-dom, \ +org.apache.xmlgraphics:batik-ext, \ +org.apache.xmlgraphics:batik-extension, \ +org.apache.xmlgraphics:batik-gui-util, \ +org.apache.xmlgraphics:batik-gvt, \ +org.apache.xmlgraphics:batik-parser, \ +org.apache.xmlgraphics:batik-shared-resources, \ +org.apache.xmlgraphics:batik-script, \ +org.apache.xmlgraphics:batik-svg-dom, \ +org.apache.xmlgraphics:batik-svggen, \ +org.apache.xmlgraphics:batik-swing, \ +org.apache.xmlgraphics:batik-transcoder, \ +org.apache.xmlgraphics:batik-xml \ No newline at end of file diff --git a/repackage/org.argeo.tp/batik/org.apache.batik.constants.bnd b/repackage/org.argeo.tp/batik/org.apache.batik.constants.bnd new file mode 100644 index 0000000..b8a4c6d --- /dev/null +++ b/repackage/org.argeo.tp/batik/org.apache.batik.constants.bnd @@ -0,0 +1 @@ +SLC-Origin-M2: org.apache.xmlgraphics:batik-constants diff --git a/repackage/org.argeo.tp/batik/org.apache.batik.css.bnd b/repackage/org.argeo.tp/batik/org.apache.batik.css.bnd new file mode 100644 index 0000000..001e90e --- /dev/null +++ b/repackage/org.argeo.tp/batik/org.apache.batik.css.bnd @@ -0,0 +1 @@ +SLC-Origin-M2: org.apache.xmlgraphics:batik-css diff --git a/repackage/org.argeo.tp/batik/org.apache.batik.i18n.bnd b/repackage/org.argeo.tp/batik/org.apache.batik.i18n.bnd new file mode 100644 index 0000000..5992e5b --- /dev/null +++ b/repackage/org.argeo.tp/batik/org.apache.batik.i18n.bnd @@ -0,0 +1 @@ +SLC-Origin-M2: org.apache.xmlgraphics:batik-i18n diff --git a/repackage/org.argeo.tp/batik/org.apache.batik.util.bnd b/repackage/org.argeo.tp/batik/org.apache.batik.util.bnd new file mode 100644 index 0000000..80371cb --- /dev/null +++ b/repackage/org.argeo.tp/batik/org.apache.batik.util.bnd @@ -0,0 +1 @@ +SLC-Origin-M2: org.apache.xmlgraphics:batik-util diff --git a/repackage/org.argeo.tp/bouncycastle/bcmail.bnd b/repackage/org.argeo.tp/bouncycastle/bcmail.bnd deleted file mode 100644 index 38ba77b..0000000 --- a/repackage/org.argeo.tp/bouncycastle/bcmail.bnd +++ /dev/null @@ -1,3 +0,0 @@ -Bundle-SymbolicName: bcmail -SLC-Origin-ManifestNotModified: true -SLC-Origin-M2: org.bouncycastle:bcmail-jdk18on diff --git a/repackage/org.argeo.tp/bouncycastle/bcpg.bnd b/repackage/org.argeo.tp/bouncycastle/bcpg.bnd deleted file mode 100644 index 6e6f8af..0000000 --- a/repackage/org.argeo.tp/bouncycastle/bcpg.bnd +++ /dev/null @@ -1,3 +0,0 @@ -Bundle-SymbolicName: bcpg -SLC-Origin-ManifestNotModified: true -SLC-Origin-M2: org.bouncycastle:bcpg-jdk18on diff --git a/repackage/org.argeo.tp/bouncycastle/bcpkix.bnd b/repackage/org.argeo.tp/bouncycastle/bcpkix.bnd deleted file mode 100644 index 50b64bc..0000000 --- a/repackage/org.argeo.tp/bouncycastle/bcpkix.bnd +++ /dev/null @@ -1,3 +0,0 @@ -Bundle-SymbolicName: bcpkix -SLC-Origin-ManifestNotModified: true -SLC-Origin-M2: org.bouncycastle:bcpkix-jdk18on diff --git a/repackage/org.argeo.tp/bouncycastle/bcprov.bnd b/repackage/org.argeo.tp/bouncycastle/bcprov.bnd deleted file mode 100644 index b507d5e..0000000 --- a/repackage/org.argeo.tp/bouncycastle/bcprov.bnd +++ /dev/null @@ -1,3 +0,0 @@ -Bundle-SymbolicName: bcprov -SLC-Origin-ManifestNotModified: true -SLC-Origin-M2: org.bouncycastle:bcprov-jdk18on diff --git a/repackage/org.argeo.tp/bouncycastle/bcutil.bnd b/repackage/org.argeo.tp/bouncycastle/bcutil.bnd deleted file mode 100644 index 778c309..0000000 --- a/repackage/org.argeo.tp/bouncycastle/bcutil.bnd +++ /dev/null @@ -1,3 +0,0 @@ -Bundle-SymbolicName: bcutil -SLC-Origin-ManifestNotModified: true -SLC-Origin-M2: org.bouncycastle:bcutil-jdk18on diff --git a/repackage/org.argeo.tp/bouncycastle/common.bnd b/repackage/org.argeo.tp/bouncycastle/common.bnd deleted file mode 100644 index bbd389d..0000000 --- a/repackage/org.argeo.tp/bouncycastle/common.bnd +++ /dev/null @@ -1,2 +0,0 @@ -Bundle-License: MIT -SLC-Origin-M2: :1.71 diff --git a/repackage/org.argeo.tp/com.zaxxer.sparsebits.bnd b/repackage/org.argeo.tp/com.zaxxer.sparsebits.bnd deleted file mode 100644 index 0f72baf..0000000 --- a/repackage/org.argeo.tp/com.zaxxer.sparsebits.bnd +++ /dev/null @@ -1,3 +0,0 @@ -Bundle-License: Apache-2.0 -Bundle-SymbolicName: com.zaxxer.sparsebits -SLC-Origin-M2: com.zaxxer:SparseBitSet:1.2 diff --git a/repackage/org.argeo.tp/dbus-java/merge.bnd b/repackage/org.argeo.tp/dbus-java/merge.bnd new file mode 100644 index 0000000..b0ea2fc --- /dev/null +++ b/repackage/org.argeo.tp/dbus-java/merge.bnd @@ -0,0 +1,10 @@ +Bundle-SymbolicName: org.freeedesktop.dbus +Bundle-License: LGPL-2.0 +# TODO Check whether relicensing of this fork was allowed +#Bundle-License: MIT +SLC-Origin-M2: :4.2.1 +Export-Package: org.freedesktop.dbus.* +SLC-Origin-M2-Merge: \ +com.github.hypfvieh:dbus-java-core,\ +com.github.hypfvieh:dbus-java-utils,\ +com.github.hypfvieh:dbus-java-transport-native-unixsocket,\ \ No newline at end of file diff --git a/repackage/org.argeo.tp/de.thjom.java.systemd.bnd b/repackage/org.argeo.tp/de.thjom.java.systemd.bnd new file mode 100644 index 0000000..c63cb0b --- /dev/null +++ b/repackage/org.argeo.tp/de.thjom.java.systemd.bnd @@ -0,0 +1,2 @@ +Bundle-License: LGPL-2.0 +SLC-Origin-M2: com.github.thjomnx:java-systemd:2.1.0 \ No newline at end of file diff --git a/repackage/org.argeo.tp/jackson/common.bnd b/repackage/org.argeo.tp/jackson/common.bnd index b9a12cc..a738fc4 100644 --- a/repackage/org.argeo.tp/jackson/common.bnd +++ b/repackage/org.argeo.tp/jackson/common.bnd @@ -1,2 +1,2 @@ Bundle-License: Apache-2.0 -SLC-Origin-M2: :2.13.1 +SLC-Origin-M2: :2.13.4 diff --git a/repackage/org.argeo.tp/jakarta.mail.bnd b/repackage/org.argeo.tp/jakarta.mail.bnd deleted file mode 100644 index 15093a7..0000000 --- a/repackage/org.argeo.tp/jakarta.mail.bnd +++ /dev/null @@ -1,4 +0,0 @@ -Bundle-License: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -Bundle-SymbolicName: jakarta.mail -SLC-Origin-M2: com.sun.mail:jakarta.mail:1.6.7 -SLC-Origin-ManifestNotModified: true diff --git a/repackage/org.argeo.tp/jakarta.servlet.api.bnd b/repackage/org.argeo.tp/jakarta.servlet.api.bnd deleted file mode 100644 index 5664fbd..0000000 --- a/repackage/org.argeo.tp/jakarta.servlet.api.bnd +++ /dev/null @@ -1,3 +0,0 @@ -Bundle-License: GPL-2.0-with-classpath-exception -SLC-Origin-M2: jakarta.servlet:jakarta.servlet-api:4.0.4 -SLC-Origin-ManifestNotModified: true diff --git a/repackage/org.argeo.tp/javax.activation.bnd b/repackage/org.argeo.tp/javax.activation.bnd deleted file mode 100644 index 167bd5f..0000000 --- a/repackage/org.argeo.tp/javax.activation.bnd +++ /dev/null @@ -1,3 +0,0 @@ -Bundle-License: BSD-3-Clause -SLC-Origin-M2: jakarta.activation:jakarta.activation-api:1.2.2 -SLC-Origin-ManifestNotModified: true diff --git a/repackage/org.argeo.tp/javax.servlet.bnd b/repackage/org.argeo.tp/javax.servlet.bnd new file mode 100644 index 0000000..5664fbd --- /dev/null +++ b/repackage/org.argeo.tp/javax.servlet.bnd @@ -0,0 +1,3 @@ +Bundle-License: GPL-2.0-with-classpath-exception +SLC-Origin-M2: jakarta.servlet:jakarta.servlet-api:4.0.4 +SLC-Origin-ManifestNotModified: true diff --git a/repackage/org.argeo.tp/net.i2p.crypto.eddsa.bnd b/repackage/org.argeo.tp/net.i2p.crypto.eddsa.bnd deleted file mode 100644 index 2eea764..0000000 --- a/repackage/org.argeo.tp/net.i2p.crypto.eddsa.bnd +++ /dev/null @@ -1,5 +0,0 @@ -Bundle-License: CC0-1.0 -SLC-Origin-M2: net.i2p.crypto:eddsa:0.3.0 -Import-Package: \ -sun.*;resolution:="optional", \ -* diff --git a/repackage/org.argeo.tp/org.apache.commons.cli.bnd b/repackage/org.argeo.tp/org.apache.commons.cli.bnd new file mode 100644 index 0000000..7e34d59 --- /dev/null +++ b/repackage/org.argeo.tp/org.apache.commons.cli.bnd @@ -0,0 +1,3 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: org.apache.commons.cli +SLC-Origin-M2: commons-cli:commons-cli:1.5.0 diff --git a/repackage/org.argeo.tp/org.apache.commons.fileupload.bnd b/repackage/org.argeo.tp/org.apache.commons.fileupload.bnd new file mode 100644 index 0000000..73b19d4 --- /dev/null +++ b/repackage/org.argeo.tp/org.apache.commons.fileupload.bnd @@ -0,0 +1,6 @@ +Bundle-License: Apache-2.0 +Import-Package:\ +javax.portlet;resolution:=optional,\ +javax.servlet.*;resolution:=optional,\ +* +SLC-Origin-M2: commons-fileupload:commons-fileupload:1.4 diff --git a/repackage/org.argeo.tp/org.apache.commons.io.bnd b/repackage/org.argeo.tp/org.apache.commons.io.bnd new file mode 100644 index 0000000..e1e25b3 --- /dev/null +++ b/repackage/org.argeo.tp/org.apache.commons.io.bnd @@ -0,0 +1,4 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: org.apache.commons.io +SLC-Origin-M2: commons-io:commons-io:2.11.0 +Import-Package: sun.*;resolution:=optional, * diff --git a/repackage/org.argeo.tp/org.apache.httpcomponents.httpclient.bnd b/repackage/org.argeo.tp/org.apache.httpcomponents.httpclient.bnd new file mode 100644 index 0000000..eead3b2 --- /dev/null +++ b/repackage/org.argeo.tp/org.apache.httpcomponents.httpclient.bnd @@ -0,0 +1,3 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: org.apache.httpcomponents.httpclient +SLC-Origin-M2: org.apache.httpcomponents:httpclient:4.5.13 \ No newline at end of file diff --git a/repackage/org.argeo.tp/org.apache.httpcomponents.httpcore.bnd b/repackage/org.argeo.tp/org.apache.httpcomponents.httpcore.bnd new file mode 100644 index 0000000..b0d0c7a --- /dev/null +++ b/repackage/org.argeo.tp/org.apache.httpcomponents.httpcore.bnd @@ -0,0 +1,3 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: org.apache.httpcomponents.httpcore +SLC-Origin-M2: org.apache.httpcomponents:httpcore:4.4.15 \ No newline at end of file diff --git a/repackage/org.argeo.tp/org.apache.httpcomponents.httpmime.bnd b/repackage/org.argeo.tp/org.apache.httpcomponents.httpmime.bnd new file mode 100644 index 0000000..1623fb5 --- /dev/null +++ b/repackage/org.argeo.tp/org.apache.httpcomponents.httpmime.bnd @@ -0,0 +1,3 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: org.apache.httpcomponents.httpmime +SLC-Origin-M2: org.apache.httpcomponents:httpmime:4.5.13 \ No newline at end of file diff --git a/repackage/org.argeo.tp/org.apache.xerces.bnd b/repackage/org.argeo.tp/org.apache.xerces.bnd new file mode 100644 index 0000000..6cb8646 --- /dev/null +++ b/repackage/org.argeo.tp/org.apache.xerces.bnd @@ -0,0 +1,6 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: org.apache.xerces +Import-Package:\ +sun.*;resolution:=optional,\ +* +SLC-Origin-M2: xerces:xercesImpl:2.12.2 \ No newline at end of file diff --git a/repackage/org.argeo.tp/org.apache.xml.resolver.bnd b/repackage/org.argeo.tp/org.apache.xml.resolver.bnd new file mode 100644 index 0000000..95f9a5e --- /dev/null +++ b/repackage/org.argeo.tp/org.apache.xml.resolver.bnd @@ -0,0 +1,3 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: org.apache.xml.resolver +SLC-Origin-M2: xml-resolver:xml-resolver:1.2 \ No newline at end of file diff --git a/repackage/org.argeo.tp/org.eclipse.jgit.bnd b/repackage/org.argeo.tp/org.eclipse.jgit.bnd new file mode 100644 index 0000000..65d1344 --- /dev/null +++ b/repackage/org.argeo.tp/org.eclipse.jgit.bnd @@ -0,0 +1,6 @@ +Bundle-License: BSD-3-Clause +SLC-Origin-M2: org.eclipse.jgit:org.eclipse.jgit:6.3.0.202209071007-r +Import-Package: \ +sun.*;resolution:=optional, \ +com.jcraft.jsch;resolution:=optional, \ +* diff --git a/repackage/org.argeo.tp/org.h2.bnd b/repackage/org.argeo.tp/org.h2.bnd deleted file mode 100644 index a6090fa..0000000 --- a/repackage/org.argeo.tp/org.h2.bnd +++ /dev/null @@ -1,4 +0,0 @@ -Bundle-License: MPL-2.0 -Bundle-SymbolicName: org.h2 -SLC-Origin-M2: com.h2database:h2:1.4.200 -SLC-Origin-ManifestNotModified: true diff --git a/repackage/org.argeo.tp/org.postgresql.jdbc42.bnd b/repackage/org.argeo.tp/org.postgresql.jdbc42.bnd deleted file mode 100644 index 7767b5c..0000000 --- a/repackage/org.argeo.tp/org.postgresql.jdbc42.bnd +++ /dev/null @@ -1,4 +0,0 @@ -Bundle-License: BSD-2-Clause -Bundle-SymbolicName: org.postgresql.jdbc42 -SLC-Origin-M2: org.postgresql:postgresql:42.3.5 -SLC-Origin-ManifestNotModified: true diff --git a/repackage/org.argeo.tp/org.tukaani.xz.bnd b/repackage/org.argeo.tp/org.tukaani.xz.bnd deleted file mode 100644 index d4a6821..0000000 --- a/repackage/org.argeo.tp/org.tukaani.xz.bnd +++ /dev/null @@ -1,2 +0,0 @@ -Bundle-License: CC0-1.0 -SLC-Origin-M2: org.tukaani:xz:1.9 diff --git a/repackage/org.argeo.tp/slf4j/org.slf4j.api.bnd b/repackage/org.argeo.tp/slf4j/org.slf4j.api.bnd index 75afe68..d034d27 100644 --- a/repackage/org.argeo.tp/slf4j/org.slf4j.api.bnd +++ b/repackage/org.argeo.tp/slf4j/org.slf4j.api.bnd @@ -1,2 +1 @@ -Bundle-SymbolicName: org.slf4j.api SLC-Origin-M2: org.slf4j:slf4j-api diff --git a/repackage/org.argeo.tp/slf4j/org.slf4j.commons.logging.bnd b/repackage/org.argeo.tp/slf4j/org.slf4j.commons.logging.bnd index 9b2ffdb..4e5e7c8 100644 --- a/repackage/org.argeo.tp/slf4j/org.slf4j.commons.logging.bnd +++ b/repackage/org.argeo.tp/slf4j/org.slf4j.commons.logging.bnd @@ -1,3 +1,2 @@ -Bundle-SymbolicName: org.slf4j.commons.logging SLC-Origin-M2: org.slf4j:jcl-over-slf4j Export-Package: org.apache.commons.logging.*;version="1.2" \ No newline at end of file diff --git a/repackage/org.argeo.tp/slf4j/org.slf4j.log4j.bnd.deactivated b/repackage/org.argeo.tp/slf4j/org.slf4j.log4j.bnd.deactivated deleted file mode 100644 index 4275c6a..0000000 --- a/repackage/org.argeo.tp/slf4j/org.slf4j.log4j.bnd.deactivated +++ /dev/null @@ -1,3 +0,0 @@ -Bundle-SymbolicName: org.slf4j.log4j -SLC-Origin-M2: org.slf4j:log4j-over-slf4j -Export-Package: org.apache.logging.log4j.*;version="2.17" \ No newline at end of file diff --git a/repackage/org.argeo.tp/xalan/merge.bnd b/repackage/org.argeo.tp/xalan/merge.bnd new file mode 100644 index 0000000..ca0c4d6 --- /dev/null +++ b/repackage/org.argeo.tp/xalan/merge.bnd @@ -0,0 +1,7 @@ +Bundle-SymbolicName: org.apache.xalan +Bundle-License: Apache-2.0 +SLC-Origin-M2: :2.7.2 +Export-Package: org.apache.* +SLC-Origin-M2-Merge: \ +xalan:xalan,\ +xalan:serializer,\ \ No newline at end of file diff --git a/repackage/org.argeo.tp/xmlgraphics/merge.bnd b/repackage/org.argeo.tp/xmlgraphics/merge.bnd new file mode 100644 index 0000000..8cb1d14 --- /dev/null +++ b/repackage/org.argeo.tp/xmlgraphics/merge.bnd @@ -0,0 +1,11 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: org.apache.xmlgraphics +SLC-Origin-M2: :2.7 +SLC-Origin-M2-Merge: \ +org.apache.xmlgraphics:xmlgraphics-commons +Export-Package: org.apache.xmlgraphics.* +Import-Package: \ +org.apache.fop.image.loader.batik;resolution:="optional", \ +org.apache.fop.render.pdf.pdfbox;resolution:="optional", \ +* + diff --git a/repackage/org.argeo.tp/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageConverter b/repackage/org.argeo.tp/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageConverter new file mode 100644 index 0000000..292f716 --- /dev/null +++ b/repackage/org.argeo.tp/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageConverter @@ -0,0 +1,5 @@ +org.apache.fop.image.loader.batik.ImageConverterSVG2G2D +org.apache.fop.image.loader.batik.ImageConverterG2D2SVG +org.apache.fop.image.loader.batik.ImageConverterWMF2G2D +org.apache.fop.render.pdf.pdfbox.ImageConverterPDF2AFP +org.apache.fop.render.pdf.pdfbox.ImageConverterPDF2G2D \ No newline at end of file diff --git a/repackage/org.argeo.tp/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory b/repackage/org.argeo.tp/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory new file mode 100644 index 0000000..27dc74a --- /dev/null +++ b/repackage/org.argeo.tp/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory @@ -0,0 +1,4 @@ +org.apache.fop.image.loader.batik.ImageLoaderFactorySVG +org.apache.fop.image.loader.batik.ImageLoaderFactoryWMF +org.apache.fop.render.pdf.pdfbox.ImageLoaderFactoryPDF +org.apache.fop.render.pdf.pdfbox.ImageLoaderFactoryImageRawData \ No newline at end of file diff --git a/repackage/org.argeo.tp/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImagePreloader b/repackage/org.argeo.tp/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImagePreloader new file mode 100644 index 0000000..82f7977 --- /dev/null +++ b/repackage/org.argeo.tp/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImagePreloader @@ -0,0 +1,5 @@ +org.apache.fop.image.loader.batik.PreloaderWMF +org.apache.fop.image.loader.batik.PreloaderSVG +org.apache.fop.render.pdf.pdfbox.PreloaderPDF +org.apache.fop.render.pdf.pdfbox.PreloaderImageRawData +org.apache.fop.render.pdf.pdfbox.LastResortPreloaderPDF \ No newline at end of file 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 7f3378c..9a7ae1d 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,3 +1,2 @@ Bundle-License: EPL-1.0 SLC-Origin-ManifestNotModified: true -SLC-Origin-URI: http://www.eclipse.org/downloads/equinox/drops/R-4.23-202203080310/equinox-SDK-4.23.zip 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 2b316d3..e96922c 100644 --- a/repackage/osgi/equinox/org.argeo.tp.osgi/eclipse-equinox/includes.properties +++ b/repackage/osgi/equinox/org.argeo.tp.osgi/eclipse-equinox/includes.properties @@ -2,6 +2,8 @@ plugins/org.eclipse.osgi_*.jar= plugins/org.eclipse.osgi.source_*.jar= plugins/org.eclipse.osgi.util*.jar= plugins/org.eclipse.osgi.services*.jar= +plugins/org.osgi.service.*.jar= +plugins/org.osgi.util*.jar= plugins/org.apache.felix.gogo.*.jar= plugins/org.apache.felix.scr*.jar= plugins/org.eclipse.equinox.console_*.jar= diff --git a/repackage/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/excludes.properties b/repackage/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/excludes.properties index 7c8efe3..df821df 100644 --- a/repackage/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/excludes.properties +++ b/repackage/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/excludes.properties @@ -1,7 +1,21 @@ plugins/org.eclipse.swt*.jar= plugins/org.eclipse.equinox*.jar= -plugins/org.eclipse.core.*.jar= +plugins/org.eclipse.osgi.*.jar= +plugins/org.eclipse.platform.doc.*.jar= +plugins/org.eclipse.jetty.*.jar= +plugins/org.eclipse.*.cocoa*.jar= +plugins/org.eclipse.*.win32*.jar= +plugins/org.eclipse.*.gtk*.jar= +plugins/org.eclipse.core.commands*.jar= +plugins/org.eclipse.core.runtime*.jar= +plugins/org.eclipse.core.jobs*.jar= +plugins/org.eclipse.core.contenttype*.jar= plugins/org.eclipse.jface_*.jar= plugins/org.eclipse.jface.source_*.jar= +plugins/org.eclipse.core.externaltools*.jar plugins/*ppc64le* plugins/org.eclipse.e4.ui.css*.jar= +plugins/org.eclipse.core.net*.jar +plugins/org.eclipse.core.file*.jar +plugins/org.eclipse.core.resources*.jar + diff --git a/repackage/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/includes.properties b/repackage/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/includes.properties index 812ea25..2e54d27 100644 --- a/repackage/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/includes.properties +++ b/repackage/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/includes.properties @@ -1,6 +1,10 @@ plugins/javax.inject*.jar= plugins/javax.annotation*.jar= plugins/org.apache.commons.jxpath*.jar= -plugins/org.eclipse.*.jar= +plugins/org.eclipse.text_*.jar= +plugins/org.eclipse.core*.jar= +plugins/org.eclipse.e4.*.jar= +plugins/org.eclipse.emf.*.jar= +plugins/org.eclipse.jface.*.jar= +plugins/org.eclipse.urischeme*.jar= plugins/com.ibm.icu*.jar= - diff --git a/repackage/swt/rcp/org.argeo.tp.swt.workbench/org.eclipse.emf.common.bnd b/repackage/swt/rcp/org.argeo.tp.swt.workbench/org.eclipse.emf.common.bnd deleted file mode 100644 index 6bade45..0000000 --- a/repackage/swt/rcp/org.argeo.tp.swt.workbench/org.eclipse.emf.common.bnd +++ /dev/null @@ -1,3 +0,0 @@ -Bundle-License: EPEL-2.0 -SLC-Origin-M2: org.eclipse.emf:org.eclipse.emf.common:2.24.0 -SLC-Origin-ManifestNotModified: true diff --git a/repackage/swt/rcp/org.argeo.tp.swt.workbench/org.eclipse.emf.ecore.bnd b/repackage/swt/rcp/org.argeo.tp.swt.workbench/org.eclipse.emf.ecore.bnd deleted file mode 100644 index 30033bf..0000000 --- a/repackage/swt/rcp/org.argeo.tp.swt.workbench/org.eclipse.emf.ecore.bnd +++ /dev/null @@ -1,3 +0,0 @@ -Bundle-License: EPEL-2.0 -SLC-Origin-M2: org.eclipse.emf:org.eclipse.emf.ecore:2.26.0 -SLC-Origin-ManifestNotModified: true diff --git a/repackage/swt/rcp/org.argeo.tp.swt.workbench/org.eclipse.emf.ecore.change.bnd b/repackage/swt/rcp/org.argeo.tp.swt.workbench/org.eclipse.emf.ecore.change.bnd deleted file mode 100644 index ba733ef..0000000 --- a/repackage/swt/rcp/org.argeo.tp.swt.workbench/org.eclipse.emf.ecore.change.bnd +++ /dev/null @@ -1,3 +0,0 @@ -Bundle-License: EPEL-2.0 -SLC-Origin-M2: org.eclipse.emf:org.eclipse.emf.ecore.change:2.14.0 -SLC-Origin-ManifestNotModified: true diff --git a/repackage/swt/rcp/org.argeo.tp.swt.workbench/org.eclipse.emf.ecore.xmi.bnd b/repackage/swt/rcp/org.argeo.tp.swt.workbench/org.eclipse.emf.ecore.xmi.bnd deleted file mode 100644 index 4a40881..0000000 --- a/repackage/swt/rcp/org.argeo.tp.swt.workbench/org.eclipse.emf.ecore.xmi.bnd +++ /dev/null @@ -1,3 +0,0 @@ -Bundle-License: EPEL-2.0 -SLC-Origin-M2: org.eclipse.emf:org.eclipse.emf.ecore.xmi:2.16.0 -SLC-Origin-ManifestNotModified: true diff --git a/repackage/swt/rcp/org.argeo.tp.swt/eclipse-equinox/includes.properties b/repackage/swt/rcp/org.argeo.tp.swt/eclipse-equinox/includes.properties index f20b07d..4f12642 100644 --- a/repackage/swt/rcp/org.argeo.tp.swt/eclipse-equinox/includes.properties +++ b/repackage/swt/rcp/org.argeo.tp.swt/eclipse-equinox/includes.properties @@ -1 +1 @@ -plugins/org.eclipse.equinox.security*.jar= +plugins/org.eclipse.equinox.security_*.jar= diff --git a/repackage/swt/rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties b/repackage/swt/rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties index 4724c12..cc21aab 100644 --- a/repackage/swt/rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties +++ b/repackage/swt/rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties @@ -1,5 +1,9 @@ plugins/org.eclipse.swt*.jar= -plugins/org.eclipse.core*.jar= +plugins/org.eclipse.core.commands_*.jar= +plugins/org.eclipse.core.runtime_*.jar= +plugins/org.eclipse.core.jobs_*.jar= +plugins/org.eclipse.core.contenttype_*.jar= plugins/org.eclipse.jface_*.jar= plugins/org.eclipse.jface.source_*.jar= plugins/org.eclipse.e4.ui.css*.jar= + diff --git a/repackage/uris.properties b/repackage/uris.properties index 0bfd643..61c3358 100644 --- a/repackage/uris.properties +++ b/repackage/uris.properties @@ -1,4 +1,4 @@ -eclipse-equinox=http://www.eclipse.org/downloads/equinox/drops/R-4.23-202203080310/equinox-SDK-4.23.zip -eclipse-rcp=http://www.eclipse.org/downloads/eclipse/downloads/drops4/R-4.23-202203080310/org.eclipse.rcp.source-4.23.zip -eclipse-rap=http://www.eclipse.org/downloads/rt/rap/3.20/e4/rap-e4-3.20.0-R-20220309-1623.zip -eclipse-nebula=http://www.eclipse.org/downloads/nebula/releases/2.6.0/repository-nebula-2.6.0.zip \ No newline at end of file +eclipse-equinox=http://www.eclipse.org/downloads/equinox/drops/R-4.25-202208311800/equinox-SDK-4.25.zip +eclipse-rcp=http://www.eclipse.org/downloads/eclipse/downloads/drops4/R-4.25-202208311800/org.eclipse.platform.source-4.25.zip +eclipse-rap=http://www.eclipse.org/downloads/rt/rap/3.22/e4/rap-e4-3.22.0-R-20220906-0913.zip +eclipse-nebula=http://www.eclipse.org/downloads/nebula/releases/2.7.1/repository-nebula-2.7.1.zip \ No newline at end of file diff --git a/sdk/argeo-build b/sdk/argeo-build index 639ffc6..5bf3887 160000 --- a/sdk/argeo-build +++ b/sdk/argeo-build @@ -1 +1 @@ -Subproject commit 639ffc61c03f6aebf9cfe5e0f79dd0c4c6aa632a +Subproject commit 5bf388711048a659992c292c4b9bdcbc595e066b diff --git a/sdk/branches/unstable.bnd b/sdk/branches/unstable.bnd index fcae8a6..6480816 100644 --- a/sdk/branches/unstable.bnd +++ b/sdk/branches/unstable.bnd @@ -1,4 +1,4 @@ major=2 minor=3 -micro=8 +micro=11 qualifier=.next \ No newline at end of file diff --git a/sdk/output-argeo-tp-backend.target b/sdk/output-argeo-tp-backend.target index b78875a..16ee93c 100644 --- a/sdk/output-argeo-tp-backend.target +++ b/sdk/output-argeo-tp-backend.target @@ -2,12 +2,12 @@ - - - + + + \ No newline at end of file diff --git a/sdk/output-argeo-tp-minimal.target b/sdk/output-argeo-tp-minimal.target index e648937..5ef8c13 100644 --- a/sdk/output-argeo-tp-minimal.target +++ b/sdk/output-argeo-tp-minimal.target @@ -4,8 +4,9 @@ - - + + + \ No newline at end of file diff --git a/sdk/output-argeo-tp-rap.target b/sdk/output-argeo-tp-rap.target index 7e4d512..e15cd4c 100644 --- a/sdk/output-argeo-tp-rap.target +++ b/sdk/output-argeo-tp-rap.target @@ -4,5 +4,6 @@ + \ No newline at end of file diff --git a/sdk/output-argeo-tp-rcp.target b/sdk/output-argeo-tp-rcp.target index b94512f..468123d 100644 --- a/sdk/output-argeo-tp-rcp.target +++ b/sdk/output-argeo-tp-rcp.target @@ -4,5 +4,6 @@ + \ No newline at end of file diff --git a/sdk/output-argeo-tp-swt.target b/sdk/output-argeo-tp-swt.target index cb459d5..b667d47 100644 --- a/sdk/output-argeo-tp-swt.target +++ b/sdk/output-argeo-tp-swt.target @@ -4,7 +4,6 @@ - \ No newline at end of file