From: Mathieu Baudier Date: Tue, 19 Dec 2023 05:54:54 +0000 (+0100) Subject: Merge tag 'v2.3.17' into testing X-Git-Tag: v2.1.35~1 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=8403f4c613b1be7c2248292248faaa37ab35cbf2;hp=d3b3a09c6f39d7df9758fb631cf4621f70a9e593;p=gpl%2Fargeo-tp.git Merge tag 'v2.3.17' into testing --- diff --git a/rebuild/org.argeo.tp.utils/Makefile b/rebuild/org.argeo.tp.utils/Makefile index 95dcab8..6217ae6 100644 --- a/rebuild/org.argeo.tp.utils/Makefile +++ b/rebuild/org.argeo.tp.utils/Makefile @@ -3,50 +3,65 @@ include ../../sdk.mk export NO_SDK_LEGAL := true -MBOX_JNI_SRC=jni/com_sun_mail_mbox +A2_CATEGORY = org.argeo.tp.sys + +# GNU +prefix ?= /usr/local +exec_prefix ?= $(prefix) +libdir ?= $(exec_prefix)/lib +A2_NATIVE_INSTALL_TARGET ?= $(DESTDIR)$(libdir)/a2 + +MBOX_JNI_SRC=jni/org_eclipse_angus_mail_mbox MBOX_TARGET_EXEC=libmbox.so -all: retrieve-ee4j-mbox osgi jni-ee4j-mbox +## FIXME - DON'T FORGET TO UPDATE THE VERSION IN THE RELATED bnd.bnd FILE! +ANGUS_BRANCH=2.0 +ANGUS_VERSION=$(ANGUS_BRANCH).2 + +all: retrieve-angus-mbox osgi jni-angus-mbox -install: osgi-install +install: + mkdir -p $(A2_NATIVE_INSTALL_TARGET)/$(A2_CATEGORY) + # Angus mbox + cp -Rv $(SDK_BUILD_BASE)/a2/$(A2_CATEGORY)/org.eclipse.angus.mail.mbox.$(ANGUS_BRANCH).jar $(A2_INSTALL_TARGET)/$(A2_CATEGORY) + cp -v $(A2_NATIVE_CATEGORY)/$(MBOX_TARGET_EXEC) $(A2_NATIVE_INSTALL_TARGET)/$(A2_CATEGORY) uninstall: osgi-uninstall -retrieve-ee4j-mbox: SRC_DIR=src/ee4j-mail -retrieve-ee4j-mbox: +retrieve-angus-mbox: SRC_DIR=src/angus-mail +retrieve-angus-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) +#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 $(ANGUS_VERSION) https://github.com/eclipse-ee4j/angus-mail.git $(SRC_DIR) rm -rf $(SRC_DIR)/.git - rsync -a --delete --exclude module-info.java $(SRC_DIR)/mbox/src/main/java/ com.sun.mail.mbox/src + rsync -a --delete --exclude module-info.java $(SRC_DIR)/providers/mbox/src/main/java/ org.eclipse.angus.mail.mbox/src # jni - rsync -a $(SRC_DIR)/mbox/src/main/cpp/com/sun/mail/mbox/ $(MBOX_JNI_SRC) - mkdir -p com.sun.mail.mbox/bin - javac -h jni/com_sun_mail_mbox/ -cp "$(A2_OUTPUT)/org.argeo.tp.utils/*" com.sun.mail.mbox/src/com/sun/mail/mbox/*.java - rm -rf com.sun.mail.mbox/bin + rsync -a $(SRC_DIR)/providers/mbox/src/main/cpp/org/eclipse/angus/mail/mbox/ $(MBOX_JNI_SRC) + mkdir -p org.eclipse.angus.mail.mbox/bin + javac -h $(MBOX_JNI_SRC) -cp "$(A2_OUTPUT)/org.argeo.tp.sys/*" org.eclipse.angus.mail.mbox/src/org/eclipse/angus/mail/mbox/*.java + rm -rf org.eclipse.angus.mail.mbox/bin -A2_CATEGORY = org.argeo.tp.utils BUNDLES = \ -com.sun.mail.mbox \ +org.eclipse.angus.mail.mbox \ clean: rm -rf $(BUILD_BASE) -DEP_CATEGORIES = org.argeo.tp.utils +DEP_CATEGORIES = org.argeo.tp.sys include $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk A2_NATIVE_CATEGORY=$(A2_OUTPUT)/lib/linux/$(shell uname -m)/$(A2_CATEGORY) -jni-ee4j-mbox: +jni-angus-mbox: mkdir -p $(A2_NATIVE_CATEGORY) $(CC) -o $(A2_NATIVE_CATEGORY)/$(MBOX_TARGET_EXEC) \ - -shared -fPIC -fpic -Wl,-soname,$(MBOX_TARGET_EXEC).1.6 \ + -shared -fPIC -fpic -Wl,-soname,$(MBOX_TARGET_EXEC).$(ANGUS_BRANCH) \ -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux $(MBOX_JNI_SRC)/*.c diff --git a/rebuild/org.argeo.tp.utils/com.sun.mail.mbox/.classpath b/rebuild/org.argeo.tp.utils/com.sun.mail.mbox/.classpath deleted file mode 100644 index ca9ba96..0000000 --- a/rebuild/org.argeo.tp.utils/com.sun.mail.mbox/.classpath +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/rebuild/org.argeo.tp.utils/com.sun.mail.mbox/.gitignore b/rebuild/org.argeo.tp.utils/com.sun.mail.mbox/.gitignore deleted file mode 100644 index 668266f..0000000 --- a/rebuild/org.argeo.tp.utils/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.utils/com.sun.mail.mbox/.project b/rebuild/org.argeo.tp.utils/com.sun.mail.mbox/.project deleted file mode 100644 index c003462..0000000 --- a/rebuild/org.argeo.tp.utils/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.utils/com.sun.mail.mbox/META-INF/.gitignore b/rebuild/org.argeo.tp.utils/com.sun.mail.mbox/META-INF/.gitignore deleted file mode 100644 index 4854a41..0000000 --- a/rebuild/org.argeo.tp.utils/com.sun.mail.mbox/META-INF/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/MANIFEST.MF diff --git a/rebuild/org.argeo.tp.utils/com.sun.mail.mbox/bnd.bnd b/rebuild/org.argeo.tp.utils/com.sun.mail.mbox/bnd.bnd deleted file mode 100644 index 66fc6c7..0000000 --- a/rebuild/org.argeo.tp.utils/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.utils/com.sun.mail.mbox/build.properties b/rebuild/org.argeo.tp.utils/com.sun.mail.mbox/build.properties deleted file mode 100644 index 34d2e4d..0000000 --- a/rebuild/org.argeo.tp.utils/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.utils/jni/com_sun_mail_mbox/.gitignore b/rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/.gitignore deleted file mode 100644 index 9b838de..0000000 --- a/rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/*.h -/*.c diff --git a/rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/UNIXFile.c b/rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/UNIXFile.c new file mode 100644 index 0000000..e66a772 --- /dev/null +++ b/rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/UNIXFile.c @@ -0,0 +1,100 @@ +/* + * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0, which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * This Source Code may also be made available under the following Secondary + * Licenses when the conditions for such availability set forth in the + * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, + * version 2 with the GNU Classpath Exception, which is available at + * https://www.gnu.org/software/classpath/license.html. + * + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 + */ + +#include +#include +#include +#include + +extern int _fcntl(); + +#include "com_sun_mail_mbox_UNIXFile.h" + +static jfieldID IO_fd_fdID; +static int fd_offset; + +/* + * Class: com_sun_mail_mbox_UNIXFile + * Method: initIDs + * Signature: (Ljava/lang/Class;Ljava/io/FileDescriptor;)V + */ +JNIEXPORT void JNICALL +Java_com_sun_mail_mbox_UNIXFile_initIDs(JNIEnv *env, jclass ufClass, + jclass fdClass, jobject stdin_obj) +{ + IO_fd_fdID = (*env)->GetFieldID(env, fdClass, "fd", "I"); + /* + * Because pre-JDK 1.2 stored the "fd" as one more than + * its actual value, we remember the value it stored for + * stdin, which should be zero, and use it as the offset + * for other fd's we extract. + */ + fd_offset = (*env)->GetIntField(env, stdin_obj, IO_fd_fdID); +} + +/* + * Class: com_sun_mail_mbox_UNIXFile + * Method: lock0 + * Signature: (Ljava/io/FileDescriptor;Ljava/lang/String;Z)Z + */ +JNIEXPORT jboolean JNICALL +Java_com_sun_mail_mbox_UNIXFile_lock0(JNIEnv *env, jclass clazz, + jobject fdobj, jstring umode, jboolean block) +{ + int fd; + const char *mode; + static struct flock flock0; + struct flock flock = flock0; + + fd = (*env)->GetIntField(env, fdobj, IO_fd_fdID); + fd -= fd_offset; + /* XXX - a lot of work to examine one character in a string */ + mode = (*env)->GetStringUTFChars(env, umode, 0); + flock.l_type = mode[1] == 'w' ? F_WRLCK : F_RDLCK; + (*env)->ReleaseStringUTFChars(env, umode, mode); + flock.l_whence = SEEK_SET; + flock.l_start = 0; + flock.l_len = 0; + return (_fcntl(fd, block ? F_SETLKW : F_SETLK, &flock) == 0 ? + JNI_TRUE : JNI_FALSE); +} + +/* + * Class: com_sun_mail_mbox_UNIXFile + * Method: lastAccessed0 + * Signature: (Ljava/lang/String;)J + */ +JNIEXPORT jlong JNICALL +Java_com_sun_mail_mbox_UNIXFile_lastAccessed0(JNIEnv *env, jclass clazz, + jstring uname) +{ + const char *name; + jlong ret = -1; + struct stat st; + + name = (*env)->GetStringUTFChars(env, uname, 0); + if (stat(name, &st) == 0) { + /* + * Should be... + ret = (jlong)st.st_atim.tv_sec * 1000 + + st.st_atim.tv_nsec / 1000000; + * but for compatibility with lastModified we use... + */ + ret = (jlong)st.st_atime * 1000; + } + (*env)->ReleaseStringUTFChars(env, uname, name); + return ret; +} diff --git a/rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/UNIXInbox.c b/rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/UNIXInbox.c new file mode 100644 index 0000000..274a44e --- /dev/null +++ b/rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/UNIXInbox.c @@ -0,0 +1,60 @@ +/* + * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0, which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * This Source Code may also be made available under the following Secondary + * Licenses when the conditions for such availability set forth in the + * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, + * version 2 with the GNU Classpath Exception, which is available at + * https://www.gnu.org/software/classpath/license.html. + * + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 + */ + +#include +#include +extern void touchlock(); /* XXX - should be in maillock.h */ + +#include "com_sun_mail_mbox_UNIXInbox.h" + +/* + * Class: com_sun_mail_mbox_UNIXInbox + * Method: maillock + * Signature: (Ljava/lang/String;I)Z + */ +JNIEXPORT jboolean JNICALL +Java_com_sun_mail_mbox_UNIXInbox_maillock(JNIEnv *env, jobject obj, + jstring user, jint retry_count) +{ + jboolean ret; + const char *name = (*env)->GetStringUTFChars(env, user, 0); + ret = maillock((char *)name, retry_count) == L_SUCCESS ? + JNI_TRUE : JNI_FALSE; + (*env)->ReleaseStringUTFChars(env, user, name); + return (ret); +} + +/* + * Class: com_sun_mail_mbox_UNIXInbox + * Method: mailunlock + * Signature: ()V + */ +JNIEXPORT void JNICALL +Java_com_sun_mail_mbox_UNIXInbox_mailunlock(JNIEnv *env, jobject obj) +{ + (void) mailunlock(); +} + +/* + * Class: com_sun_mail_mbox_UNIXInbox + * Method: touchlock0 + * Signature: ()V + */ +JNIEXPORT void JNICALL +Java_com_sun_mail_mbox_UNIXInbox_touchlock0(JNIEnv *env, jobject obj) +{ + (void) touchlock(); +} diff --git a/rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/com_sun_mail_mbox_UNIXFile.h b/rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/com_sun_mail_mbox_UNIXFile.h new file mode 100644 index 0000000..c85274f --- /dev/null +++ b/rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/com_sun_mail_mbox_UNIXFile.h @@ -0,0 +1,47 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ +#include +/* Header for class com_sun_mail_mbox_UNIXFile */ + +#ifndef _Included_com_sun_mail_mbox_UNIXFile +#define _Included_com_sun_mail_mbox_UNIXFile +#ifdef __cplusplus +extern "C" { +#endif +#undef com_sun_mail_mbox_UNIXFile_serialVersionUID +#define com_sun_mail_mbox_UNIXFile_serialVersionUID 301077366599181567LL +#undef com_sun_mail_mbox_UNIXFile_serialVersionUID +#define com_sun_mail_mbox_UNIXFile_serialVersionUID -7972156315284146651LL +#undef com_sun_mail_mbox_UNIXFile_NONE +#define com_sun_mail_mbox_UNIXFile_NONE 0L +#undef com_sun_mail_mbox_UNIXFile_NATIVE +#define com_sun_mail_mbox_UNIXFile_NATIVE 1L +#undef com_sun_mail_mbox_UNIXFile_JAVA +#define com_sun_mail_mbox_UNIXFile_JAVA 2L +/* + * Class: com_sun_mail_mbox_UNIXFile + * Method: initIDs + * Signature: (Ljava/lang/Class;Ljava/io/FileDescriptor;)V + */ +JNIEXPORT void JNICALL Java_com_sun_mail_mbox_UNIXFile_initIDs + (JNIEnv *, jclass, jclass, jobject); + +/* + * Class: com_sun_mail_mbox_UNIXFile + * Method: lock0 + * Signature: (Ljava/io/FileDescriptor;Ljava/lang/String;Z)Z + */ +JNIEXPORT jboolean JNICALL Java_com_sun_mail_mbox_UNIXFile_lock0 + (JNIEnv *, jclass, jobject, jstring, jboolean); + +/* + * Class: com_sun_mail_mbox_UNIXFile + * Method: lastAccessed0 + * Signature: (Ljava/lang/String;)J + */ +JNIEXPORT jlong JNICALL Java_com_sun_mail_mbox_UNIXFile_lastAccessed0 + (JNIEnv *, jclass, jstring); + +#ifdef __cplusplus +} +#endif +#endif diff --git a/rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/com_sun_mail_mbox_UNIXInbox.h b/rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/com_sun_mail_mbox_UNIXInbox.h new file mode 100644 index 0000000..9f24cb9 --- /dev/null +++ b/rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/com_sun_mail_mbox_UNIXInbox.h @@ -0,0 +1,51 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ +#include +/* Header for class com_sun_mail_mbox_UNIXInbox */ + +#ifndef _Included_com_sun_mail_mbox_UNIXInbox +#define _Included_com_sun_mail_mbox_UNIXInbox +#ifdef __cplusplus +extern "C" { +#endif +#undef com_sun_mail_mbox_UNIXInbox_serialVersionUID +#define com_sun_mail_mbox_UNIXInbox_serialVersionUID 301077366599181567LL +#undef com_sun_mail_mbox_UNIXInbox_serialVersionUID +#define com_sun_mail_mbox_UNIXInbox_serialVersionUID -7972156315284146651LL +#undef com_sun_mail_mbox_UNIXInbox_NONE +#define com_sun_mail_mbox_UNIXInbox_NONE 0L +#undef com_sun_mail_mbox_UNIXInbox_NATIVE +#define com_sun_mail_mbox_UNIXInbox_NATIVE 1L +#undef com_sun_mail_mbox_UNIXInbox_JAVA +#define com_sun_mail_mbox_UNIXInbox_JAVA 2L +#undef com_sun_mail_mbox_UNIXInbox_serialVersionUID +#define com_sun_mail_mbox_UNIXInbox_serialVersionUID -254578891263785591LL +#undef com_sun_mail_mbox_UNIXInbox_serialVersionUID +#define com_sun_mail_mbox_UNIXInbox_serialVersionUID 651261842162777620LL +/* + * Class: com_sun_mail_mbox_UNIXInbox + * Method: maillock + * Signature: (Ljava/lang/String;I)Z + */ +JNIEXPORT jboolean JNICALL Java_com_sun_mail_mbox_UNIXInbox_maillock + (JNIEnv *, jobject, jstring, jint); + +/* + * Class: com_sun_mail_mbox_UNIXInbox + * Method: mailunlock + * Signature: ()V + */ +JNIEXPORT void JNICALL Java_com_sun_mail_mbox_UNIXInbox_mailunlock + (JNIEnv *, jobject); + +/* + * Class: com_sun_mail_mbox_UNIXInbox + * Method: touchlock0 + * Signature: ()V + */ +JNIEXPORT void JNICALL Java_com_sun_mail_mbox_UNIXInbox_touchlock0 + (JNIEnv *, jobject); + +#ifdef __cplusplus +} +#endif +#endif diff --git a/rebuild/org.argeo.tp.utils/jni/org_eclipse_angus_mail_mbox/.gitignore b/rebuild/org.argeo.tp.utils/jni/org_eclipse_angus_mail_mbox/.gitignore new file mode 100644 index 0000000..9b838de --- /dev/null +++ b/rebuild/org.argeo.tp.utils/jni/org_eclipse_angus_mail_mbox/.gitignore @@ -0,0 +1,2 @@ +/*.h +/*.c diff --git a/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/.classpath b/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/.classpath new file mode 100644 index 0000000..ca9ba96 --- /dev/null +++ b/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/.classpath @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/.gitignore b/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/.gitignore new file mode 100644 index 0000000..668266f --- /dev/null +++ b/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/.gitignore @@ -0,0 +1,2 @@ +/src/ +/bin/ \ No newline at end of file diff --git a/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/.project b/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/.project new file mode 100644 index 0000000..c003462 --- /dev/null +++ b/rebuild/org.argeo.tp.utils/org.eclipse.angus.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.utils/org.eclipse.angus.mail.mbox/META-INF/.gitignore b/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/META-INF/.gitignore new file mode 100644 index 0000000..4854a41 --- /dev/null +++ b/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/META-INF/.gitignore @@ -0,0 +1 @@ +/MANIFEST.MF diff --git a/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/bnd.bnd b/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/bnd.bnd new file mode 100644 index 0000000..b486982 --- /dev/null +++ b/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/bnd.bnd @@ -0,0 +1,10 @@ +Export-Package: org.eclipse.angus.mail.* + +Import-Package: \ +jakarta.mail.event,\ +org.graalvm.*;resolution:="optional",\ +* + +major: 2 +minor: 0 +micro: 2 diff --git a/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/build.properties b/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/build.properties new file mode 100644 index 0000000..34d2e4d --- /dev/null +++ b/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/build.properties @@ -0,0 +1,4 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + . diff --git a/rebuild/org.argeo.tp.utils/src/.gitignore b/rebuild/org.argeo.tp.utils/src/.gitignore index ca46c96..a738803 100644 --- a/rebuild/org.argeo.tp.utils/src/.gitignore +++ b/rebuild/org.argeo.tp.utils/src/.gitignore @@ -1 +1 @@ -ee4j-mail/ \ No newline at end of file +angus-mail/ \ No newline at end of file diff --git a/repackage/Makefile b/repackage/Makefile index c509174..37eb377 100644 --- a/repackage/Makefile +++ b/repackage/Makefile @@ -2,24 +2,25 @@ include ../sdk.mk # Minimal third-parties for running headless Argeo CMS CATEGORIES_CMS=\ -osgi/equinox/org.argeo.tp.osgi \ org.argeo.tp \ org.argeo.tp.httpd \ crypto/fips/org.argeo.tp.crypto \ +org.argeo.tp.sshd \ +osgi/equinox/org.argeo.tp.osgi \ osgi/equinox/org.argeo.tp.eclipse \ - CATEGORIES=\ $(CATEGORIES_CMS) \ +org.argeo.tp.sys \ org.argeo.tp.sdk \ osgi/api/org.argeo.tp.osgi \ swt/rap/org.argeo.tp.swt \ swt/rap/org.argeo.tp.swt.workbench \ swt/rcp/org.argeo.tp.swt \ -lib/linux/x86_64/org.argeo.tp \ -lib/linux/aarch64/org.argeo.tp \ -lib/win32/x86_64/org.argeo.tp \ -lib/macosx/x86_64/org.argeo.tp \ +lib/linux/x86_64/org.argeo.tp.sys \ +lib/linux/aarch64/org.argeo.tp.sys \ +lib/win32/x86_64/org.argeo.tp.sys \ +lib/macosx/x86_64/org.argeo.tp.sys \ 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 \ @@ -28,6 +29,7 @@ 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.utils \ +org.argeo.tp.img \ org.argeo.tp.publish \ org.argeo.tp.math \ org.argeo.tp.jcr \ diff --git a/repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/common.bnd b/repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/common.bnd index 108ed45..bde7d56 100644 --- a/repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/common.bnd +++ b/repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/common.bnd @@ -1,4 +1,4 @@ SPDX-License-Identifier: MIT -Argeo-Origin-M2: :1.76 +Argeo-Origin-M2: :1.77 Argeo-Origin-NoMetadataGeneration: true Argeo-Origin-Do-Not-Modify: true diff --git a/repackage/lib/linux/aarch64/org.argeo.tp.sys/jna/com.sun.jna.bnd b/repackage/lib/linux/aarch64/org.argeo.tp.sys/jna/com.sun.jna.bnd new file mode 100644 index 0000000..9d0402c --- /dev/null +++ b/repackage/lib/linux/aarch64/org.argeo.tp.sys/jna/com.sun.jna.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: net.java.dev.jna:jna +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/lib/linux/aarch64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd b/repackage/lib/linux/aarch64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd new file mode 100644 index 0000000..11a8eb3 --- /dev/null +++ b/repackage/lib/linux/aarch64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: net.java.dev.jna:jna-platform +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/lib/linux/aarch64/org.argeo.tp.sys/jna/common.bnd b/repackage/lib/linux/aarch64/org.argeo.tp.sys/jna/common.bnd new file mode 100644 index 0000000..4379476 --- /dev/null +++ b/repackage/lib/linux/aarch64/org.argeo.tp.sys/jna/common.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: :5.13.0 +SPDX-License-Identifier: LGPL-2.1-or-later OR Apache-2.0 diff --git a/repackage/lib/linux/aarch64/org.argeo.tp/com.sun.jna.bnd b/repackage/lib/linux/aarch64/org.argeo.tp/com.sun.jna.bnd deleted file mode 100644 index f5c1507..0000000 --- a/repackage/lib/linux/aarch64/org.argeo.tp/com.sun.jna.bnd +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-License-Identifier: LGPL-2.1-or-later OR Apache-2.0 -Argeo-Origin-M2: net.java.dev.jna:jna:5.13.0 -Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/lib/linux/x86_64/org.argeo.tp.sys/jna/com.sun.jna.bnd b/repackage/lib/linux/x86_64/org.argeo.tp.sys/jna/com.sun.jna.bnd new file mode 100644 index 0000000..9d0402c --- /dev/null +++ b/repackage/lib/linux/x86_64/org.argeo.tp.sys/jna/com.sun.jna.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: net.java.dev.jna:jna +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/lib/linux/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd b/repackage/lib/linux/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd new file mode 100644 index 0000000..11a8eb3 --- /dev/null +++ b/repackage/lib/linux/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: net.java.dev.jna:jna-platform +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/lib/linux/x86_64/org.argeo.tp.sys/jna/common.bnd b/repackage/lib/linux/x86_64/org.argeo.tp.sys/jna/common.bnd new file mode 100644 index 0000000..4379476 --- /dev/null +++ b/repackage/lib/linux/x86_64/org.argeo.tp.sys/jna/common.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: :5.13.0 +SPDX-License-Identifier: LGPL-2.1-or-later OR Apache-2.0 diff --git a/repackage/lib/linux/x86_64/org.argeo.tp/com.sun.jna.bnd b/repackage/lib/linux/x86_64/org.argeo.tp/com.sun.jna.bnd deleted file mode 100644 index f5c1507..0000000 --- a/repackage/lib/linux/x86_64/org.argeo.tp/com.sun.jna.bnd +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-License-Identifier: LGPL-2.1-or-later OR Apache-2.0 -Argeo-Origin-M2: net.java.dev.jna:jna:5.13.0 -Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/lib/macosx/x86_64/org.argeo.tp.sys/jna/com.sun.jna.bnd b/repackage/lib/macosx/x86_64/org.argeo.tp.sys/jna/com.sun.jna.bnd new file mode 100644 index 0000000..9d0402c --- /dev/null +++ b/repackage/lib/macosx/x86_64/org.argeo.tp.sys/jna/com.sun.jna.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: net.java.dev.jna:jna +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/lib/macosx/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd b/repackage/lib/macosx/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd new file mode 100644 index 0000000..11a8eb3 --- /dev/null +++ b/repackage/lib/macosx/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: net.java.dev.jna:jna-platform +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/lib/macosx/x86_64/org.argeo.tp.sys/jna/common.bnd b/repackage/lib/macosx/x86_64/org.argeo.tp.sys/jna/common.bnd new file mode 100644 index 0000000..4379476 --- /dev/null +++ b/repackage/lib/macosx/x86_64/org.argeo.tp.sys/jna/common.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: :5.13.0 +SPDX-License-Identifier: LGPL-2.1-or-later OR Apache-2.0 diff --git a/repackage/lib/macosx/x86_64/org.argeo.tp/com.sun.jna.bnd b/repackage/lib/macosx/x86_64/org.argeo.tp/com.sun.jna.bnd deleted file mode 100644 index f5c1507..0000000 --- a/repackage/lib/macosx/x86_64/org.argeo.tp/com.sun.jna.bnd +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-License-Identifier: LGPL-2.1-or-later OR Apache-2.0 -Argeo-Origin-M2: net.java.dev.jna:jna:5.13.0 -Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/lib/win32/x86_64/org.argeo.tp.sys/jna/com.sun.jna.bnd b/repackage/lib/win32/x86_64/org.argeo.tp.sys/jna/com.sun.jna.bnd new file mode 100644 index 0000000..9d0402c --- /dev/null +++ b/repackage/lib/win32/x86_64/org.argeo.tp.sys/jna/com.sun.jna.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: net.java.dev.jna:jna +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/lib/win32/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd b/repackage/lib/win32/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd new file mode 100644 index 0000000..11a8eb3 --- /dev/null +++ b/repackage/lib/win32/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: net.java.dev.jna:jna-platform +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/lib/win32/x86_64/org.argeo.tp.sys/jna/common.bnd b/repackage/lib/win32/x86_64/org.argeo.tp.sys/jna/common.bnd new file mode 100644 index 0000000..4379476 --- /dev/null +++ b/repackage/lib/win32/x86_64/org.argeo.tp.sys/jna/common.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: :5.13.0 +SPDX-License-Identifier: LGPL-2.1-or-later OR Apache-2.0 diff --git a/repackage/lib/win32/x86_64/org.argeo.tp/com.sun.jna.bnd b/repackage/lib/win32/x86_64/org.argeo.tp/com.sun.jna.bnd deleted file mode 100644 index f5c1507..0000000 --- a/repackage/lib/win32/x86_64/org.argeo.tp/com.sun.jna.bnd +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-License-Identifier: LGPL-2.1-or-later OR Apache-2.0 -Argeo-Origin-M2: net.java.dev.jna:jna:5.13.0 -Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.earth/geotools/merge.bnd b/repackage/org.argeo.tp.earth/geotools/merge.bnd index 0904371..56ffb4d 100644 --- a/repackage/org.argeo.tp.earth/geotools/merge.bnd +++ b/repackage/org.argeo.tp.earth/geotools/merge.bnd @@ -1,6 +1,6 @@ SPDX-License-Identifier: LGPL-2.1-only Bundle-SymbolicName: org.geotools -Argeo-Origin-M2: :30.0 +Argeo-Origin-M2: :30.1 Argeo-Origin-M2-Repo: https://repo.osgeo.org/repository/release/ Export-Package: org.geotools.*, org.w3.xlink.* @@ -49,6 +49,7 @@ org.parboiled.test;resolution:="optional",\ org.parboiled.transform;resolution:="optional",\ org.parboiled.trees;resolution:="optional",\ org.parboiled.*;resolution:="optional",\ +org.apache.commons.text.*;resolution:="optional",\ * Argeo-Origin-M2-Merge: \ diff --git a/repackage/org.argeo.tp.earth/org.eclipse.xsd.bnd b/repackage/org.argeo.tp.earth/org.eclipse.xsd.bnd new file mode 100644 index 0000000..3faceb5 --- /dev/null +++ b/repackage/org.argeo.tp.earth/org.eclipse.xsd.bnd @@ -0,0 +1,4 @@ +SPDX-License-Identifier: EPL-2.0 +# Required by GeoTools +Argeo-Origin-M2: org.eclipse.emf:org.eclipse.xsd:2.19.0 +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.httpd/jakarta.servlet.bnd b/repackage/org.argeo.tp.httpd/jakarta.servlet.bnd new file mode 100644 index 0000000..57e156a --- /dev/null +++ b/repackage/org.argeo.tp.httpd/jakarta.servlet.bnd @@ -0,0 +1,3 @@ +SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 OR EPL-2.0 +Argeo-Origin-M2: jakarta.servlet:jakarta.servlet-api:6.0.0 +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.httpd/jakarta.websocket.bnd b/repackage/org.argeo.tp.httpd/jakarta.websocket.bnd new file mode 100644 index 0000000..bdd5633 --- /dev/null +++ b/repackage/org.argeo.tp.httpd/jakarta.websocket.bnd @@ -0,0 +1,3 @@ +SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 OR EPL-2.0 +Argeo-Origin-M2: jakarta.websocket:jakarta.websocket-api:2.0.0 +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.httpd/javax.servlet.bnd b/repackage/org.argeo.tp.httpd/javax.servlet.bnd new file mode 100644 index 0000000..4201c14 --- /dev/null +++ b/repackage/org.argeo.tp.httpd/javax.servlet.bnd @@ -0,0 +1,3 @@ +SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 OR EPL-2.0 +Argeo-Origin-M2: jakarta.servlet:jakarta.servlet-api:4.0.4 +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.httpd/javax.websocket.bnd b/repackage/org.argeo.tp.httpd/javax.websocket.bnd new file mode 100644 index 0000000..33979a3 --- /dev/null +++ b/repackage/org.argeo.tp.httpd/javax.websocket.bnd @@ -0,0 +1,3 @@ +SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 OR CDDL-1.1 +Argeo-Origin-M2: jakarta.websocket:jakarta.websocket-api:1.1.2 +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd b/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd index cd46982..d822338 100644 --- a/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd +++ b/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd @@ -1,22 +1,33 @@ Bundle-SymbolicName: org.eclipse.jetty.websocket SPDX-License-Identifier: Apache-2.0 OR EPL-2.0 -Argeo-Origin-M2: :10.0.16 +Argeo-Origin-M2: :12.0.4 +# TODO split ee8 and ee10 ? Argeo-Origin-M2-Merge: \ -org.eclipse.jetty.websocket:websocket-core-client, \ -org.eclipse.jetty.websocket:websocket-core-common, \ -org.eclipse.jetty.websocket:websocket-core-server, \ -org.eclipse.jetty.websocket:websocket-jetty-api, \ -org.eclipse.jetty.websocket:websocket-jetty-client, \ -org.eclipse.jetty.websocket:websocket-jetty-common, \ -org.eclipse.jetty.websocket:websocket-jetty-server,\ -org.eclipse.jetty.websocket:websocket-javax-client, \ -org.eclipse.jetty.websocket:websocket-javax-common, \ -org.eclipse.jetty.websocket:websocket-javax-server,\ -org.eclipse.jetty.websocket:websocket-servlet, \ +org.eclipse.jetty.websocket:jetty-websocket-core-client, \ +org.eclipse.jetty.websocket:jetty-websocket-core-common, \ +org.eclipse.jetty.websocket:jetty-websocket-core-server, \ +org.eclipse.jetty.websocket:jetty-websocket-jetty-api, \ +org.eclipse.jetty.websocket:jetty-websocket-jetty-client, \ +org.eclipse.jetty.websocket:jetty-websocket-jetty-common, \ +org.eclipse.jetty.websocket:jetty-websocket-jetty-server,\ +org.eclipse.jetty.ee8.websocket:jetty-ee8-websocket-servlet, \ +org.eclipse.jetty.ee8.websocket:jetty-ee8-websocket-jetty-common, \ +org.eclipse.jetty.ee8.websocket:jetty-ee8-websocket-jetty-api, \ +org.eclipse.jetty.ee8.websocket:jetty-ee8-websocket-javax-client, \ +org.eclipse.jetty.ee8.websocket:jetty-ee8-websocket-javax-common, \ +org.eclipse.jetty.ee8.websocket:jetty-ee8-websocket-javax-server,\ +org.eclipse.jetty.ee8.websocket:jetty-ee8-websocket-jetty-server, \ + +#org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-servlet, \ +#org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-client, \ +#org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-common, \ +#org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-server,\ +#org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jetty-server, \ Export-Package: org.eclipse.jetty.* Import-Package: \ !java.*, \ -org.eclipse.jetty.webapp;resolution:="optional", \ +org.eclipse.jetty.ee8.webapp;resolution:="optional", \ +org.eclipse.jetty.ee10.webapp;resolution:="optional", \ * \ No newline at end of file diff --git a/repackage/org.argeo.tp.httpd/jetty/common.bnd b/repackage/org.argeo.tp.httpd/jetty/common.bnd index a648fcb..262ef7f 100644 --- a/repackage/org.argeo.tp.httpd/jetty/common.bnd +++ b/repackage/org.argeo.tp.httpd/jetty/common.bnd @@ -1,2 +1,2 @@ SPDX-License-Identifier: Apache-2.0 OR EPL-2.0 -Argeo-Origin-M2: :10.0.16 +Argeo-Origin-M2: :12.0.4 diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee10.servlet.bnd.future b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee10.servlet.bnd.future new file mode 100644 index 0000000..bf2d413 --- /dev/null +++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee10.servlet.bnd.future @@ -0,0 +1,2 @@ +Argeo-Origin-M2: org.eclipse.jetty.ee10:jetty-ee10-servlet +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee8.nested.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee8.nested.bnd new file mode 100644 index 0000000..fdf3d4c --- /dev/null +++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee8.nested.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: org.eclipse.jetty.ee8:jetty-ee8-nested +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee8.security.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee8.security.bnd new file mode 100644 index 0000000..8ce0706 --- /dev/null +++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee8.security.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: org.eclipse.jetty.ee8:jetty-ee8-security +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee8.servlet.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee8.servlet.bnd new file mode 100644 index 0000000..22b1b78 --- /dev/null +++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee8.servlet.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: org.eclipse.jetty.ee8:jetty-ee8-servlet +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.client.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.client.bnd index 89b7b2c..a57bba3 100644 --- a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.client.bnd +++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.client.bnd @@ -1,2 +1,2 @@ -Argeo-Origin-M2: org.eclipse.jetty.http2:http2-client +Argeo-Origin-M2: org.eclipse.jetty.http2:jetty-http2-client Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.client.transport.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.client.transport.bnd new file mode 100644 index 0000000..4eab154 --- /dev/null +++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.client.transport.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: org.eclipse.jetty.http2:jetty-http2-client-transport +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.common.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.common.bnd index f106b39..7336a0d 100644 --- a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.common.bnd +++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.common.bnd @@ -1,2 +1,2 @@ -Argeo-Origin-M2: org.eclipse.jetty.http2:http2-common +Argeo-Origin-M2: org.eclipse.jetty.http2:jetty-http2-common Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.hpack.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.hpack.bnd index 75298f0..a94db98 100644 --- a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.hpack.bnd +++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.hpack.bnd @@ -1,2 +1,2 @@ -Argeo-Origin-M2: org.eclipse.jetty.http2:http2-hpack +Argeo-Origin-M2: org.eclipse.jetty.http2:jetty-http2-hpack Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.server.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.server.bnd index c62e1ed..88f9a53 100644 --- a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.server.bnd +++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.server.bnd @@ -1,2 +1,2 @@ -Argeo-Origin-M2: org.eclipse.jetty.http2:http2-server +Argeo-Origin-M2: org.eclipse.jetty.http2:jetty-http2-server Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http3.client.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http3.client.bnd new file mode 100644 index 0000000..a4686e5 --- /dev/null +++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http3.client.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: org.eclipse.jetty.http3:jetty-http3-client +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http3.client.transport.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http3.client.transport.bnd new file mode 100644 index 0000000..3c6c6fb --- /dev/null +++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http3.client.transport.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: org.eclipse.jetty.http3:jetty-http3-client-transport +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http3.common.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http3.common.bnd new file mode 100644 index 0000000..b267f17 --- /dev/null +++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http3.common.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: org.eclipse.jetty.http3:jetty-http3-common +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http3.qpack.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http3.qpack.bnd new file mode 100644 index 0000000..9758836 --- /dev/null +++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http3.qpack.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: org.eclipse.jetty.http3:jetty-http3-qpack +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http3.server.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http3.server.bnd new file mode 100644 index 0000000..5863fae --- /dev/null +++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http3.server.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: org.eclipse.jetty.http3:jetty-http3-server +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.quic.client.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.quic.client.bnd new file mode 100644 index 0000000..28a2397 --- /dev/null +++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.quic.client.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: org.eclipse.jetty.quic:jetty-quic-client +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.quic.common.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.quic.common.bnd new file mode 100644 index 0000000..ca1da67 --- /dev/null +++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.quic.common.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: org.eclipse.jetty.quic:jetty-quic-common +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.quic.quiche.common.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.quic.quiche.common.bnd new file mode 100644 index 0000000..cabb222 --- /dev/null +++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.quic.quiche.common.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: org.eclipse.jetty.quic:jetty-quic-quiche-common +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.quic.quiche.jna.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.quic.quiche.jna.bnd new file mode 100644 index 0000000..93214e4 --- /dev/null +++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.quic.quiche.jna.bnd @@ -0,0 +1,5 @@ +Argeo-Origin-M2: org.eclipse.jetty.quic:jetty-quic-quiche-jna +Argeo-Origin-NoMetadataGeneration: true +Import-Package:\ +com.sun.jna*;resolution:="optional",\ +* \ No newline at end of file diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.quic.server.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.quic.server.bnd new file mode 100644 index 0000000..3c93633 --- /dev/null +++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.quic.server.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: org.eclipse.jetty.quic:jetty-quic-server +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.servlet.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.servlet.bnd deleted file mode 100644 index 4bcefbc..0000000 --- a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.servlet.bnd +++ /dev/null @@ -1,2 +0,0 @@ -Argeo-Origin-M2: org.eclipse.jetty:jetty-servlet -Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.servlets.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.servlets.bnd deleted file mode 100644 index daafe91..0000000 --- a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.servlets.bnd +++ /dev/null @@ -1,2 +0,0 @@ -Argeo-Origin-M2: org.eclipse.jetty:jetty-servlets -Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.session.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.session.bnd new file mode 100644 index 0000000..06c7dc0 --- /dev/null +++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.session.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: org.eclipse.jetty:jetty-session +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.httpd/org.apache.commons.fileupload.bnd b/repackage/org.argeo.tp.httpd/org.apache.commons.fileupload.bnd new file mode 100644 index 0000000..9a0f1aa --- /dev/null +++ b/repackage/org.argeo.tp.httpd/org.apache.commons.fileupload.bnd @@ -0,0 +1,6 @@ +SPDX-License-Identifier: Apache-2.0 +Import-Package:\ +javax.portlet;resolution:=optional,\ +javax.servlet.*;resolution:=optional,\ +* +Argeo-Origin-M2: commons-fileupload:commons-fileupload:1.5 diff --git a/repackage/org.argeo.tp.img/batik/common.bnd b/repackage/org.argeo.tp.img/batik/common.bnd new file mode 100644 index 0000000..9e6d355 --- /dev/null +++ b/repackage/org.argeo.tp.img/batik/common.bnd @@ -0,0 +1,2 @@ +SPDX-License-Identifier: Apache-2.0 +Argeo-Origin-M2: :1.17 \ No newline at end of file diff --git a/repackage/org.argeo.tp.img/batik/merge.bnd b/repackage/org.argeo.tp.img/batik/merge.bnd new file mode 100644 index 0000000..aa1f6da --- /dev/null +++ b/repackage/org.argeo.tp.img/batik/merge.bnd @@ -0,0 +1,27 @@ +SPDX-License-Identifier: Apache-2.0 +Bundle-SymbolicName: org.apache.batik +Export-Package: org.apache.* +Import-Package: \ +org.apache.batik.script.*;resolution:="optional",\ +org.apache.batik.*,\ +org.apache.xmlgraphics.*,\ +org.w3c.*,\ +*;resolution:="optional" +Argeo-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.img/batik/org.apache.batik.constants.bnd b/repackage/org.argeo.tp.img/batik/org.apache.batik.constants.bnd new file mode 100644 index 0000000..68d83e9 --- /dev/null +++ b/repackage/org.argeo.tp.img/batik/org.apache.batik.constants.bnd @@ -0,0 +1 @@ +Argeo-Origin-M2: org.apache.xmlgraphics:batik-constants diff --git a/repackage/org.argeo.tp.img/batik/org.apache.batik.css.bnd b/repackage/org.argeo.tp.img/batik/org.apache.batik.css.bnd new file mode 100644 index 0000000..959eb09 --- /dev/null +++ b/repackage/org.argeo.tp.img/batik/org.apache.batik.css.bnd @@ -0,0 +1 @@ +Argeo-Origin-M2: org.apache.xmlgraphics:batik-css diff --git a/repackage/org.argeo.tp.img/batik/org.apache.batik.i18n.bnd b/repackage/org.argeo.tp.img/batik/org.apache.batik.i18n.bnd new file mode 100644 index 0000000..2235e68 --- /dev/null +++ b/repackage/org.argeo.tp.img/batik/org.apache.batik.i18n.bnd @@ -0,0 +1 @@ +Argeo-Origin-M2: org.apache.xmlgraphics:batik-i18n diff --git a/repackage/org.argeo.tp.img/batik/org.apache.batik.util.bnd b/repackage/org.argeo.tp.img/batik/org.apache.batik.util.bnd new file mode 100644 index 0000000..216a588 --- /dev/null +++ b/repackage/org.argeo.tp.img/batik/org.apache.batik.util.bnd @@ -0,0 +1 @@ +Argeo-Origin-M2: org.apache.xmlgraphics:batik-util diff --git a/repackage/org.argeo.tp.img/com.adobe.xmp.xmpcore.bnd.disabled b/repackage/org.argeo.tp.img/com.adobe.xmp.xmpcore.bnd.disabled new file mode 100644 index 0000000..2c219c2 --- /dev/null +++ b/repackage/org.argeo.tp.img/com.adobe.xmp.xmpcore.bnd.disabled @@ -0,0 +1,3 @@ +SPDX-License-Identifier: BSD-3-Clause +# No source available in Maven Central for 6.1.11 +Argeo-Origin-M2: com.adobe.xmp:xmpcore:6.1.11 diff --git a/repackage/org.argeo.tp.img/com.drew.metadata.bnd b/repackage/org.argeo.tp.img/com.drew.metadata.bnd new file mode 100644 index 0000000..a34aa78 --- /dev/null +++ b/repackage/org.argeo.tp.img/com.drew.metadata.bnd @@ -0,0 +1,5 @@ +SPDX-License-Identifier: Apache-2.0 +Argeo-Origin-M2: com.drewnoakes:metadata-extractor:2.19.0 +Import-Package: \ +com.adobe.*;resolution:=optional, \ +* diff --git a/repackage/org.argeo.tp.img/org.apache.commons.imaging.bnd b/repackage/org.argeo.tp.img/org.apache.commons.imaging.bnd new file mode 100644 index 0000000..a45cbc9 --- /dev/null +++ b/repackage/org.argeo.tp.img/org.apache.commons.imaging.bnd @@ -0,0 +1,3 @@ +SPDX-License-Identifier: Apache-2.0 +Bundle-Version: 0.99.3 +Argeo-Origin-M2: org.apache.commons:commons-imaging:1.0-alpha3 diff --git a/repackage/org.argeo.tp.img/xmlgraphics/merge.bnd b/repackage/org.argeo.tp.img/xmlgraphics/merge.bnd new file mode 100644 index 0000000..68f9c4d --- /dev/null +++ b/repackage/org.argeo.tp.img/xmlgraphics/merge.bnd @@ -0,0 +1,11 @@ +SPDX-License-Identifier: Apache-2.0 +Bundle-SymbolicName: org.apache.xmlgraphics +Argeo-Origin-M2: :2.9 +Argeo-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.img/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageConverter b/repackage/org.argeo.tp.img/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageConverter new file mode 100644 index 0000000..292f716 --- /dev/null +++ b/repackage/org.argeo.tp.img/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.img/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory b/repackage/org.argeo.tp.img/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory new file mode 100644 index 0000000..27dc74a --- /dev/null +++ b/repackage/org.argeo.tp.img/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.img/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImagePreloader b/repackage/org.argeo.tp.img/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImagePreloader new file mode 100644 index 0000000..82f7977 --- /dev/null +++ b/repackage/org.argeo.tp.img/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/org.argeo.tp.jcr/jackrabbit/common.bnd b/repackage/org.argeo.tp.jcr/jackrabbit/common.bnd index 0a2abe6..4153cf3 100644 --- a/repackage/org.argeo.tp.jcr/jackrabbit/common.bnd +++ b/repackage/org.argeo.tp.jcr/jackrabbit/common.bnd @@ -1,2 +1,2 @@ SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: :2.20.12 \ No newline at end of file +Argeo-Origin-M2: :2.20.13 \ No newline at end of file diff --git a/repackage/org.argeo.tp.jcr/oak/common.bnd b/repackage/org.argeo.tp.jcr/oak/common.bnd index eadd95e..388b664 100644 --- a/repackage/org.argeo.tp.jcr/oak/common.bnd +++ b/repackage/org.argeo.tp.jcr/oak/common.bnd @@ -1,2 +1,2 @@ SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: :1.56.0 \ No newline at end of file +Argeo-Origin-M2: :1.60.0 \ No newline at end of file diff --git a/repackage/org.argeo.tp.math/org.locationtech.jts.bnd b/repackage/org.argeo.tp.math/org.locationtech.jts.bnd deleted file mode 100644 index b163e3a..0000000 --- a/repackage/org.argeo.tp.math/org.locationtech.jts.bnd +++ /dev/null @@ -1,2 +0,0 @@ -SPDX-License-Identifier: BSD-3-Clause -Argeo-Origin-M2: org.locationtech.jts:jts-core:1.19.0 \ No newline at end of file diff --git a/repackage/org.argeo.tp.office/org.apache.xmlbeans.bnd b/repackage/org.argeo.tp.office/org.apache.xmlbeans.bnd index 569d40a..dedd30c 100644 --- a/repackage/org.argeo.tp.office/org.apache.xmlbeans.bnd +++ b/repackage/org.argeo.tp.office/org.apache.xmlbeans.bnd @@ -4,4 +4,4 @@ Import-Package: org.apache.tools.ant.*;resolution:=optional, net.sf.saxon.*;resolution:=optional, com.sun.*;resolution:=optional, * -Argeo-Origin-M2: org.apache.xmlbeans:xmlbeans:5.1.1 \ No newline at end of file +Argeo-Origin-M2: org.apache.xmlbeans:xmlbeans:5.2.0 diff --git a/repackage/org.argeo.tp.office/poi/common.bnd b/repackage/org.argeo.tp.office/poi/common.bnd index e030d3e..dc0d5fd 100644 --- a/repackage/org.argeo.tp.office/poi/common.bnd +++ b/repackage/org.argeo.tp.office/poi/common.bnd @@ -1,2 +1,2 @@ SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: :5.2.4 \ No newline at end of file +Argeo-Origin-M2: :5.2.5 \ No newline at end of file diff --git a/repackage/org.argeo.tp.publish/com.github.librepdf.openpdf.bnd b/repackage/org.argeo.tp.publish/com.github.librepdf.openpdf.bnd index 3dc17b1..a301d0e 100644 --- a/repackage/org.argeo.tp.publish/com.github.librepdf.openpdf.bnd +++ b/repackage/org.argeo.tp.publish/com.github.librepdf.openpdf.bnd @@ -1,5 +1,5 @@ SPDX-License-Identifier: LGPL-2.1-only -Argeo-Origin-M2: com.github.librepdf:openpdf:1.3.30 +Argeo-Origin-M2: com.github.librepdf:openpdf:1.3.33 Import-Package: \ com.ibm.icu.*;resolution:=optional,\ org.bouncycastle.*;resolution:="optional",\ diff --git a/repackage/org.argeo.tp.publish/de.rototor.pdfbox.graphics2d.bnd b/repackage/org.argeo.tp.publish/de.rototor.pdfbox.graphics2d.bnd index ea833ff..ca7beec 100644 --- a/repackage/org.argeo.tp.publish/de.rototor.pdfbox.graphics2d.bnd +++ b/repackage/org.argeo.tp.publish/de.rototor.pdfbox.graphics2d.bnd @@ -1,5 +1,5 @@ SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: de.rototor.pdfbox:graphics2d:3.0.0 +Argeo-Origin-M2: de.rototor.pdfbox:graphics2d:3.0.1 Import-Package: \ sun.*;resolution:=optional, \ diff --git a/repackage/org.argeo.tp.publish/flying-saucer/common.bnd b/repackage/org.argeo.tp.publish/flying-saucer/common.bnd deleted file mode 100644 index b1dce98..0000000 --- a/repackage/org.argeo.tp.publish/flying-saucer/common.bnd +++ /dev/null @@ -1,2 +0,0 @@ -SPDX-License-Identifier: LGPL-3.0-only -Argeo-Origin-M2: :9.3.1 \ No newline at end of file diff --git a/repackage/org.argeo.tp.publish/flying-saucer/org.xhtmlrenderer.core.bnd b/repackage/org.argeo.tp.publish/flying-saucer/org.xhtmlrenderer.core.bnd deleted file mode 100644 index d4a0510..0000000 --- a/repackage/org.argeo.tp.publish/flying-saucer/org.xhtmlrenderer.core.bnd +++ /dev/null @@ -1 +0,0 @@ -Argeo-Origin-M2: org.xhtmlrenderer:flying-saucer-core diff --git a/repackage/org.argeo.tp.publish/flying-saucer/org.xhtmlrenderer.openpdf.bnd b/repackage/org.argeo.tp.publish/flying-saucer/org.xhtmlrenderer.openpdf.bnd deleted file mode 100644 index ace9050..0000000 --- a/repackage/org.argeo.tp.publish/flying-saucer/org.xhtmlrenderer.openpdf.bnd +++ /dev/null @@ -1 +0,0 @@ -Argeo-Origin-M2: org.xhtmlrenderer:flying-saucer-pdf-openpdf diff --git a/repackage/org.argeo.tp.publish/flying-saucer/org.xhtmlrenderer.swt.bnd.disabled b/repackage/org.argeo.tp.publish/flying-saucer/org.xhtmlrenderer.swt.bnd.disabled deleted file mode 100644 index 6b89d64..0000000 --- a/repackage/org.argeo.tp.publish/flying-saucer/org.xhtmlrenderer.swt.bnd.disabled +++ /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.publish/pdfbox/common.bnd b/repackage/org.argeo.tp.publish/pdfbox/common.bnd index 973e8a1..c90afda 100644 --- a/repackage/org.argeo.tp.publish/pdfbox/common.bnd +++ b/repackage/org.argeo.tp.publish/pdfbox/common.bnd @@ -1,2 +1,2 @@ SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: :3.0.0 \ No newline at end of file +Argeo-Origin-M2: :3.0.1 \ 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 865c6ea..1d28a12 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 @@ SPDX-License-Identifier: EPL-2.0 Bundle-SymbolicName: org.junit.jupiter -Argeo-Origin-M2: :5.10.0 +Argeo-Origin-M2: :5.10.1 Argeo-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 0ca0cc2..98df23c 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 @@ SPDX-License-Identifier: EPL-2.0 Bundle-SymbolicName: org.junit.platform -Argeo-Origin-M2: :1.10.0 +Argeo-Origin-M2: :1.10.1 Argeo-Origin-M2-Merge: \ org.junit.platform:junit-platform-commons, \ org.junit.platform:junit-platform-console, \ diff --git a/repackage/org.argeo.tp.sdk/org.junit.vintage.bnd b/repackage/org.argeo.tp.sdk/org.junit.vintage.bnd index 52acae7..ff5349d 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 @@ SPDX-License-Identifier: EPL-2.0 -Argeo-Origin-M2: org.junit.vintage:junit-vintage-engine:5.10.0 \ No newline at end of file +Argeo-Origin-M2: org.junit.vintage:junit-vintage-engine:5.10.1 \ No newline at end of file diff --git a/repackage/org.argeo.tp.sshd/apache-sshd/common.bnd b/repackage/org.argeo.tp.sshd/apache-sshd/common.bnd new file mode 100644 index 0000000..70556e9 --- /dev/null +++ b/repackage/org.argeo.tp.sshd/apache-sshd/common.bnd @@ -0,0 +1,2 @@ +SPDX-License-Identifier: Apache-2.0 +Argeo-Origin-M2: :2.11.0 \ No newline at end of file diff --git a/repackage/org.argeo.tp.sshd/apache-sshd/merge.bnd b/repackage/org.argeo.tp.sshd/apache-sshd/merge.bnd new file mode 100644 index 0000000..d65c5cc --- /dev/null +++ b/repackage/org.argeo.tp.sshd/apache-sshd/merge.bnd @@ -0,0 +1,15 @@ +SPDX-License-Identifier: Apache-2.0 +Bundle-SymbolicName: org.apache.sshd +Export-Package: org.apache.* +Import-Package: \ +org.apache.tomcat.jni.*;resolution:=optional,\ +org.bouncycastle.crypto.prng;resolution:=optional,\ +org.bouncycastle.*;resolution:=optional,\ +net.i2p.crypto.eddsa.*;resolution:=optional,\ +org.slf4j,\ +org.slf4j.event,\ +org.slf4j.helpers,\ +* +Argeo-Origin-M2-Merge: \ +org.apache.sshd:sshd-core, \ +org.apache.sshd:sshd-common diff --git a/repackage/org.argeo.tp.sshd/apache-sshd/org.apache.sshd.cli.bnd b/repackage/org.argeo.tp.sshd/apache-sshd/org.apache.sshd.cli.bnd new file mode 100644 index 0000000..ec35e33 --- /dev/null +++ b/repackage/org.argeo.tp.sshd/apache-sshd/org.apache.sshd.cli.bnd @@ -0,0 +1,5 @@ +Argeo-Origin-M2: org.apache.sshd:sshd-cli + +Import-Package: \ +org.bouncycastle.*;resolution:=optional,\ +* diff --git a/repackage/org.argeo.tp.sshd/apache-sshd/org.apache.sshd.git.bnd b/repackage/org.argeo.tp.sshd/apache-sshd/org.apache.sshd.git.bnd new file mode 100644 index 0000000..d4eec3c --- /dev/null +++ b/repackage/org.argeo.tp.sshd/apache-sshd/org.apache.sshd.git.bnd @@ -0,0 +1,7 @@ +Argeo-Origin-M2: org.apache.sshd:sshd-git + +Import-Package: \ +org.bouncycastle.*;resolution:=optional,\ +org.eclipse.jgit.*;resolution:=optional,\ +org.kohsuke.*;resolution:=optional,\ +* \ No newline at end of file diff --git a/repackage/org.argeo.tp.sshd/apache-sshd/org.apache.sshd.putty.bnd b/repackage/org.argeo.tp.sshd/apache-sshd/org.apache.sshd.putty.bnd new file mode 100644 index 0000000..67671b2 --- /dev/null +++ b/repackage/org.argeo.tp.sshd/apache-sshd/org.apache.sshd.putty.bnd @@ -0,0 +1,6 @@ +Argeo-Origin-M2: org.apache.sshd:sshd-putty + +Import-Package: \ +org.bouncycastle.*;resolution:=optional,\ +net.i2p.*;resolution:=optional,\ +* \ No newline at end of file diff --git a/repackage/org.argeo.tp.sshd/apache-sshd/org.apache.sshd.scp.bnd b/repackage/org.argeo.tp.sshd/apache-sshd/org.apache.sshd.scp.bnd new file mode 100644 index 0000000..b1c94d8 --- /dev/null +++ b/repackage/org.argeo.tp.sshd/apache-sshd/org.apache.sshd.scp.bnd @@ -0,0 +1,5 @@ +Argeo-Origin-M2: org.apache.sshd:sshd-scp + +Import-Package: \ +org.bouncycastle.*;resolution:=optional,\ +* diff --git a/repackage/org.argeo.tp.sshd/apache-sshd/org.apache.sshd.sftp.bnd b/repackage/org.argeo.tp.sshd/apache-sshd/org.apache.sshd.sftp.bnd new file mode 100644 index 0000000..43fc2e4 --- /dev/null +++ b/repackage/org.argeo.tp.sshd/apache-sshd/org.apache.sshd.sftp.bnd @@ -0,0 +1,5 @@ +Argeo-Origin-M2: org.apache.sshd:sshd-sftp + +Import-Package: \ +org.bouncycastle.*;resolution:=optional,\ +* diff --git a/repackage/org.argeo.tp.sys/activation/merge.bnd b/repackage/org.argeo.tp.sys/activation/merge.bnd new file mode 100644 index 0000000..46bae12 --- /dev/null +++ b/repackage/org.argeo.tp.sys/activation/merge.bnd @@ -0,0 +1,13 @@ +Bundle-SymbolicName: org.eclipse.angus.activation +SPDX-License-Identifier: BSD-3-Clause +Argeo-Origin-M2: :2.0.1 +Import-Package:\ +org.glassfish.hk2.osgiresourcelocator;resolution:="optional",\ +org.graalvm.*;resolution:="optional",\ +* + +Export-Package: org.eclipse.*, jakarta.*;version="2.1.2" + +Argeo-Origin-M2-Merge: \ +org.eclipse.angus:angus-activation,\ +jakarta.activation:jakarta.activation-api:2.1.2,\ diff --git a/repackage/org.argeo.tp.sys/com.googlecode.javaewah.JavaEWAH.bnd b/repackage/org.argeo.tp.sys/com.googlecode.javaewah.JavaEWAH.bnd new file mode 100644 index 0000000..421ace3 --- /dev/null +++ b/repackage/org.argeo.tp.sys/com.googlecode.javaewah.JavaEWAH.bnd @@ -0,0 +1,3 @@ +SPDX-License-Identifier: Apache-2.0 +Argeo-Origin-M2: com.googlecode.javaewah:JavaEWAH:1.2.3 +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.sys/de.thjom.java.systemd.bnd b/repackage/org.argeo.tp.sys/de.thjom.java.systemd.bnd new file mode 100644 index 0000000..7d28b18 --- /dev/null +++ b/repackage/org.argeo.tp.sys/de.thjom.java.systemd.bnd @@ -0,0 +1,2 @@ +SPDX-License-Identifier: LGPL-2.0-only +Argeo-Origin-M2: com.github.thjomnx:java-systemd:2.1.0 \ No newline at end of file diff --git a/repackage/org.argeo.tp.sys/jackson/com.fasterxml.jackson.core.jackson.annotations.bnd b/repackage/org.argeo.tp.sys/jackson/com.fasterxml.jackson.core.jackson.annotations.bnd new file mode 100644 index 0000000..1db7eb0 --- /dev/null +++ b/repackage/org.argeo.tp.sys/jackson/com.fasterxml.jackson.core.jackson.annotations.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: com.fasterxml.jackson.core:jackson-annotations +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.sys/jackson/com.fasterxml.jackson.core.jackson.core.bnd b/repackage/org.argeo.tp.sys/jackson/com.fasterxml.jackson.core.jackson.core.bnd new file mode 100644 index 0000000..0457673 --- /dev/null +++ b/repackage/org.argeo.tp.sys/jackson/com.fasterxml.jackson.core.jackson.core.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: com.fasterxml.jackson.core:jackson-core +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.sys/jackson/com.fasterxml.jackson.core.jackson.databind.bnd b/repackage/org.argeo.tp.sys/jackson/com.fasterxml.jackson.core.jackson.databind.bnd new file mode 100644 index 0000000..5e42823 --- /dev/null +++ b/repackage/org.argeo.tp.sys/jackson/com.fasterxml.jackson.core.jackson.databind.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: com.fasterxml.jackson.core:jackson-databind +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.sys/jackson/common.bnd b/repackage/org.argeo.tp.sys/jackson/common.bnd new file mode 100644 index 0000000..1aaf767 --- /dev/null +++ b/repackage/org.argeo.tp.sys/jackson/common.bnd @@ -0,0 +1,2 @@ +SPDX-License-Identifier: Apache-2.0 +Argeo-Origin-M2: :2.16.0 diff --git a/repackage/org.argeo.tp.sys/jakarta.activation.bnd.deactivated b/repackage/org.argeo.tp.sys/jakarta.activation.bnd.deactivated new file mode 100644 index 0000000..19df7c0 --- /dev/null +++ b/repackage/org.argeo.tp.sys/jakarta.activation.bnd.deactivated @@ -0,0 +1,3 @@ +SPDX-License-Identifier: BSD-3-Clause +Argeo-Origin-M2: jakarta.activation:jakarta.activation-api:2.1.2 +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.sys/jakarta.mail.bnd b/repackage/org.argeo.tp.sys/jakarta.mail.bnd new file mode 100644 index 0000000..a1df1b8 --- /dev/null +++ b/repackage/org.argeo.tp.sys/jakarta.mail.bnd @@ -0,0 +1,3 @@ +SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 OR EPL-2.0 +Argeo-Origin-M2: org.eclipse.angus:jakarta.mail:2.0.2 +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.sys/javax.activation.bnd b/repackage/org.argeo.tp.sys/javax.activation.bnd new file mode 100644 index 0000000..28c047c --- /dev/null +++ b/repackage/org.argeo.tp.sys/javax.activation.bnd @@ -0,0 +1,3 @@ +SPDX-License-Identifier: BSD-3-Clause +Argeo-Origin-M2: jakarta.activation:jakarta.activation-api:1.2.2 +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.sys/javax.xml.bind.bnd b/repackage/org.argeo.tp.sys/javax.xml.bind.bnd new file mode 100644 index 0000000..37afe39 --- /dev/null +++ b/repackage/org.argeo.tp.sys/javax.xml.bind.bnd @@ -0,0 +1,7 @@ +SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 OR CDDL-1.0 +Argeo-Origin-M2: javax.xml.bind:jaxb-api:2.4.0-b180830.0359 +Bundle-Version: 2.4.0.b1808300359 + +Import-Package: \ +org.glassfish.hk2.osgiresourcelocator;resolution:="optional",\ +* diff --git a/repackage/org.argeo.tp.sys/org.apache.commons.codec.bnd b/repackage/org.argeo.tp.sys/org.apache.commons.codec.bnd new file mode 100644 index 0000000..f8a1d61 --- /dev/null +++ b/repackage/org.argeo.tp.sys/org.apache.commons.codec.bnd @@ -0,0 +1,2 @@ +SPDX-License-Identifier: Apache-2.0 +Argeo-Origin-M2: commons-codec:commons-codec:1.16.0 diff --git a/repackage/org.argeo.tp.sys/org.apache.commons.compress.bnd b/repackage/org.argeo.tp.sys/org.apache.commons.compress.bnd new file mode 100644 index 0000000..4b559e4 --- /dev/null +++ b/repackage/org.argeo.tp.sys/org.apache.commons.compress.bnd @@ -0,0 +1,7 @@ +SPDX-License-Identifier: Apache-2.0 +Argeo-Origin-M2: org.apache.commons:commons-compress:1.25.0 +Import-Package: \ +org.brotli.*;resolution:=optional, +org.tukaani.*;resolution:=optional, +com.github.luben.zstd;resolution:=optional, +* diff --git a/repackage/org.argeo.tp.sys/org.apache.commons.configuration2.bnd b/repackage/org.argeo.tp.sys/org.apache.commons.configuration2.bnd new file mode 100644 index 0000000..acb2b43 --- /dev/null +++ b/repackage/org.argeo.tp.sys/org.apache.commons.configuration2.bnd @@ -0,0 +1,5 @@ +SPDX-License-Identifier: Apache-2.0 +Argeo-Origin-M2: org.apache.commons:commons-configuration2:2.9.0 +Import-Package: \ +org.apache.commons.jexl2.*;resolution:=optional, +* diff --git a/repackage/org.argeo.tp.sys/org.apache.commons.exec.bnd b/repackage/org.argeo.tp.sys/org.apache.commons.exec.bnd new file mode 100644 index 0000000..0607a8b --- /dev/null +++ b/repackage/org.argeo.tp.sys/org.apache.commons.exec.bnd @@ -0,0 +1,2 @@ +SPDX-License-Identifier: Apache-2.0 +Argeo-Origin-M2: org.apache.commons:commons-exec:1.3 diff --git a/repackage/org.argeo.tp.sys/org.apache.commons.vfs2.bnd b/repackage/org.argeo.tp.sys/org.apache.commons.vfs2.bnd new file mode 100644 index 0000000..9900d35 --- /dev/null +++ b/repackage/org.argeo.tp.sys/org.apache.commons.vfs2.bnd @@ -0,0 +1,4 @@ +SPDX-License-Identifier: Apache-2.0 +Import-Package: org.apache.tools.ant.*;resolution:=optional, +* +Argeo-Origin-M2: org.apache.commons:commons-vfs2:2.9.0 \ No newline at end of file diff --git a/repackage/org.argeo.tp.sys/org.apache.httpcomponents.httpclient.bnd b/repackage/org.argeo.tp.sys/org.apache.httpcomponents.httpclient.bnd new file mode 100644 index 0000000..27c4192 --- /dev/null +++ b/repackage/org.argeo.tp.sys/org.apache.httpcomponents.httpclient.bnd @@ -0,0 +1,2 @@ +SPDX-License-Identifier: Apache-2.0 +Argeo-Origin-M2: org.apache.httpcomponents:httpclient:4.5.14 \ No newline at end of file diff --git a/repackage/org.argeo.tp.sys/org.apache.httpcomponents.httpcore.bnd b/repackage/org.argeo.tp.sys/org.apache.httpcomponents.httpcore.bnd new file mode 100644 index 0000000..f40caa9 --- /dev/null +++ b/repackage/org.argeo.tp.sys/org.apache.httpcomponents.httpcore.bnd @@ -0,0 +1,2 @@ +SPDX-License-Identifier: Apache-2.0 +Argeo-Origin-M2: org.apache.httpcomponents:httpcore:4.4.16 \ No newline at end of file diff --git a/repackage/org.argeo.tp.sys/org.apache.httpcomponents.httpmime.bnd b/repackage/org.argeo.tp.sys/org.apache.httpcomponents.httpmime.bnd new file mode 100644 index 0000000..b25473d --- /dev/null +++ b/repackage/org.argeo.tp.sys/org.apache.httpcomponents.httpmime.bnd @@ -0,0 +1,2 @@ +SPDX-License-Identifier: Apache-2.0 +Argeo-Origin-M2: org.apache.httpcomponents:httpmime:4.5.14 \ No newline at end of file diff --git a/repackage/org.argeo.tp.sys/org.apache.tomcat.jni.bnd b/repackage/org.argeo.tp.sys/org.apache.tomcat.jni.bnd new file mode 100644 index 0000000..d09967e --- /dev/null +++ b/repackage/org.argeo.tp.sys/org.apache.tomcat.jni.bnd @@ -0,0 +1,3 @@ +SPDX-License-Identifier: Apache-2.0 +# Use Tomcat v9 to stay compatible with JNI library v1.2 provided by Debian 11 +Argeo-Origin-M2: org.apache.tomcat:tomcat-jni:9.0.78 \ No newline at end of file diff --git a/repackage/org.argeo.tp.sys/org.eclipse.jgit.bnd b/repackage/org.argeo.tp.sys/org.eclipse.jgit.bnd new file mode 100644 index 0000000..7486670 --- /dev/null +++ b/repackage/org.argeo.tp.sys/org.eclipse.jgit.bnd @@ -0,0 +1,6 @@ +SPDX-License-Identifier: BSD-3-Clause +Argeo-Origin-M2: org.eclipse.jgit:org.eclipse.jgit:6.8.0.202311291450-r +Import-Package: \ +sun.*;resolution:=optional, \ +com.jcraft.jsch;resolution:=optional, \ +* diff --git a/repackage/org.argeo.tp.sys/org.glassfish.hk2.osgiresourcelocator.bnd b/repackage/org.argeo.tp.sys/org.glassfish.hk2.osgiresourcelocator.bnd new file mode 100644 index 0000000..1426a20 --- /dev/null +++ b/repackage/org.argeo.tp.sys/org.glassfish.hk2.osgiresourcelocator.bnd @@ -0,0 +1,2 @@ +SPDX-License-Identifier: GPL-2.0 WITH Classpath-exception-2.0 OR EPL-2.0 +Argeo-Origin-M2: org.glassfish.hk2:osgi-resource-locator:1.0.3 diff --git a/repackage/org.argeo.tp.sys/org.jline.bnd b/repackage/org.argeo.tp.sys/org.jline.bnd new file mode 100644 index 0000000..6bc5a2a --- /dev/null +++ b/repackage/org.argeo.tp.sys/org.jline.bnd @@ -0,0 +1,9 @@ +SPDX-License-Identifier: BSD-3-Clause +Argeo-Origin-M2: org.jline:jline:3.24.1 +Import-Package:\ +sun.misc.*;resolution:="optional",\ +com.sun.jna.*;resolution:="optional",\ +org.fusesource.jansi.*;resolution:="optional",\ +org.apache.sshd.*;resolution:="optional",\ +javax.annotation.*;resolution:="optional",\ +* diff --git a/repackage/org.argeo.tp.sys/org.mozilla.universalchardet.bnd b/repackage/org.argeo.tp.sys/org.mozilla.universalchardet.bnd new file mode 100644 index 0000000..0dc40c0 --- /dev/null +++ b/repackage/org.argeo.tp.sys/org.mozilla.universalchardet.bnd @@ -0,0 +1,2 @@ +SPDX-License-Identifier: LGPL-3.0-only OR GPL-3.0-only OR MPL-1.0 +Argeo-Origin-M2: com.github.albfernandez:juniversalchardet:2.4.0 diff --git a/repackage/org.argeo.tp.sys/org.tukaani.xz.bnd b/repackage/org.argeo.tp.sys/org.tukaani.xz.bnd new file mode 100644 index 0000000..a58ae5b --- /dev/null +++ b/repackage/org.argeo.tp.sys/org.tukaani.xz.bnd @@ -0,0 +1,2 @@ +SPDX-License-Identifier: CC0-1.0 +Argeo-Origin-M2: org.tukaani:xz:1.9 diff --git a/repackage/org.argeo.tp.sys/org.xbill.dns.bnd b/repackage/org.argeo.tp.sys/org.xbill.dns.bnd new file mode 100644 index 0000000..4643a20 --- /dev/null +++ b/repackage/org.argeo.tp.sys/org.xbill.dns.bnd @@ -0,0 +1,4 @@ +# this is actually dnsjava, see https://github.com/dnsjava/dnsjava +SPDX-License-Identifier: BSD-3-Clause +Argeo-Origin-M2: dnsjava:dnsjava:3.5.3 +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.utils/com.adobe.xmp.xmpcore.bnd b/repackage/org.argeo.tp.utils/com.adobe.xmp.xmpcore.bnd deleted file mode 100644 index 2c219c2..0000000 --- a/repackage/org.argeo.tp.utils/com.adobe.xmp.xmpcore.bnd +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-License-Identifier: BSD-3-Clause -# No source available in Maven Central for 6.1.11 -Argeo-Origin-M2: com.adobe.xmp:xmpcore:6.1.11 diff --git a/repackage/org.argeo.tp.utils/com.drew.metadata.bnd b/repackage/org.argeo.tp.utils/com.drew.metadata.bnd deleted file mode 100644 index 86e37b3..0000000 --- a/repackage/org.argeo.tp.utils/com.drew.metadata.bnd +++ /dev/null @@ -1,2 +0,0 @@ -SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: com.drewnoakes:metadata-extractor:2.18.0 diff --git a/repackage/org.argeo.tp.utils/com.googlecode.javaewah.JavaEWAH.bnd b/repackage/org.argeo.tp.utils/com.googlecode.javaewah.JavaEWAH.bnd deleted file mode 100644 index 421ace3..0000000 --- a/repackage/org.argeo.tp.utils/com.googlecode.javaewah.JavaEWAH.bnd +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: com.googlecode.javaewah:JavaEWAH:1.2.3 -Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.utils/de.thjom.java.systemd.bnd b/repackage/org.argeo.tp.utils/de.thjom.java.systemd.bnd deleted file mode 100644 index 7d28b18..0000000 --- a/repackage/org.argeo.tp.utils/de.thjom.java.systemd.bnd +++ /dev/null @@ -1,2 +0,0 @@ -SPDX-License-Identifier: LGPL-2.0-only -Argeo-Origin-M2: com.github.thjomnx:java-systemd:2.1.0 \ No newline at end of file diff --git a/repackage/org.argeo.tp.utils/javax.activation.bnd b/repackage/org.argeo.tp.utils/javax.activation.bnd deleted file mode 100644 index 28c047c..0000000 --- a/repackage/org.argeo.tp.utils/javax.activation.bnd +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-License-Identifier: BSD-3-Clause -Argeo-Origin-M2: jakarta.activation:jakarta.activation-api:1.2.2 -Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.utils/javax.mail.bnd b/repackage/org.argeo.tp.utils/javax.mail.bnd deleted file mode 100644 index d20614b..0000000 --- a/repackage/org.argeo.tp.utils/javax.mail.bnd +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 OR EPL-2.0 -Argeo-Origin-M2: com.sun.mail:jakarta.mail:1.6.7 -Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.utils/javax.xml.bind.bnd b/repackage/org.argeo.tp.utils/javax.xml.bind.bnd deleted file mode 100644 index 37afe39..0000000 --- a/repackage/org.argeo.tp.utils/javax.xml.bind.bnd +++ /dev/null @@ -1,7 +0,0 @@ -SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 OR CDDL-1.0 -Argeo-Origin-M2: javax.xml.bind:jaxb-api:2.4.0-b180830.0359 -Bundle-Version: 2.4.0.b1808300359 - -Import-Package: \ -org.glassfish.hk2.osgiresourcelocator;resolution:="optional",\ -* diff --git a/repackage/org.argeo.tp.utils/net.sf.saxon.bnd b/repackage/org.argeo.tp.utils/net.sf.saxon.bnd index 2b64c2c..e23bc91 100644 --- a/repackage/org.argeo.tp.utils/net.sf.saxon.bnd +++ b/repackage/org.argeo.tp.utils/net.sf.saxon.bnd @@ -1,5 +1,5 @@ SPDX-License-Identifier: MPL-2.0 -Argeo-Origin-M2: net.sf.saxon:Saxon-HE:12.3 +Argeo-Origin-M2: net.sf.saxon:Saxon-HE:12.4 Import-Package:\ com.sun.org.apache.xerces.internal.jaxp;resolution:="optional",\ jline.*;resolution:="optional",\ diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.csv.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.csv.bnd deleted file mode 100644 index bb0c29d..0000000 --- a/repackage/org.argeo.tp.utils/org.apache.commons.csv.bnd +++ /dev/null @@ -1,2 +0,0 @@ -SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: org.apache.commons:commons-csv:1.10.0 diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.csv.bnd.disabled b/repackage/org.argeo.tp.utils/org.apache.commons.csv.bnd.disabled new file mode 100644 index 0000000..bb0c29d --- /dev/null +++ b/repackage/org.argeo.tp.utils/org.apache.commons.csv.bnd.disabled @@ -0,0 +1,2 @@ +SPDX-License-Identifier: Apache-2.0 +Argeo-Origin-M2: org.apache.commons:commons-csv:1.10.0 diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.dbcp2.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.dbcp2.bnd index 0aea1a9..cb96722 100644 --- a/repackage/org.argeo.tp.utils/org.apache.commons.dbcp2.bnd +++ b/repackage/org.argeo.tp.utils/org.apache.commons.dbcp2.bnd @@ -1,5 +1,5 @@ SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: org.apache.commons:commons-dbcp2:2.10.0 +Argeo-Origin-M2: org.apache.commons:commons-dbcp2:2.11.0 Import-Package: javax.transaction.*; resolution:="optional",\ * diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.exec.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.exec.bnd deleted file mode 100644 index 0607a8b..0000000 --- a/repackage/org.argeo.tp.utils/org.apache.commons.exec.bnd +++ /dev/null @@ -1,2 +0,0 @@ -SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: org.apache.commons:commons-exec:1.3 diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.imaging.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.imaging.bnd deleted file mode 100644 index a45cbc9..0000000 --- a/repackage/org.argeo.tp.utils/org.apache.commons.imaging.bnd +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-License-Identifier: Apache-2.0 -Bundle-Version: 0.99.3 -Argeo-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 index 47b6b65..67eab44 100644 --- a/repackage/org.argeo.tp.utils/org.apache.commons.lang3.bnd +++ b/repackage/org.argeo.tp.utils/org.apache.commons.lang3.bnd @@ -1,2 +1,2 @@ SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: org.apache.commons:commons-lang3:3.13.0 +Argeo-Origin-M2: org.apache.commons:commons-lang3:3.14.0 diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.text.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.text.bnd deleted file mode 100644 index 173a150..0000000 --- a/repackage/org.argeo.tp.utils/org.apache.commons.text.bnd +++ /dev/null @@ -1,2 +0,0 @@ -SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: org.apache.commons:commons-text:1.10.0 diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.text.bnd.disabled b/repackage/org.argeo.tp.utils/org.apache.commons.text.bnd.disabled new file mode 100644 index 0000000..173a150 --- /dev/null +++ b/repackage/org.argeo.tp.utils/org.apache.commons.text.bnd.disabled @@ -0,0 +1,2 @@ +SPDX-License-Identifier: Apache-2.0 +Argeo-Origin-M2: org.apache.commons:commons-text:1.10.0 diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.vfs2.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.vfs2.bnd deleted file mode 100644 index 9900d35..0000000 --- a/repackage/org.argeo.tp.utils/org.apache.commons.vfs2.bnd +++ /dev/null @@ -1,4 +0,0 @@ -SPDX-License-Identifier: Apache-2.0 -Import-Package: org.apache.tools.ant.*;resolution:=optional, -* -Argeo-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.santuario.xmlsec.bnd b/repackage/org.argeo.tp.utils/org.apache.santuario.xmlsec.bnd index d80056d..cfbcb8f 100644 --- a/repackage/org.argeo.tp.utils/org.apache.santuario.xmlsec.bnd +++ b/repackage/org.argeo.tp.utils/org.apache.santuario.xmlsec.bnd @@ -1,2 +1,2 @@ SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: org.apache.santuario:xmlsec:2.3.3 +Argeo-Origin-M2: org.apache.santuario:xmlsec:2.3.4 diff --git a/repackage/org.argeo.tp.utils/org.eclipse.jgit.bnd b/repackage/org.argeo.tp.utils/org.eclipse.jgit.bnd deleted file mode 100644 index 8f66ead..0000000 --- a/repackage/org.argeo.tp.utils/org.eclipse.jgit.bnd +++ /dev/null @@ -1,6 +0,0 @@ -SPDX-License-Identifier: BSD-3-Clause -Argeo-Origin-M2: org.eclipse.jgit:org.eclipse.jgit:6.7.0.202309050840-r -Import-Package: \ -sun.*;resolution:=optional, \ -com.jcraft.jsch;resolution:=optional, \ -* diff --git a/repackage/org.argeo.tp.utils/org.eclipse.xsd.bnd b/repackage/org.argeo.tp.utils/org.eclipse.xsd.bnd deleted file mode 100644 index 3faceb5..0000000 --- a/repackage/org.argeo.tp.utils/org.eclipse.xsd.bnd +++ /dev/null @@ -1,4 +0,0 @@ -SPDX-License-Identifier: EPL-2.0 -# Required by GeoTools -Argeo-Origin-M2: org.eclipse.emf:org.eclipse.xsd:2.19.0 -Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.utils/org.mozilla.rhino.bnd b/repackage/org.argeo.tp.utils/org.mozilla.rhino.bnd deleted file mode 100644 index 6d62d87..0000000 --- a/repackage/org.argeo.tp.utils/org.mozilla.rhino.bnd +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-License-Identifier: MPL-2.0 -Argeo-Origin-M2: org.mozilla:rhino:1.7.14 -Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.utils/org.mozilla.rhino.bnd.disabled b/repackage/org.argeo.tp.utils/org.mozilla.rhino.bnd.disabled new file mode 100644 index 0000000..6d62d87 --- /dev/null +++ b/repackage/org.argeo.tp.utils/org.mozilla.rhino.bnd.disabled @@ -0,0 +1,3 @@ +SPDX-License-Identifier: MPL-2.0 +Argeo-Origin-M2: org.mozilla:rhino:1.7.14 +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.utils/org.w3c.dom.smil.bnd b/repackage/org.argeo.tp.utils/org.w3c.dom.smil.bnd new file mode 100644 index 0000000..f4cfa98 --- /dev/null +++ b/repackage/org.argeo.tp.utils/org.w3c.dom.smil.bnd @@ -0,0 +1,7 @@ +SPDX-License-Identifier: W3C +Bundle-Version: 1.0 +Argeo-Origin-M2: org.axsl.org.w3c.dom.smil:smil-boston-dom-java:2000-02-25 + +Import-Package: \ +org.w3c.*;resolution:="optional", \ +* diff --git a/repackage/org.argeo.tp.utils/org.w3c.dom.svg.bnd b/repackage/org.argeo.tp.utils/org.w3c.dom.svg.bnd new file mode 100644 index 0000000..89da058 --- /dev/null +++ b/repackage/org.argeo.tp.utils/org.w3c.dom.svg.bnd @@ -0,0 +1,6 @@ +SPDX-License-Identifier: W3C +Argeo-Origin-M2: org.axsl.org.w3c.dom.svg:svg-dom-java:1.1 + +Import-Package: \ +org.w3c.*;resolution:="optional", \ +* diff --git a/repackage/org.argeo.tp.utils/tika/merge.bnd b/repackage/org.argeo.tp.utils/tika/merge.bnd index 9c0021b..ba90127 100644 --- a/repackage/org.argeo.tp.utils/tika/merge.bnd +++ b/repackage/org.argeo.tp.utils/tika/merge.bnd @@ -1,6 +1,6 @@ Bundle-SymbolicName: org.apache.tika SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: :2.9.0 +Argeo-Origin-M2: :2.9.1 Export-Package: org.apache.* Import-Package: *;resolution:=optional Argeo-Origin-M2-Merge: \ diff --git a/repackage/org.argeo.tp/apache-sshd/common.bnd b/repackage/org.argeo.tp/apache-sshd/common.bnd deleted file mode 100644 index 8c69a5a..0000000 --- a/repackage/org.argeo.tp/apache-sshd/common.bnd +++ /dev/null @@ -1,2 +0,0 @@ -SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: :2.10.0 \ No newline at end of file diff --git a/repackage/org.argeo.tp/apache-sshd/merge.bnd b/repackage/org.argeo.tp/apache-sshd/merge.bnd deleted file mode 100644 index d65c5cc..0000000 --- a/repackage/org.argeo.tp/apache-sshd/merge.bnd +++ /dev/null @@ -1,15 +0,0 @@ -SPDX-License-Identifier: Apache-2.0 -Bundle-SymbolicName: org.apache.sshd -Export-Package: org.apache.* -Import-Package: \ -org.apache.tomcat.jni.*;resolution:=optional,\ -org.bouncycastle.crypto.prng;resolution:=optional,\ -org.bouncycastle.*;resolution:=optional,\ -net.i2p.crypto.eddsa.*;resolution:=optional,\ -org.slf4j,\ -org.slf4j.event,\ -org.slf4j.helpers,\ -* -Argeo-Origin-M2-Merge: \ -org.apache.sshd:sshd-core, \ -org.apache.sshd:sshd-common diff --git a/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.cli.bnd b/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.cli.bnd deleted file mode 100644 index ec35e33..0000000 --- a/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.cli.bnd +++ /dev/null @@ -1,5 +0,0 @@ -Argeo-Origin-M2: org.apache.sshd:sshd-cli - -Import-Package: \ -org.bouncycastle.*;resolution:=optional,\ -* diff --git a/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.git.bnd b/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.git.bnd deleted file mode 100644 index d4eec3c..0000000 --- a/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.git.bnd +++ /dev/null @@ -1,7 +0,0 @@ -Argeo-Origin-M2: org.apache.sshd:sshd-git - -Import-Package: \ -org.bouncycastle.*;resolution:=optional,\ -org.eclipse.jgit.*;resolution:=optional,\ -org.kohsuke.*;resolution:=optional,\ -* \ No newline at end of file diff --git a/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.putty.bnd b/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.putty.bnd deleted file mode 100644 index 67671b2..0000000 --- a/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.putty.bnd +++ /dev/null @@ -1,6 +0,0 @@ -Argeo-Origin-M2: org.apache.sshd:sshd-putty - -Import-Package: \ -org.bouncycastle.*;resolution:=optional,\ -net.i2p.*;resolution:=optional,\ -* \ No newline at end of file diff --git a/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.scp.bnd b/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.scp.bnd deleted file mode 100644 index b1c94d8..0000000 --- a/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.scp.bnd +++ /dev/null @@ -1,5 +0,0 @@ -Argeo-Origin-M2: org.apache.sshd:sshd-scp - -Import-Package: \ -org.bouncycastle.*;resolution:=optional,\ -* diff --git a/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.sftp.bnd b/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.sftp.bnd deleted file mode 100644 index 43fc2e4..0000000 --- a/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.sftp.bnd +++ /dev/null @@ -1,5 +0,0 @@ -Argeo-Origin-M2: org.apache.sshd:sshd-sftp - -Import-Package: \ -org.bouncycastle.*;resolution:=optional,\ -* diff --git a/repackage/org.argeo.tp/batik/common.bnd b/repackage/org.argeo.tp/batik/common.bnd deleted file mode 100644 index 9e6d355..0000000 --- a/repackage/org.argeo.tp/batik/common.bnd +++ /dev/null @@ -1,2 +0,0 @@ -SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: :1.17 \ No newline at end of file diff --git a/repackage/org.argeo.tp/batik/merge.bnd b/repackage/org.argeo.tp/batik/merge.bnd deleted file mode 100644 index aa1f6da..0000000 --- a/repackage/org.argeo.tp/batik/merge.bnd +++ /dev/null @@ -1,27 +0,0 @@ -SPDX-License-Identifier: Apache-2.0 -Bundle-SymbolicName: org.apache.batik -Export-Package: org.apache.* -Import-Package: \ -org.apache.batik.script.*;resolution:="optional",\ -org.apache.batik.*,\ -org.apache.xmlgraphics.*,\ -org.w3c.*,\ -*;resolution:="optional" -Argeo-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 deleted file mode 100644 index 68d83e9..0000000 --- a/repackage/org.argeo.tp/batik/org.apache.batik.constants.bnd +++ /dev/null @@ -1 +0,0 @@ -Argeo-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 deleted file mode 100644 index 959eb09..0000000 --- a/repackage/org.argeo.tp/batik/org.apache.batik.css.bnd +++ /dev/null @@ -1 +0,0 @@ -Argeo-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 deleted file mode 100644 index 2235e68..0000000 --- a/repackage/org.argeo.tp/batik/org.apache.batik.i18n.bnd +++ /dev/null @@ -1 +0,0 @@ -Argeo-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 deleted file mode 100644 index 216a588..0000000 --- a/repackage/org.argeo.tp/batik/org.apache.batik.util.bnd +++ /dev/null @@ -1 +0,0 @@ -Argeo-Origin-M2: org.apache.xmlgraphics:batik-util diff --git a/repackage/org.argeo.tp/com.apicatalog.jsonld.bnd b/repackage/org.argeo.tp/com.apicatalog.jsonld.bnd deleted file mode 100644 index fc8f2e0..0000000 --- a/repackage/org.argeo.tp/com.apicatalog.jsonld.bnd +++ /dev/null @@ -1,2 +0,0 @@ -SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: com.apicatalog:titanium-json-ld:1.3.2 diff --git a/repackage/org.argeo.tp/com.apicatalog.jsonld.bnd.disabled b/repackage/org.argeo.tp/com.apicatalog.jsonld.bnd.disabled new file mode 100644 index 0000000..fc8f2e0 --- /dev/null +++ b/repackage/org.argeo.tp/com.apicatalog.jsonld.bnd.disabled @@ -0,0 +1,2 @@ +SPDX-License-Identifier: Apache-2.0 +Argeo-Origin-M2: com.apicatalog:titanium-json-ld:1.3.2 diff --git a/repackage/org.argeo.tp/com.sun.jna.platform.bnd b/repackage/org.argeo.tp/com.sun.jna.platform.bnd deleted file mode 100644 index bf2e305..0000000 --- a/repackage/org.argeo.tp/com.sun.jna.platform.bnd +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-License-Identifier: LGPL-2.1-or-later OR Apache-2.0 -Argeo-Origin-M2: net.java.dev.jna:jna-platform:5.13.0 -Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson.annotations.bnd b/repackage/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson.annotations.bnd deleted file mode 100644 index 1db7eb0..0000000 --- a/repackage/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson.annotations.bnd +++ /dev/null @@ -1,2 +0,0 @@ -Argeo-Origin-M2: com.fasterxml.jackson.core:jackson-annotations -Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson.core.bnd b/repackage/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson.core.bnd deleted file mode 100644 index 0457673..0000000 --- a/repackage/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson.core.bnd +++ /dev/null @@ -1,2 +0,0 @@ -Argeo-Origin-M2: com.fasterxml.jackson.core:jackson-core -Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson.databind.bnd b/repackage/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson.databind.bnd deleted file mode 100644 index 5e42823..0000000 --- a/repackage/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson.databind.bnd +++ /dev/null @@ -1,2 +0,0 @@ -Argeo-Origin-M2: com.fasterxml.jackson.core:jackson-databind -Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp/jackson/common.bnd b/repackage/org.argeo.tp/jackson/common.bnd deleted file mode 100644 index faf3ecb..0000000 --- a/repackage/org.argeo.tp/jackson/common.bnd +++ /dev/null @@ -1,2 +0,0 @@ -SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: :2.15.2 diff --git a/repackage/org.argeo.tp/javax.servlet.bnd b/repackage/org.argeo.tp/javax.servlet.bnd deleted file mode 100644 index 4201c14..0000000 --- a/repackage/org.argeo.tp/javax.servlet.bnd +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 OR EPL-2.0 -Argeo-Origin-M2: jakarta.servlet:jakarta.servlet-api:4.0.4 -Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp/javax.websocket.bnd b/repackage/org.argeo.tp/javax.websocket.bnd deleted file mode 100644 index 66904f6..0000000 --- a/repackage/org.argeo.tp/javax.websocket.bnd +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 OR CDDL-1.1 -Argeo-Origin-M2: javax.websocket:javax.websocket-api:1.1 -Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp/org.apache.commons.cli.bnd b/repackage/org.argeo.tp/org.apache.commons.cli.bnd index 3dffa2a..e81875d 100644 --- a/repackage/org.argeo.tp/org.apache.commons.cli.bnd +++ b/repackage/org.argeo.tp/org.apache.commons.cli.bnd @@ -1,2 +1,2 @@ SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: commons-cli:commons-cli:1.5.0 +Argeo-Origin-M2: commons-cli:commons-cli:1.6.0 diff --git a/repackage/org.argeo.tp/org.apache.commons.codec.bnd b/repackage/org.argeo.tp/org.apache.commons.codec.bnd deleted file mode 100644 index f8a1d61..0000000 --- a/repackage/org.argeo.tp/org.apache.commons.codec.bnd +++ /dev/null @@ -1,2 +0,0 @@ -SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: commons-codec:commons-codec:1.16.0 diff --git a/repackage/org.argeo.tp/org.apache.commons.compress.bnd b/repackage/org.argeo.tp/org.apache.commons.compress.bnd deleted file mode 100644 index 6236965..0000000 --- a/repackage/org.argeo.tp/org.apache.commons.compress.bnd +++ /dev/null @@ -1,7 +0,0 @@ -SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: org.apache.commons:commons-compress:1.24.0 -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/org.apache.commons.fileupload.bnd b/repackage/org.argeo.tp/org.apache.commons.fileupload.bnd deleted file mode 100644 index 9a0f1aa..0000000 --- a/repackage/org.argeo.tp/org.apache.commons.fileupload.bnd +++ /dev/null @@ -1,6 +0,0 @@ -SPDX-License-Identifier: Apache-2.0 -Import-Package:\ -javax.portlet;resolution:=optional,\ -javax.servlet.*;resolution:=optional,\ -* -Argeo-Origin-M2: commons-fileupload:commons-fileupload:1.5 diff --git a/repackage/org.argeo.tp/org.apache.commons.io.bnd b/repackage/org.argeo.tp/org.apache.commons.io.bnd index 81629ea..6df3327 100644 --- a/repackage/org.argeo.tp/org.apache.commons.io.bnd +++ b/repackage/org.argeo.tp/org.apache.commons.io.bnd @@ -1,3 +1,3 @@ SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: commons-io:commons-io:2.14.0 +Argeo-Origin-M2: commons-io:commons-io:2.15.1 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 deleted file mode 100644 index 27c4192..0000000 --- a/repackage/org.argeo.tp/org.apache.httpcomponents.httpclient.bnd +++ /dev/null @@ -1,2 +0,0 @@ -SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: org.apache.httpcomponents:httpclient:4.5.14 \ 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 deleted file mode 100644 index f40caa9..0000000 --- a/repackage/org.argeo.tp/org.apache.httpcomponents.httpcore.bnd +++ /dev/null @@ -1,2 +0,0 @@ -SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: org.apache.httpcomponents:httpcore:4.4.16 \ 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 deleted file mode 100644 index b25473d..0000000 --- a/repackage/org.argeo.tp/org.apache.httpcomponents.httpmime.bnd +++ /dev/null @@ -1,2 +0,0 @@ -SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: org.apache.httpcomponents:httpmime:4.5.14 \ No newline at end of file diff --git a/repackage/org.argeo.tp/org.apache.tomcat.jni.bnd b/repackage/org.argeo.tp/org.apache.tomcat.jni.bnd deleted file mode 100644 index d09967e..0000000 --- a/repackage/org.argeo.tp/org.apache.tomcat.jni.bnd +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-License-Identifier: Apache-2.0 -# Use Tomcat v9 to stay compatible with JNI library v1.2 provided by Debian 11 -Argeo-Origin-M2: org.apache.tomcat:tomcat-jni:9.0.78 \ No newline at end of file diff --git a/repackage/org.argeo.tp/org.jline.bnd b/repackage/org.argeo.tp/org.jline.bnd deleted file mode 100644 index 0f85fed..0000000 --- a/repackage/org.argeo.tp/org.jline.bnd +++ /dev/null @@ -1,9 +0,0 @@ -SPDX-License-Identifier: BSD-3-Clause -Argeo-Origin-M2: org.jline:jline:3.23.0 -Import-Package:\ -sun.misc.*;resolution:="optional",\ -com.sun.jna.*;resolution:="optional",\ -org.fusesource.jansi.*;resolution:="optional",\ -org.apache.sshd.*;resolution:="optional",\ -javax.annotation.*;resolution:="optional",\ -* diff --git a/repackage/org.argeo.tp/org.locationtech.jts.bnd b/repackage/org.argeo.tp/org.locationtech.jts.bnd new file mode 100644 index 0000000..b163e3a --- /dev/null +++ b/repackage/org.argeo.tp/org.locationtech.jts.bnd @@ -0,0 +1,2 @@ +SPDX-License-Identifier: BSD-3-Clause +Argeo-Origin-M2: org.locationtech.jts:jts-core:1.19.0 \ No newline at end of file diff --git a/repackage/org.argeo.tp/org.mozilla.universalchardet.bnd b/repackage/org.argeo.tp/org.mozilla.universalchardet.bnd deleted file mode 100644 index 0dc40c0..0000000 --- a/repackage/org.argeo.tp/org.mozilla.universalchardet.bnd +++ /dev/null @@ -1,2 +0,0 @@ -SPDX-License-Identifier: LGPL-3.0-only OR GPL-3.0-only OR MPL-1.0 -Argeo-Origin-M2: com.github.albfernandez:juniversalchardet:2.4.0 diff --git a/repackage/org.argeo.tp/org.postgresql.jdbc.bnd b/repackage/org.argeo.tp/org.postgresql.jdbc.bnd index 445e23e..11dd468 100644 --- a/repackage/org.argeo.tp/org.postgresql.jdbc.bnd +++ b/repackage/org.argeo.tp/org.postgresql.jdbc.bnd @@ -1,5 +1,5 @@ SPDX-License-Identifier: BSD-2-Clause -Argeo-Origin-M2: org.postgresql:postgresql:42.6.0 +Argeo-Origin-M2: org.postgresql:postgresql:42.7.1 Import-Package:\ org.osgi.service.jdbc;resolution:="optional",\ com.sun.jna.*;resolution:="optional",\ 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 a58ae5b..0000000 --- a/repackage/org.argeo.tp/org.tukaani.xz.bnd +++ /dev/null @@ -1,2 +0,0 @@ -SPDX-License-Identifier: CC0-1.0 -Argeo-Origin-M2: org.tukaani:xz:1.9 diff --git a/repackage/org.argeo.tp/org.w3c.dom.smil.bnd b/repackage/org.argeo.tp/org.w3c.dom.smil.bnd deleted file mode 100644 index f4cfa98..0000000 --- a/repackage/org.argeo.tp/org.w3c.dom.smil.bnd +++ /dev/null @@ -1,7 +0,0 @@ -SPDX-License-Identifier: W3C -Bundle-Version: 1.0 -Argeo-Origin-M2: org.axsl.org.w3c.dom.smil:smil-boston-dom-java:2000-02-25 - -Import-Package: \ -org.w3c.*;resolution:="optional", \ -* diff --git a/repackage/org.argeo.tp/org.w3c.dom.svg.bnd b/repackage/org.argeo.tp/org.w3c.dom.svg.bnd deleted file mode 100644 index 89da058..0000000 --- a/repackage/org.argeo.tp/org.w3c.dom.svg.bnd +++ /dev/null @@ -1,6 +0,0 @@ -SPDX-License-Identifier: W3C -Argeo-Origin-M2: org.axsl.org.w3c.dom.svg:svg-dom-java:1.1 - -Import-Package: \ -org.w3c.*;resolution:="optional", \ -* diff --git a/repackage/org.argeo.tp/parsson/merge.bnd b/repackage/org.argeo.tp/parsson/merge.bnd index a3b9d6e..85f3f80 100644 --- a/repackage/org.argeo.tp/parsson/merge.bnd +++ b/repackage/org.argeo.tp/parsson/merge.bnd @@ -1,10 +1,10 @@ Bundle-SymbolicName: org.eclipse.parsson SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 OR EPL-2.0 -Argeo-Origin-M2: :1.1.4 +Argeo-Origin-M2: :1.1.5 Export-Package: org.eclipse.*, jakarta.* Import-Package:\ org.glassfish.hk2.osgiresourcelocator;resolution:="optional",\ * Argeo-Origin-M2-Merge: \ org.eclipse.parsson:parsson,\ -jakarta.json:jakarta.json-api:2.1.2,\ \ No newline at end of file +jakarta.json:jakarta.json-api:2.1.3,\ \ No newline at end of file diff --git a/repackage/org.argeo.tp/xmlgraphics/merge.bnd b/repackage/org.argeo.tp/xmlgraphics/merge.bnd deleted file mode 100644 index 68f9c4d..0000000 --- a/repackage/org.argeo.tp/xmlgraphics/merge.bnd +++ /dev/null @@ -1,11 +0,0 @@ -SPDX-License-Identifier: Apache-2.0 -Bundle-SymbolicName: org.apache.xmlgraphics -Argeo-Origin-M2: :2.9 -Argeo-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 deleted file mode 100644 index 292f716..0000000 --- a/repackage/org.argeo.tp/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/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory b/repackage/org.argeo.tp/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory deleted file mode 100644 index 27dc74a..0000000 --- a/repackage/org.argeo.tp/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/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImagePreloader b/repackage/org.argeo.tp/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImagePreloader deleted file mode 100644 index 82f7977..0000000 --- a/repackage/org.argeo.tp/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/swt/rap/org.argeo.tp.swt.workbench/eclipse-rap/includes.properties b/repackage/swt/rap/org.argeo.tp.swt.workbench/eclipse-rap/includes.properties index 0e09a50..7d7a00b 100644 --- a/repackage/swt/rap/org.argeo.tp.swt.workbench/eclipse-rap/includes.properties +++ b/repackage/swt/rap/org.argeo.tp.swt.workbench/eclipse-rap/includes.properties @@ -1,5 +1,5 @@ -plugins/jakarta.inject*.jar= -plugins/jakarta.annotation*.jar= +plugins/jakarta.inject.jakarta.inject-api_2*.jar= +plugins/jakarta.annotation-api_2*.jar= plugins/org.eclipse.e4*.jar= plugins/org.eclipse.emf*.jar= plugins/org.eclipse.rap.e4_*.jar= diff --git a/repackage/swt/rap/org.argeo.tp.swt/eclipse-rap/includes.properties b/repackage/swt/rap/org.argeo.tp.swt/eclipse-rap/includes.properties index 149a56f..adc73a6 100644 --- a/repackage/swt/rap/org.argeo.tp.swt/eclipse-rap/includes.properties +++ b/repackage/swt/rap/org.argeo.tp.swt/eclipse-rap/includes.properties @@ -7,4 +7,3 @@ plugins/org.eclipse.rap.fileupload*.jar= plugins/org.eclipse.rap.filedialog*.jar= plugins/org.eclipse.rap.jface_*.jar= plugins/org.eclipse.rap.jface.source_*.jar= -plugins/org.eclipse.rap.nebula.*.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 97dd14f..b087e23 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,5 +1,5 @@ -plugins/jakarta.inject*.jar= -plugins/jakarta.annotation*.jar= +plugins/jakarta.inject.jakarta.inject-api_2*.jar= +plugins/jakarta.annotation-api_2*.jar= plugins/org.eclipse.text_*.jar= plugins/org.eclipse.core*.jar= plugins/org.eclipse.e4.*.jar= diff --git a/repackage/swt/rcp/org.argeo.tp.swt/eclipse-nebula/common.bnd b/repackage/swt/rcp/org.argeo.tp.swt/eclipse-nebula/common.bnd deleted file mode 100644 index 743e1d3..0000000 --- a/repackage/swt/rcp/org.argeo.tp.swt/eclipse-nebula/common.bnd +++ /dev/null @@ -1,2 +0,0 @@ -SPDX-License-Identifier: EPL-2.0 -Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/swt/rcp/org.argeo.tp.swt/eclipse-nebula/excludes.properties b/repackage/swt/rcp/org.argeo.tp.swt/eclipse-nebula/excludes.properties deleted file mode 100644 index 5574815..0000000 --- a/repackage/swt/rcp/org.argeo.tp.swt/eclipse-nebula/excludes.properties +++ /dev/null @@ -1,2 +0,0 @@ -plugins/org.eclipse.nebula.widgets.grid.example*.jar= -plugins/org.eclipse.nebula.widgets.grid.css*.jar= diff --git a/repackage/swt/rcp/org.argeo.tp.swt/eclipse-nebula/includes.properties b/repackage/swt/rcp/org.argeo.tp.swt/eclipse-nebula/includes.properties deleted file mode 100644 index 09ea542..0000000 --- a/repackage/swt/rcp/org.argeo.tp.swt/eclipse-nebula/includes.properties +++ /dev/null @@ -1,2 +0,0 @@ -plugins/org.eclipse.nebula.widgets.grid*.jar= -plugins/org.eclipse.nebula.widgets.richtext*.jar= diff --git a/repackage/uris.properties b/repackage/uris.properties index b99bc54..6d71e1d 100644 --- a/repackage/uris.properties +++ b/repackage/uris.properties @@ -1,5 +1,5 @@ -eclipse-equinox=http://www.eclipse.org/downloads/equinox/drops/R-4.29-202309031000/equinox-SDK-4.29.zip -eclipse-rcp=http://www.eclipse.org/downloads/eclipse/downloads/drops4/R-4.29-202309031000/org.eclipse.platform.source-4.29.zip -eclipse-rap=http://www.eclipse.org/downloads/rt/rap/3.26/e4/rap-e4-3.26.0-R-20230906-1232.zip +eclipse-equinox=http://www.eclipse.org/downloads/equinox/drops/R-4.30-202312010110/equinox-SDK-4.30.zip +eclipse-rcp=http://www.eclipse.org/downloads/eclipse/downloads/drops4/R-4.30-202312010110/org.eclipse.platform.source-4.30.zip +eclipse-rap=http://www.eclipse.org/downloads/rt/rap/3.27/e4/rap-e4-3.27.0-R-20231205-1650.zip # Nebula does not seem to provide archives anymore, 3.1.0 is available only as an update site -eclipse-nebula=http://www.eclipse.org/downloads/nebula/releases/3.0.0/repository-nebula-3.0.0.zip \ No newline at end of file +#eclipse-nebula=http://www.eclipse.org/downloads/nebula/releases/3.0.0/repository-nebula-3.0.0.zip \ No newline at end of file diff --git a/sdk/argeo-build b/sdk/argeo-build index f2ebcc2..cabcc34 160000 --- a/sdk/argeo-build +++ b/sdk/argeo-build @@ -1 +1 @@ -Subproject commit f2ebcc21eecda1ee5db65700cf16f4833a7190b0 +Subproject commit cabcc3462226b71849ca42301c21e05b63f150c2 diff --git a/sdk/branches/unstable.bnd b/sdk/branches/unstable.bnd index 4cfe309..76ea33e 100644 --- a/sdk/branches/unstable.bnd +++ b/sdk/branches/unstable.bnd @@ -1,4 +1,4 @@ major=2 minor=3 -micro=16 +micro=17 qualifier= diff --git a/sdk/output-argeo-tp-apps.target b/sdk/output-argeo-tp-apps.target index ab4040a..4347af1 100644 --- a/sdk/output-argeo-tp-apps.target +++ b/sdk/output-argeo-tp-apps.target @@ -3,6 +3,7 @@ + diff --git a/sdk/output-argeo-tp-platform.target b/sdk/output-argeo-tp-platform.target index 08e0cb7..d26be02 100644 --- a/sdk/output-argeo-tp-platform.target +++ b/sdk/output-argeo-tp-platform.target @@ -5,12 +5,14 @@ - + + + \ No newline at end of file diff --git a/sdk/output-argeo-tp-rcp-win.target b/sdk/output-argeo-tp-rcp-win.target index 8696d84..c692070 100644 --- a/sdk/output-argeo-tp-rcp-win.target +++ b/sdk/output-argeo-tp-rcp-win.target @@ -3,6 +3,7 @@ + diff --git a/sdk/output-argeo-tp-rcp.target b/sdk/output-argeo-tp-rcp.target index bd35257..2f2d6ac 100644 --- a/sdk/output-argeo-tp-rcp.target +++ b/sdk/output-argeo-tp-rcp.target @@ -3,6 +3,7 @@ + diff --git a/sdk/output-argeo-tp-swt.target b/sdk/output-argeo-tp-swt.target index 40bee2f..76a1b32 100644 --- a/sdk/output-argeo-tp-swt.target +++ b/sdk/output-argeo-tp-swt.target @@ -3,7 +3,6 @@ -