Merge tag 'v2.3.14' into testing
authorMathieu Baudier <mbaudier@argeo.org>
Thu, 1 Jun 2023 06:58:56 +0000 (08:58 +0200)
committerMathieu Baudier <mbaudier@argeo.org>
Thu, 1 Jun 2023 06:58:56 +0000 (08:58 +0200)
375 files changed:
.gitignore
COPYING
Makefile
NOTICE [new file with mode: 0644]
legacy/bootstrap/ant/build.sh [deleted file]
legacy/bootstrap/ant/org.apache.ant-skipTestJars.patch [deleted file]
legacy/org.argeo.tp/biz.aQute.bnd/build.sh [deleted file]
legacy/org.argeo.tp/org.eclipse.jdt.core.compiler.batch/MANIFEST.MF [deleted file]
legacy/org.argeo.tp/org.eclipse.jdt.core.compiler.batch/build.sh [deleted file]
rebuild/Makefile
rebuild/org.argeo.tp.formats/Makefile [deleted file]
rebuild/org.argeo.tp.formats/com.sun.mail.mbox/.classpath [deleted file]
rebuild/org.argeo.tp.formats/com.sun.mail.mbox/.gitignore [deleted file]
rebuild/org.argeo.tp.formats/com.sun.mail.mbox/.project [deleted file]
rebuild/org.argeo.tp.formats/com.sun.mail.mbox/META-INF/.gitignore [deleted file]
rebuild/org.argeo.tp.formats/com.sun.mail.mbox/bnd.bnd [deleted file]
rebuild/org.argeo.tp.formats/com.sun.mail.mbox/build.properties [deleted file]
rebuild/org.argeo.tp.formats/src/.gitignore [deleted file]
rebuild/org.argeo.tp.utils/Makefile [new file with mode: 0644]
rebuild/org.argeo.tp.utils/com.sun.mail.mbox/.classpath [new file with mode: 0644]
rebuild/org.argeo.tp.utils/com.sun.mail.mbox/.gitignore [new file with mode: 0644]
rebuild/org.argeo.tp.utils/com.sun.mail.mbox/.project [new file with mode: 0644]
rebuild/org.argeo.tp.utils/com.sun.mail.mbox/META-INF/.gitignore [new file with mode: 0644]
rebuild/org.argeo.tp.utils/com.sun.mail.mbox/bnd.bnd [new file with mode: 0644]
rebuild/org.argeo.tp.utils/com.sun.mail.mbox/build.properties [new file with mode: 0644]
rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/.gitignore [new file with mode: 0644]
rebuild/org.argeo.tp.utils/src/.gitignore [new file with mode: 0644]
rebuild/org.argeo.tp/Makefile [deleted file]
rebuild/org.argeo.tp/org.argeo.ext.slf4j/.classpath [deleted file]
rebuild/org.argeo.tp/org.argeo.ext.slf4j/.gitignore [deleted file]
rebuild/org.argeo.tp/org.argeo.ext.slf4j/.project [deleted file]
rebuild/org.argeo.tp/org.argeo.ext.slf4j/META-INF/.gitignore [deleted file]
rebuild/org.argeo.tp/org.argeo.ext.slf4j/bnd.bnd [deleted file]
rebuild/org.argeo.tp/org.argeo.ext.slf4j/build.properties [deleted file]
rebuild/org.argeo.tp/org.argeo.ext.slf4j/src/org/slf4j/impl/ArgeoLogger.java [deleted file]
rebuild/org.argeo.tp/org.argeo.ext.slf4j/src/org/slf4j/impl/StaticLoggerBinder.java [deleted file]
rebuild/org.argeo.tp/org.argeo.ext.slf4j/src/org/slf4j/impl/SystemLoggingAdapter.java [deleted file]
repackage/Makefile
repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bc-fips.bnd.disabled [new file with mode: 0644]
repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bc-noncert.bnd [new file with mode: 0644]
repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bcmail-fips.bnd [new file with mode: 0644]
repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bcpg-fips.bnd [new file with mode: 0644]
repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bcpkix-fips.bnd [new file with mode: 0644]
repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bctls-fips.bnd [new file with mode: 0644]
repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/common.bnd [new file with mode: 0644]
repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/bcmail.bnd [new file with mode: 0644]
repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/bcpg.bnd [new file with mode: 0644]
repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/bcpkix.bnd [new file with mode: 0644]
repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/bcprov.bnd [new file with mode: 0644]
repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/bctls.bnd [new file with mode: 0644]
repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/bcutil.bnd [new file with mode: 0644]
repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/common.bnd [new file with mode: 0644]
repackage/crypto/full/org.argeo.tp.crypto/net.i2p.crypto.eddsa.bnd [new file with mode: 0644]
repackage/eclipse.mirrors.txt
repackage/lib/linux/aarch64/org.argeo.tp/eclipse-rcp/common.bnd [new file with mode: 0644]
repackage/lib/linux/aarch64/org.argeo.tp/eclipse-rcp/includes.properties [new file with mode: 0644]
repackage/lib/linux/aarch64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd
repackage/lib/linux/aarch64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd
repackage/lib/linux/aarch64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties
repackage/lib/linux/x86_64/org.argeo.tp/eclipse-rcp/common.bnd [new file with mode: 0644]
repackage/lib/linux/x86_64/org.argeo.tp/eclipse-rcp/includes.properties [new file with mode: 0644]
repackage/lib/linux/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd
repackage/lib/linux/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd
repackage/lib/linux/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties
repackage/lib/macosx/x86_64/org.argeo.tp/eclipse-rcp/common.bnd [new file with mode: 0644]
repackage/lib/macosx/x86_64/org.argeo.tp/eclipse-rcp/includes.properties [new file with mode: 0644]
repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/common.bnd
repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd
repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd
repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties
repackage/lib/win32/x86_64/org.argeo.tp/eclipse-rcp/common.bnd [new file with mode: 0644]
repackage/lib/win32/x86_64/org.argeo.tp/eclipse-rcp/includes.properties [new file with mode: 0644]
repackage/lib/win32/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd
repackage/lib/win32/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd
repackage/lib/win32/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties
repackage/org.argeo.tp.crypto/apache-sshd/common.bnd [deleted file]
repackage/org.argeo.tp.crypto/apache-sshd/merge.bnd [deleted file]
repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.cli.bnd [deleted file]
repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.git.bnd [deleted file]
repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.putty.bnd [deleted file]
repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.scp.bnd [deleted file]
repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.sftp.bnd [deleted file]
repackage/org.argeo.tp.crypto/bouncycastle/bcmail.bnd [deleted file]
repackage/org.argeo.tp.crypto/bouncycastle/bcpg.bnd [deleted file]
repackage/org.argeo.tp.crypto/bouncycastle/bcpkix.bnd [deleted file]
repackage/org.argeo.tp.crypto/bouncycastle/bcprov.bnd [deleted file]
repackage/org.argeo.tp.crypto/bouncycastle/bcutil.bnd [deleted file]
repackage/org.argeo.tp.crypto/bouncycastle/common.bnd [deleted file]
repackage/org.argeo.tp.crypto/net.i2p.crypto.eddsa.bnd [deleted file]
repackage/org.argeo.tp.crypto/org.apache.tomcat.jni.bnd [deleted file]
repackage/org.argeo.tp.earth/geotools/merge.bnd [new file with mode: 0644]
repackage/org.argeo.tp.earth/h2gis/common.bnd [new file with mode: 0644]
repackage/org.argeo.tp.earth/h2gis/org.h2gis.api.bnd [new file with mode: 0644]
repackage/org.argeo.tp.earth/h2gis/org.h2gis.bnd [new file with mode: 0644]
repackage/org.argeo.tp.earth/h2gis/org.h2gis.postgis_jts.bnd [new file with mode: 0644]
repackage/org.argeo.tp.earth/h2gis/org.h2gis.utilities.bnd [new file with mode: 0644]
repackage/org.argeo.tp.earth/org.cts.bnd [new file with mode: 0644]
repackage/org.argeo.tp.earth/org.locationtech.spatial4j.bnd [new file with mode: 0644]
repackage/org.argeo.tp.earth/org.poly2tri.bnd [new file with mode: 0644]
repackage/org.argeo.tp.earth/postgis/common.bnd [new file with mode: 0644]
repackage/org.argeo.tp.earth/postgis/net.postgis.jdbc.bnd [new file with mode: 0644]
repackage/org.argeo.tp.earth/postgis/net.postgis.jdbc.geometry.bnd [new file with mode: 0644]
repackage/org.argeo.tp.earth/postgis/net.postgis.jdbc.java2d.bnd [new file with mode: 0644]
repackage/org.argeo.tp.earth/postgis/net.postgis.jdbc.jts.bnd [new file with mode: 0644]
repackage/org.argeo.tp.gis/ejml/merge.bnd [deleted file]
repackage/org.argeo.tp.gis/geotools/merge.bnd [deleted file]
repackage/org.argeo.tp.gis/h2gis/common.bnd [deleted file]
repackage/org.argeo.tp.gis/h2gis/org.h2gis.api.bnd [deleted file]
repackage/org.argeo.tp.gis/h2gis/org.h2gis.bnd [deleted file]
repackage/org.argeo.tp.gis/h2gis/org.h2gis.postgis_jts.bnd [deleted file]
repackage/org.argeo.tp.gis/h2gis/org.h2gis.utilities.bnd [deleted file]
repackage/org.argeo.tp.gis/org.cts.bnd [deleted file]
repackage/org.argeo.tp.gis/org.locationtech.jts.bnd [deleted file]
repackage/org.argeo.tp.gis/org.locationtech.spatial4j.bnd [deleted file]
repackage/org.argeo.tp.gis/org.poly2tri.bnd [deleted file]
repackage/org.argeo.tp.gis/postgis/common.bnd [deleted file]
repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.bnd [deleted file]
repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.geometry.bnd [deleted file]
repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.java2d.bnd [deleted file]
repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.jts.bnd [deleted file]
repackage/org.argeo.tp.gis/units/merge.bnd [deleted file]
repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd [new file with mode: 0644]
repackage/org.argeo.tp.httpd/jetty/common.bnd [new file with mode: 0644]
repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.alpn.client.bnd [new file with mode: 0644]
repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.alpn.server.bnd [new file with mode: 0644]
repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.client.bnd [new file with mode: 0644]
repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.continuation.bnd.retired [new file with mode: 0644]
repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http.bnd [new file with mode: 0644]
repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.client.bnd [new file with mode: 0644]
repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.common.bnd [new file with mode: 0644]
repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.hpack.bnd [new file with mode: 0644]
repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.server.bnd [new file with mode: 0644]
repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.io.bnd [new file with mode: 0644]
repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.jmx.bnd [new file with mode: 0644]
repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.security.bnd [new file with mode: 0644]
repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.server.bnd [new file with mode: 0644]
repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.servlet.bnd [new file with mode: 0644]
repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.servlets.bnd [new file with mode: 0644]
repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.util.ajax.bnd [new file with mode: 0644]
repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.util.bnd [new file with mode: 0644]
repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.xml.bnd [new file with mode: 0644]
repackage/org.argeo.tp.jcr/EDU.oswego.cs.dl.util.concurrent.bnd
repackage/org.argeo.tp.jcr/jackrabbit/common.bnd
repackage/org.argeo.tp.jcr/jackrabbit/merge.bnd [new file with mode: 0644]
repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.core.bnd [deleted file]
repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.core.bnd.disabled [new file with mode: 0644]
repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.data.bnd [deleted file]
repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.data.bnd.disabled [new file with mode: 0644]
repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.jcr.client.bnd
repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.jcr.commons.bnd
repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.jcr2dav.bnd
repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.jcr2spi.bnd
repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.server.bnd
repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.servlet.bnd [deleted file]
repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.servlet.bnd.disabled [new file with mode: 0644]
repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.spi.bnd
repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.spi.commons.bnd
repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.spi2dav.bnd
repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.spi2jcr.bnd
repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.webdav.bnd
repackage/org.argeo.tp.jcr/javax.jcr.bnd
repackage/org.argeo.tp.jcr/oak/common.bnd
repackage/org.argeo.tp.jcr/oak/org.apache.jackrabbit.api.bnd
repackage/org.argeo.tp.jcr/org.apache.commons.collections.bnd [deleted file]
repackage/org.argeo.tp.jcr/org.apache.commons.dbcp.bnd [deleted file]
repackage/org.argeo.tp.jcr/org.apache.commons.pool.bnd [deleted file]
repackage/org.argeo.tp.jcr/org.apache.lucene.bnd
repackage/org.argeo.tp.jetty/jetty-websocket/merge.bnd [deleted file]
repackage/org.argeo.tp.jetty/jetty/common.bnd [deleted file]
repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.alpn.client.bnd [deleted file]
repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.alpn.server.bnd [deleted file]
repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.client.bnd [deleted file]
repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.continuation.bnd.retired [deleted file]
repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.http.bnd [deleted file]
repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.http2.client.bnd [deleted file]
repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.http2.common.bnd [deleted file]
repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.http2.hpack.bnd [deleted file]
repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.http2.server.bnd [deleted file]
repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.io.bnd [deleted file]
repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.jmx.bnd [deleted file]
repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.security.bnd [deleted file]
repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.server.bnd [deleted file]
repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.servlet.bnd [deleted file]
repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.servlets.bnd [deleted file]
repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.util.ajax.bnd [deleted file]
repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.util.bnd [deleted file]
repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.xml.bnd [deleted file]
repackage/org.argeo.tp.math/ejml/merge.bnd [new file with mode: 0644]
repackage/org.argeo.tp.math/org.apache.commons.math3.bnd [new file with mode: 0644]
repackage/org.argeo.tp.math/org.locationtech.jts.bnd [new file with mode: 0644]
repackage/org.argeo.tp.math/units/merge.bnd [new file with mode: 0644]
repackage/org.argeo.tp.office/com.healthmarketscience.jackcess.bnd [new file with mode: 0644]
repackage/org.argeo.tp.office/log4j/common.bnd [new file with mode: 0644]
repackage/org.argeo.tp.office/log4j/org.apache.logging.log4j.api.bnd [new file with mode: 0644]
repackage/org.argeo.tp.office/log4j/org.apache.logging.log4j.core.bnd [new file with mode: 0644]
repackage/org.argeo.tp.office/org.apache.xmlbeans.bnd [new file with mode: 0644]
repackage/org.argeo.tp.office/poi/common.bnd [new file with mode: 0644]
repackage/org.argeo.tp.office/poi/org.apache.poi.bnd [new file with mode: 0644]
repackage/org.argeo.tp.office/poi/org.apache.poi.ooxml.bnd [new file with mode: 0644]
repackage/org.argeo.tp.office/poi/org.apache.poi.ooxml.schemas.bnd [new file with mode: 0644]
repackage/org.argeo.tp.office/poi/org.apache.poi.scratchpad.bnd [new file with mode: 0644]
repackage/org.argeo.tp.poi/com.healthmarketscience.jackcess.bnd [deleted file]
repackage/org.argeo.tp.poi/log4j/common.bnd [deleted file]
repackage/org.argeo.tp.poi/log4j/org.apache.logging.log4j.api.bnd [deleted file]
repackage/org.argeo.tp.poi/log4j/org.apache.logging.log4j.core.bnd [deleted file]
repackage/org.argeo.tp.poi/org.apache.xmlbeans.bnd [deleted file]
repackage/org.argeo.tp.poi/poi/common.bnd [deleted file]
repackage/org.argeo.tp.poi/poi/org.apache.poi.bnd [deleted file]
repackage/org.argeo.tp.poi/poi/org.apache.poi.ooxml.bnd [deleted file]
repackage/org.argeo.tp.poi/poi/org.apache.poi.ooxml.schemas.bnd [deleted file]
repackage/org.argeo.tp.poi/poi/org.apache.poi.scratchpad.bnd [deleted file]
repackage/org.argeo.tp.publish/com.github.librepdf.openpdf.bnd [new file with mode: 0644]
repackage/org.argeo.tp.publish/de.rototor.pdfbox.graphics2d.bnd [new file with mode: 0644]
repackage/org.argeo.tp.publish/flying-saucer/common.bnd [new file with mode: 0644]
repackage/org.argeo.tp.publish/flying-saucer/org.xhtmlrenderer.core.bnd [new file with mode: 0644]
repackage/org.argeo.tp.publish/flying-saucer/org.xhtmlrenderer.openpdf.bnd [new file with mode: 0644]
repackage/org.argeo.tp.publish/flying-saucer/org.xhtmlrenderer.swt.bnd.disabled [new file with mode: 0644]
repackage/org.argeo.tp.publish/fop/merge.bnd [new file with mode: 0644]
repackage/org.argeo.tp.publish/org.apache.pdfbox.jempbox.bnd [new file with mode: 0644]
repackage/org.argeo.tp.publish/pdfbox/common.bnd [new file with mode: 0644]
repackage/org.argeo.tp.publish/pdfbox/org.apache.fontbox.bnd [new file with mode: 0644]
repackage/org.argeo.tp.publish/pdfbox/org.apache.pdfbox.bnd [new file with mode: 0644]
repackage/org.argeo.tp.publish/pdfbox/org.apache.xmpbox.bnd [new file with mode: 0644]
repackage/org.argeo.tp.sdk/biz.aQute.bndlib.bnd [deleted file]
repackage/org.argeo.tp.sdk/junit-jupiter/merge.bnd
repackage/org.argeo.tp.sdk/junit-platform/merge.bnd
repackage/org.argeo.tp.sdk/org.apiguardian.api.bnd [new file with mode: 0644]
repackage/org.argeo.tp.sdk/org.apiguardian.bnd [deleted file]
repackage/org.argeo.tp.sdk/org.eclipse.jdt.core.compiler.batch.bnd [deleted file]
repackage/org.argeo.tp.sdk/org.hamcrest.core.bnd
repackage/org.argeo.tp.sdk/org.junit.bnd
repackage/org.argeo.tp.sdk/org.junit.vintage.bnd
repackage/org.argeo.tp.sdk/org.opentest4j.bnd
repackage/org.argeo.tp.sdk/org.redline-rpm.bnd
repackage/org.argeo.tp.sql/org.h2.bnd [deleted file]
repackage/org.argeo.tp.sql/org.postgresql.bnd [deleted file]
repackage/org.argeo.tp.utils/asm/common.bnd [new file with mode: 0644]
repackage/org.argeo.tp.utils/asm/org.objectweb.asm.bnd [new file with mode: 0644]
repackage/org.argeo.tp.utils/asm/org.objectweb.asm.tree.analysis.bnd [new file with mode: 0644]
repackage/org.argeo.tp.utils/asm/org.objectweb.asm.tree.bnd [new file with mode: 0644]
repackage/org.argeo.tp.utils/asm/org.objectweb.asm.util.bnd [new file with mode: 0644]
repackage/org.argeo.tp.utils/com.adobe.xmp.xmpcore.bnd
repackage/org.argeo.tp.utils/com.dd.plist.bnd
repackage/org.argeo.tp.utils/com.drew.metadata.bnd
repackage/org.argeo.tp.utils/com.github.mangstadt.biweekly.bnd
repackage/org.argeo.tp.utils/com.github.mangstadt.ezvcard.bnd
repackage/org.argeo.tp.utils/com.github.mangstadt.vinnie.bnd
repackage/org.argeo.tp.utils/com.googlecode.javaewah.JavaEWAH.bnd [new file with mode: 0644]
repackage/org.argeo.tp.utils/com.graphbuilder.bnd
repackage/org.argeo.tp.utils/com.lowagie.bnd [deleted file]
repackage/org.argeo.tp.utils/com.pff.bnd
repackage/org.argeo.tp.utils/com.zaxxer.sparsebits.bnd
repackage/org.argeo.tp.utils/de.rototor.pdfbox.graphics2d.bnd [deleted file]
repackage/org.argeo.tp.utils/de.thjom.java.systemd.bnd [new file with mode: 0644]
repackage/org.argeo.tp.utils/flying-saucer/common.bnd [deleted file]
repackage/org.argeo.tp.utils/flying-saucer/org.xhtmlrenderer.core.bnd [deleted file]
repackage/org.argeo.tp.utils/flying-saucer/org.xhtmlrenderer.openpdf.bnd [deleted file]
repackage/org.argeo.tp.utils/flying-saucer/org.xhtmlrenderer.swt.bnd.disabled [deleted file]
repackage/org.argeo.tp.utils/fop/merge.bnd [deleted file]
repackage/org.argeo.tp.utils/io.nayuki.qrcodegen.bnd
repackage/org.argeo.tp.utils/javax.activation.bnd
repackage/org.argeo.tp.utils/javax.el.bnd [new file with mode: 0644]
repackage/org.argeo.tp.utils/javax.mail.bnd
repackage/org.argeo.tp.utils/javax.servlet.jsp.bnd [new file with mode: 0644]
repackage/org.argeo.tp.utils/javax.xml.bind.bnd
repackage/org.argeo.tp.utils/net.sf.cglib.bnd [new file with mode: 0644]
repackage/org.argeo.tp.utils/net.sf.saxon.bnd [new file with mode: 0644]
repackage/org.argeo.tp.utils/org.apache.commons.beanutils.bnd [new file with mode: 0644]
repackage/org.argeo.tp.utils/org.apache.commons.codec.bnd [deleted file]
repackage/org.argeo.tp.utils/org.apache.commons.collections.bnd [new file with mode: 0644]
repackage/org.argeo.tp.utils/org.apache.commons.collections4.bnd
repackage/org.argeo.tp.utils/org.apache.commons.compress.bnd [deleted file]
repackage/org.argeo.tp.utils/org.apache.commons.csv.bnd
repackage/org.argeo.tp.utils/org.apache.commons.dbcp.bnd [new file with mode: 0644]
repackage/org.argeo.tp.utils/org.apache.commons.dbcp2.bnd [new file with mode: 0644]
repackage/org.argeo.tp.utils/org.apache.commons.digester.bnd [new file with mode: 0644]
repackage/org.argeo.tp.utils/org.apache.commons.exec.bnd
repackage/org.argeo.tp.utils/org.apache.commons.imaging.bnd
repackage/org.argeo.tp.utils/org.apache.commons.jxpath.bnd [new file with mode: 0644]
repackage/org.argeo.tp.utils/org.apache.commons.lang3.bnd
repackage/org.argeo.tp.utils/org.apache.commons.math3.bnd [deleted file]
repackage/org.argeo.tp.utils/org.apache.commons.pool.bnd [new file with mode: 0644]
repackage/org.argeo.tp.utils/org.apache.commons.pool2.bnd [new file with mode: 0644]
repackage/org.argeo.tp.utils/org.apache.commons.text.bnd
repackage/org.argeo.tp.utils/org.apache.commons.vfs.bnd [deleted file]
repackage/org.argeo.tp.utils/org.apache.commons.vfs2.bnd [new file with mode: 0644]
repackage/org.argeo.tp.utils/org.apache.pdfbox.jempbox.bnd [deleted file]
repackage/org.argeo.tp.utils/org.apache.santuario.xmlsec.bnd [new file with mode: 0644]
repackage/org.argeo.tp.utils/org.apache.xml.security.bnd [deleted file]
repackage/org.argeo.tp.utils/org.eclipse.jgit.bnd [new file with mode: 0644]
repackage/org.argeo.tp.utils/org.mozilla.javascript.bnd [deleted file]
repackage/org.argeo.tp.utils/org.mozilla.rhino.bnd [new file with mode: 0644]
repackage/org.argeo.tp.utils/org.tukaani.xz.bnd [deleted file]
repackage/org.argeo.tp.utils/org.xmlresolver.bnd [new file with mode: 0644]
repackage/org.argeo.tp.utils/pdfbox/common.bnd [deleted file]
repackage/org.argeo.tp.utils/pdfbox/org.apache.pdfbox.bnd [deleted file]
repackage/org.argeo.tp.utils/pdfbox/org.apache.pdfbox.fontbox.bnd [deleted file]
repackage/org.argeo.tp.utils/pdfbox/org.apache.pdfbox.xmpbox.bnd [deleted file]
repackage/org.argeo.tp.utils/tika/merge.bnd
repackage/org.argeo.tp/apache-sshd/common.bnd [new file with mode: 0644]
repackage/org.argeo.tp/apache-sshd/merge.bnd [new file with mode: 0644]
repackage/org.argeo.tp/apache-sshd/org.apache.sshd.cli.bnd [new file with mode: 0644]
repackage/org.argeo.tp/apache-sshd/org.apache.sshd.git.bnd [new file with mode: 0644]
repackage/org.argeo.tp/apache-sshd/org.apache.sshd.putty.bnd [new file with mode: 0644]
repackage/org.argeo.tp/apache-sshd/org.apache.sshd.scp.bnd [new file with mode: 0644]
repackage/org.argeo.tp/apache-sshd/org.apache.sshd.sftp.bnd [new file with mode: 0644]
repackage/org.argeo.tp/batik/common.bnd
repackage/org.argeo.tp/batik/merge.bnd
repackage/org.argeo.tp/batik/org.apache.batik.constants.bnd
repackage/org.argeo.tp/batik/org.apache.batik.css.bnd
repackage/org.argeo.tp/batik/org.apache.batik.i18n.bnd
repackage/org.argeo.tp/batik/org.apache.batik.util.bnd
repackage/org.argeo.tp/com.googlecode.javaewah.JavaEWAH.bnd [deleted file]
repackage/org.argeo.tp/dbus-java/merge.bnd
repackage/org.argeo.tp/de.thjom.java.systemd.bnd [deleted file]
repackage/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson-annotations.bnd [deleted file]
repackage/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson-core.bnd [deleted file]
repackage/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson-databind.bnd [deleted file]
repackage/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson.annotations.bnd [new file with mode: 0644]
repackage/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson.core.bnd [new file with mode: 0644]
repackage/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson.databind.bnd [new file with mode: 0644]
repackage/org.argeo.tp/jackson/common.bnd
repackage/org.argeo.tp/javax.servlet.bnd
repackage/org.argeo.tp/javax.websocket.bnd
repackage/org.argeo.tp/org.apache.commons.cli.bnd
repackage/org.argeo.tp/org.apache.commons.codec.bnd [new file with mode: 0644]
repackage/org.argeo.tp/org.apache.commons.compress.bnd [new file with mode: 0644]
repackage/org.argeo.tp/org.apache.commons.fileupload.bnd
repackage/org.argeo.tp/org.apache.commons.io.bnd
repackage/org.argeo.tp/org.apache.httpcomponents.httpclient.bnd
repackage/org.argeo.tp/org.apache.httpcomponents.httpcore.bnd
repackage/org.argeo.tp/org.apache.httpcomponents.httpmime.bnd
repackage/org.argeo.tp/org.apache.tomcat.jni.bnd [new file with mode: 0644]
repackage/org.argeo.tp/org.apache.xerces.bnd
repackage/org.argeo.tp/org.apache.xml.resolver.bnd
repackage/org.argeo.tp/org.eclipse.jgit.bnd [deleted file]
repackage/org.argeo.tp/org.h2.bnd [new file with mode: 0644]
repackage/org.argeo.tp/org.jline.bnd [new file with mode: 0644]
repackage/org.argeo.tp/org.mozilla.universalchardet.bnd [new file with mode: 0644]
repackage/org.argeo.tp/org.postgresql.jdbc.bnd [new file with mode: 0644]
repackage/org.argeo.tp/org.tukaani.xz.bnd [new file with mode: 0644]
repackage/org.argeo.tp/org.w3c.css.sac.bnd
repackage/org.argeo.tp/org.w3c.dom.smil.bnd
repackage/org.argeo.tp/org.w3c.dom.svg.bnd
repackage/org.argeo.tp/slf4j/common.bnd [deleted file]
repackage/org.argeo.tp/slf4j/org.slf4j.api.bnd [deleted file]
repackage/org.argeo.tp/slf4j/org.slf4j.commons.logging.bnd [deleted file]
repackage/org.argeo.tp/xalan/merge.bnd [deleted file]
repackage/org.argeo.tp/xmlgraphics/merge.bnd
repackage/osgi/api/org.argeo.tp.osgi/osgi.cmpn.bnd
repackage/osgi/api/org.argeo.tp.osgi/osgi.core.bnd
repackage/osgi/equinox/org.argeo.tp.eclipse/eclipse-equinox/common.bnd
repackage/osgi/equinox/org.argeo.tp.osgi/eclipse-equinox/common.bnd
repackage/swt/rap/org.argeo.tp.swt.workbench/eclipse-rap/common.bnd
repackage/swt/rap/org.argeo.tp.swt.workbench/eclipse-rap/includes.properties
repackage/swt/rap/org.argeo.tp.swt/eclipse-rap/common.bnd
repackage/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/common.bnd
repackage/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/includes.properties
repackage/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd
repackage/swt/rcp/org.argeo.tp.swt/eclipse-nebula/common.bnd
repackage/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd
repackage/uris.properties
sdk/.gitignore [new file with mode: 0644]
sdk/argeo-build
sdk/branches/unstable.bnd
sdk/output-argeo-tp-apps.target [new file with mode: 0644]
sdk/output-argeo-tp-backend.target [deleted file]
sdk/output-argeo-tp-minimal.target [deleted file]
sdk/output-argeo-tp-platform.target [new file with mode: 0644]
sdk/output-argeo-tp-rap.target
sdk/output-argeo-tp-rcp-win.target
sdk/output-argeo-tp-rcp.target
sdk/output-argeo-tp-rwt.target
sdk/output-argeo-tp-swt-win.target
sdk/output-argeo-tp-swt.target

index 2f26f165df281ba8f5b6f161e59db7144d11551b..070ded16949652895ac3c84f22ccc3ea38367db7 100644 (file)
@@ -1 +1,10 @@
-sdk.mk
\ No newline at end of file
+sdk.mk
+/output/
+*.build
+*.buildinfo
+*.changes
+*.dsc
+*.tar
+*.tar.*
+*.deb
+*.rpm
diff --git a/COPYING b/COPYING
index f288702d2fa16d3cdf0035b15a9fcbc552cd88e7..d159169d1050894d3ea3b98e1c965c4058208fe1 100644 (file)
--- a/COPYING
+++ b/COPYING
                     GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
+                       Version 2, June 1991
 
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
                             Preamble
 
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
 
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
 
   For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
 this License.
 
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
 
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
 
                      END OF TERMS AND CONDITIONS
 
@@ -628,15 +287,15 @@ free software which everyone can redistribute and change under these terms.
 
   To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
+convey the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
     Copyright (C) <year>  <name of author>
 
-    This program is free software: you can redistribute it and/or modify
+    This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
+    the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
@@ -644,31 +303,37 @@ the "copyright" line and a pointer to where the full notice is found.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
 
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
 
 The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
index 8327b9bef846407c6c0a5c1c7ad0b891f33e8a8b..faff1a3d58940e487105d2f90de1bf7e8898cf7c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,27 +1,30 @@
 include sdk.mk
-.PHONY: clean all
+.PHONY: clean all bootstrap
 
 all: distribution
 
-BOOTSTRAP_BASE=$(SDK_BUILD_BASE)/bootstrap
+install:
+       make -C repackage install
+       make -C rebuild install
+       
+uninstall:
+       make -C repackage uninstall
+       make -C rebuild uninstall
+       
 
 A2_OUTPUT = $(SDK_BUILD_BASE)/a2
 
-distribution: bootstrap
+distribution:
        make -C repackage all
        make -C rebuild all
        
-bootstrap :
-       mkdir -p $(SDK_BUILD_BASE)/bootstrap
-       wget -c -O $(BOOTSTRAP_BASE)/ecj.jar https://repo1.maven.org/maven2/org/eclipse/jdt/ecj/3.29.0/ecj-3.29.0.jar
-       wget -c -O $(BOOTSTRAP_BASE)/slf4j-api.jar https://repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.28/slf4j-api-1.7.28.jar
-       wget -c -O $(BOOTSTRAP_BASE)/bndlib.jar https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/5.3.0/biz.aQute.bndlib-5.3.0.jar
-
 clean:
-       rm -rf $(BOOTSTRAP_BASE)
        make -C repackage clean
        make -C rebuild clean
 
+native-deps-debian:
+       sudo apt install liblockfile-dev
+
 clean-origin-cache:
        rm -rf $(HOME)/.cache/argeo/build
 
diff --git a/NOTICE b/NOTICE
new file mode 100644 (file)
index 0000000..f9d6825
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,24 @@
+Argeo Third Parties - Build and repackaging harness for third party libraries
+
+Copyright 2013-2023 Mathieu Baudier
+Copyright 2013-2023 Argeo GmbH
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, see <https://www.gnu.org/licenses>.
+
+## Clarification
+Please note that this copyright and license only cover the scripts, programs,
+descriptors, or any other content originally produced in order to rebuild or
+repackage third-party software. They do NOT cover the rebuilt or repackaged
+components themselves when they are redistributed. These third-party components 
+are redistributed under they own applicable licenses.
diff --git a/legacy/bootstrap/ant/build.sh b/legacy/bootstrap/ant/build.sh
deleted file mode 100755 (executable)
index 771016f..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-source ../../../bin/argeo-builder
-argeo_builder_variables $PWD
-
-VERSION=1.8.4
-
-SOURCE_FILE=/ant/source/apache-ant-$VERSION-src.tar.gz
-SOURCE_FILENAME=${SOURCE_FILE##*/}
-SRC_DIR=$BUILD_DIR/src
-CLASSES_DIR=$BUILD_DIR/classes
-
-echo Download sources
-argeo_builder_download_apache $SOURCE_FILE
-
-echo Untar sources
-reset_dir $BUILD_DIR
-(cd $BUILD_DIR && tar -xzf $SOURCE_DIR/$SOURCE_FILENAME)
-mv $BUILD_DIR/apache-ant-* $BUILD_DIR/apache-ant
-
-echo Patch
-(cd $BUILD_DIR/apache-ant && patch < $ARTIFACT_DIR/org.apache.ant-skipTestJars.patch)
-
-echo Build bootstrap
-(cd $BUILD_DIR/apache-ant && sh build.sh jars)
-
-push_to_cache $BUILD_DIR/apache-ant/build/lib/ant.jar
-push_to_cache $BUILD_DIR/apache-ant/build/lib/ant-launcher.jar
diff --git a/legacy/bootstrap/ant/org.apache.ant-skipTestJars.patch b/legacy/bootstrap/ant/org.apache.ant-skipTestJars.patch
deleted file mode 100644 (file)
index 5d16574..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
---- build.xml.orig     2012-05-22 06:25:21.000000000 +0200
-+++ build.xml  2013-01-30 07:36:35.990006411 +0100
-@@ -884,7 +884,7 @@
-        ===================================================================
-   -->
-   <target name="dist-lite"
--    depends="jars,test-jar"
-+    depends="jars"
-     description="--> creates a minimum distribution to run Apache Ant">
-     <mkdir dir="${dist.dir}"/>
-
diff --git a/legacy/org.argeo.tp/biz.aQute.bnd/build.sh b/legacy/org.argeo.tp/biz.aQute.bnd/build.sh
deleted file mode 100755 (executable)
index 39a01a7..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-source ../../../bin/argeo-builder
-argeo_builder_variables $PWD
-
-VERSION=2.0.0
-
-echo Checkout
-[ -d $SOURCE_DIR ] && echo git pull || mkdir -p $SOURCE_DIR; (cd $SOURCE_DIR && git clone git://github.com/bndtools/bnd.git .);
-#mkdir -p $SOURCE_DIR
-
-
-echo Build
-reset_dir $BUILD_DIR
-(cd $BUILD_DIR && git clone file://$SOURCE_DIR .)
-(cd $BUILD_DIR && run_ant dist)
-
-push_to_cache $BUILD_DIR/dist/bundles/biz.aQute.bnd/biz.aQute.bnd-$VERSION.jar
-push_to_cache $BUILD_DIR/dist/bundles/biz.aQute.bndlib/biz.aQute.bndlib-$VERSION.jar
-
diff --git a/legacy/org.argeo.tp/org.eclipse.jdt.core.compiler.batch/MANIFEST.MF b/legacy/org.argeo.tp/org.eclipse.jdt.core.compiler.batch/MANIFEST.MF
deleted file mode 100644 (file)
index 0981fae..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: org.eclipse.jdt.internal.compiler.batch.Main
-Bundle-ManifestVersion: 2
-Bundle-Name: Eclipse Compiler for Java(TM)
-Bundle-SymbolicName: org.eclipse.jdt.core.compiler.batch
-Bundle-Version: $BUNDLE_VERSION
-Bundle-ClassPath: .
-Bundle-Vendor: Eclipse.org
-Export-Package: org.eclipse.jdt.core,
- org.eclipse.jdt.core.compiler,
- org.eclipse.jdt.internal.antadapter;x-internal:=true,
- org.eclipse.jdt.internal.compiler;x-internal:=true,
- org.eclipse.jdt.internal.compiler.apt.dispatch;x-internal:=true,
- org.eclipse.jdt.internal.compiler.apt.model;x-internal:=true,
- org.eclipse.jdt.internal.compiler.apt.util;x-internal:=true,
- org.eclipse.jdt.internal.compiler.ast;x-internal:=true,
- org.eclipse.jdt.internal.compiler.batch;x-internal:=true,
- org.eclipse.jdt.internal.compiler.classfmt;x-internal:=true,
- org.eclipse.jdt.internal.compiler.codegen;x-internal:=true,
- org.eclipse.jdt.internal.compiler.env;x-internal:=true,
- org.eclipse.jdt.internal.compiler.flow;x-internal:=true,
- org.eclipse.jdt.internal.compiler.impl;x-internal:=true,
- org.eclipse.jdt.internal.compiler.lookup;x-internal:=true,
- org.eclipse.jdt.internal.compiler.parser;x-internal:=true,
- org.eclipse.jdt.internal.compiler.parser.diagnose;x-internal:=true,
- org.eclipse.jdt.internal.compiler.problem;x-internal:=true,
- org.eclipse.jdt.internal.compiler.util;x-internal:=true,
- org.eclipse.jdt.internal.compiler.tool;x-internal:=true
diff --git a/legacy/org.argeo.tp/org.eclipse.jdt.core.compiler.batch/build.sh b/legacy/org.argeo.tp/org.eclipse.jdt.core.compiler.batch/build.sh
deleted file mode 100755 (executable)
index de70d08..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-source ../../../bin/argeo-builder
-argeo_builder_variables $PWD
-
-SOURCE_FILE=/eclipse/downloads/drops4/R-4.2.1-201209141800/ecjsrc-4.2.1.jar
-SOURCE_FILENAME=${SOURCE_FILE##*/}
-SRC_DIR=$BUILD_DIR/src
-CLASSES_DIR=$BUILD_DIR/classes
-
-BUNDLE_VERSION=3.8.2
-
-# TODO make javac choice more configurable 
-JAVAC=$JAVA_HOME/bin/javac
-JAR=$JAVA_HOME/bin/jar
-
-JAVAC_OPTS="-nowarn -source 1.6 -target 1.6 -classpath $CACHE_BASE/bootstrap/ant.jar"
-
-echo Download sources
-argeo_builder_download_eclipse $SOURCE_FILE
-
-echo Unjar sources
-reset_dir $SRC_DIR
-(cd $SRC_DIR && $JAR -xvf $SOURCE_DIR/$SOURCE_FILENAME)
-
-echo Compile
-reset_dir $CLASSES_DIR
-$JAVAC $JAVAC_OPTS -d $CLASSES_DIR $(find $SRC_DIR/org/* | grep .java) 2>&1 | tee $BUILD_DIR/build.log
-
-echo Copy additional files
-(cd $SRC_DIR && cp --parents $(find . | grep .rsc) $CLASSES_DIR)
-(cd $SRC_DIR && cp --parents $(find . | grep .properties) $CLASSES_DIR)
-(cd $SRC_DIR && cp --parents $(find . | grep .props) $CLASSES_DIR)
-mkdir $CLASSES_DIR/META-INF
-cp -r $SRC_DIR/META-INF/services $CLASSES_DIR/META-INF
-
-echo Generate MANIFEST.MF
-MANIFEST_FILE=$ARTIFACT_DIR/MANIFEST.MF
-
-CACHE_JAR_FILE=${ARTIFACT_DIR/specs/cache}_$BUNDLE_VERSION.jar
-echo Create jar file $CACHE_JAR_FILE
-mkdir -p $(dirname $CACHE_JAR_FILE)
-$JAR -cfm $CACHE_JAR_FILE $MANIFEST_FILE -C $CLASSES_DIR .
index bbf429c58e6240c08562777bf1202c1e1f293bed..792dfdac8af3679878a894586ab26f3b7498da04 100644 (file)
@@ -1,10 +1,14 @@
 .PHONY: clean all
 
 all:
-       make -C org.argeo.tp all
-       make -C org.argeo.tp.formats all
+       make -C org.argeo.tp.utils all
+
+install:
+       make -C org.argeo.tp.utils install
+       
+uninstall:
+       make -C org.argeo.tp.utils uninstall
        
 clean:
-       make -C org.argeo.tp clean
-       make -C org.argeo.tp.formats clean
+       make -C org.argeo.tp.utils clean
        
\ No newline at end of file
diff --git a/rebuild/org.argeo.tp.formats/Makefile b/rebuild/org.argeo.tp.formats/Makefile
deleted file mode 100644 (file)
index 99dff70..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-include ../../sdk.mk
-.PHONY: clean all osgi
-
-all: retrieve-ee4j-mbox osgi
-
-retrieve-ee4j-mbox: SRC_DIR=src/ee4j-mail
-retrieve-ee4j-mbox:
-       rm -rf $(SRC_DIR)
-       mkdir -p $(SRC_DIR)
-       #git -C $(SRC_DIR) init
-       #git -C $(SRC_DIR) remote add -f origin https://github.com/eclipse-ee4j/mail.git
-       #git -C $(SRC_DIR) config core.sparseCheckout true
-       #echo "mbox" >> $(SRC_DIR)/.git/info/sparse-checkout
-       #git -C $(SRC_DIR) pull origin 1.6.7
-       git clone --branch 1.6.7 https://github.com/eclipse-ee4j/mail.git $(SRC_DIR)
-       rm -rf $(SRC_DIR)/.git
-       rsync -a --delete --exclude module-info.java $(SRC_DIR)/mbox/src/main/java/ com.sun.mail.mbox/src
-
-A2_CATEGORY = org.argeo.tp.utils
-
-BUNDLES = \
-com.sun.mail.mbox \
-
-clean:
-       rm -rf $(BUILD_BASE)
-
-DEP_CATEGORIES = org.argeo.tp.utils
-
-include  $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
\ No newline at end of file
diff --git a/rebuild/org.argeo.tp.formats/com.sun.mail.mbox/.classpath b/rebuild/org.argeo.tp.formats/com.sun.mail.mbox/.classpath
deleted file mode 100644 (file)
index ca9ba96..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-               <attributes>
-                       <attribute name="module" value="true"/>
-               </attributes>
-       </classpathentry>
-       <classpathentry kind="src" path="src"/>
-       <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/rebuild/org.argeo.tp.formats/com.sun.mail.mbox/.gitignore b/rebuild/org.argeo.tp.formats/com.sun.mail.mbox/.gitignore
deleted file mode 100644 (file)
index 668266f..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-/src/
-/bin/
\ No newline at end of file
diff --git a/rebuild/org.argeo.tp.formats/com.sun.mail.mbox/.project b/rebuild/org.argeo.tp.formats/com.sun.mail.mbox/.project
deleted file mode 100644 (file)
index c003462..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-       <name>com.sun.mail.mbox</name>
-       <comment></comment>
-       <projects>
-       </projects>
-       <buildSpec>
-               <buildCommand>
-                       <name>org.eclipse.jdt.core.javabuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.ManifestBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.SchemaBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-       </buildSpec>
-       <natures>
-               <nature>org.eclipse.pde.PluginNature</nature>
-               <nature>org.eclipse.jdt.core.javanature</nature>
-       </natures>
-</projectDescription>
diff --git a/rebuild/org.argeo.tp.formats/com.sun.mail.mbox/META-INF/.gitignore b/rebuild/org.argeo.tp.formats/com.sun.mail.mbox/META-INF/.gitignore
deleted file mode 100644 (file)
index 4854a41..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/MANIFEST.MF
diff --git a/rebuild/org.argeo.tp.formats/com.sun.mail.mbox/bnd.bnd b/rebuild/org.argeo.tp.formats/com.sun.mail.mbox/bnd.bnd
deleted file mode 100644 (file)
index 66fc6c7..0000000
+++ /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.formats/com.sun.mail.mbox/build.properties b/rebuild/org.argeo.tp.formats/com.sun.mail.mbox/build.properties
deleted file mode 100644 (file)
index 34d2e4d..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .
diff --git a/rebuild/org.argeo.tp.formats/src/.gitignore b/rebuild/org.argeo.tp.formats/src/.gitignore
deleted file mode 100644 (file)
index ca46c96..0000000
+++ /dev/null
@@ -1 +0,0 @@
-ee4j-mail/
\ No newline at end of file
diff --git a/rebuild/org.argeo.tp.utils/Makefile b/rebuild/org.argeo.tp.utils/Makefile
new file mode 100644 (file)
index 0000000..95dcab8
--- /dev/null
@@ -0,0 +1,52 @@
+include ../../sdk.mk
+.PHONY: clean all osgi
+
+export NO_SDK_LEGAL := true
+
+MBOX_JNI_SRC=jni/com_sun_mail_mbox
+MBOX_TARGET_EXEC=libmbox.so
+
+all: retrieve-ee4j-mbox osgi jni-ee4j-mbox
+
+install: osgi-install
+       
+uninstall: osgi-uninstall
+
+retrieve-ee4j-mbox: SRC_DIR=src/ee4j-mail
+retrieve-ee4j-mbox:
+       rm -rf $(SRC_DIR)
+       mkdir -p $(SRC_DIR)
+       #git -C $(SRC_DIR) init
+       #git -C $(SRC_DIR) remote add -f origin https://github.com/eclipse-ee4j/mail.git
+       #git -C $(SRC_DIR) config core.sparseCheckout true
+       #echo "mbox" >> $(SRC_DIR)/.git/info/sparse-checkout
+       #git -C $(SRC_DIR) pull origin 1.6.7
+       git clone --branch 1.6.7 https://github.com/eclipse-ee4j/mail.git $(SRC_DIR)
+       rm -rf $(SRC_DIR)/.git
+       rsync -a --delete --exclude module-info.java $(SRC_DIR)/mbox/src/main/java/ com.sun.mail.mbox/src
+       # 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
+
+A2_CATEGORY = org.argeo.tp.utils
+
+BUNDLES = \
+com.sun.mail.mbox \
+
+clean:
+       rm -rf $(BUILD_BASE)
+
+DEP_CATEGORIES = org.argeo.tp.utils
+
+include  $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
+
+A2_NATIVE_CATEGORY=$(A2_OUTPUT)/lib/linux/$(shell uname -m)/$(A2_CATEGORY)
+
+jni-ee4j-mbox:
+       mkdir -p $(A2_NATIVE_CATEGORY)
+       $(CC) -o $(A2_NATIVE_CATEGORY)/$(MBOX_TARGET_EXEC) \
+        -shared -fPIC -fpic -Wl,-soname,$(MBOX_TARGET_EXEC).1.6 \
+        -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux $(MBOX_JNI_SRC)/*.c
+
diff --git a/rebuild/org.argeo.tp.utils/com.sun.mail.mbox/.classpath b/rebuild/org.argeo.tp.utils/com.sun.mail.mbox/.classpath
new file mode 100644 (file)
index 0000000..ca9ba96
--- /dev/null
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
+               <attributes>
+                       <attribute name="module" value="true"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="src" path="src"/>
+       <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/rebuild/org.argeo.tp.utils/com.sun.mail.mbox/.gitignore b/rebuild/org.argeo.tp.utils/com.sun.mail.mbox/.gitignore
new file mode 100644 (file)
index 0000000..668266f
--- /dev/null
@@ -0,0 +1,2 @@
+/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
new file mode 100644 (file)
index 0000000..c003462
--- /dev/null
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>com.sun.mail.mbox</name>
+       <comment></comment>
+       <projects>
+       </projects>
+       <buildSpec>
+               <buildCommand>
+                       <name>org.eclipse.jdt.core.javabuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.ManifestBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.SchemaBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+       </buildSpec>
+       <natures>
+               <nature>org.eclipse.pde.PluginNature</nature>
+               <nature>org.eclipse.jdt.core.javanature</nature>
+       </natures>
+</projectDescription>
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
new file mode 100644 (file)
index 0000000..4854a41
--- /dev/null
@@ -0,0 +1 @@
+/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
new file mode 100644 (file)
index 0000000..66fc6c7
--- /dev/null
@@ -0,0 +1,9 @@
+Export-Package: com.sun.mail.*;version="1.6.7"
+
+Import-Package: \
+javax.mail.event,\
+*
+
+major: 1
+minor: 6
+micro: 7
\ No newline at end of file
diff --git a/rebuild/org.argeo.tp.utils/com.sun.mail.mbox/build.properties b/rebuild/org.argeo.tp.utils/com.sun.mail.mbox/build.properties
new file mode 100644 (file)
index 0000000..34d2e4d
--- /dev/null
@@ -0,0 +1,4 @@
+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
new file mode 100644 (file)
index 0000000..9b838de
--- /dev/null
@@ -0,0 +1,2 @@
+/*.h
+/*.c
diff --git a/rebuild/org.argeo.tp.utils/src/.gitignore b/rebuild/org.argeo.tp.utils/src/.gitignore
new file mode 100644 (file)
index 0000000..ca46c96
--- /dev/null
@@ -0,0 +1 @@
+ee4j-mail/
\ No newline at end of file
diff --git a/rebuild/org.argeo.tp/Makefile b/rebuild/org.argeo.tp/Makefile
deleted file mode 100644 (file)
index 6dbcfa4..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-include ../../sdk.mk
-.PHONY: clean all osgi
-
-all: osgi
-
-A2_CATEGORY = org.argeo.tp
-
-BUNDLES = \
-org.argeo.ext.slf4j \
-
-clean:
-       rm -rf $(BUILD_BASE)
-
-DEP_CATEGORIES = org.argeo.tp
-
-include  $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
\ No newline at end of file
diff --git a/rebuild/org.argeo.tp/org.argeo.ext.slf4j/.classpath b/rebuild/org.argeo.tp/org.argeo.ext.slf4j/.classpath
deleted file mode 100644 (file)
index e801ebf..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="src" path="src"/>
-       <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/rebuild/org.argeo.tp/org.argeo.ext.slf4j/.gitignore b/rebuild/org.argeo.tp/org.argeo.ext.slf4j/.gitignore
deleted file mode 100644 (file)
index 65776c3..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/bin/
\ No newline at end of file
diff --git a/rebuild/org.argeo.tp/org.argeo.ext.slf4j/.project b/rebuild/org.argeo.tp/org.argeo.ext.slf4j/.project
deleted file mode 100644 (file)
index 3ed363d..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-       <name>org.argeo.ext.slf4j</name>
-       <comment></comment>
-       <projects>
-       </projects>
-       <buildSpec>
-               <buildCommand>
-                       <name>org.eclipse.jdt.core.javabuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.ManifestBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.SchemaBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-       </buildSpec>
-       <natures>
-               <nature>org.eclipse.pde.PluginNature</nature>
-               <nature>org.eclipse.jdt.core.javanature</nature>
-       </natures>
-</projectDescription>
diff --git a/rebuild/org.argeo.tp/org.argeo.ext.slf4j/META-INF/.gitignore b/rebuild/org.argeo.tp/org.argeo.ext.slf4j/META-INF/.gitignore
deleted file mode 100644 (file)
index 4854a41..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/MANIFEST.MF
diff --git a/rebuild/org.argeo.tp/org.argeo.ext.slf4j/bnd.bnd b/rebuild/org.argeo.tp/org.argeo.ext.slf4j/bnd.bnd
deleted file mode 100644 (file)
index 37061df..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-Export-Package: org.slf4j.impl
-
-Import-Package: *
diff --git a/rebuild/org.argeo.tp/org.argeo.ext.slf4j/build.properties b/rebuild/org.argeo.tp/org.argeo.ext.slf4j/build.properties
deleted file mode 100644 (file)
index 34d2e4d..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .
diff --git a/rebuild/org.argeo.tp/org.argeo.ext.slf4j/src/org/slf4j/impl/ArgeoLogger.java b/rebuild/org.argeo.tp/org.argeo.ext.slf4j/src/org/slf4j/impl/ArgeoLogger.java
deleted file mode 100644 (file)
index 5c4889a..0000000
+++ /dev/null
@@ -1,180 +0,0 @@
-package org.slf4j.impl;
-
-import org.slf4j.helpers.MarkerIgnoringBase;
-
-class ArgeoLogger extends MarkerIgnoringBase {
-       private static final long serialVersionUID = -7719157836932627307L;
-       private final SystemLoggingAdapter log;
-
-       protected ArgeoLogger(String name, SystemLoggingAdapter log) {
-               this.name = name;
-               this.log = log;
-       }
-
-       @Override
-       public boolean isDebugEnabled() {
-               return log.isDebugEnabled();
-       }
-
-       @Override
-       public boolean isTraceEnabled() {
-               return log.isDebugEnabled();
-       }
-
-       @Override
-       public void trace(String msg) {
-               log.trace(msg);
-
-       }
-
-       @Override
-       public void trace(String format, Object... arguments) {
-               log.trace(format, arguments);
-
-       }
-
-       @Override
-       public void trace(String msg, Throwable t) {
-               log.trace(msg, t);
-
-       }
-
-       @Override
-       public void debug(String msg) {
-               log.debug(msg);
-
-       }
-
-       @Override
-       public void debug(String format, Object... arguments) {
-               log.debug(format, arguments);
-
-       }
-
-       @Override
-       public void debug(String msg, Throwable t) {
-               log.debug(msg, t);
-
-       }
-
-       @Override
-       public boolean isInfoEnabled() {
-               return log.isInfoEnabled();
-       }
-
-       @Override
-       public void info(String msg) {
-               log.info(msg);
-
-       }
-
-       @Override
-       public void info(String format, Object... arguments) {
-               log.info(format, arguments);
-       }
-
-       @Override
-       public void info(String msg, Throwable t) {
-               log.info(msg, t);
-
-       }
-
-       @Override
-       public boolean isWarnEnabled() {
-               return log.isWarnEnabled();
-       }
-
-       @Override
-       public void warn(String msg) {
-               log.warn(msg);
-
-       }
-
-       @Override
-       public void warn(String format, Object... arguments) {
-               log.warn(format, arguments);
-
-       }
-
-       @Override
-       public void warn(String msg, Throwable t) {
-               log.warn(msg, t);
-
-       }
-
-       @Override
-       public boolean isErrorEnabled() {
-
-               return log.isErrorEnabled();
-       }
-
-       @Override
-       public void error(String msg) {
-               log.error(msg);
-
-       }
-
-       @Override
-       public void error(String format, Object... arguments) {
-               log.error(format, arguments);
-
-       }
-
-       @Override
-       public void error(String msg, Throwable t) {
-               log.error(msg, t);
-
-       }
-
-       @Override
-       public void trace(String format, Object arg) {
-               trace(format, new Object[] { arg });
-
-       }
-
-       @Override
-       public void trace(String format, Object arg1, Object arg2) {
-               trace(format, new Object[] { arg1, arg2 });
-       }
-
-       @Override
-       public void debug(String format, Object arg) {
-               debug(format, new Object[] { arg });
-       }
-
-       @Override
-       public void debug(String format, Object arg1, Object arg2) {
-               debug(format, new Object[] { arg1, arg2 });
-       }
-
-       @Override
-       public void info(String format, Object arg) {
-               info(format, new Object[] { arg });
-       }
-
-       @Override
-       public void info(String format, Object arg1, Object arg2) {
-               info(format, new Object[] { arg1, arg2 });
-       }
-
-       @Override
-       public void warn(String format, Object arg) {
-               warn(format, new Object[] { arg });
-       }
-
-       @Override
-       public void warn(String format, Object arg1, Object arg2) {
-               warn(format, new Object[] { arg1, arg2 });
-       }
-
-       @Override
-       public void error(String format, Object arg) {
-               error(format, new Object[] { arg });
-       }
-
-       @Override
-       public void error(String format, Object arg1, Object arg2) {
-               error(format, new Object[] { arg1, arg2 });
-       }
-
-}
\ No newline at end of file
diff --git a/rebuild/org.argeo.tp/org.argeo.ext.slf4j/src/org/slf4j/impl/StaticLoggerBinder.java b/rebuild/org.argeo.tp/org.argeo.ext.slf4j/src/org/slf4j/impl/StaticLoggerBinder.java
deleted file mode 100644 (file)
index 8c5b3ad..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.slf4j.impl;
-
-import org.slf4j.ILoggerFactory;
-import org.slf4j.spi.LoggerFactoryBinder;
-
-public class StaticLoggerBinder implements LoggerFactoryBinder {
-       public static final String REQUESTED_API_VERSION = "1.7";
-
-       private static final StaticLoggerBinder SINGLETON = new StaticLoggerBinder();
-
-       private final ILoggerFactory loggerFactory;
-
-       protected StaticLoggerBinder() {
-               loggerFactory = new SystemLoggerFactory();
-       }
-
-       @Override
-       public ILoggerFactory getLoggerFactory() {
-               return loggerFactory;
-       }
-
-       @Override
-       public String getLoggerFactoryClassStr() {
-               return SystemLoggerFactory.class.getName();
-       }
-
-       public static final StaticLoggerBinder getSingleton() {
-               return SINGLETON;
-       }
-
-       static class SystemLoggerFactory implements ILoggerFactory {
-
-               @Override
-               public org.slf4j.Logger getLogger(String name) {
-                       SystemLoggingAdapter logger = SystemLoggingAdapter.getLog(name);
-                       return new ArgeoLogger(name, logger);
-               }
-
-       }
-
-}
diff --git a/rebuild/org.argeo.tp/org.argeo.ext.slf4j/src/org/slf4j/impl/SystemLoggingAdapter.java b/rebuild/org.argeo.tp/org.argeo.ext.slf4j/src/org/slf4j/impl/SystemLoggingAdapter.java
deleted file mode 100644 (file)
index 7a6c865..0000000
+++ /dev/null
@@ -1,203 +0,0 @@
-package org.slf4j.impl;
-
-import java.lang.System.Logger;
-import java.lang.System.Logger.Level;
-import java.util.Objects;
-import java.util.function.Supplier;
-
-/**
- * A Commons Logging / SLF4J style logging utilities wrapping a standard Java
- * platform {@link Logger}.
- */
-public interface SystemLoggingAdapter {
-       Logger getLogger();
-
-       default boolean isDebugEnabled() {
-               return getLogger().isLoggable(Level.DEBUG);
-       }
-
-       default boolean isErrorEnabled() {
-               return getLogger().isLoggable(Level.ERROR);
-       }
-
-       default boolean isInfoEnabled() {
-               return getLogger().isLoggable(Level.INFO);
-       }
-
-       default boolean isTraceEnabled() {
-               return getLogger().isLoggable(Level.TRACE);
-       }
-
-       default boolean isWarnEnabled() {
-               return getLogger().isLoggable(Level.WARNING);
-       }
-
-       /*
-        * TRACE
-        */
-
-       default void trace(String message) {
-               getLogger().log(Level.TRACE, message);
-       }
-
-       default void trace(Supplier<String> message) {
-               getLogger().log(Level.TRACE, message);
-       }
-
-       default void trace(Object message) {
-               getLogger().log(Level.TRACE, Objects.requireNonNull(message));
-       }
-
-       default void trace(String message, Throwable t) {
-               getLogger().log(Level.TRACE, message, t);
-       }
-
-       default void trace(Object message, Throwable t) {
-               trace(Objects.requireNonNull(message).toString(), t);
-       }
-
-       default void trace(String format, Object... arguments) {
-               getLogger().log(Level.TRACE, format, arguments);
-       }
-
-       /*
-        * DEBUG
-        */
-
-       default void debug(String message) {
-               getLogger().log(Level.DEBUG, message);
-       }
-
-       default void debug(Supplier<String> message) {
-               getLogger().log(Level.DEBUG, message);
-       }
-
-       default void debug(Object message) {
-               getLogger().log(Level.DEBUG, message);
-       }
-
-       default void debug(String message, Throwable t) {
-               getLogger().log(Level.DEBUG, message, t);
-       }
-
-       default void debug(Object message, Throwable t) {
-               debug(Objects.requireNonNull(message).toString(), t);
-       }
-
-       default void debug(String format, Object... arguments) {
-               getLogger().log(Level.DEBUG, format, arguments);
-       }
-
-       /*
-        * INFO
-        */
-
-       default void info(String message) {
-               getLogger().log(Level.INFO, message);
-       }
-
-       default void info(Supplier<String> message) {
-               getLogger().log(Level.INFO, message);
-       }
-
-       default void info(Object message) {
-               getLogger().log(Level.INFO, message);
-       }
-
-       default void info(String message, Throwable t) {
-               getLogger().log(Level.INFO, message, t);
-       }
-
-       default void info(Object message, Throwable t) {
-               info(Objects.requireNonNull(message).toString(), t);
-       }
-
-       default void info(String format, Object... arguments) {
-               getLogger().log(Level.INFO, format, arguments);
-       }
-
-       /*
-        * WARN
-        */
-
-       default void warn(String message) {
-               getLogger().log(Level.WARNING, message);
-       }
-
-       default void warn(Supplier<String> message) {
-               getLogger().log(Level.WARNING, message);
-       }
-
-       default void warn(Object message) {
-               getLogger().log(Level.WARNING, message);
-       }
-
-       default void warn(String message, Throwable t) {
-               getLogger().log(Level.WARNING, message, t);
-       }
-
-       default void warn(Object message, Throwable t) {
-               warn(Objects.requireNonNull(message).toString(), t);
-       }
-
-       default void warn(String format, Object... arguments) {
-               getLogger().log(Level.WARNING, format, arguments);
-       }
-
-       /*
-        * ERROR
-        */
-
-       default void error(String message) {
-               getLogger().log(Level.ERROR, message);
-       }
-
-       default void error(Supplier<String> message) {
-               getLogger().log(Level.ERROR, message);
-       }
-
-       default void error(Object message) {
-               getLogger().log(Level.ERROR, message);
-       }
-
-       default void error(String message, Throwable t) {
-               getLogger().log(Level.ERROR, message, t);
-       }
-
-       default void error(Object message, Throwable t) {
-               error(Objects.requireNonNull(message).toString(), t);
-       }
-
-       default void error(String format, Object... arguments) {
-               getLogger().log(Level.ERROR, format, arguments);
-       }
-
-       /*
-        * STATIC UTILITIES
-        */
-
-       static SystemLoggingAdapter getLog(Class<?> clss) {
-               return getLog(Objects.requireNonNull(clss).getName());
-       }
-
-       static SystemLoggingAdapter getLog(String name) {
-               Logger logger = System.getLogger(Objects.requireNonNull(name));
-               return new LoggerWrapper(logger);
-       }
-
-       /** A trivial implementation wrapping a platform logger. */
-       static class LoggerWrapper implements SystemLoggingAdapter {
-               private final Logger logger;
-
-               LoggerWrapper(Logger logger) {
-                       this.logger = logger;
-               }
-
-               @Override
-               public Logger getLogger() {
-                       return logger;
-               }
-
-       }
-
-}
index e555f392ea660e44781a5057ebd628913297886c..c509174f669e72afdbd19cbfe5d652e7f27df6dc 100644 (file)
@@ -1,18 +1,25 @@
 include ../sdk.mk
-.PHONY: clean all
 
-BOOTSTRAP_BASE=$(SDK_BUILD_BASE)/bootstrap
+# 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 \
+osgi/equinox/org.argeo.tp.eclipse \
 
-A2_OUTPUT = $(SDK_BUILD_BASE)/a2
 
 CATEGORIES=\
+$(CATEGORIES_CMS) \
 org.argeo.tp.sdk \
 osgi/api/org.argeo.tp.osgi \
-osgi/equinox/org.argeo.tp.osgi \
-osgi/equinox/org.argeo.tp.eclipse \
 swt/rap/org.argeo.tp.swt \
 swt/rap/org.argeo.tp.swt.workbench \
 swt/rcp/org.argeo.tp.swt \
+lib/linux/x86_64/org.argeo.tp \
+lib/linux/aarch64/org.argeo.tp \
+lib/win32/x86_64/org.argeo.tp \
+lib/macosx/x86_64/org.argeo.tp \
 lib/linux/x86_64/swt/rcp/org.argeo.tp.swt \
 lib/linux/aarch64/swt/rcp/org.argeo.tp.swt \
 lib/win32/x86_64/swt/rcp/org.argeo.tp.swt \
@@ -20,38 +27,15 @@ lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt \
 lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt.workbench \
 swt/rcp/org.argeo.tp.swt \
 swt/rcp/org.argeo.tp.swt.workbench \
-org.argeo.tp \
-org.argeo.tp.crypto \
-org.argeo.tp.jetty \
 org.argeo.tp.utils \
-org.argeo.tp.sql \
+org.argeo.tp.publish \
+org.argeo.tp.math \
 org.argeo.tp.jcr \
-org.argeo.tp.poi \
-org.argeo.tp.gis \
-
-TODOS_REPACKAGE = $(foreach category, $(CATEGORIES),$(BUILD_BASE)/$(category)/to-repackage) 
-
-BUILD_BASE = $(SDK_BUILD_BASE)/$(shell basename $(SDK_SRC_BASE))
-
-all: $(BUILD_BASE)/repackaged 
-
-.SECONDEXPANSION:
-
-$(BUILD_BASE)/repackaged : CATEGORIES_TO_REPACKAGE = $(subst $(abspath $(BUILD_BASE))/,, $(subst to-repackage,, $?))
-$(BUILD_BASE)/repackaged : $(TODOS_REPACKAGE)
-       $(JVM) -cp \
-        $(BOOTSTRAP_BASE)/bndlib.jar:$(BOOTSTRAP_BASE)/slf4j-api.jar \
-        $(SDK_SRC_BASE)/sdk/argeo-build/src/org/argeo/build/Repackage.java $(A2_OUTPUT) $(CATEGORIES_TO_REPACKAGE)
-       touch $(BUILD_BASE)/repackaged
-
-$(BUILD_BASE)/%/to-repackage : $$(shell find % -type f )
-       @rm -rf $(dir $@)
-       @mkdir -p $(dir $@) 
-       @touch $@
+org.argeo.tp.office \
+org.argeo.tp.earth \
+crypto/full/org.argeo.tp.crypto \
 
-clean:
-       $(foreach category, $(CATEGORIES), rm -rf $(A2_OUTPUT)/$(category))
-       $(foreach category, $(CATEGORIES), rm -rf $(BUILD_BASE)/$(category))
-       rm -f $(BUILD_BASE)/repackaged
+install-for-minimal-cms:
+       $(MAKE) install CATEGORIES="$(CATEGORIES_CMS)"
 
-include  $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
\ No newline at end of file
+include  $(SDK_SRC_BASE)/sdk/argeo-build/repackage.mk
\ No newline at end of file
diff --git a/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bc-fips.bnd.disabled b/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bc-fips.bnd.disabled
new file mode 100644 (file)
index 0000000..b3384ca
--- /dev/null
@@ -0,0 +1,3 @@
+# !! The current version is unsafe, see:
+# https://github.com/bcgit/bc-java/wiki/CVE-2022-45146
+Argeo-Origin-M2: org.bouncycastle:bc-fips
diff --git a/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bc-noncert.bnd b/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bc-noncert.bnd
new file mode 100644 (file)
index 0000000..4788299
--- /dev/null
@@ -0,0 +1,5 @@
+# !! The current version is unsafe, see:
+# https://github.com/bcgit/bc-java/wiki/CVE-2022-45146
+Argeo-Origin-M2: org.bouncycastle:bc-noncert:1.0.2.4
+Argeo-Origin-URI: https://downloads.bouncycastle.org/fips-java/bc-noncert-1.0.2.4.jar
+Argeo-Origin-Sources-URI: https://downloads.bouncycastle.org/fips-java/bc-noncert-1.0.2.4-sources.jar
diff --git a/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bcmail-fips.bnd b/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bcmail-fips.bnd
new file mode 100644 (file)
index 0000000..34dc61f
--- /dev/null
@@ -0,0 +1 @@
+Argeo-Origin-M2: org.bouncycastle:bcmail-fips:1.0.4
diff --git a/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bcpg-fips.bnd b/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bcpg-fips.bnd
new file mode 100644 (file)
index 0000000..be773b7
--- /dev/null
@@ -0,0 +1 @@
+Argeo-Origin-M2: org.bouncycastle:bcpg-fips:1.0.7.1
diff --git a/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bcpkix-fips.bnd b/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bcpkix-fips.bnd
new file mode 100644 (file)
index 0000000..f2f46d6
--- /dev/null
@@ -0,0 +1 @@
+Argeo-Origin-M2: org.bouncycastle:bcpkix-fips:1.0.7
diff --git a/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bctls-fips.bnd b/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bctls-fips.bnd
new file mode 100644 (file)
index 0000000..7de0139
--- /dev/null
@@ -0,0 +1 @@
+Argeo-Origin-M2: org.bouncycastle:bctls-fips:1.0.14.1
diff --git a/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/common.bnd b/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/common.bnd
new file mode 100644 (file)
index 0000000..c924a57
--- /dev/null
@@ -0,0 +1,4 @@
+SPDX-License-Identifier: MIT
+Argeo-Origin-NoMetadataGeneration: true
+Argeo-Origin-Do-Not-Modify: true
+Argeo-Origin-M2: :1.0.2.4
\ No newline at end of file
diff --git a/repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/bcmail.bnd b/repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/bcmail.bnd
new file mode 100644 (file)
index 0000000..ec30584
--- /dev/null
@@ -0,0 +1 @@
+Argeo-Origin-M2: org.bouncycastle:bcmail-jdk18on
diff --git a/repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/bcpg.bnd b/repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/bcpg.bnd
new file mode 100644 (file)
index 0000000..af90715
--- /dev/null
@@ -0,0 +1 @@
+Argeo-Origin-M2: org.bouncycastle:bcpg-jdk18on
diff --git a/repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/bcpkix.bnd b/repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/bcpkix.bnd
new file mode 100644 (file)
index 0000000..1634680
--- /dev/null
@@ -0,0 +1 @@
+Argeo-Origin-M2: org.bouncycastle:bcpkix-jdk18on
diff --git a/repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/bcprov.bnd b/repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/bcprov.bnd
new file mode 100644 (file)
index 0000000..2941b4e
--- /dev/null
@@ -0,0 +1 @@
+Argeo-Origin-M2: org.bouncycastle:bcprov-jdk18on
diff --git a/repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/bctls.bnd b/repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/bctls.bnd
new file mode 100644 (file)
index 0000000..5ac9fb2
--- /dev/null
@@ -0,0 +1 @@
+Argeo-Origin-M2: org.bouncycastle:bctls-jdk18on
diff --git a/repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/bcutil.bnd b/repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/bcutil.bnd
new file mode 100644 (file)
index 0000000..0a71f96
--- /dev/null
@@ -0,0 +1 @@
+Argeo-Origin-M2: org.bouncycastle:bcutil-jdk18on
diff --git a/repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/common.bnd b/repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/common.bnd
new file mode 100644 (file)
index 0000000..85574ab
--- /dev/null
@@ -0,0 +1,4 @@
+SPDX-License-Identifier: MIT
+Argeo-Origin-M2: :1.73
+Argeo-Origin-NoMetadataGeneration: true
+Argeo-Origin-Do-Not-Modify: true
diff --git a/repackage/crypto/full/org.argeo.tp.crypto/net.i2p.crypto.eddsa.bnd b/repackage/crypto/full/org.argeo.tp.crypto/net.i2p.crypto.eddsa.bnd
new file mode 100644 (file)
index 0000000..c53f340
--- /dev/null
@@ -0,0 +1,5 @@
+SPDX-License-Identifier: CC0-1.0
+Argeo-Origin-M2: net.i2p.crypto:eddsa:0.3.0
+Import-Package: \
+sun.*;resolution:="optional", \
+*
index 652708c58f2f39cd7419327a2df8863041bbf353..c5517a219148aedd1c1b056de70fa6c89d4327f7 100644 (file)
@@ -1,3 +1,3 @@
-http://ftp-stud.hs-esslingen.de/Mirrors/eclipse
-http://ftp.fau.de/eclipse
+https://ftp-stud.hs-esslingen.de/Mirrors/eclipse
+https://ftp.fau.de/eclipse
 https://mirror.dogado.de/eclipse
\ No newline at end of file
diff --git a/repackage/lib/linux/aarch64/org.argeo.tp/eclipse-rcp/common.bnd b/repackage/lib/linux/aarch64/org.argeo.tp/eclipse-rcp/common.bnd
new file mode 100644 (file)
index 0000000..8c4c7a4
--- /dev/null
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1
+Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/lib/linux/aarch64/org.argeo.tp/eclipse-rcp/includes.properties b/repackage/lib/linux/aarch64/org.argeo.tp/eclipse-rcp/includes.properties
new file mode 100644 (file)
index 0000000..c5cebf3
--- /dev/null
@@ -0,0 +1 @@
+plugins/com.sun.jna*.jar=
index 9a7ae1d766aac5589a4dc9fb268cf02033c7ba56..743e1d35b9bf18163748d8a0207963a83cab1ac4 100644 (file)
@@ -1,2 +1,2 @@
-Bundle-License: EPL-1.0
-SLC-Origin-ManifestNotModified: true
+SPDX-License-Identifier: EPL-2.0
+Argeo-Origin-NoMetadataGeneration: true
index 9a7ae1d766aac5589a4dc9fb268cf02033c7ba56..743e1d35b9bf18163748d8a0207963a83cab1ac4 100644 (file)
@@ -1,2 +1,2 @@
-Bundle-License: EPL-1.0
-SLC-Origin-ManifestNotModified: true
+SPDX-License-Identifier: EPL-2.0
+Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/lib/linux/x86_64/org.argeo.tp/eclipse-rcp/common.bnd b/repackage/lib/linux/x86_64/org.argeo.tp/eclipse-rcp/common.bnd
new file mode 100644 (file)
index 0000000..8c4c7a4
--- /dev/null
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1
+Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/lib/linux/x86_64/org.argeo.tp/eclipse-rcp/includes.properties b/repackage/lib/linux/x86_64/org.argeo.tp/eclipse-rcp/includes.properties
new file mode 100644 (file)
index 0000000..c5cebf3
--- /dev/null
@@ -0,0 +1 @@
+plugins/com.sun.jna*.jar=
index 9a7ae1d766aac5589a4dc9fb268cf02033c7ba56..743e1d35b9bf18163748d8a0207963a83cab1ac4 100644 (file)
@@ -1,2 +1,2 @@
-Bundle-License: EPL-1.0
-SLC-Origin-ManifestNotModified: true
+SPDX-License-Identifier: EPL-2.0
+Argeo-Origin-NoMetadataGeneration: true
index 9a7ae1d766aac5589a4dc9fb268cf02033c7ba56..743e1d35b9bf18163748d8a0207963a83cab1ac4 100644 (file)
@@ -1,2 +1,2 @@
-Bundle-License: EPL-1.0
-SLC-Origin-ManifestNotModified: true
+SPDX-License-Identifier: EPL-2.0
+Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/lib/macosx/x86_64/org.argeo.tp/eclipse-rcp/common.bnd b/repackage/lib/macosx/x86_64/org.argeo.tp/eclipse-rcp/common.bnd
new file mode 100644 (file)
index 0000000..8c4c7a4
--- /dev/null
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1
+Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/lib/macosx/x86_64/org.argeo.tp/eclipse-rcp/includes.properties b/repackage/lib/macosx/x86_64/org.argeo.tp/eclipse-rcp/includes.properties
new file mode 100644 (file)
index 0000000..c5cebf3
--- /dev/null
@@ -0,0 +1 @@
+plugins/com.sun.jna*.jar=
index 9a7ae1d766aac5589a4dc9fb268cf02033c7ba56..743e1d35b9bf18163748d8a0207963a83cab1ac4 100644 (file)
@@ -1,2 +1,2 @@
-Bundle-License: EPL-1.0
-SLC-Origin-ManifestNotModified: true
+SPDX-License-Identifier: EPL-2.0
+Argeo-Origin-NoMetadataGeneration: true
index 9a7ae1d766aac5589a4dc9fb268cf02033c7ba56..743e1d35b9bf18163748d8a0207963a83cab1ac4 100644 (file)
@@ -1,2 +1,2 @@
-Bundle-License: EPL-1.0
-SLC-Origin-ManifestNotModified: true
+SPDX-License-Identifier: EPL-2.0
+Argeo-Origin-NoMetadataGeneration: true
index 9a7ae1d766aac5589a4dc9fb268cf02033c7ba56..743e1d35b9bf18163748d8a0207963a83cab1ac4 100644 (file)
@@ -1,2 +1,2 @@
-Bundle-License: EPL-1.0
-SLC-Origin-ManifestNotModified: true
+SPDX-License-Identifier: EPL-2.0
+Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/lib/win32/x86_64/org.argeo.tp/eclipse-rcp/common.bnd b/repackage/lib/win32/x86_64/org.argeo.tp/eclipse-rcp/common.bnd
new file mode 100644 (file)
index 0000000..8c4c7a4
--- /dev/null
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1
+Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/lib/win32/x86_64/org.argeo.tp/eclipse-rcp/includes.properties b/repackage/lib/win32/x86_64/org.argeo.tp/eclipse-rcp/includes.properties
new file mode 100644 (file)
index 0000000..c5cebf3
--- /dev/null
@@ -0,0 +1 @@
+plugins/com.sun.jna*.jar=
index 9a7ae1d766aac5589a4dc9fb268cf02033c7ba56..743e1d35b9bf18163748d8a0207963a83cab1ac4 100644 (file)
@@ -1,2 +1,2 @@
-Bundle-License: EPL-1.0
-SLC-Origin-ManifestNotModified: true
+SPDX-License-Identifier: EPL-2.0
+Argeo-Origin-NoMetadataGeneration: true
index 9a7ae1d766aac5589a4dc9fb268cf02033c7ba56..743e1d35b9bf18163748d8a0207963a83cab1ac4 100644 (file)
@@ -1,2 +1,2 @@
-Bundle-License: EPL-1.0
-SLC-Origin-ManifestNotModified: true
+SPDX-License-Identifier: EPL-2.0
+Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.crypto/apache-sshd/common.bnd b/repackage/org.argeo.tp.crypto/apache-sshd/common.bnd
deleted file mode 100644 (file)
index d73cbb3..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-License: Apache-2.0
-SLC-Origin-M2: :2.9.1
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.crypto/apache-sshd/merge.bnd b/repackage/org.argeo.tp.crypto/apache-sshd/merge.bnd
deleted file mode 100644 (file)
index 0af7209..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-Bundle-License: Apache-2.0
-Bundle-SymbolicName: org.apache.sshd
-SLC-Origin-M2: :2.9.1
-Export-Package: org.apache.*
-Import-Package: \
-org.apache.tomcat.jni.*;resolution:=optional,\
-org.bouncycastle.crypto.prng,\
-org.bouncycastle.jce.provider.*;resolution:=optional,\
-net.i2p.crypto.eddsa.*;resolution:=optional,\
-org.slf4j,\
-org.slf4j.event,\
-org.slf4j.helpers,\
-*
-SLC-Origin-M2-Merge: \
-org.apache.sshd:sshd-core, \
-org.apache.sshd:sshd-common
diff --git a/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.cli.bnd b/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.cli.bnd
deleted file mode 100644 (file)
index 7b00c2c..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-SymbolicName: org.apache.sshd.cli
-SLC-Origin-M2: org.apache.sshd:sshd-cli
diff --git a/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.git.bnd b/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.git.bnd
deleted file mode 100644 (file)
index 7d9ef2b..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-Bundle-SymbolicName: org.apache.sshd.git
-SLC-Origin-M2: org.apache.sshd:sshd-git
-Import-Package: \
-org.eclipse.jgit.pgm.*;resolution:=optional,\
-org.kohsuke.*;resolution:=optional,\
-*
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.putty.bnd b/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.putty.bnd
deleted file mode 100644 (file)
index cf8a99a..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-Bundle-SymbolicName: org.apache.sshd.putty
-SLC-Origin-M2: org.apache.sshd:sshd-putty
-Import-Package: \
-net.i2p.*;resolution:=optional,\
-*
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.scp.bnd b/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.scp.bnd
deleted file mode 100644 (file)
index 6744473..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-SymbolicName: org.apache.sshd.scp
-SLC-Origin-M2: org.apache.sshd:sshd-scp
diff --git a/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.sftp.bnd b/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.sftp.bnd
deleted file mode 100644 (file)
index b6b8b0d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-SymbolicName: org.apache.sshd.sftp
-SLC-Origin-M2: org.apache.sshd:sshd-sftp
diff --git a/repackage/org.argeo.tp.crypto/bouncycastle/bcmail.bnd b/repackage/org.argeo.tp.crypto/bouncycastle/bcmail.bnd
deleted file mode 100644 (file)
index 38ba77b..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-Bundle-SymbolicName: bcmail
-SLC-Origin-ManifestNotModified: true
-SLC-Origin-M2: org.bouncycastle:bcmail-jdk18on
diff --git a/repackage/org.argeo.tp.crypto/bouncycastle/bcpg.bnd b/repackage/org.argeo.tp.crypto/bouncycastle/bcpg.bnd
deleted file mode 100644 (file)
index 6e6f8af..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-Bundle-SymbolicName: bcpg
-SLC-Origin-ManifestNotModified: true
-SLC-Origin-M2: org.bouncycastle:bcpg-jdk18on
diff --git a/repackage/org.argeo.tp.crypto/bouncycastle/bcpkix.bnd b/repackage/org.argeo.tp.crypto/bouncycastle/bcpkix.bnd
deleted file mode 100644 (file)
index 50b64bc..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-Bundle-SymbolicName: bcpkix
-SLC-Origin-ManifestNotModified: true
-SLC-Origin-M2: org.bouncycastle:bcpkix-jdk18on
diff --git a/repackage/org.argeo.tp.crypto/bouncycastle/bcprov.bnd b/repackage/org.argeo.tp.crypto/bouncycastle/bcprov.bnd
deleted file mode 100644 (file)
index b507d5e..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-Bundle-SymbolicName: bcprov
-SLC-Origin-ManifestNotModified: true
-SLC-Origin-M2: org.bouncycastle:bcprov-jdk18on
diff --git a/repackage/org.argeo.tp.crypto/bouncycastle/bcutil.bnd b/repackage/org.argeo.tp.crypto/bouncycastle/bcutil.bnd
deleted file mode 100644 (file)
index 778c309..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-Bundle-SymbolicName: bcutil
-SLC-Origin-ManifestNotModified: true
-SLC-Origin-M2: org.bouncycastle:bcutil-jdk18on
diff --git a/repackage/org.argeo.tp.crypto/bouncycastle/common.bnd b/repackage/org.argeo.tp.crypto/bouncycastle/common.bnd
deleted file mode 100644 (file)
index b860aa5..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-License: MIT
-SLC-Origin-M2: :1.72
diff --git a/repackage/org.argeo.tp.crypto/net.i2p.crypto.eddsa.bnd b/repackage/org.argeo.tp.crypto/net.i2p.crypto.eddsa.bnd
deleted file mode 100644 (file)
index 2eea764..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-Bundle-License: CC0-1.0
-SLC-Origin-M2: net.i2p.crypto:eddsa:0.3.0
-Import-Package: \
-sun.*;resolution:="optional", \
-*
diff --git a/repackage/org.argeo.tp.crypto/org.apache.tomcat.jni.bnd b/repackage/org.argeo.tp.crypto/org.apache.tomcat.jni.bnd
deleted file mode 100644 (file)
index dafe848..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-Bundle-License: Apache-2.0
-# Use Tomcat v9 to stay compatible with JNI library v1.2 provided by Debian 11
-SLC-Origin-M2: org.apache.tomcat:tomcat-jni:9.0.68
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.earth/geotools/merge.bnd b/repackage/org.argeo.tp.earth/geotools/merge.bnd
new file mode 100644 (file)
index 0000000..2a8d4a3
--- /dev/null
@@ -0,0 +1,91 @@
+SPDX-License-Identifier: LGPL-2.1-only
+Bundle-SymbolicName: org.geotools
+Argeo-Origin-M2: :29.1
+Argeo-Origin-M2-Repo: https://repo.osgeo.org/repository/release/
+
+Export-Package: org.geotools.*, org.opengis.*, net.opengis.*, org.w3.xlink.*
+
+Import-Package: \
+org.geotools.gui.swing.*;resolution:="optional",\
+org.locationtech.jts.*,\
+org.geotools.*,\
+org.opengis.*,\
+net.opengis.*,\
+javax.measure.*, \
+tech.units.indriya.*, \
+si.uom.*, \
+systems.uom.*, \
+org.ejml.*,\
+au.com.objectix.*;resolution:="optional",\
+ch.qos.logback.*;resolution:="optional",\
+com.conversantmedia.*;resolution:="optional",\
+com.google.re2j.*;resolution:="optional",\
+com.sun.media.*;resolution:="optional",\
+com.sun.medialib.*;resolution:="optional",\
+geodb.*;resolution:="optional",\
+it.geosolutions.*;resolution:="optional",\
+javax.imageio.*;resolution:="optional",\
+javax.media.*;resolution:="optional",\
+javax.sql.*;resolution:="optional",\
+javax.swing.*;resolution:="optional",\
+net.miginfocom.*;resolution:="optional",\
+net.sf.geographiclib.*;resolution:="optional",\
+org.apache.log4j.*;resolution:="optional",\
+org.apache.logging.log4j.*;resolution:="optional",\
+org.eclipse.*;resolution:="optional",\
+org.jaitools.*;resolution:="optional",\
+org.jdom2.*;resolution:="optional",\
+org.junit.*;resolution:="optional",\
+org.parboiled.*;resolution:="optional",\
+org.picocontainer.*;resolution:="optional",\
+*
+
+Argeo-Origin-M2-Merge: \
+org.geotools:gt-metadata, \
+org.geotools:gt-property, \
+org.geotools:gt-opengis, \
+org.geotools:gt-main, \
+org.geotools:gt-cql, \
+org.geotools:gt-http, \
+org.geotools:gt-coverage, \
+org.geotools:gt-referencing, \
+org.geotools:gt-process, \
+org.geotools:gt-epsg-extension, \
+org.geotools:gt-epsg-wkt, \
+org.geotools:gt-transform, \
+org.geotools:gt-geojson-core, \
+org.geotools:gt-geojson-store, \
+org.geotools:gt-shapefile, \
+org.geotools:gt-xml, \
+org.geotools:gt-svg, \
+org.geotools:gt-brewer, \
+org.geotools:gt-css, \
+org.geotools:gt-image, \
+org.geotools:gt-geotiff, \
+org.geotools:gt-render, \
+org.geotools:gt-swing, \
+org.geotools:gt-wfs-ng, \
+org.geotools:gt-wms, \
+org.geotools:gt-wmts, \
+org.geotools:gt-jdbc, \
+org.geotools:gt-complex, \
+org.geotools:gt-app-schema, \
+org.geotools:gt-app-schema-resolver, \
+org.geotools:gt-gml-geometry-streaming, \
+org.geotools:gt-tile-client, \
+org.geotools.jdbc:gt-jdbc-postgis, \
+org.geotools.jdbc:gt-jdbc-h2, \
+org.geotools.xsd:gt-xsd-core, \
+org.geotools.xsd:gt-xsd-filter, \
+org.geotools.xsd:gt-xsd-ows, \
+org.geotools.xsd:gt-xsd-fes, \
+org.geotools.xsd:gt-xsd-gml2, \
+org.geotools.xsd:gt-xsd-gml3, \
+org.geotools.xsd:gt-xsd-wfs, \
+org.geotools.xsd:gt-xsd-wmts, \
+org.geotools.xsd:gt-xsd-sld, \
+org.geotools.ogc:net.opengis.ows, \
+org.geotools.ogc:net.opengis.wfs, \
+org.geotools.ogc:net.opengis.wmts, \
+org.geotools.ogc:net.opengis.fes, \
+org.geotools.ogc:org.w3.xlink, \
diff --git a/repackage/org.argeo.tp.earth/h2gis/common.bnd b/repackage/org.argeo.tp.earth/h2gis/common.bnd
new file mode 100644 (file)
index 0000000..8be57e7
--- /dev/null
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: LGPL-3.0-or-later
+Argeo-Origin-M2: :2.2.0
diff --git a/repackage/org.argeo.tp.earth/h2gis/org.h2gis.api.bnd b/repackage/org.argeo.tp.earth/h2gis/org.h2gis.api.bnd
new file mode 100644 (file)
index 0000000..dd596a9
--- /dev/null
@@ -0,0 +1 @@
+Argeo-Origin-M2: org.orbisgis:h2gis-api
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.earth/h2gis/org.h2gis.bnd b/repackage/org.argeo.tp.earth/h2gis/org.h2gis.bnd
new file mode 100644 (file)
index 0000000..0febb55
--- /dev/null
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.orbisgis:h2gis
+Fragment-Host: org.h2
diff --git a/repackage/org.argeo.tp.earth/h2gis/org.h2gis.postgis_jts.bnd b/repackage/org.argeo.tp.earth/h2gis/org.h2gis.postgis_jts.bnd
new file mode 100644 (file)
index 0000000..4f6db00
--- /dev/null
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.orbisgis:postgis-jts
+Fragment-Host: org.h2
diff --git a/repackage/org.argeo.tp.earth/h2gis/org.h2gis.utilities.bnd b/repackage/org.argeo.tp.earth/h2gis/org.h2gis.utilities.bnd
new file mode 100644 (file)
index 0000000..a90e36b
--- /dev/null
@@ -0,0 +1 @@
+Argeo-Origin-M2: org.orbisgis:h2gis-utilities
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.earth/org.cts.bnd b/repackage/org.argeo.tp.earth/org.cts.bnd
new file mode 100644 (file)
index 0000000..ec4c2c1
--- /dev/null
@@ -0,0 +1,3 @@
+SPDX-License-Identifier: LGPL-3.0-or-later
+Argeo-Origin-M2: org.orbisgis:cts:1.7.0
+# TODO: 1.7.0 sources are missing in Maven central
diff --git a/repackage/org.argeo.tp.earth/org.locationtech.spatial4j.bnd b/repackage/org.argeo.tp.earth/org.locationtech.spatial4j.bnd
new file mode 100644 (file)
index 0000000..fe983a8
--- /dev/null
@@ -0,0 +1,6 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: org.locationtech.spatial4j:spatial4j:0.8
+
+Import-Package:\
+org.noggit;resolution:="optional",\
+*
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.earth/org.poly2tri.bnd b/repackage/org.argeo.tp.earth/org.poly2tri.bnd
new file mode 100644 (file)
index 0000000..61a9634
--- /dev/null
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: BSD-3-Clause
+Argeo-Origin-M2: org.orbisgis:poly2tri:0.4.0
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.earth/postgis/common.bnd b/repackage/org.argeo.tp.earth/postgis/common.bnd
new file mode 100644 (file)
index 0000000..fa61071
--- /dev/null
@@ -0,0 +1,3 @@
+SPDX-License-Identifier: LGPL-2.1-only
+Argeo-Origin-M2: :2021.1.0
+Export-Package: net.postgis.*
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.earth/postgis/net.postgis.jdbc.bnd b/repackage/org.argeo.tp.earth/postgis/net.postgis.jdbc.bnd
new file mode 100644 (file)
index 0000000..ca4423f
--- /dev/null
@@ -0,0 +1 @@
+Argeo-Origin-M2: net.postgis:postgis-jdbc
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.earth/postgis/net.postgis.jdbc.geometry.bnd b/repackage/org.argeo.tp.earth/postgis/net.postgis.jdbc.geometry.bnd
new file mode 100644 (file)
index 0000000..5874235
--- /dev/null
@@ -0,0 +1 @@
+Argeo-Origin-M2: net.postgis:postgis-geometry
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.earth/postgis/net.postgis.jdbc.java2d.bnd b/repackage/org.argeo.tp.earth/postgis/net.postgis.jdbc.java2d.bnd
new file mode 100644 (file)
index 0000000..fd94fc5
--- /dev/null
@@ -0,0 +1 @@
+Argeo-Origin-M2: net.postgis:postgis-jdbc-java2d
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.earth/postgis/net.postgis.jdbc.jts.bnd b/repackage/org.argeo.tp.earth/postgis/net.postgis.jdbc.jts.bnd
new file mode 100644 (file)
index 0000000..f27d562
--- /dev/null
@@ -0,0 +1 @@
+Argeo-Origin-M2: net.postgis:postgis-jdbc-jts
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.gis/ejml/merge.bnd b/repackage/org.argeo.tp.gis/ejml/merge.bnd
deleted file mode 100644 (file)
index 6aaf0ee..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-Bundle-SymbolicName: org.ejml
-Bundle-License: Apache-2.0
-SLC-Origin-M2: :0.41
-Export-Package: org.ejml.*
-SLC-Origin-M2-Merge: \
-org.ejml:ejml-core, \
-org.ejml:ejml-simple, \
-org.ejml:ejml-fdense, \
-org.ejml:ejml-ddense, \
-org.ejml:ejml-cdense, \
-org.ejml:ejml-zdense, \
-org.ejml:ejml-dsparse, \
-
-Import-Package: \
-us.hebi.matlab.*;resolution:="optional", \
-javax.swing;resolution:="optional",
-*
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.gis/geotools/merge.bnd b/repackage/org.argeo.tp.gis/geotools/merge.bnd
deleted file mode 100644 (file)
index 77156e1..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-Bundle-License: LGPL-2.1-only
-Bundle-SymbolicName: org.geotools
-SLC-Origin-M2: :27.2
-SLC-Origin-M2-Repo: https://repo.osgeo.org/repository/release/
-Export-Package: org.geotools.*, org.opengis.*, net.opengis.*, org.w3.xlink.*
-Import-Package: \
-org.locationtech.jts.*,\
-org.geotools.gui.swing.*;resolution:="optional",\
-org.geotools.*,\
-org.opengis.*,\
-net.opengis.*,\
-javax.measure.*, \
-tech.units.indriya.*, \
-si.uom.*, \
-systems.uom.*, \
-org.ejml.*,\
-*;resolution:="optional"
-SLC-Origin-M2-Merge: \
-org.geotools:gt-metadata, \
-org.geotools:gt-property, \
-org.geotools:gt-opengis, \
-org.geotools:gt-main, \
-org.geotools:gt-cql, \
-org.geotools:gt-http, \
-org.geotools:gt-coverage, \
-org.geotools:gt-referencing, \
-org.geotools:gt-process, \
-org.geotools:gt-epsg-extension, \
-org.geotools:gt-epsg-wkt, \
-org.geotools:gt-transform, \
-org.geotools:gt-geojson-core, \
-org.geotools:gt-geojson-store, \
-org.geotools:gt-shapefile, \
-org.geotools:gt-xml, \
-org.geotools:gt-svg, \
-org.geotools:gt-brewer, \
-org.geotools:gt-css, \
-org.geotools:gt-image, \
-org.geotools:gt-geotiff, \
-org.geotools:gt-render, \
-org.geotools:gt-swing, \
-org.geotools:gt-wfs-ng, \
-org.geotools:gt-wms, \
-org.geotools:gt-wmts, \
-org.geotools:gt-jdbc, \
-org.geotools:gt-complex, \
-org.geotools:gt-app-schema, \
-org.geotools:gt-app-schema-resolver, \
-org.geotools:gt-gml-geometry-streaming, \
-org.geotools:gt-tile-client, \
-org.geotools.jdbc:gt-jdbc-postgis, \
-org.geotools.jdbc:gt-jdbc-h2, \
-org.geotools.xsd:gt-xsd-core, \
-org.geotools.xsd:gt-xsd-filter, \
-org.geotools.xsd:gt-xsd-ows, \
-org.geotools.xsd:gt-xsd-fes, \
-org.geotools.xsd:gt-xsd-gml2, \
-org.geotools.xsd:gt-xsd-gml3, \
-org.geotools.xsd:gt-xsd-wfs, \
-org.geotools.xsd:gt-xsd-wmts, \
-org.geotools.xsd:gt-xsd-sld, \
-org.geotools.ogc:net.opengis.ows, \
-org.geotools.ogc:net.opengis.wfs, \
-org.geotools.ogc:net.opengis.wmts, \
-org.geotools.ogc:net.opengis.fes, \
-org.geotools.ogc:org.w3.xlink, \
diff --git a/repackage/org.argeo.tp.gis/h2gis/common.bnd b/repackage/org.argeo.tp.gis/h2gis/common.bnd
deleted file mode 100644 (file)
index 52b4af1..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-License: LGPL-3.0-or-later
-SLC-Origin-M2: :2.1.0
diff --git a/repackage/org.argeo.tp.gis/h2gis/org.h2gis.api.bnd b/repackage/org.argeo.tp.gis/h2gis/org.h2gis.api.bnd
deleted file mode 100644 (file)
index f343ffd..0000000
+++ /dev/null
@@ -1 +0,0 @@
-SLC-Origin-M2: org.orbisgis:h2gis-api
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.gis/h2gis/org.h2gis.bnd b/repackage/org.argeo.tp.gis/h2gis/org.h2gis.bnd
deleted file mode 100644 (file)
index ec85e3a..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-SLC-Origin-M2: org.orbisgis:h2gis
-Fragment-Host: org.h2
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.gis/h2gis/org.h2gis.postgis_jts.bnd b/repackage/org.argeo.tp.gis/h2gis/org.h2gis.postgis_jts.bnd
deleted file mode 100644 (file)
index b15c334..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-SLC-Origin-M2: org.orbisgis:postgis-jts
-Fragment-Host: org.h2
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.gis/h2gis/org.h2gis.utilities.bnd b/repackage/org.argeo.tp.gis/h2gis/org.h2gis.utilities.bnd
deleted file mode 100644 (file)
index 4f7d45d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-SLC-Origin-M2: org.orbisgis:h2gis-utilities
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.gis/org.cts.bnd b/repackage/org.argeo.tp.gis/org.cts.bnd
deleted file mode 100644 (file)
index c535e54..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-Bundle-License: LGPL-3.0-or-later
-SLC-Origin-M2: org.orbisgis:cts:1.6.0
-# 1.6.0 sources are missing in Maven central
diff --git a/repackage/org.argeo.tp.gis/org.locationtech.jts.bnd b/repackage/org.argeo.tp.gis/org.locationtech.jts.bnd
deleted file mode 100644 (file)
index cdf0a19..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-License: BSD-3-Clause
-SLC-Origin-M2: org.locationtech.jts:jts-core:1.19.0
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.gis/org.locationtech.spatial4j.bnd b/repackage/org.argeo.tp.gis/org.locationtech.spatial4j.bnd
deleted file mode 100644 (file)
index 46c5d8e..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-Bundle-License: Apache-2.0
-SLC-Origin-M2: org.locationtech.spatial4j:spatial4j:0.8
-Import-Package:\
-org.noggit;resolution:="optional",\
-*
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.gis/org.poly2tri.bnd b/repackage/org.argeo.tp.gis/org.poly2tri.bnd
deleted file mode 100644 (file)
index 7972450..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-License: BSD-3-Clause
-SLC-Origin-M2: org.orbisgis:poly2tri:0.4.0
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.gis/postgis/common.bnd b/repackage/org.argeo.tp.gis/postgis/common.bnd
deleted file mode 100644 (file)
index f49155e..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-Bundle-License: LGPL-2.1-only
-SLC-Origin-M2: :2021.1.0
-Export-Package: net.postgis.*
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.bnd b/repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.bnd
deleted file mode 100644 (file)
index e373a7b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-SLC-Origin-M2: net.postgis:postgis-jdbc
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.geometry.bnd b/repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.geometry.bnd
deleted file mode 100644 (file)
index 92b8f63..0000000
+++ /dev/null
@@ -1 +0,0 @@
-SLC-Origin-M2: net.postgis:postgis-geometry
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.java2d.bnd b/repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.java2d.bnd
deleted file mode 100644 (file)
index 03dd804..0000000
+++ /dev/null
@@ -1 +0,0 @@
-SLC-Origin-M2: net.postgis:postgis-jdbc-java2d
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.jts.bnd b/repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.jts.bnd
deleted file mode 100644 (file)
index 7329fa0..0000000
+++ /dev/null
@@ -1 +0,0 @@
-SLC-Origin-M2: net.postgis:postgis-jdbc-jts
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.gis/units/merge.bnd b/repackage/org.argeo.tp.gis/units/merge.bnd
deleted file mode 100644 (file)
index b9bcadd..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-Bundle-License: BSD-3-Clause
-Bundle-SymbolicName: tech.units.indriya
-SLC-Origin-M2: :2.0.4
-Export-Package: javax.measure.*, tech.units.indriya.*, si.uom.*, systems.uom.*
-Import-Package: \
-*;resolution:="optional"
-SLC-Origin-M2-Merge: \
-javax.measure:unit-api:2.0, \
-tech.units:indriya, \
-tech.uom.lib:uom-lib-common:2.0.1, \
-si.uom:si-units:2.0.1, \
-si.uom:si-quantity:2.0.1, \
-systems.uom:systems-common:2.0.2, \
-systems.uom:systems-quantity:2.0.2, \
diff --git a/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd b/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd
new file mode 100644 (file)
index 0000000..7612c79
--- /dev/null
@@ -0,0 +1,22 @@
+Bundle-SymbolicName: org.eclipse.jetty.websocket
+SPDX-License-Identifier: Apache-2.0 OR EPL-2.0
+Argeo-Origin-M2: :10.0.15
+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, \
+
+Export-Package: org.eclipse.jetty.*
+
+Import-Package: \
+!java.*, \
+org.eclipse.jetty.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
new file mode 100644 (file)
index 0000000..a4e02f0
--- /dev/null
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0 OR EPL-2.0
+Argeo-Origin-M2: :10.0.15
diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.alpn.client.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.alpn.client.bnd
new file mode 100644 (file)
index 0000000..bbe59b7
--- /dev/null
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.eclipse.jetty:jetty-alpn-client
+Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.alpn.server.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.alpn.server.bnd
new file mode 100644 (file)
index 0000000..cd72af5
--- /dev/null
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.eclipse.jetty:jetty-alpn-server
+Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.client.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.client.bnd
new file mode 100644 (file)
index 0000000..c6fd028
--- /dev/null
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.eclipse.jetty:jetty-client
+Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.continuation.bnd.retired b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.continuation.bnd.retired
new file mode 100644 (file)
index 0000000..5cf169d
--- /dev/null
@@ -0,0 +1,3 @@
+SLC-Origin-M2: org.eclipse.jetty:jetty-continuation
+SLC-Origin-ManifestNotModified: true
+Bundle-SymbolicName: org.eclipse.jetty.continuation
diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http.bnd
new file mode 100644 (file)
index 0000000..e6338bc
--- /dev/null
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.eclipse.jetty:jetty-http
+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
new file mode 100644 (file)
index 0000000..89b7b2c
--- /dev/null
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.eclipse.jetty.http2:http2-client
+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
new file mode 100644 (file)
index 0000000..f106b39
--- /dev/null
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.eclipse.jetty.http2: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
new file mode 100644 (file)
index 0000000..75298f0
--- /dev/null
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.eclipse.jetty.http2: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
new file mode 100644 (file)
index 0000000..c62e1ed
--- /dev/null
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.eclipse.jetty.http2:http2-server
+Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.io.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.io.bnd
new file mode 100644 (file)
index 0000000..40c1839
--- /dev/null
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.eclipse.jetty:jetty-io
+Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.jmx.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.jmx.bnd
new file mode 100644 (file)
index 0000000..dc2803c
--- /dev/null
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.eclipse.jetty:jetty-jmx
+Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.security.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.security.bnd
new file mode 100644 (file)
index 0000000..a691b62
--- /dev/null
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.eclipse.jetty:jetty-security
+Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.server.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.server.bnd
new file mode 100644 (file)
index 0000000..d3e83cc
--- /dev/null
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.eclipse.jetty:jetty-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
new file mode 100644 (file)
index 0000000..4bcefbc
--- /dev/null
@@ -0,0 +1,2 @@
+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
new file mode 100644 (file)
index 0000000..daafe91
--- /dev/null
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.eclipse.jetty:jetty-servlets
+Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.util.ajax.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.util.ajax.bnd
new file mode 100644 (file)
index 0000000..3f8dc5d
--- /dev/null
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.eclipse.jetty:jetty-util-ajax
+Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.util.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.util.bnd
new file mode 100644 (file)
index 0000000..d594d02
--- /dev/null
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.eclipse.jetty:jetty-util
+Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.xml.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.xml.bnd
new file mode 100644 (file)
index 0000000..3a8a0b7
--- /dev/null
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.eclipse.jetty:jetty-xml
+Argeo-Origin-NoMetadataGeneration: true
index d2432b79b9ebafd325a5fa8953b191035954f10c..92a2950c4689691bfa6706cb2b3073be5f17b348 100644 (file)
@@ -1,3 +1,2 @@
-Bundle-License: Public Domain
-Bundle-SymbolicName: EDU.oswego.cs.dl.util.concurrent
-SLC-Origin-M2: concurrent:concurrent:1.3.4
\ No newline at end of file
+SPDX-License-Identifier: CC0-1.0
+Argeo-Origin-M2: concurrent:concurrent:1.3.4
\ No newline at end of file
index 5d259b220edc50bb87c3dc366e08294dff4d9f4e..29be7dc36daa11580a68504b764008df80bc2a6b 100644 (file)
@@ -1,2 +1,2 @@
-Bundle-License: Apache-2.0
-SLC-Origin-M2: :2.20.6
\ No newline at end of file
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: :2.20.10
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.jcr/jackrabbit/merge.bnd b/repackage/org.argeo.tp.jcr/jackrabbit/merge.bnd
new file mode 100644 (file)
index 0000000..7a6d1ec
--- /dev/null
@@ -0,0 +1,23 @@
+Bundle-SymbolicName: org.apache.jackrabbit.core
+
+Argeo-Origin-M2-Merge: \
+org.apache.jackrabbit:jackrabbit-core, \
+org.apache.jackrabbit:jackrabbit-data, \
+org.apache.jackrabbit:jackrabbit-jcr-servlet, \
+
+Export-Package: org.apache.jackrabbit.*
+
+Import-Package: \
+org.apache.jackrabbit.test;resolution:=optional,\
+org.apache.derby.*;resolution:=optional,\
+org.h2;resolution:=optional,\
+org.postgresql;resolution:=optional,\
+oracle.jdbc;resolution:=optional,\
+org.gjt.mm.mysql;resolution:=optional,\
+com.mysql.jdbc;resolution:=optional,\
+com.microsoft.sqlserver.jdbc;resolution:=optional,\
+net.sourceforge.jtds.jdbc;resolution:=optional,\
+org.hsqldb;resolution:=optional,\
+org.apache.jackrabbit.rmi.*;resolution:=optional,*\
+javax.servlet.*;resolution:=optional,*
+*
diff --git a/repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.core.bnd b/repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.core.bnd
deleted file mode 100644 (file)
index a746cae..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-SLC-Origin-M2: org.apache.jackrabbit:jackrabbit-core
-Bundle-SymbolicName: org.apache.jackrabbit.core
-Import-Package: org.apache.jackrabbit.test;resolution:=optional,\
-org.apache.derby.*;resolution:=optional,\
-org.h2;resolution:=optional,\
-org.postgresql;resolution:=optional,\
-oracle.jdbc;resolution:=optional,\
-org.gjt.mm.mysql;resolution:=optional,\
-com.mysql.jdbc;resolution:=optional,\
-com.microsoft.sqlserver.jdbc;resolution:=optional,\
-net.sourceforge.jtds.jdbc;resolution:=optional,\
-org.hsqldb;resolution:=optional,\
-*
diff --git a/repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.core.bnd.disabled b/repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.core.bnd.disabled
new file mode 100644 (file)
index 0000000..a00a55a
--- /dev/null
@@ -0,0 +1,12 @@
+Argeo-Origin-M2: org.apache.jackrabbit:jackrabbit-core
+Import-Package: org.apache.jackrabbit.test;resolution:=optional,\
+org.apache.derby.*;resolution:=optional,\
+org.h2;resolution:=optional,\
+org.postgresql;resolution:=optional,\
+oracle.jdbc;resolution:=optional,\
+org.gjt.mm.mysql;resolution:=optional,\
+com.mysql.jdbc;resolution:=optional,\
+com.microsoft.sqlserver.jdbc;resolution:=optional,\
+net.sourceforge.jtds.jdbc;resolution:=optional,\
+org.hsqldb;resolution:=optional,\
+*
diff --git a/repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.data.bnd b/repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.data.bnd
deleted file mode 100644 (file)
index 981b846..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-SLC-Origin-M2: org.apache.jackrabbit:jackrabbit-data
-Bundle-SymbolicName: org.apache.jackrabbit.data
-Fragment-Host: org.apache.jackrabbit.core
-Import-Package: org.apache.jackrabbit.test;resolution:=optional,\
-org.apache.derby.*;resolution:=optional,\
-org.h2;resolution:=optional,\
-org.postgresql;resolution:=optional,\
-oracle.jdbc;resolution:=optional,\
-org.gjt.mm.mysql;resolution:=optional,\
-com.mysql.jdbc;resolution:=optional,\
-com.microsoft.sqlserver.jdbc;resolution:=optional,\
-net.sourceforge.jtds.jdbc;resolution:=optional,\
-org.hsqldb;resolution:=optional,\
-*
diff --git a/repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.data.bnd.disabled b/repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.data.bnd.disabled
new file mode 100644 (file)
index 0000000..b1193c5
--- /dev/null
@@ -0,0 +1,13 @@
+Argeo-Origin-M2: org.apache.jackrabbit:jackrabbit-data
+Fragment-Host: org.apache.jackrabbit.core
+Import-Package: org.apache.jackrabbit.test;resolution:=optional,\
+org.apache.derby.*;resolution:=optional,\
+org.h2;resolution:=optional,\
+org.postgresql;resolution:=optional,\
+oracle.jdbc;resolution:=optional,\
+org.gjt.mm.mysql;resolution:=optional,\
+com.mysql.jdbc;resolution:=optional,\
+com.microsoft.sqlserver.jdbc;resolution:=optional,\
+net.sourceforge.jtds.jdbc;resolution:=optional,\
+org.hsqldb;resolution:=optional,\
+*
index 9c083a3df0055b898b18b7e6f8d0c5ff027fdf52..c9de84a387039e637a24f7ca52dc968a5c2cc8f2 100644 (file)
@@ -1,2 +1 @@
-SLC-Origin-M2: org.apache.jackrabbit:jackrabbit-jcr-client
-Bundle-SymbolicName: org.apache.jackrabbit.jcr.client
+Argeo-Origin-M2: org.apache.jackrabbit:jackrabbit-jcr-client
index 7af2a80c8629e696649dae337d268ce1ccb1db9f..5f78c0f244a6e6bdb30864717ee8ca67d51bcde6 100644 (file)
@@ -1,2 +1 @@
-SLC-Origin-M2: org.apache.jackrabbit:jackrabbit-jcr-commons
-Bundle-SymbolicName: org.apache.jackrabbit.jcr.commons
+Argeo-Origin-M2: org.apache.jackrabbit:jackrabbit-jcr-commons
index 6ec7dd9397c6f346c73648181023426b1360b88b..2895f041e0cba06e70303221b6792e0950e44d18 100644 (file)
@@ -1,2 +1 @@
-SLC-Origin-M2: org.apache.jackrabbit:jackrabbit-jcr2dav
-Bundle-SymbolicName: org.apache.jackrabbit.jcr2dav
+Argeo-Origin-M2: org.apache.jackrabbit:jackrabbit-jcr2dav
index 5809e9e4865f053885702102bef1d201e780b89c..8fdd6fa6d2e95522fc3fd3574a51bbb169380145 100644 (file)
@@ -1,2 +1 @@
-SLC-Origin-M2: org.apache.jackrabbit:jackrabbit-jcr2spi
-Bundle-SymbolicName: org.apache.jackrabbit.jcr2spi
+Argeo-Origin-M2: org.apache.jackrabbit:jackrabbit-jcr2spi
index ef7d703787631797cd272132cb59781c617c9cc7..620511ac35e4cefa33ada54e59ef0c23e570516b 100644 (file)
@@ -1,2 +1 @@
-SLC-Origin-M2: org.apache.jackrabbit:jackrabbit-jcr-server
-Bundle-SymbolicName: org.apache.jackrabbit.server
+Argeo-Origin-M2: org.apache.jackrabbit:jackrabbit-jcr-server
diff --git a/repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.servlet.bnd b/repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.servlet.bnd
deleted file mode 100644 (file)
index 01f4326..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-SLC-Origin-M2: org.apache.jackrabbit:jackrabbit-jcr-servlet
-Bundle-SymbolicName: org.apache.jackrabbit.servlet
-Fragment-Host: org.apache.jackrabbit.core
-Import-Package: org.apache.jackrabbit.rmi.*;resolution:=optional,*
diff --git a/repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.servlet.bnd.disabled b/repackage/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.servlet.bnd.disabled
new file mode 100644 (file)
index 0000000..f8d5dec
--- /dev/null
@@ -0,0 +1,3 @@
+Argeo-Origin-M2: org.apache.jackrabbit:jackrabbit-jcr-servlet
+Fragment-Host: org.apache.jackrabbit.core
+Import-Package: org.apache.jackrabbit.rmi.*;resolution:=optional,*
index 6d0c7e4ba2a95755b05275091e839a82246c0cbf..dcc9b15cca7092130f20b758c4059ece11151613 100644 (file)
@@ -1,2 +1 @@
-SLC-Origin-M2: org.apache.jackrabbit:jackrabbit-spi
-Bundle-SymbolicName: org.apache.jackrabbit.spi
+Argeo-Origin-M2: org.apache.jackrabbit:jackrabbit-spi
index 3014a8c4f7bfd5385588f4f5e8a53f2671690bc3..9020c99d46a13b07c8ee874054b69bb22e4ddf40 100644 (file)
@@ -1,2 +1 @@
-SLC-Origin-M2: org.apache.jackrabbit:jackrabbit-spi-commons
-Bundle-SymbolicName: org.apache.jackrabbit.spi.commons
+Argeo-Origin-M2: org.apache.jackrabbit:jackrabbit-spi-commons
index 7c7de9c52584dd8a6518043861ed74b4d4f5d8e8..c9f93fa2295c008d5ef346e85a9ccbadebeb09fe 100644 (file)
@@ -1,2 +1 @@
-SLC-Origin-M2: org.apache.jackrabbit:jackrabbit-spi2dav
-Bundle-SymbolicName: org.apache.jackrabbit.spi2dav
+Argeo-Origin-M2: org.apache.jackrabbit:jackrabbit-spi2dav
index 9474f309b7f4bde487fa2ef7233fb6b8d73e956e..f663dc1e8eb088edf1167dd5a516f766d4589bc7 100644 (file)
@@ -1,2 +1 @@
-SLC-Origin-M2: org.apache.jackrabbit:jackrabbit-spi2jcr
-Bundle-SymbolicName: org.apache.jackrabbit.spi2jcr
+Argeo-Origin-M2: org.apache.jackrabbit:jackrabbit-spi2jcr
index 9a453bf028365c26cbe687b077a363333c9d9eae..3da6221e0b2b49d50308745c6351f8bd969063fe 100644 (file)
@@ -1,2 +1 @@
-SLC-Origin-M2: org.apache.jackrabbit:jackrabbit-webdav
-Bundle-SymbolicName: org.apache.jackrabbit.webdav
+Argeo-Origin-M2: org.apache.jackrabbit:jackrabbit-webdav
index 10bd6c30e7425f7974f13114bedd5402e2d24653..a064d0d92199695d53acf0dd16d013f171a38857 100644 (file)
@@ -1,5 +1,4 @@
-Bundle-License: https://www.adobe.io/experience-manager/reference-materials/spec/jcr/2.0/license.html
-Bundle-SymbolicName: javax.jcr
-Bundle-Version: 2.0.0
-SLC-Origin-M2: javax.jcr:jcr:2.0
-SLC-Origin-ManifestNotModified: true
+SPDX-License-Identifier: LicenseRef-argeo2-day-spec-with-addendum
+Bundle-License: https://s.apache.org/jcr-2.0-spec/license.html
+Argeo-Origin-M2: javax.jcr:jcr:2.0
+Argeo-Origin-Do-Not-Modify: true
index 02eafb790382142957c4eeaa2a2fc0620c9923d5..e907d29cdb7000c0be07485cbb2fede304ea7b63 100644 (file)
@@ -1,2 +1,2 @@
-Bundle-License: Apache-2.0
-SLC-Origin-M2: :1.44.0
\ No newline at end of file
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: :1.52.0
\ No newline at end of file
index ebd491d6f502222952a3138d236925b01ecfb540..5a65c2e3c9b6fa02e436a4acfa4fd47f5037acab 100644 (file)
@@ -1,3 +1,2 @@
-SLC-Origin-M2: org.apache.jackrabbit:oak-jackrabbit-api
-Bundle-SymbolicName: org.apache.jackrabbit.api
+Argeo-Origin-M2: org.apache.jackrabbit:oak-jackrabbit-api
 Export-Package: org.apache.jackrabbit.*
diff --git a/repackage/org.argeo.tp.jcr/org.apache.commons.collections.bnd b/repackage/org.argeo.tp.jcr/org.apache.commons.collections.bnd
deleted file mode 100644 (file)
index b81a7e3..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-Bundle-License: Apache-2.0
-Bundle-SymbolicName: org.apache.commons.collections
-SLC-Origin-M2: commons-collections:commons-collections:3.2.2
diff --git a/repackage/org.argeo.tp.jcr/org.apache.commons.dbcp.bnd b/repackage/org.argeo.tp.jcr/org.apache.commons.dbcp.bnd
deleted file mode 100644 (file)
index 7d03c4d..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-Bundle-License: Apache-2.0
-Bundle-SymbolicName: org.apache.commons.dbcp
-SLC-Origin-M2: commons-dbcp:commons-dbcp:1.4
-Import-Package: javax.transaction.*; resolution:="optional",\
-*
diff --git a/repackage/org.argeo.tp.jcr/org.apache.commons.pool.bnd b/repackage/org.argeo.tp.jcr/org.apache.commons.pool.bnd
deleted file mode 100644 (file)
index c0ae270..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-Bundle-License: Apache-2.0
-Bundle-SymbolicName: org.apache.commons.pool
-SLC-Origin-M2: commons-pool:commons-pool:1.6
index 8126ffd79f2c00b4f640bff8c3e277a1d1d9d719..3f403b093ecd2879194ae099f21f499608010695 100644 (file)
@@ -1,3 +1,7 @@
-Bundle-License: Apache-2.0
-Bundle-SymbolicName: org.apache.lucene
-SLC-Origin-M2: org.apache.lucene:lucene-core:3.6.2
\ No newline at end of file
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: org.apache.lucene:lucene-core:3.6.2
+
+Import-Package: \
+sun.*;resolution:=optional, \
+com.sun.*;resolution:=optional, \
+*
diff --git a/repackage/org.argeo.tp.jetty/jetty-websocket/merge.bnd b/repackage/org.argeo.tp.jetty/jetty-websocket/merge.bnd
deleted file mode 100644 (file)
index abaada7..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-Bundle-SymbolicName: org.eclipse.jetty.websocket
-Bundle-License: Apache-2.0
-SLC-Origin-M2: :10.0.12
-SLC-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, \
-
-Export-Package: org.eclipse.jetty.*
-
-Import-Package: \
-!java.*, \
-org.eclipse.jetty.webapp;resolution:="optional", \
-*
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.jetty/jetty/common.bnd b/repackage/org.argeo.tp.jetty/jetty/common.bnd
deleted file mode 100644 (file)
index 27fd8a9..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-License: Apache-2.0
-SLC-Origin-M2: :10.0.12
diff --git a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.alpn.client.bnd b/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.alpn.client.bnd
deleted file mode 100644 (file)
index 202f50a..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-SLC-Origin-M2: org.eclipse.jetty:jetty-alpn-client
-SLC-Origin-ManifestNotModified: true
diff --git a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.alpn.server.bnd b/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.alpn.server.bnd
deleted file mode 100644 (file)
index 47e4560..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-SLC-Origin-M2: org.eclipse.jetty:jetty-alpn-server
-SLC-Origin-ManifestNotModified: true
diff --git a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.client.bnd b/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.client.bnd
deleted file mode 100644 (file)
index 8bce1ab..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-SLC-Origin-M2: org.eclipse.jetty:jetty-client
-SLC-Origin-ManifestNotModified: true
-Bundle-SymbolicName: org.eclipse.jetty.client
diff --git a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.continuation.bnd.retired b/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.continuation.bnd.retired
deleted file mode 100644 (file)
index 5cf169d..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-SLC-Origin-M2: org.eclipse.jetty:jetty-continuation
-SLC-Origin-ManifestNotModified: true
-Bundle-SymbolicName: org.eclipse.jetty.continuation
diff --git a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.http.bnd b/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.http.bnd
deleted file mode 100644 (file)
index 4a4e18c..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-SLC-Origin-M2: org.eclipse.jetty:jetty-http
-SLC-Origin-ManifestNotModified: true
-Bundle-SymbolicName: org.eclipse.jetty.http
diff --git a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.http2.client.bnd b/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.http2.client.bnd
deleted file mode 100644 (file)
index b57b83f..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-SLC-Origin-M2: org.eclipse.jetty.http2:http2-client
-SLC-Origin-ManifestNotModified: true
diff --git a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.http2.common.bnd b/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.http2.common.bnd
deleted file mode 100644 (file)
index c1d7174..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-SLC-Origin-M2: org.eclipse.jetty.http2:http2-common
-SLC-Origin-ManifestNotModified: true
diff --git a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.http2.hpack.bnd b/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.http2.hpack.bnd
deleted file mode 100644 (file)
index 766cdd0..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-SLC-Origin-M2: org.eclipse.jetty.http2:http2-hpack
-SLC-Origin-ManifestNotModified: true
diff --git a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.http2.server.bnd b/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.http2.server.bnd
deleted file mode 100644 (file)
index 2f1a080..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-SLC-Origin-M2: org.eclipse.jetty.http2:http2-server
-SLC-Origin-ManifestNotModified: true
diff --git a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.io.bnd b/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.io.bnd
deleted file mode 100644 (file)
index 4037c70..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-SLC-Origin-M2: org.eclipse.jetty:jetty-io
-SLC-Origin-ManifestNotModified: true
-Bundle-SymbolicName: org.eclipse.jetty.io
diff --git a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.jmx.bnd b/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.jmx.bnd
deleted file mode 100644 (file)
index dbdf6e1..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-SLC-Origin-M2: org.eclipse.jetty:jetty-jmx
-SLC-Origin-ManifestNotModified: true
-Bundle-SymbolicName: org.eclipse.jetty.jmx
diff --git a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.security.bnd b/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.security.bnd
deleted file mode 100644 (file)
index f28b886..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-SLC-Origin-M2: org.eclipse.jetty:jetty-security
-SLC-Origin-ManifestNotModified: true
-Bundle-SymbolicName: org.eclipse.jetty.security
diff --git a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.server.bnd b/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.server.bnd
deleted file mode 100644 (file)
index d66a70d..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-SLC-Origin-M2: org.eclipse.jetty:jetty-server
-SLC-Origin-ManifestNotModified: true
-Bundle-SymbolicName: org.eclipse.jetty.server
diff --git a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.servlet.bnd b/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.servlet.bnd
deleted file mode 100644 (file)
index 68469c1..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-SLC-Origin-M2: org.eclipse.jetty:jetty-servlet
-SLC-Origin-ManifestNotModified: true
-Bundle-SymbolicName: org.eclipse.jetty.servlet
diff --git a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.servlets.bnd b/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.servlets.bnd
deleted file mode 100644 (file)
index 27a8f2e..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-SLC-Origin-M2: org.eclipse.jetty:jetty-servlets
-SLC-Origin-ManifestNotModified: true
-Bundle-SymbolicName: org.eclipse.jetty.servlets
diff --git a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.util.ajax.bnd b/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.util.ajax.bnd
deleted file mode 100644 (file)
index ec671fa..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-SLC-Origin-M2: org.eclipse.jetty:jetty-util-ajax
-SLC-Origin-ManifestNotModified: true
-Bundle-SymbolicName: org.eclipse.jetty.util.ajax
diff --git a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.util.bnd b/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.util.bnd
deleted file mode 100644 (file)
index 600cc70..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-SLC-Origin-M2: org.eclipse.jetty:jetty-util
-SLC-Origin-ManifestNotModified: true
-Bundle-SymbolicName: org.eclipse.jetty.util
diff --git a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.xml.bnd b/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.xml.bnd
deleted file mode 100644 (file)
index 0ccef1a..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-SLC-Origin-M2: org.eclipse.jetty:jetty-xml
-SLC-Origin-ManifestNotModified: true
-Bundle-SymbolicName: org.eclipse.jetty.xml
diff --git a/repackage/org.argeo.tp.math/ejml/merge.bnd b/repackage/org.argeo.tp.math/ejml/merge.bnd
new file mode 100644 (file)
index 0000000..e77efdd
--- /dev/null
@@ -0,0 +1,17 @@
+Bundle-SymbolicName: org.ejml
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: :0.43
+Export-Package: org.ejml.*
+Argeo-Origin-M2-Merge: \
+org.ejml:ejml-core, \
+org.ejml:ejml-simple, \
+org.ejml:ejml-fdense, \
+org.ejml:ejml-ddense, \
+org.ejml:ejml-cdense, \
+org.ejml:ejml-zdense, \
+org.ejml:ejml-dsparse, \
+
+Import-Package: \
+us.hebi.matlab.*;resolution:="optional", \
+javax.swing;resolution:="optional",
+*
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.math/org.apache.commons.math3.bnd b/repackage/org.argeo.tp.math/org.apache.commons.math3.bnd
new file mode 100644 (file)
index 0000000..e9ac478
--- /dev/null
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: org.apache.commons:commons-math3:3.6.1
diff --git a/repackage/org.argeo.tp.math/org.locationtech.jts.bnd b/repackage/org.argeo.tp.math/org.locationtech.jts.bnd
new file mode 100644 (file)
index 0000000..b163e3a
--- /dev/null
@@ -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.math/units/merge.bnd b/repackage/org.argeo.tp.math/units/merge.bnd
new file mode 100644 (file)
index 0000000..3b9b42a
--- /dev/null
@@ -0,0 +1,14 @@
+SPDX-License-Identifier: BSD-3-Clause
+Bundle-SymbolicName: tech.units.indriya
+Argeo-Origin-M2: :2.1.4
+Export-Package: javax.measure.*, tech.units.indriya.*, si.uom.*, systems.uom.*
+Import-Package: \
+*;resolution:="optional"
+Argeo-Origin-M2-Merge: \
+javax.measure:unit-api:2.1.3, \
+tech.units:indriya, \
+tech.uom.lib:uom-lib-common:2.1, \
+si.uom:si-units:2.1, \
+si.uom:si-quantity:2.1, \
+systems.uom:systems-common:2.1, \
+systems.uom:systems-quantity:2.1, \
diff --git a/repackage/org.argeo.tp.office/com.healthmarketscience.jackcess.bnd b/repackage/org.argeo.tp.office/com.healthmarketscience.jackcess.bnd
new file mode 100644 (file)
index 0000000..720e04c
--- /dev/null
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: com.healthmarketscience.jackcess:jackcess:4.0.5
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.office/log4j/common.bnd b/repackage/org.argeo.tp.office/log4j/common.bnd
new file mode 100644 (file)
index 0000000..6cd7b19
--- /dev/null
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: :2.20.0
diff --git a/repackage/org.argeo.tp.office/log4j/org.apache.logging.log4j.api.bnd b/repackage/org.argeo.tp.office/log4j/org.apache.logging.log4j.api.bnd
new file mode 100644 (file)
index 0000000..a999360
--- /dev/null
@@ -0,0 +1,3 @@
+Argeo-Origin-M2: org.apache.logging.log4j:log4j-api
+Bundle-ActivationPolicy: lazy
+Import-Package: *;resolution:=optional
diff --git a/repackage/org.argeo.tp.office/log4j/org.apache.logging.log4j.core.bnd b/repackage/org.argeo.tp.office/log4j/org.apache.logging.log4j.core.bnd
new file mode 100644 (file)
index 0000000..cd0ad25
--- /dev/null
@@ -0,0 +1,3 @@
+Argeo-Origin-M2: org.apache.logging.log4j:log4j-core
+Import-Package:\
+*;resolution:="optional"
diff --git a/repackage/org.argeo.tp.office/org.apache.xmlbeans.bnd b/repackage/org.argeo.tp.office/org.apache.xmlbeans.bnd
new file mode 100644 (file)
index 0000000..569d40a
--- /dev/null
@@ -0,0 +1,7 @@
+SPDX-License-Identifier: Apache-2.0
+DynamicImport-Package: *
+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
diff --git a/repackage/org.argeo.tp.office/poi/common.bnd b/repackage/org.argeo.tp.office/poi/common.bnd
new file mode 100644 (file)
index 0000000..66536ad
--- /dev/null
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: :5.2.3
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.office/poi/org.apache.poi.bnd b/repackage/org.argeo.tp.office/poi/org.apache.poi.bnd
new file mode 100644 (file)
index 0000000..e6ee512
--- /dev/null
@@ -0,0 +1,4 @@
+Argeo-Origin-M2: org.apache.poi:poi
+Import-Package: \
+org.apache.logging.log4j.*;resolution:=optional,\
+*
diff --git a/repackage/org.argeo.tp.office/poi/org.apache.poi.ooxml.bnd b/repackage/org.argeo.tp.office/poi/org.apache.poi.ooxml.bnd
new file mode 100644 (file)
index 0000000..2a8bcf6
--- /dev/null
@@ -0,0 +1,7 @@
+Import-Package: \
+com.graphbuilder.*;resolution:=optional,\
+com.graphbuilder.*;resolution:=optional,\
+org.etsi.uri.*;resolution:=optional,\
+org.apache.logging.log4j.*;resolution:=optional,\
+*
+Argeo-Origin-M2: org.apache.poi:poi-ooxml
diff --git a/repackage/org.argeo.tp.office/poi/org.apache.poi.ooxml.schemas.bnd b/repackage/org.argeo.tp.office/poi/org.apache.poi.ooxml.schemas.bnd
new file mode 100644 (file)
index 0000000..385a652
--- /dev/null
@@ -0,0 +1,6 @@
+Import-Package: \
+com.microsoft.schemas.*;resolution:=optional, \
+org.openxmlformats.schemas.*;resolution:=optional, \
+*
+Require-Bundle: org.apache.xmlbeans
+Argeo-Origin-M2: org.apache.poi:poi-ooxml-full
diff --git a/repackage/org.argeo.tp.office/poi/org.apache.poi.scratchpad.bnd b/repackage/org.argeo.tp.office/poi/org.apache.poi.scratchpad.bnd
new file mode 100644 (file)
index 0000000..70e12e3
--- /dev/null
@@ -0,0 +1,4 @@
+Argeo-Origin-M2: org.apache.poi:poi-scratchpad
+Import-Package: \
+org.apache.logging.log4j.*;resolution:=optional,\
+*
diff --git a/repackage/org.argeo.tp.poi/com.healthmarketscience.jackcess.bnd b/repackage/org.argeo.tp.poi/com.healthmarketscience.jackcess.bnd
deleted file mode 100644 (file)
index 028a094..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-License: Apache-2.0
-SLC-Origin-M2: com.healthmarketscience.jackcess:jackcess:4.0.4
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.poi/log4j/common.bnd b/repackage/org.argeo.tp.poi/log4j/common.bnd
deleted file mode 100644 (file)
index f9e517b..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-License: Apache-2.0
-SLC-Origin-M2: :2.19.0
diff --git a/repackage/org.argeo.tp.poi/log4j/org.apache.logging.log4j.api.bnd b/repackage/org.argeo.tp.poi/log4j/org.apache.logging.log4j.api.bnd
deleted file mode 100644 (file)
index c29a8e4..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-SLC-Origin-M2: org.apache.logging.log4j:log4j-api
-Bundle-ActivationPolicy: lazy
-Import-Package: *;resolution:=optional
diff --git a/repackage/org.argeo.tp.poi/log4j/org.apache.logging.log4j.core.bnd b/repackage/org.argeo.tp.poi/log4j/org.apache.logging.log4j.core.bnd
deleted file mode 100644 (file)
index 4864b50..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-SLC-Origin-M2: org.apache.logging.log4j:log4j-core
-Import-Package:\
-*;resolution:="optional"
diff --git a/repackage/org.argeo.tp.poi/org.apache.xmlbeans.bnd b/repackage/org.argeo.tp.poi/org.apache.xmlbeans.bnd
deleted file mode 100644 (file)
index 8905324..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-Bundle-License: Apache-2.0
-Bundle-SymbolicName: org.apache.xmlbeans
-DynamicImport-Package: *
-Import-Package: org.apache.tools.ant.*;resolution:=optional,
-net.sf.saxon.*;resolution:=optional,
-com.sun.*;resolution:=optional,
-*
-SLC-Origin-M2: org.apache.xmlbeans:xmlbeans:5.1.1
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.poi/poi/common.bnd b/repackage/org.argeo.tp.poi/poi/common.bnd
deleted file mode 100644 (file)
index b2394bd..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-License: Apache-2.0
-SLC-Origin-M2: :5.2.3
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.poi/poi/org.apache.poi.bnd b/repackage/org.argeo.tp.poi/poi/org.apache.poi.bnd
deleted file mode 100644 (file)
index 9856bd2..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-Bundle-SymbolicName: org.apache.poi
-SLC-Origin-M2: org.apache.poi:poi
-Import-Package: \
-org.apache.logging.log4j.*;resolution:=optional,\
-*
diff --git a/repackage/org.argeo.tp.poi/poi/org.apache.poi.ooxml.bnd b/repackage/org.argeo.tp.poi/poi/org.apache.poi.ooxml.bnd
deleted file mode 100644 (file)
index 75bea7c..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-Bundle-SymbolicName: org.apache.poi.ooxml
-Import-Package: \
-com.graphbuilder.*;resolution:=optional,\
-com.graphbuilder.*;resolution:=optional,\
-org.etsi.uri.*;resolution:=optional,\
-org.apache.logging.log4j.*;resolution:=optional,\
-*
-SLC-Origin-M2: org.apache.poi:poi-ooxml
diff --git a/repackage/org.argeo.tp.poi/poi/org.apache.poi.ooxml.schemas.bnd b/repackage/org.argeo.tp.poi/poi/org.apache.poi.ooxml.schemas.bnd
deleted file mode 100644 (file)
index 7b4fa6e..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-Bundle-SymbolicName: org.apache.poi.ooxml.schemas
-Import-Package: \
-com.microsoft.schemas.*;resolution:=optional, \
-org.openxmlformats.schemas.*;resolution:=optional, \
-*
-Require-Bundle: org.apache.xmlbeans
-SLC-Origin-M2: org.apache.poi:poi-ooxml-full
diff --git a/repackage/org.argeo.tp.poi/poi/org.apache.poi.scratchpad.bnd b/repackage/org.argeo.tp.poi/poi/org.apache.poi.scratchpad.bnd
deleted file mode 100644 (file)
index 50b0d3f..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-Bundle-SymbolicName: org.apache.poi.scratchpad
-SLC-Origin-M2: org.apache.poi:poi-scratchpad
-Import-Package: \
-org.apache.logging.log4j.*;resolution:=optional,\
-*
diff --git a/repackage/org.argeo.tp.publish/com.github.librepdf.openpdf.bnd b/repackage/org.argeo.tp.publish/com.github.librepdf.openpdf.bnd
new file mode 100644 (file)
index 0000000..3dc17b1
--- /dev/null
@@ -0,0 +1,6 @@
+SPDX-License-Identifier: LGPL-2.1-only
+Argeo-Origin-M2: com.github.librepdf:openpdf:1.3.30
+Import-Package: \
+com.ibm.icu.*;resolution:=optional,\
+org.bouncycastle.*;resolution:="optional",\
+*
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.publish/de.rototor.pdfbox.graphics2d.bnd b/repackage/org.argeo.tp.publish/de.rototor.pdfbox.graphics2d.bnd
new file mode 100644 (file)
index 0000000..e159513
--- /dev/null
@@ -0,0 +1,6 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: de.rototor.pdfbox:graphics2d:0.43
+
+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
new file mode 100644 (file)
index 0000000..c532bd7
--- /dev/null
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: LGPL-3.0-only
+Argeo-Origin-M2: :9.1.22
\ 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
new file mode 100644 (file)
index 0000000..d4a0510
--- /dev/null
@@ -0,0 +1 @@
+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
new file mode 100644 (file)
index 0000000..ace9050
--- /dev/null
@@ -0,0 +1 @@
+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
new file mode 100644 (file)
index 0000000..6b89d64
--- /dev/null
@@ -0,0 +1,4 @@
+SLC-Origin-M2: org.xhtmlrenderer:flying-saucer-swt
+Import-Package:\
+org.eclipse.swt.printing;resolution:="optional",\
+*
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.publish/fop/merge.bnd b/repackage/org.argeo.tp.publish/fop/merge.bnd
new file mode 100644 (file)
index 0000000..e0ca825
--- /dev/null
@@ -0,0 +1,16 @@
+SPDX-License-Identifier: Apache-2.0
+Bundle-SymbolicName: org.apache.fop
+Argeo-Origin-M2: :2.8
+Argeo-Origin-M2-Merge: \
+org.apache.xmlgraphics:fop-core,\
+org.apache.xmlgraphics:fop-util,\
+org.apache.xmlgraphics:fop-events,\
+org.apache.xmlgraphics:fop-pdf-images,\
+
+Export-Package: org.apache.fop.*
+
+Import-Package: \
+javax.media.jai;resolution:="optional",\
+com.thoughtworks.qdox.*;resolution:="optional",\
+org.apache.tools.ant.*;resolution:="optional",\
+*
diff --git a/repackage/org.argeo.tp.publish/org.apache.pdfbox.jempbox.bnd b/repackage/org.argeo.tp.publish/org.apache.pdfbox.jempbox.bnd
new file mode 100644 (file)
index 0000000..34e5c0f
--- /dev/null
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: org.apache.pdfbox:jempbox:1.8.17
diff --git a/repackage/org.argeo.tp.publish/pdfbox/common.bnd b/repackage/org.argeo.tp.publish/pdfbox/common.bnd
new file mode 100644 (file)
index 0000000..0a280f1
--- /dev/null
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: :2.0.28
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.publish/pdfbox/org.apache.fontbox.bnd b/repackage/org.argeo.tp.publish/pdfbox/org.apache.fontbox.bnd
new file mode 100644 (file)
index 0000000..8f6e26b
--- /dev/null
@@ -0,0 +1 @@
+Argeo-Origin-M2: org.apache.pdfbox:fontbox
diff --git a/repackage/org.argeo.tp.publish/pdfbox/org.apache.pdfbox.bnd b/repackage/org.argeo.tp.publish/pdfbox/org.apache.pdfbox.bnd
new file mode 100644 (file)
index 0000000..98dd4d6
--- /dev/null
@@ -0,0 +1,5 @@
+Argeo-Origin-M2: org.apache.pdfbox:pdfbox
+Import-Package: \
+sun.java2d.cmm.kcms;resolution:="optional",\
+org.bouncycastle.*;resolution:="optional",\
+*
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.publish/pdfbox/org.apache.xmpbox.bnd b/repackage/org.argeo.tp.publish/pdfbox/org.apache.xmpbox.bnd
new file mode 100644 (file)
index 0000000..a447a24
--- /dev/null
@@ -0,0 +1 @@
+Argeo-Origin-M2: org.apache.pdfbox:xmpbox
diff --git a/repackage/org.argeo.tp.sdk/biz.aQute.bndlib.bnd b/repackage/org.argeo.tp.sdk/biz.aQute.bndlib.bnd
deleted file mode 100644 (file)
index 0fa851b..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-Bundle-License: Apache-2.0
-SLC-Origin-M2: biz.aQute.bnd:biz.aQute.bndlib:5.3.0
-SLC-Origin-ManifestNotModified: true
index 6eaa07c4ec589e01543fc97164ef7cd4a275f4df..a57dd47b09fbcbd68838309ecd44dd117128ed5f 100644 (file)
@@ -1,7 +1,7 @@
-Bundle-License: EPL-2.0
+SPDX-License-Identifier: EPL-2.0
 Bundle-SymbolicName: org.junit.jupiter
-SLC-Origin-M2: :5.9.1
-SLC-Origin-M2-Merge: \
+Argeo-Origin-M2: :5.9.3
+Argeo-Origin-M2-Merge: \
 org.junit.jupiter:junit-jupiter-api, \
 org.junit.jupiter:junit-jupiter-engine, \
 org.junit.jupiter:junit-jupiter-params, \
index 110a32ee3fce450adfdf7ef60ef5e1c7c3896bf1..b8d5cb5ad4a1ecedf55f87dc4c556cacc030e9c5 100644 (file)
@@ -1,7 +1,7 @@
-Bundle-License: EPL-2.0
+SPDX-License-Identifier: EPL-2.0
 Bundle-SymbolicName: org.junit.platform
-SLC-Origin-M2: :1.9.1
-SLC-Origin-M2-Merge: \
+Argeo-Origin-M2: :1.9.3
+Argeo-Origin-M2-Merge: \
 org.junit.platform:junit-platform-commons, \
 org.junit.platform:junit-platform-console, \
 org.junit.platform:junit-platform-engine, \
diff --git a/repackage/org.argeo.tp.sdk/org.apiguardian.api.bnd b/repackage/org.argeo.tp.sdk/org.apiguardian.api.bnd
new file mode 100644 (file)
index 0000000..2b1f78f
--- /dev/null
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: org.apiguardian:apiguardian-api:1.1.2
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.sdk/org.apiguardian.bnd b/repackage/org.argeo.tp.sdk/org.apiguardian.bnd
deleted file mode 100644 (file)
index 039c57a..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-License: Apache-2.0
-SLC-Origin-M2: org.apiguardian:apiguardian-api:1.1.2
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.sdk/org.eclipse.jdt.core.compiler.batch.bnd b/repackage/org.argeo.tp.sdk/org.eclipse.jdt.core.compiler.batch.bnd
deleted file mode 100644 (file)
index 70b5ac0..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-Bundle-License: EPL-2.0
-SLC-Origin-M2: org.eclipse.jdt:ecj:3.31.0
-SLC-Origin-ManifestNotModified: true
-Main-Class: org.eclipse.jdt.internal.compiler.batch.Main
\ No newline at end of file
index 1a47046c51f7755ff903c4479432a21d15dbb907..cc2f2b32e1258966bd906e23860e76e29bf3f6b0 100644 (file)
@@ -1,2 +1,2 @@
-Bundle-License: BSD-3-Clause
-SLC-Origin-M2: org.hamcrest:hamcrest-core:1.3
+SPDX-License-Identifier: BSD-3-Clause
+Argeo-Origin-M2: org.hamcrest:hamcrest-core:1.3
index 414b102583d269cf37ac4766f1db891063e5ae38..5d6cbfa02831c26b080ee32ddef9a570e9327066 100644 (file)
@@ -1,6 +1,5 @@
-Bundle-License: EPL-1.0
-Bundle-SymbolicName: org.junit
+SPDX-License-Identifier: EPL-2.0
 Import-Package: org.hamcrest;resolution:=optional,\
 org.hamcrest.core;resolution:=optional,\
 *
-SLC-Origin-M2: junit:junit:4.13.2
\ No newline at end of file
+Argeo-Origin-M2: junit:junit:4.13.2
\ No newline at end of file
index df674e48721b609802424423b51dfda567dce2ea..2b1ab94f941b60965a86e6e2cf1a8f009bf8e1c2 100644 (file)
@@ -1,2 +1,2 @@
-Bundle-License: EPL-2.0
-SLC-Origin-M2: org.junit.vintage:junit-vintage-engine:5.9.1
\ No newline at end of file
+SPDX-License-Identifier: EPL-2.0
+Argeo-Origin-M2: org.junit.vintage:junit-vintage-engine:5.9.3
\ No newline at end of file
index c959b429bc188e76915dcebf005f68e06f49f251..7622d976f671b9921480b983bd6fb7b7e184d771 100644 (file)
@@ -1,2 +1,2 @@
-Bundle-License: Apache-2.0
-SLC-Origin-M2: org.opentest4j:opentest4j:1.2.0
\ No newline at end of file
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: org.opentest4j:opentest4j:1.2.0
\ No newline at end of file
index 6a32d263722c2f3d3d96fcbb9b84e2c345ba6625..7633ae105fd8d2eb670479fd6463dab523eda818 100644 (file)
@@ -1,7 +1,6 @@
-Bundle-License: MIT
-Bundle-SymbolicName: org.redline-rpm
+SPDX-License-Identifier: MIT
 Import-Package: sun.security.*;resolution:=optional,
 org.apache.tools.ant.*;resolution:=optional,
 org.apache.tools.zip;resolution:=optional,
 *
-SLC-Origin-M2: org.redline-rpm:redline:1.2.10
+Argeo-Origin-M2: org.redline-rpm:redline:1.2.10
diff --git a/repackage/org.argeo.tp.sql/org.h2.bnd b/repackage/org.argeo.tp.sql/org.h2.bnd
deleted file mode 100644 (file)
index 2d6de4e..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-Bundle-License: MPL-2.0
-Bundle-SymbolicName: org.h2
-SLC-Origin-M2: com.h2database:h2:2.1.214
-Import-Package:\
-jakarta.*;resolution:=optional,\
-org.apache.lucene.*;resolution:=optional,\
-org.codehaus.groovy.*;resolution:=optional,\
-org.osgi.*;resolution:=optional,\
-com.ibm.icu.*;resolution:=optional,\
-*
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.sql/org.postgresql.bnd b/repackage/org.argeo.tp.sql/org.postgresql.bnd
deleted file mode 100644 (file)
index 6e68b97..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-Bundle-License: BSD-2-Clause
-SLC-Origin-M2: org.postgresql:postgresql:42.5.0
-Import-Package:\
-org.osgi.service.jdbc;resolution:="optional",\
-com.sun.jna.*;resolution:="optional",\
-org.checkerframework.*;resolution:="optional",\
-waffle.*;resolution:="optional",\
-*
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.utils/asm/common.bnd b/repackage/org.argeo.tp.utils/asm/common.bnd
new file mode 100644 (file)
index 0000000..cc32d2b
--- /dev/null
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: BSD-3-Clause
+Argeo-Origin-M2: :9.4
diff --git a/repackage/org.argeo.tp.utils/asm/org.objectweb.asm.bnd b/repackage/org.argeo.tp.utils/asm/org.objectweb.asm.bnd
new file mode 100644 (file)
index 0000000..c5eac67
--- /dev/null
@@ -0,0 +1 @@
+Argeo-Origin-M2: org.ow2.asm:asm
diff --git a/repackage/org.argeo.tp.utils/asm/org.objectweb.asm.tree.analysis.bnd b/repackage/org.argeo.tp.utils/asm/org.objectweb.asm.tree.analysis.bnd
new file mode 100644 (file)
index 0000000..c76963a
--- /dev/null
@@ -0,0 +1 @@
+Argeo-Origin-M2: org.ow2.asm:asm-analysis
diff --git a/repackage/org.argeo.tp.utils/asm/org.objectweb.asm.tree.bnd b/repackage/org.argeo.tp.utils/asm/org.objectweb.asm.tree.bnd
new file mode 100644 (file)
index 0000000..9ab0bbf
--- /dev/null
@@ -0,0 +1 @@
+Argeo-Origin-M2: org.ow2.asm:asm-tree
diff --git a/repackage/org.argeo.tp.utils/asm/org.objectweb.asm.util.bnd b/repackage/org.argeo.tp.utils/asm/org.objectweb.asm.util.bnd
new file mode 100644 (file)
index 0000000..84e6979
--- /dev/null
@@ -0,0 +1 @@
+Argeo-Origin-M2: org.ow2.asm:asm-util
index e7066595754aebb1deaab2ccef981b412248e1d7..66fc30a8541924137b1c86fa821072035842ed33 100644 (file)
@@ -1,4 +1,3 @@
-Bundle-License: BSD-3-Clause
-Bundle-SymbolicName: com.adobe.xmp.xmpcore
+SPDX-License-Identifier: BSD-3-Clause
 # No source available in Maven Central for 6.1.11
-SLC-Origin-M2: com.adobe.xmp:xmpcore:6.1.10
+Argeo-Origin-M2: com.adobe.xmp:xmpcore:6.1.10
index b1713f04853f8ef3f836eb7840ff52ab3482f42b..dd4b5ef8cb645d6bd40b0aeec0e3f4a315b5cec7 100644 (file)
@@ -1,2 +1,2 @@
-Bundle-License: MIT
-SLC-Origin-M2: com.googlecode.plist:dd-plist:1.26
\ No newline at end of file
+SPDX-License-Identifier: MIT
+Argeo-Origin-M2: com.googlecode.plist:dd-plist:1.27
\ No newline at end of file
index ddb5ffd3cccd892ae3df0cfdfaee1ba8f0756a49..86e37b3f35b3e3840c1daeb5ac6174ffc07a8ca3 100644 (file)
@@ -1,3 +1,2 @@
-Bundle-License: Apache-2.0
-Bundle-SymbolicName: com.drew.metadata
-SLC-Origin-M2: com.drewnoakes:metadata-extractor:2.18.0
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: com.drewnoakes:metadata-extractor:2.18.0
index 395c23308df32267d39e87dbd21d6c76abe80787..2e44ac3569d28a4e901d7d9b2e299c2a2ce0d0e9 100644 (file)
@@ -1,3 +1,2 @@
-Bundle-License: BSD-2-Clause
-Bundle-SymbolicName: com.github.mangstadt.beweekly
-SLC-Origin-M2: net.sf.biweekly:biweekly:0.6.6
\ No newline at end of file
+SPDX-License-Identifier: BSD-2-Clause
+Argeo-Origin-M2: net.sf.biweekly:biweekly:0.6.7
\ No newline at end of file
index 8aa1e6ea4458fd810766bf3e20d411ac99e933e1..09fbdccd83a5f994510ddfde45a9e83ff455a058 100644 (file)
@@ -1,6 +1,5 @@
-Bundle-License: BSD-2-Clause
-Bundle-SymbolicName: com.github.mangstadt.ezvcard
-SLC-Origin-M2: com.googlecode.ez-vcard:ez-vcard:0.11.3
+SPDX-License-Identifier: BSD-2-Clause
+Argeo-Origin-M2: com.googlecode.ez-vcard:ez-vcard:0.12.0
 Import-Package: \
 freemarker.*;resolution:="optional", \
 com.fasterxml.jackson.*;resolution:="optional", \
index eded65b70fcc0ac9c294ee20304cca6d7e9904a6..f4f548cfd80c72d509d074c6ccd4d9a50d7a995f 100644 (file)
@@ -1,3 +1,2 @@
-Bundle-License: MIT
-Bundle-SymbolicName: com.github.mangstadt.vinnie
-SLC-Origin-M2: com.github.mangstadt:vinnie:2.0.2
\ No newline at end of file
+SPDX-License-Identifier: MIT
+Argeo-Origin-M2: com.github.mangstadt:vinnie:2.0.2
diff --git a/repackage/org.argeo.tp.utils/com.googlecode.javaewah.JavaEWAH.bnd b/repackage/org.argeo.tp.utils/com.googlecode.javaewah.JavaEWAH.bnd
new file mode 100644 (file)
index 0000000..421ace3
--- /dev/null
@@ -0,0 +1,3 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: com.googlecode.javaewah:JavaEWAH:1.2.3
+Argeo-Origin-NoMetadataGeneration: true
index d400fd7bdcd00b6acccaee7fafaf4ce0982408e2..6850718ef9ff055344caeb95a06e981abcae60fc 100644 (file)
@@ -1,3 +1,2 @@
-Bundle-License: BSD-3-Clause
-Bundle-SymbolicName: com.graphbuilder
-SLC-Origin-M2: com.github.virtuald:curvesapi:1.07
+SPDX-License-Identifier: BSD-3-Clause
+Argeo-Origin-M2: com.github.virtuald:curvesapi:1.07
diff --git a/repackage/org.argeo.tp.utils/com.lowagie.bnd b/repackage/org.argeo.tp.utils/com.lowagie.bnd
deleted file mode 100644 (file)
index 8b7f1c5..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-Bundle-License: LGPL-2.1
-Bundle-SymbolicName: com.lowagie
-SLC-Origin-M2: com.github.librepdf:openpdf:1.3.30
-Import-Package: \
-com.ibm.icu.*;resolution:=optional,\
-*
\ No newline at end of file
index 4d2a3beac28a1fad3612cda03bb84d89e972989c..4cbdfc1155e02fb0d3fe224f6e03c4068bacb021 100644 (file)
@@ -1,2 +1,2 @@
-Bundle-License: Apache-2.0
-SLC-Origin-M2: com.pff:java-libpst:0.9.3
\ No newline at end of file
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: com.pff:java-libpst:0.9.3
\ No newline at end of file
index 0f72baf58f60889167dec9a062ee0a1d0cc483b3..0f1f4be89277f3f765f68096349393ac45caa816 100644 (file)
@@ -1,3 +1,2 @@
-Bundle-License: Apache-2.0
-Bundle-SymbolicName: com.zaxxer.sparsebits
-SLC-Origin-M2: com.zaxxer:SparseBitSet:1.2
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: com.zaxxer:SparseBitSet:1.2
diff --git a/repackage/org.argeo.tp.utils/de.rototor.pdfbox.graphics2d.bnd b/repackage/org.argeo.tp.utils/de.rototor.pdfbox.graphics2d.bnd
deleted file mode 100644 (file)
index 08f2139..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-Bundle-License: Apache-2.0
-Bundle-SymbolicName: de.rototor.pdfbox.graphics2d
-SLC-Origin-M2: de.rototor.pdfbox:graphics2d:0.41
diff --git a/repackage/org.argeo.tp.utils/de.thjom.java.systemd.bnd b/repackage/org.argeo.tp.utils/de.thjom.java.systemd.bnd
new file mode 100644 (file)
index 0000000..7d28b18
--- /dev/null
@@ -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.utils/flying-saucer/common.bnd b/repackage/org.argeo.tp.utils/flying-saucer/common.bnd
deleted file mode 100644 (file)
index 8fc898c..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-License: LGPL-3
-SLC-Origin-M2: :9.1.22
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.utils/flying-saucer/org.xhtmlrenderer.core.bnd b/repackage/org.argeo.tp.utils/flying-saucer/org.xhtmlrenderer.core.bnd
deleted file mode 100644 (file)
index 19312ee..0000000
+++ /dev/null
@@ -1 +0,0 @@
-SLC-Origin-M2: org.xhtmlrenderer:flying-saucer-core
diff --git a/repackage/org.argeo.tp.utils/flying-saucer/org.xhtmlrenderer.openpdf.bnd b/repackage/org.argeo.tp.utils/flying-saucer/org.xhtmlrenderer.openpdf.bnd
deleted file mode 100644 (file)
index 0c241bd..0000000
+++ /dev/null
@@ -1 +0,0 @@
-SLC-Origin-M2: org.xhtmlrenderer:flying-saucer-pdf-openpdf
diff --git a/repackage/org.argeo.tp.utils/flying-saucer/org.xhtmlrenderer.swt.bnd.disabled b/repackage/org.argeo.tp.utils/flying-saucer/org.xhtmlrenderer.swt.bnd.disabled
deleted file mode 100644 (file)
index 6b89d64..0000000
+++ /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.utils/fop/merge.bnd b/repackage/org.argeo.tp.utils/fop/merge.bnd
deleted file mode 100644 (file)
index b8f6548..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-Bundle-License: Apache-2.0
-Bundle-SymbolicName: org.apache.fop
-SLC-Origin-M2: :2.7
-SLC-Origin-M2-Merge: \
-org.apache.xmlgraphics:fop-core,\
-org.apache.xmlgraphics:fop-util,\
-org.apache.xmlgraphics:fop-events,\
-org.apache.xmlgraphics:fop-pdf-images,\
-
-Export-Package: org.apache.fop.*
-
-Import-Package: \
-javax.media.jai;resolution:="optional",\
-com.thoughtworks.qdox.*;resolution:="optional",\
-org.apache.tools.ant.*;resolution:="optional",\
-*
index 34445b6d601f60a08a9134a40f3dc964ac5dd093..7b3ee12d0cb100fcbf3cdd2c758c88ecfb4aadcc 100644 (file)
@@ -1,2 +1,2 @@
-Bundle-License: MIT
-SLC-Origin-M2: io.nayuki:qrcodegen:1.8.0
+SPDX-License-Identifier: MIT
+Argeo-Origin-M2: io.nayuki:qrcodegen:1.8.0
index 167bd5f7d2afb460182b931c923ae77de70466a6..28c047c8e98a27c1e5dc9402d263ff3d53213dee 100644 (file)
@@ -1,3 +1,3 @@
-Bundle-License: BSD-3-Clause
-SLC-Origin-M2: jakarta.activation:jakarta.activation-api:1.2.2
-SLC-Origin-ManifestNotModified: true
+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.el.bnd b/repackage/org.argeo.tp.utils/javax.el.bnd
new file mode 100644 (file)
index 0000000..caf57c0
--- /dev/null
@@ -0,0 +1,3 @@
+SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 OR CDDL-1.1
+# TODO: find a way to retrieve a more recent version (e.g. v3.0.4), or to rebuild it 
+Argeo-Origin-M2: javax.el:javax.el-api:3.0.0
index 15093a733d2a4f27eac9f98b7b545d53e87f4f2f..d20614bb28cbf59ccf33e077abfcac00a6ba8704 100644 (file)
@@ -1,4 +1,3 @@
-Bundle-License: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-Bundle-SymbolicName: jakarta.mail
-SLC-Origin-M2: com.sun.mail:jakarta.mail:1.6.7
-SLC-Origin-ManifestNotModified: true
+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.servlet.jsp.bnd b/repackage/org.argeo.tp.utils/javax.servlet.jsp.bnd
new file mode 100644 (file)
index 0000000..884367b
--- /dev/null
@@ -0,0 +1,3 @@
+SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 OR CDDL-1.1
+Argeo-Origin-M2: javax.servlet.jsp:javax.servlet.jsp-api:2.3.3
+Argeo-Origin-NoMetadataGeneration: true
index a827549f2bce49fdab066bee30463490346e72d6..37afe39a6697cbc5ec2295316fb72936f41534c0 100644 (file)
@@ -1,7 +1,7 @@
-Bundle-License: CDDL-1.0 OR GPL-2.0 WITH Classpath-exception-2.0
-Bundle-SymbolicName: javax.xml.bind
-Bundle-Version: 2.4.0
-SLC-Origin-M2: javax.xml.bind:jaxb-api:2.4.0-b180830.0359
+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.cglib.bnd b/repackage/org.argeo.tp.utils/net.sf.cglib.bnd
new file mode 100644 (file)
index 0000000..6aa02c5
--- /dev/null
@@ -0,0 +1,7 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: cglib:cglib:3.3.0
+
+Import-Package: \
+org.apache.tools.ant.*;resolution:=optional, \
+sun.*;resolution:=optional, \
+*
diff --git a/repackage/org.argeo.tp.utils/net.sf.saxon.bnd b/repackage/org.argeo.tp.utils/net.sf.saxon.bnd
new file mode 100644 (file)
index 0000000..a22d535
--- /dev/null
@@ -0,0 +1,6 @@
+SPDX-License-Identifier: MPL-2.0
+Argeo-Origin-M2: net.sf.saxon:Saxon-HE:12.2
+Import-Package:\
+com.sun.org.apache.xerces.internal.jaxp;resolution:="optional",\
+jline.*;resolution:="optional",\
+*
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.beanutils.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.beanutils.bnd
new file mode 100644 (file)
index 0000000..5d6aa32
--- /dev/null
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: commons-beanutils:commons-beanutils:1.9.4
diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.codec.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.codec.bnd
deleted file mode 100644 (file)
index fe4bfa6..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-Bundle-License: Apache-2.0
-Bundle-SymbolicName: org.apache.commons.codec
-SLC-Origin-M2: commons-codec:commons-codec:1.15
diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.collections.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.collections.bnd
new file mode 100644 (file)
index 0000000..54e0797
--- /dev/null
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: commons-collections:commons-collections:3.2.2
index 4379a1947a4150cb582c13e40f7352851358a252..9bb5e5bc5700317e9a3bd73323e964809043d124 100644 (file)
@@ -1,3 +1,2 @@
-Bundle-License: Apache-2.0
-Bundle-SymbolicName: org.apache.commons.collections4
-SLC-Origin-M2: org.apache.commons:commons-collections4:4.4
\ No newline at end of file
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: org.apache.commons:commons-collections4:4.4
diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.compress.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.compress.bnd
deleted file mode 100644 (file)
index 5a045bd..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-Bundle-License: Apache-2.0
-Bundle-SymbolicName: org.apache.commons.compress
-SLC-Origin-M2: org.apache.commons:commons-compress:1.22
-Import-Package: \
-org.brotli.*;resolution:=optional,
-org.tukaani.*;resolution:=optional,
-com.github.luben.zstd;resolution:=optional,
-*
\ No newline at end of file
index 94f8301f2dcf422690bdf3f1ce7fa4a481ce42ef..bb0c29d8cccd8e2f3e097baff1f77256d65e31f6 100644 (file)
@@ -1,3 +1,2 @@
-Bundle-License: Apache-2.0
-Bundle-SymbolicName: org.apache.commons.csv
-SLC-Origin-M2: org.apache.commons:commons-csv:1.9.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.dbcp.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.dbcp.bnd
new file mode 100644 (file)
index 0000000..2fea39f
--- /dev/null
@@ -0,0 +1,5 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: commons-dbcp:commons-dbcp:1.4
+
+Import-Package: javax.transaction.*; resolution:="optional",\
+*
diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.dbcp2.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.dbcp2.bnd
new file mode 100644 (file)
index 0000000..1f6e450
--- /dev/null
@@ -0,0 +1,5 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: org.apache.commons:commons-dbcp2:2.9.0
+
+Import-Package: javax.transaction.*; resolution:="optional",\
+*
diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.digester.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.digester.bnd
new file mode 100644 (file)
index 0000000..3936876
--- /dev/null
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: commons-digester:commons-digester:2.1
index b1885872d2c7a72c85a34a63ba8f4124bbcf9b9e..0607a8b5d92205f781b05c0f007f5fb5708c9325 100644 (file)
@@ -1,3 +1,2 @@
-Bundle-License: Apache-2.0
-Bundle-SymbolicName: org.apache.commons.exec
-SLC-Origin-M2: org.apache.commons:commons-exec:1.3
\ No newline at end of file
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: org.apache.commons:commons-exec:1.3
index f0d2123871d4760406a7e25043823e5c9d60c6cf..a45cbc91c8c5bea2dfada8770f5d93ef94327248 100644 (file)
@@ -1,4 +1,3 @@
-Bundle-License: Apache-2.0
-Bundle-SymbolicName: org.apache.commons.imaging
+SPDX-License-Identifier: Apache-2.0
 Bundle-Version: 0.99.3
-SLC-Origin-M2: org.apache.commons:commons-imaging:1.0-alpha3
+Argeo-Origin-M2: org.apache.commons:commons-imaging:1.0-alpha3
diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.jxpath.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.jxpath.bnd
new file mode 100644 (file)
index 0000000..d58bd33
--- /dev/null
@@ -0,0 +1,8 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: commons-jxpath:commons-jxpath:1.3
+
+Import-Package: \
+javax.xml.*;resolution:="optional", \
+org.w3c.*;resolution:="optional", \
+org.jdom.*;resolution:="optional", \
+*
\ No newline at end of file
index 373f64737b566cda47fa92bbfcfa287a574c97ea..e90caec1f8906c2acd50d6915f2aa7ece53b916f 100644 (file)
@@ -1,3 +1,2 @@
-Bundle-License: Apache-2.0
-Bundle-SymbolicName: org.apache.commons.lang3
-SLC-Origin-M2: org.apache.commons:commons-lang3:3.12.0
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: org.apache.commons:commons-lang3:3.12.0
diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.math3.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.math3.bnd
deleted file mode 100644 (file)
index 9ce7741..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-Bundle-License: Apache-2.0
-Bundle-SymbolicName: org.apache.commons.math3
-SLC-Origin-M2: org.apache.commons:commons-math3:3.6.1
diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.pool.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.pool.bnd
new file mode 100644 (file)
index 0000000..c5c3cc5
--- /dev/null
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: commons-pool:commons-pool:1.6
diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.pool2.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.pool2.bnd
new file mode 100644 (file)
index 0000000..6826cea
--- /dev/null
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: org.apache.commons:commons-pool2:2.11.1
index b14d9b50d730457042b689ec972b1a546b6aea71..173a1505a98d571d607539482e7af5e44f3b1112 100644 (file)
@@ -1,3 +1,2 @@
-Bundle-License: Apache-2.0
-Bundle-SymbolicName: org.apache.commons.text
-SLC-Origin-M2: org.apache.commons:commons-text:1.10.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.vfs.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.vfs.bnd
deleted file mode 100644 (file)
index 3a73689..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-Bundle-License: Apache-2.0
-Bundle-SymbolicName: org.apache.commons.vfs
-Import-Package: org.apache.tools.ant.*;resolution:=optional,
-*
-SLC-Origin-M2: org.apache.commons:commons-vfs2:2.9.0
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.vfs2.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.vfs2.bnd
new file mode 100644 (file)
index 0000000..9900d35
--- /dev/null
@@ -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.utils/org.apache.pdfbox.jempbox.bnd b/repackage/org.argeo.tp.utils/org.apache.pdfbox.jempbox.bnd
deleted file mode 100644 (file)
index 4edfaa5..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-Bundle-License: Apache-2.0
-Bundle-SymbolicName: org.apache.pdfbox.jempbox
-SLC-Origin-M2: org.apache.pdfbox:jempbox:1.8.17
diff --git a/repackage/org.argeo.tp.utils/org.apache.santuario.xmlsec.bnd b/repackage/org.argeo.tp.utils/org.apache.santuario.xmlsec.bnd
new file mode 100644 (file)
index 0000000..d80056d
--- /dev/null
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: org.apache.santuario:xmlsec:2.3.3
diff --git a/repackage/org.argeo.tp.utils/org.apache.xml.security.bnd b/repackage/org.argeo.tp.utils/org.apache.xml.security.bnd
deleted file mode 100644 (file)
index caf6de4..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-Bundle-License: Apache-2.0
-Bundle-SymbolicName: org.apache.xml.security
-SLC-Origin-M2: org.apache.santuario:xmlsec:2.3.2
diff --git a/repackage/org.argeo.tp.utils/org.eclipse.jgit.bnd b/repackage/org.argeo.tp.utils/org.eclipse.jgit.bnd
new file mode 100644 (file)
index 0000000..5ad0391
--- /dev/null
@@ -0,0 +1,6 @@
+SPDX-License-Identifier: BSD-3-Clause
+Argeo-Origin-M2: org.eclipse.jgit:org.eclipse.jgit:6.5.0.202303070854-r
+Import-Package: \
+sun.*;resolution:=optional, \
+com.jcraft.jsch;resolution:=optional, \
+*
diff --git a/repackage/org.argeo.tp.utils/org.mozilla.javascript.bnd b/repackage/org.argeo.tp.utils/org.mozilla.javascript.bnd
deleted file mode 100644 (file)
index 277db30..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-Bundle-License: MPL-2.0
-Bundle-SymbolicName: org.mozilla.javascript
-SLC-Origin-M2: org.mozilla:rhino:1.7.14
-SLC-Origin-ManifestNotModified: true
diff --git a/repackage/org.argeo.tp.utils/org.mozilla.rhino.bnd b/repackage/org.argeo.tp.utils/org.mozilla.rhino.bnd
new file mode 100644 (file)
index 0000000..6d62d87
--- /dev/null
@@ -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.tukaani.xz.bnd b/repackage/org.argeo.tp.utils/org.tukaani.xz.bnd
deleted file mode 100644 (file)
index d4a6821..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-License: CC0-1.0
-SLC-Origin-M2: org.tukaani:xz:1.9
diff --git a/repackage/org.argeo.tp.utils/org.xmlresolver.bnd b/repackage/org.argeo.tp.utils/org.xmlresolver.bnd
new file mode 100644 (file)
index 0000000..246043a
--- /dev/null
@@ -0,0 +1,8 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: org.xmlresolver:xmlresolver:5.2.0
+Import-Package:\
+com.thaiopensource.*;resolution:="optional",\
+org.apache.xerces.*;resolution:="optional",\
+org.apache.hc.client5.*;resolution:="optional",\
+org.apache.hc.core5.*;resolution:="optional",\
+*
diff --git a/repackage/org.argeo.tp.utils/pdfbox/common.bnd b/repackage/org.argeo.tp.utils/pdfbox/common.bnd
deleted file mode 100644 (file)
index 9dcfa6c..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-License: Apache-2.0
-SLC-Origin-M2: :2.0.27
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.utils/pdfbox/org.apache.pdfbox.bnd b/repackage/org.argeo.tp.utils/pdfbox/org.apache.pdfbox.bnd
deleted file mode 100644 (file)
index 1adc204..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-Bundle-SymbolicName: org.apache.pdfbox
-SLC-Origin-M2: org.apache.pdfbox:pdfbox
-Import-Package: \
-sun.java2d.cmm.kcms;resolution:="optional",\
-*
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.utils/pdfbox/org.apache.pdfbox.fontbox.bnd b/repackage/org.argeo.tp.utils/pdfbox/org.apache.pdfbox.fontbox.bnd
deleted file mode 100644 (file)
index 519f90f..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-SymbolicName: org.apache.pdfbox.fontbox
-SLC-Origin-M2: org.apache.pdfbox:fontbox
diff --git a/repackage/org.argeo.tp.utils/pdfbox/org.apache.pdfbox.xmpbox.bnd b/repackage/org.argeo.tp.utils/pdfbox/org.apache.pdfbox.xmpbox.bnd
deleted file mode 100644 (file)
index 8a0c26c..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-SymbolicName: org.apache.pdfbox.xmpbox
-SLC-Origin-M2: org.apache.pdfbox:xmpbox
index 7a5b16f87ef8bc996fade9e438746ad64273776e..fd0587dcd246cc07b25dee442a4d2b029a14d38a 100644 (file)
@@ -1,9 +1,9 @@
 Bundle-SymbolicName: org.apache.tika
-Bundle-License: Apache-2.0
-SLC-Origin-M2: :2.5.0
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: :2.8.0
 Export-Package: org.apache.*
 Import-Package: *;resolution:=optional
-SLC-Origin-M2-Merge: \
+Argeo-Origin-M2-Merge: \
 org.apache.tika:tika-core,\
 org.apache.tika:tika-parser-zip-commons,\
 org.apache.tika:tika-parser-xmp-commons,\
diff --git a/repackage/org.argeo.tp/apache-sshd/common.bnd b/repackage/org.argeo.tp/apache-sshd/common.bnd
new file mode 100644 (file)
index 0000000..8c69a5a
--- /dev/null
@@ -0,0 +1,2 @@
+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
new file mode 100644 (file)
index 0000000..b8ab9a6
--- /dev/null
@@ -0,0 +1,16 @@
+SPDX-License-Identifier: Apache-2.0
+Bundle-SymbolicName: org.apache.sshd
+Argeo-Origin-M2: :2.9.2
+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
new file mode 100644 (file)
index 0000000..ec35e33
--- /dev/null
@@ -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/apache-sshd/org.apache.sshd.git.bnd b/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.git.bnd
new file mode 100644 (file)
index 0000000..d4eec3c
--- /dev/null
@@ -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/apache-sshd/org.apache.sshd.putty.bnd b/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.putty.bnd
new file mode 100644 (file)
index 0000000..67671b2
--- /dev/null
@@ -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/apache-sshd/org.apache.sshd.scp.bnd b/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.scp.bnd
new file mode 100644 (file)
index 0000000..b1c94d8
--- /dev/null
@@ -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/apache-sshd/org.apache.sshd.sftp.bnd b/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.sftp.bnd
new file mode 100644 (file)
index 0000000..43fc2e4
--- /dev/null
@@ -0,0 +1,5 @@
+Argeo-Origin-M2: org.apache.sshd:sshd-sftp
+
+Import-Package: \
+org.bouncycastle.*;resolution:=optional,\
+*
index cc6803179836b0cdba07a93217a38723cdf7d573..29f5f04260f06e44546a921766fc722df461ae8b 100644 (file)
@@ -1,2 +1,2 @@
-Bundle-License: Apache-2.0
-SLC-Origin-M2: :1.16
\ No newline at end of file
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: :1.16
\ No newline at end of file
index 3c1a85dd0edc4e38cd1d2bc7225ac907ab7b624c..785d44b710ea092935c18cb5eac08795a71b2e45 100644 (file)
@@ -1,6 +1,6 @@
-Bundle-License: Apache-2.0
+SPDX-License-Identifier: Apache-2.0
 Bundle-SymbolicName: org.apache.batik
-SLC-Origin-M2: :1.16
+Argeo-Origin-M2: :1.16
 Export-Package: org.apache.*
 Import-Package: \
 org.apache.batik.script.*;resolution:="optional",\
@@ -8,7 +8,7 @@ org.apache.batik.*,\
 org.apache.xmlgraphics.*,\
 org.w3c.*,\
 *;resolution:="optional"
-SLC-Origin-M2-Merge: \
+Argeo-Origin-M2-Merge: \
 org.apache.xmlgraphics:batik-anim, \
 org.apache.xmlgraphics:batik-awt-util, \
 org.apache.xmlgraphics:batik-bridge, \
index b8a4c6d9ca30938bc173e702b3b1b7fecbf88362..68d83e9412f02876d380a65bf77515a822f43b5c 100644 (file)
@@ -1 +1 @@
-SLC-Origin-M2: org.apache.xmlgraphics:batik-constants
+Argeo-Origin-M2: org.apache.xmlgraphics:batik-constants
index 001e90e3cea1da2cf7f5e3fa8268013f386a0bae..959eb096a9782e6c0ad24547867472ce2f5dc118 100644 (file)
@@ -1 +1 @@
-SLC-Origin-M2: org.apache.xmlgraphics:batik-css
+Argeo-Origin-M2: org.apache.xmlgraphics:batik-css
index 5992e5b6cd9ddd0cf24696251e23c2acf7e943e8..2235e6897be49879f64faa7379289194370539e1 100644 (file)
@@ -1 +1 @@
-SLC-Origin-M2: org.apache.xmlgraphics:batik-i18n
+Argeo-Origin-M2: org.apache.xmlgraphics:batik-i18n
index 80371cb1f1369d3517a2407599b3af8b878a65bb..216a588e9da7e50f86eadecdaa6cf32689ae4446 100644 (file)
@@ -1 +1 @@
-SLC-Origin-M2: org.apache.xmlgraphics:batik-util
+Argeo-Origin-M2: org.apache.xmlgraphics:batik-util
diff --git a/repackage/org.argeo.tp/com.googlecode.javaewah.JavaEWAH.bnd b/repackage/org.argeo.tp/com.googlecode.javaewah.JavaEWAH.bnd
deleted file mode 100644 (file)
index 4355de4..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-Bundle-License: Apache-2.0
-Bundle-SymbolicName: com.googlecode.javaewah.JavaEWAH
-SLC-Origin-M2: com.googlecode.javaewah:JavaEWAH:1.1.13
-SLC-Origin-ManifestNotModified: true
index 8a91e1d28ab187204a7a94803713ad1b4885ae85..ad44fa718eebf565e7179dddcb8afae6413dd9f7 100644 (file)
@@ -1,10 +1,10 @@
 Bundle-SymbolicName: org.freeedesktop.dbus
-Bundle-License: LGPL-2.0
+SPDX-License-Identifier: LGPL-2.0
 # TODO Check whether relicensing of this fork was allowed
-#Bundle-License: MIT
-SLC-Origin-M2: :4.2.1
+#SPDX-License-Identifier: MIT
+Argeo-Origin-M2: :4.3.0
 Export-Package: org.freedesktop.dbus.*
-SLC-Origin-M2-Merge: \
+Argeo-Origin-M2-Merge: \
 com.github.hypfvieh:dbus-java-core,\
 com.github.hypfvieh:dbus-java-utils,\
 com.github.hypfvieh:dbus-java-transport-native-unixsocket,\
diff --git a/repackage/org.argeo.tp/de.thjom.java.systemd.bnd b/repackage/org.argeo.tp/de.thjom.java.systemd.bnd
deleted file mode 100644 (file)
index c63cb0b..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-License: LGPL-2.0
-SLC-Origin-M2: com.github.thjomnx:java-systemd:2.1.0
\ No newline at end of file
diff --git a/repackage/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson-annotations.bnd b/repackage/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson-annotations.bnd
deleted file mode 100644 (file)
index 94b69a1..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-Bundle-SymbolicName: com.fasterxml.jackson.core.jackson-annotations
-SLC-Origin-M2: com.fasterxml.jackson.core:jackson-annotations
-SLC-Origin-ManifestNotModified: 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 (file)
index a4b359f..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-Bundle-SymbolicName: com.fasterxml.jackson.core.jackson-core
-SLC-Origin-M2: com.fasterxml.jackson.core:jackson-core
-SLC-Origin-ManifestNotModified: 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 (file)
index 32ded22..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-Bundle-SymbolicName: com.fasterxml.jackson.core.jackson-databind
-SLC-Origin-M2: com.fasterxml.jackson.core:jackson-databind
-SLC-Origin-ManifestNotModified: 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
new file mode 100644 (file)
index 0000000..1db7eb0
--- /dev/null
@@ -0,0 +1,2 @@
+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
new file mode 100644 (file)
index 0000000..0457673
--- /dev/null
@@ -0,0 +1,2 @@
+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
new file mode 100644 (file)
index 0000000..5e42823
--- /dev/null
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: com.fasterxml.jackson.core:jackson-databind
+Argeo-Origin-NoMetadataGeneration: true
index a738fc4361fae74f00fe56287e5b4f4548498462..71e2f1914d6c64ae04f04e19849d5add9155707a 100644 (file)
@@ -1,2 +1,2 @@
-Bundle-License: Apache-2.0
-SLC-Origin-M2: :2.13.4
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: :2.15.1
index 5664fbda557da1c121a2729c0133d68e6435fb81..4201c14f80111ba19ea45c6829a22ec35c60bbd4 100644 (file)
@@ -1,3 +1,3 @@
-Bundle-License: GPL-2.0-with-classpath-exception
-SLC-Origin-M2: jakarta.servlet:jakarta.servlet-api:4.0.4
-SLC-Origin-ManifestNotModified: true
+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
index cefcff8d1badfabe1a01b4108da999ff8799ad43..66904f66c90878058bb5819078ac74dec200667a 100644 (file)
@@ -1,4 +1,3 @@
-Bundle-SymbolicName: javax.websocket
-Bundle-License: GPL-2.0-only OR CDDL-1.1
-SLC-Origin-M2: javax.websocket:javax.websocket-api:1.1
-SLC-Origin-ManifestNotModified: true
+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
index 7e34d5996a0c09ae59102bbc3732dc503a872744..3dffa2a4ad6b12240309c9bbff01f315749393aa 100644 (file)
@@ -1,3 +1,2 @@
-Bundle-License: Apache-2.0
-Bundle-SymbolicName: org.apache.commons.cli
-SLC-Origin-M2: commons-cli:commons-cli:1.5.0
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: commons-cli:commons-cli:1.5.0
diff --git a/repackage/org.argeo.tp/org.apache.commons.codec.bnd b/repackage/org.argeo.tp/org.apache.commons.codec.bnd
new file mode 100644 (file)
index 0000000..2c29670
--- /dev/null
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: commons-codec:commons-codec:1.15
diff --git a/repackage/org.argeo.tp/org.apache.commons.compress.bnd b/repackage/org.argeo.tp/org.apache.commons.compress.bnd
new file mode 100644 (file)
index 0000000..9ad7267
--- /dev/null
@@ -0,0 +1,7 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: org.apache.commons:commons-compress:1.23.0
+Import-Package: \
+org.brotli.*;resolution:=optional,
+org.tukaani.*;resolution:=optional,
+com.github.luben.zstd;resolution:=optional,
+*
\ No newline at end of file
index 73b19d418df40e1936af7e88929cc286ad591417..9a0f1aaf2268ff240818f2c33055537bff23d8c0 100644 (file)
@@ -1,6 +1,6 @@
-Bundle-License: Apache-2.0
+SPDX-License-Identifier: Apache-2.0
 Import-Package:\
 javax.portlet;resolution:=optional,\
 javax.servlet.*;resolution:=optional,\
 *
-SLC-Origin-M2: commons-fileupload:commons-fileupload:1.4
+Argeo-Origin-M2: commons-fileupload:commons-fileupload:1.5
index e1e25b3998d91c49fa15f63b2ea38c4300b77cae..758183992671cb605c97261d49570cfdca04068c 100644 (file)
@@ -1,4 +1,3 @@
-Bundle-License: Apache-2.0
-Bundle-SymbolicName: org.apache.commons.io
-SLC-Origin-M2: commons-io:commons-io:2.11.0
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: commons-io:commons-io:2.12.0
 Import-Package: sun.*;resolution:=optional, *
index eead3b20c4f746c5da060f703d48191b70594083..27c4192f07f7ee0d65d23bd90f75e2fb20e848a6 100644 (file)
@@ -1,3 +1,2 @@
-Bundle-License: Apache-2.0
-Bundle-SymbolicName: org.apache.httpcomponents.httpclient
-SLC-Origin-M2: org.apache.httpcomponents:httpclient:4.5.13
\ No newline at end of file
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: org.apache.httpcomponents:httpclient:4.5.14
\ No newline at end of file
index b0d0c7ac5006e8f80e98fb65ed73fe915773b988..f40caa9ee74f819f2e0560d379d5f8d2fdb13e01 100644 (file)
@@ -1,3 +1,2 @@
-Bundle-License: Apache-2.0
-Bundle-SymbolicName: org.apache.httpcomponents.httpcore
-SLC-Origin-M2: org.apache.httpcomponents:httpcore:4.4.15
\ No newline at end of file
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: org.apache.httpcomponents:httpcore:4.4.16
\ No newline at end of file
index 1623fb54e9c7ed6147eb2fcb1fdf456eaddaa3e9..b25473d6a9b0fc3f40bce93691c3bd34b2c0679b 100644 (file)
@@ -1,3 +1,2 @@
-Bundle-License: Apache-2.0
-Bundle-SymbolicName: org.apache.httpcomponents.httpmime
-SLC-Origin-M2: org.apache.httpcomponents:httpmime:4.5.13
\ No newline at end of file
+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
new file mode 100644 (file)
index 0000000..e54669a
--- /dev/null
@@ -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.72
\ No newline at end of file
index 6cb8646c80029eb5630fcafa7d84ef4498318f0a..6a4e37922973b771a3a649a563628f1ff6340071 100644 (file)
@@ -1,6 +1,6 @@
-Bundle-License: Apache-2.0
-Bundle-SymbolicName: org.apache.xerces
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: xerces:xercesImpl:2.12.2
+Export-Package: org.apache.*, !org.w3c.*
 Import-Package:\
 sun.*;resolution:=optional,\
 *
-SLC-Origin-M2: xerces:xercesImpl:2.12.2
\ No newline at end of file
index 95f9a5ed94f96f97060c6245db9ebfd7bbc29b21..b91a11dfb5888244504078c308e757d603acb244 100644 (file)
@@ -1,3 +1,2 @@
-Bundle-License: Apache-2.0
-Bundle-SymbolicName: org.apache.xml.resolver
-SLC-Origin-M2: xml-resolver:xml-resolver:1.2
\ No newline at end of file
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: xml-resolver:xml-resolver:1.2
\ No newline at end of file
diff --git a/repackage/org.argeo.tp/org.eclipse.jgit.bnd b/repackage/org.argeo.tp/org.eclipse.jgit.bnd
deleted file mode 100644 (file)
index 65d1344..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-Bundle-License: BSD-3-Clause
-SLC-Origin-M2: org.eclipse.jgit:org.eclipse.jgit:6.3.0.202209071007-r
-Import-Package: \
-sun.*;resolution:=optional, \
-com.jcraft.jsch;resolution:=optional, \
-*
diff --git a/repackage/org.argeo.tp/org.h2.bnd b/repackage/org.argeo.tp/org.h2.bnd
new file mode 100644 (file)
index 0000000..9df3bcf
--- /dev/null
@@ -0,0 +1,11 @@
+SPDX-License-Identifier: MPL-2.0
+Argeo-Origin-M2: com.h2database:h2:2.1.214
+
+Import-Package:\
+jakarta.*;resolution:=optional,\
+org.apache.lucene.*;resolution:=optional,\
+org.codehaus.groovy.*;resolution:=optional,\
+org.osgi.*;resolution:=optional,\
+com.ibm.icu.*;resolution:=optional,\
+org.locationtech.jts.*;resolution:=optional,\
+*
\ No newline at end of file
diff --git a/repackage/org.argeo.tp/org.jline.bnd b/repackage/org.argeo.tp/org.jline.bnd
new file mode 100644 (file)
index 0000000..0f85fed
--- /dev/null
@@ -0,0 +1,9 @@
+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.mozilla.universalchardet.bnd b/repackage/org.argeo.tp/org.mozilla.universalchardet.bnd
new file mode 100644 (file)
index 0000000..0dc40c0
--- /dev/null
@@ -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/org.postgresql.jdbc.bnd b/repackage/org.argeo.tp/org.postgresql.jdbc.bnd
new file mode 100644 (file)
index 0000000..445e23e
--- /dev/null
@@ -0,0 +1,8 @@
+SPDX-License-Identifier: BSD-2-Clause
+Argeo-Origin-M2: org.postgresql:postgresql:42.6.0
+Import-Package:\
+org.osgi.service.jdbc;resolution:="optional",\
+com.sun.jna.*;resolution:="optional",\
+org.checkerframework.*;resolution:="optional",\
+waffle.*;resolution:="optional",\
+*
\ No newline at end of file
diff --git a/repackage/org.argeo.tp/org.tukaani.xz.bnd b/repackage/org.argeo.tp/org.tukaani.xz.bnd
new file mode 100644 (file)
index 0000000..a58ae5b
--- /dev/null
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: CC0-1.0
+Argeo-Origin-M2: org.tukaani:xz:1.9
index bbb35cc55c37ed769523c2c39f693f3bcf7aa2c8..fb4b05cd0517f494ab5bd3feb2049e96fa2b54f2 100644 (file)
@@ -1,3 +1,2 @@
-Bundle-License: W3C
-Bundle-SymbolicName: org.w3c.css.sac
-SLC-Origin-M2: org.w3c.css:sac:1.3
+SPDX-License-Identifier: W3C
+Argeo-Origin-M2: org.w3c.css:sac:1.3
index 05b9dd6efc7f5ada611a167f3099116475f6d9ac..f4cfa986c986b27353a0282a14e0806735dc1bf6 100644 (file)
@@ -1,4 +1,7 @@
-Bundle-License: W3C
-Bundle-SymbolicName: org.w3c.dom.smil
+SPDX-License-Identifier: W3C
 Bundle-Version: 1.0
-SLC-Origin-M2: org.axsl.org.w3c.dom.smil:smil-boston-dom-java:2000-02-25
+Argeo-Origin-M2: org.axsl.org.w3c.dom.smil:smil-boston-dom-java:2000-02-25
+
+Import-Package: \
+org.w3c.*;resolution:="optional", \
+*
index 44cb2b182925aebb911f9474f9bf8cc6322585a5..89da058c6c0e1a2c2db32afc26916d5c03c2c133 100644 (file)
@@ -1,3 +1,6 @@
-Bundle-License: W3C
-Bundle-SymbolicName: org.w3c.dom.svg
-SLC-Origin-M2: org.axsl.org.w3c.dom.svg:svg-dom-java:1.1
+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/slf4j/common.bnd b/repackage/org.argeo.tp/slf4j/common.bnd
deleted file mode 100644 (file)
index 2c5cf1d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-License: Apache-2.0
-SLC-Origin-M2: :1.7.36
diff --git a/repackage/org.argeo.tp/slf4j/org.slf4j.api.bnd b/repackage/org.argeo.tp/slf4j/org.slf4j.api.bnd
deleted file mode 100644 (file)
index d034d27..0000000
+++ /dev/null
@@ -1 +0,0 @@
-SLC-Origin-M2: org.slf4j:slf4j-api
diff --git a/repackage/org.argeo.tp/slf4j/org.slf4j.commons.logging.bnd b/repackage/org.argeo.tp/slf4j/org.slf4j.commons.logging.bnd
deleted file mode 100644 (file)
index 4e5e7c8..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-SLC-Origin-M2: org.slf4j:jcl-over-slf4j
-Export-Package: org.apache.commons.logging.*;version="1.2"
\ No newline at end of file
diff --git a/repackage/org.argeo.tp/xalan/merge.bnd b/repackage/org.argeo.tp/xalan/merge.bnd
deleted file mode 100644 (file)
index ca0c4d6..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-Bundle-SymbolicName: org.apache.xalan
-Bundle-License: Apache-2.0
-SLC-Origin-M2: :2.7.2
-Export-Package: org.apache.*
-SLC-Origin-M2-Merge: \
-xalan:xalan,\
-xalan:serializer,\
\ No newline at end of file
index 8cb1d14512b8dd973097a434754fab86b724d378..ea8e74d0b1e88aba9dcddb9f2cc5c386d5b5e6ed 100644 (file)
@@ -1,7 +1,7 @@
-Bundle-License: Apache-2.0
+SPDX-License-Identifier: Apache-2.0
 Bundle-SymbolicName: org.apache.xmlgraphics
-SLC-Origin-M2: :2.7
-SLC-Origin-M2-Merge: \
+Argeo-Origin-M2: :2.8
+Argeo-Origin-M2-Merge: \
 org.apache.xmlgraphics:xmlgraphics-commons
 Export-Package: org.apache.xmlgraphics.*
 Import-Package: \
index ef1e50320d8a6f4b368d788dff5a5c0532669f80..330d93aae41f823bf22ac22d7d148aee91c07337 100644 (file)
@@ -1,2 +1,3 @@
-SLC-Origin-M2: org.osgi:osgi.cmpn:7.0.0
-SLC-Origin-ManifestNotModified: true
+Argeo-Origin-M2: org.osgi:osgi.cmpn:7.0.0
+Argeo-Origin-NoMetadataGeneration: true
+SPDX-License-Identifier: Apache-2.0
index 16a91c476fb4e69f9f5723b49986d4649db93ed5..7bffea26a4bdb35a72fb4598b33e3cd3fc145f42 100644 (file)
@@ -1,2 +1,3 @@
-SLC-Origin-M2: org.osgi:osgi.core:7.0.0
-SLC-Origin-ManifestNotModified: true
+Argeo-Origin-M2: org.osgi:osgi.core:8.0.0
+Argeo-Origin-NoMetadataGeneration: true
+SPDX-License-Identifier: Apache-2.0
index 9a7ae1d766aac5589a4dc9fb268cf02033c7ba56..743e1d35b9bf18163748d8a0207963a83cab1ac4 100644 (file)
@@ -1,2 +1,2 @@
-Bundle-License: EPL-1.0
-SLC-Origin-ManifestNotModified: true
+SPDX-License-Identifier: EPL-2.0
+Argeo-Origin-NoMetadataGeneration: true
index 9a7ae1d766aac5589a4dc9fb268cf02033c7ba56..743e1d35b9bf18163748d8a0207963a83cab1ac4 100644 (file)
@@ -1,2 +1,2 @@
-Bundle-License: EPL-1.0
-SLC-Origin-ManifestNotModified: true
+SPDX-License-Identifier: EPL-2.0
+Argeo-Origin-NoMetadataGeneration: true
index 9a7ae1d766aac5589a4dc9fb268cf02033c7ba56..743e1d35b9bf18163748d8a0207963a83cab1ac4 100644 (file)
@@ -1,2 +1,2 @@
-Bundle-License: EPL-1.0
-SLC-Origin-ManifestNotModified: true
+SPDX-License-Identifier: EPL-2.0
+Argeo-Origin-NoMetadataGeneration: true
index 93e66cb31bf1fa1710eb3026bcd26d030262a256..e8e614aa7d49ac80563609b95c389fdf79ea4b26 100644 (file)
@@ -1,6 +1,5 @@
 plugins/javax.inject*.jar=
 plugins/javax.annotation*.jar=
-plugins/org.apache.commons.jxpath*.jar=
 plugins/org.eclipse.e4*.jar=
 plugins/org.eclipse.emf*.jar=
 plugins/org.eclipse.rap.e4_*.jar=
index 9a7ae1d766aac5589a4dc9fb268cf02033c7ba56..743e1d35b9bf18163748d8a0207963a83cab1ac4 100644 (file)
@@ -1,2 +1,2 @@
-Bundle-License: EPL-1.0
-SLC-Origin-ManifestNotModified: true
+SPDX-License-Identifier: EPL-2.0
+Argeo-Origin-NoMetadataGeneration: true
index 9a7ae1d766aac5589a4dc9fb268cf02033c7ba56..743e1d35b9bf18163748d8a0207963a83cab1ac4 100644 (file)
@@ -1,2 +1,2 @@
-Bundle-License: EPL-1.0
-SLC-Origin-ManifestNotModified: true
+SPDX-License-Identifier: EPL-2.0
+Argeo-Origin-NoMetadataGeneration: true
index 2e54d27bbe1a23648a7e4f8cd90a948288a7f502..a8755e14018bf9c9f7471d5a91449a4ac22358f0 100644 (file)
@@ -1,6 +1,5 @@
 plugins/javax.inject*.jar=
 plugins/javax.annotation*.jar=
-plugins/org.apache.commons.jxpath*.jar=
 plugins/org.eclipse.text_*.jar=
 plugins/org.eclipse.core*.jar=
 plugins/org.eclipse.e4.*.jar=
index 9a7ae1d766aac5589a4dc9fb268cf02033c7ba56..743e1d35b9bf18163748d8a0207963a83cab1ac4 100644 (file)
@@ -1,2 +1,2 @@
-Bundle-License: EPL-1.0
-SLC-Origin-ManifestNotModified: true
+SPDX-License-Identifier: EPL-2.0
+Argeo-Origin-NoMetadataGeneration: true
index b42292d2391dbfd20686e25563e491e5996e8c5a..743e1d35b9bf18163748d8a0207963a83cab1ac4 100644 (file)
@@ -1,2 +1,2 @@
-Bundle-License: EPL-2.0
-SLC-Origin-ManifestNotModified: true
+SPDX-License-Identifier: EPL-2.0
+Argeo-Origin-NoMetadataGeneration: true
index 9a7ae1d766aac5589a4dc9fb268cf02033c7ba56..743e1d35b9bf18163748d8a0207963a83cab1ac4 100644 (file)
@@ -1,2 +1,2 @@
-Bundle-License: EPL-1.0
-SLC-Origin-ManifestNotModified: true
+SPDX-License-Identifier: EPL-2.0
+Argeo-Origin-NoMetadataGeneration: true
index 61c3358bfac14b16b3aff5b7fded9b2a83e5b003..217bef96d407da8612b05c389b4575c5443a26bb 100644 (file)
@@ -1,4 +1,4 @@
-eclipse-equinox=http://www.eclipse.org/downloads/equinox/drops/R-4.25-202208311800/equinox-SDK-4.25.zip
-eclipse-rcp=http://www.eclipse.org/downloads/eclipse/downloads/drops4/R-4.25-202208311800/org.eclipse.platform.source-4.25.zip
-eclipse-rap=http://www.eclipse.org/downloads/rt/rap/3.22/e4/rap-e4-3.22.0-R-20220906-0913.zip
-eclipse-nebula=http://www.eclipse.org/downloads/nebula/releases/2.7.1/repository-nebula-2.7.1.zip
\ No newline at end of file
+eclipse-equinox=http://www.eclipse.org/downloads/equinox/drops/R-4.27-202303020300/equinox-SDK-4.27.zip
+eclipse-rcp=http://www.eclipse.org/downloads/eclipse/downloads/drops4/R-4.27-202303020300/org.eclipse.platform.source-4.27.zip
+eclipse-rap=http://www.eclipse.org/downloads/rt/rap/3.24/e4/rap-e4-3.24.0-R-20230308-0917.zip
+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/.gitignore b/sdk/.gitignore
new file mode 100644 (file)
index 0000000..82520ca
--- /dev/null
@@ -0,0 +1 @@
+/tmp/
index a1d5c8e4bbee31d104fc1151cac4a8e19f5ef1fa..d9cae87d811258d5a13e43eea8492f3792377ce4 160000 (submodule)
@@ -1 +1 @@
-Subproject commit a1d5c8e4bbee31d104fc1151cac4a8e19f5ef1fa
+Subproject commit d9cae87d811258d5a13e43eea8492f3792377ce4
index 6480816f69674f9e8ee0c17310b15f314e26c40a..81f345fedff58a5c853f62d82cb2eba151ac2bc5 100644 (file)
@@ -1,4 +1,4 @@
 major=2
 minor=3
-micro=11
-qualifier=.next
\ No newline at end of file
+micro=14
+qualifier=
diff --git a/sdk/output-argeo-tp-apps.target b/sdk/output-argeo-tp-apps.target
new file mode 100644 (file)
index 0000000..ab4040a
--- /dev/null
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="argeo-tp-apps">
+       <locations>
+               <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.utils" type="Directory"/>
+               <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.publish" type="Directory"/>
+               <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.math" type="Directory"/>
+               <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.earth" type="Directory"/>
+               <location path="${project_loc:argeo-tp}/../output/a2/osgi/equinox/org.argeo.tp.eclipse" type="Directory"/>
+               <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
+               <location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-platform.target"/>
+       </locations>
+</target>
\ No newline at end of file
diff --git a/sdk/output-argeo-tp-backend.target b/sdk/output-argeo-tp-backend.target
deleted file mode 100644 (file)
index 16ee93c..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?>
-<target name="argeo-tp-backend">
-       <locations>
-               <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.utils" type="Directory"/>
-               <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.sql" type="Directory"/>
-               <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.gis" type="Directory"/>
-               <location path="${project_loc:argeo-tp}/../output/a2/osgi/equinox/org.argeo.tp.eclipse" type="Directory"/>
-               <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
-               <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
-               <location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-minimal.target"/>
-       </locations>
-</target>
\ No newline at end of file
diff --git a/sdk/output-argeo-tp-minimal.target b/sdk/output-argeo-tp-minimal.target
deleted file mode 100644 (file)
index 5ef8c13..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?>
-<target name="argeo-tp-minimal">
-       <locations>
-               <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp" type="Directory"/>
-               <location path="${project_loc:argeo-tp}/../output/a2/osgi/equinox/org.argeo.tp.osgi" type="Directory"/>
-               <location path="${project_loc:argeo-tp}/../output/a2/osgi/equinox/org.argeo.tp.eclipse" type="Directory"/>
-               <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.crypto" type="Directory"/>
-               <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.jetty" type="Directory"/>
-       </locations>
-       <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
-</target>
\ No newline at end of file
diff --git a/sdk/output-argeo-tp-platform.target b/sdk/output-argeo-tp-platform.target
new file mode 100644 (file)
index 0000000..08e0cb7
--- /dev/null
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="argeo-tp-platform">
+       <locations>
+               <location path="${project_loc:argeo-tp}/../output/a2/crypto/fips/org.argeo.tp.crypto" type="Directory"/>
+               <location path="${project_loc:argeo-tp}/../output/a2/log/syslogger/org.argeo.tp" type="Directory"/>
+               <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp" type="Directory"/>
+               <location path="${project_loc:argeo-tp}/../output/a2/lib/linux/x86_64/org.argeo.tp" type="Directory"/>
+               <location path="${project_loc:argeo-tp}/../output/a2/osgi/equinox/org.argeo.tp.osgi" type="Directory"/>
+               <location path="${project_loc:argeo-tp}/../output/a2/osgi/equinox/org.argeo.tp.eclipse" type="Directory"/>
+               <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.httpd" type="Directory"/>
+               <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.build" type="Directory"/>
+               <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
+       </locations>
+       <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+</target>
\ No newline at end of file
index e15cd4cfbd273181ac588b728f5e06b1fc86f4f7..1652752c48ef127707442618a46c8671a5acfab1 100644 (file)
@@ -4,6 +4,6 @@
        <locations>
                <location path="${project_loc:argeo-tp}/../output/a2/swt/rap/org.argeo.tp.swt.workbench" type="Directory"/>
                <location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-rwt.target"/>
-               <location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-backend.target"/>
+               <location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-apps.target"/>
        </locations>
 </target>
\ No newline at end of file
index 8c52463cffcd365aa16e5abc94b690d3d97d126c..8696d8403e9db4b276454f21d3ba0a4ed59f6d89 100644 (file)
@@ -4,6 +4,6 @@
        <locations>\r
                <location path="${project_loc:argeo-tp}/../output/a2/swt/rcp/org.argeo.tp.swt.workbench" type="Directory"/>\r
                <location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-swt-win.target"/>\r
-               <location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-backend.target"/>\r
+               <location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-apps.target"/>\r
        </locations>\r
 </target>
\ No newline at end of file
index 468123d4565a291f8b37520fea16cc45a5fa7826..bd35257b202c4a307818af7f2ce5f5660da46335 100644 (file)
@@ -4,6 +4,6 @@
        <locations>
                <location path="${project_loc:argeo-tp}/../output/a2/swt/rcp/org.argeo.tp.swt.workbench" type="Directory"/>
                <location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-swt.target"/>
-               <location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-backend.target"/>
+               <location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-apps.target"/>
        </locations>
 </target>
\ No newline at end of file
index ee966053d4d745a79bc5c2595c43f087152011c3..7e21e4403d88a207ae18d668c059836c9c8f5d2a 100644 (file)
@@ -3,6 +3,6 @@
 <target name="argeo-tp-rwt">
        <locations>
                <location path="${project_loc:argeo-tp}/../output/a2/swt/rap/org.argeo.tp.swt" type="Directory"/>
-               <location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-backend.target"/>
+               <location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-platform.target"/>
        </locations>
 </target>
\ No newline at end of file
index a0771aea7fb318841ac02efc73e5cd483ec02d80..dd8a157bffe3c700c68cae7743589300617d3307 100644 (file)
@@ -4,6 +4,6 @@
        <locations>\r
                <location path="${project_loc:argeo-tp}/../output/a2/swt/rcp/org.argeo.tp.swt" type="Directory"/>\r
                <location path="${project_loc:argeo-tp}/../output/a2/lib/win32/x86_64/swt/rcp/org.argeo.tp.swt" type="Directory"/>\r
-               <location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-backend.target"/>\r
+               <location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-platform.target"/>\r
        </locations>\r
 </target>
\ No newline at end of file
index b667d4791da199335aa94223900478d8f125f753..40bee2f41182a6dfddfb1d2187ba137a685dd205 100644 (file)
@@ -3,7 +3,8 @@
 <target name="argeo-tp-swt">
        <locations>
                <location path="${project_loc:argeo-tp}/../output/a2/swt/rcp/org.argeo.tp.swt" type="Directory"/>
+               <location path="${project_loc:argeo-tp}/../output/a2/lib/linux/x86_64/org.argeo.tp" type="Directory"/>
                <location path="${project_loc:argeo-tp}/../output/a2/lib/linux/x86_64/swt/rcp/org.argeo.tp.swt" type="Directory"/>
-               <location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-backend.target"/>
+               <location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-platform.target"/>
        </locations>
 </target>
\ No newline at end of file