From b94c9b33a552d5a28884398dbc5b95eb95fcce6c Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 7 Feb 2022 12:13:49 +0100 Subject: [PATCH] All Argeo layers working with the new distribution factory. --- cms/org.argeo.cms.integration/bnd.bnd | 1 + .../src/org/argeo/slc/build/A2Factory.java | 26 ++++++++++++++----- org.argeo.slc.jcr/bnd.bnd | 5 ++-- sdk/argeo-tp-rap.target | 1 - tp/org.argeo.tp.apache/apache-sshd/common.bnd | 2 ++ .../apache-sshd/org.apache.sshd.cli.bnd | 3 +++ .../apache-sshd/org.apache.sshd.common.bnd | 6 +++++ .../apache-sshd/org.apache.sshd.core.bnd | 3 +++ .../apache-sshd/org.apache.sshd.git.bnd | 3 +++ .../apache-sshd/org.apache.sshd.putty.bnd | 3 +++ .../apache-sshd/org.apache.sshd.scp.bnd | 3 +++ .../apache-sshd/org.apache.sshd.sftp.bnd | 3 +++ .../org.apache.commons.cli.bnd | 1 - .../org.apache.commons.codec.bnd | 1 - .../org.apache.commons.dbcp.bnd | 1 - .../org.apache.commons.exec.bnd | 3 +++ .../org.apache.commons.fileupload.bnd | 1 - .../org.apache.commons.httpclient.bnd | 2 -- .../org.apache.commons.io.bnd | 2 -- .../org.apache.commons.pool.bnd | 1 - .../org.apache.commons.vfs.bnd | 5 ++++ .../org.apache.httpcomponents.httpclient.bnd | 3 +-- .../org.apache.httpcomponents.httpcore.bnd | 3 +-- .../org.apache.httpcomponents.httpmime.bnd | 3 +-- tp/org.argeo.tp.apache/org.apache.lucene.bnd | 3 +-- .../org.apache.tika.core.bnd | 1 - .../org.apache.tika.parsers.bnd | 4 +-- tp/org.argeo.tp.apache/org.apache.xalan.bnd | 3 +-- .../org.apache.xalan.serializer.bnd | 3 +-- tp/org.argeo.tp.apache/org.apache.xerces.bnd | 5 ++-- .../org.apache.xml.resolver.bnd | 3 +-- .../org.apache.xmlbeans.bnd | 9 +++---- .../EDU.oswego.cs.dl.util.concurrent.bnd | 3 +-- tp/org.argeo.tp.jcr/jackrabbit/common.bnd | 3 +-- .../javax.websocket.bnd | 1 + .../jetty-websocket/common.bnd | 2 ++ .../org.eclipse.jetty.websocket.api.bnd | 0 .../org.eclipse.jetty.websocket.client.bnd | 0 .../org.eclipse.jetty.websocket.common.bnd | 0 ...clipse.jetty.websocket.javax.websocket.bnd | 0 ...jetty.websocket.javax.websocket.server.bnd | 0 .../org.eclipse.jetty.websocket.server.bnd | 0 .../org.eclipse.jetty.websocket.servlet.bnd | 0 .../org.eclipse.jdt.core.compiler.batch.bnd | 3 +++ tp/org.argeo.tp.sdk/org.eclipse.jgit.bnd | 3 +++ tp/org.argeo.tp.sdk/org.junit.bnd | 3 +-- tp/org.argeo.tp.sdk/org.redline-rpm.bnd | 1 - ...erxml.jackson.core.jackson-annotations.bnd | 3 +++ ...om.fasterxml.jackson.core.jackson-core.bnd | 3 +++ ...asterxml.jackson.core.jackson-databind.bnd | 3 +++ tp/org.argeo.tp/jackson/common.bnd | 2 ++ tp/org.argeo.tp/org.slf4j.api.bnd | 3 --- tp/org.argeo.tp/slf4j/common.bnd | 2 ++ tp/org.argeo.tp/slf4j/org.slf4j.api.bnd | 2 ++ .../slf4j/org.slf4j.commons.logging.bnd | 3 +++ 55 files changed, 102 insertions(+), 54 deletions(-) create mode 100644 tp/org.argeo.tp.apache/apache-sshd/common.bnd create mode 100644 tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.cli.bnd create mode 100644 tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.common.bnd create mode 100644 tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.core.bnd create mode 100644 tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.git.bnd create mode 100644 tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.putty.bnd create mode 100644 tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.scp.bnd create mode 100644 tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.sftp.bnd create mode 100644 tp/org.argeo.tp.apache/org.apache.commons.exec.bnd create mode 100644 tp/org.argeo.tp.apache/org.apache.commons.vfs.bnd rename tp/{org.argeo.tp.javax => org.argeo.tp.jetty}/javax.websocket.bnd (75%) create mode 100644 tp/org.argeo.tp.jetty/jetty-websocket/common.bnd rename tp/org.argeo.tp.jetty/{jetty => jetty-websocket}/org.eclipse.jetty.websocket.api.bnd (100%) rename tp/org.argeo.tp.jetty/{jetty => jetty-websocket}/org.eclipse.jetty.websocket.client.bnd (100%) rename tp/org.argeo.tp.jetty/{jetty => jetty-websocket}/org.eclipse.jetty.websocket.common.bnd (100%) rename tp/org.argeo.tp.jetty/{jetty => jetty-websocket}/org.eclipse.jetty.websocket.javax.websocket.bnd (100%) rename tp/org.argeo.tp.jetty/{jetty => jetty-websocket}/org.eclipse.jetty.websocket.javax.websocket.server.bnd (100%) rename tp/org.argeo.tp.jetty/{jetty => jetty-websocket}/org.eclipse.jetty.websocket.server.bnd (100%) rename tp/org.argeo.tp.jetty/{jetty => jetty-websocket}/org.eclipse.jetty.websocket.servlet.bnd (100%) create mode 100644 tp/org.argeo.tp.sdk/org.eclipse.jdt.core.compiler.batch.bnd create mode 100644 tp/org.argeo.tp.sdk/org.eclipse.jgit.bnd create mode 100644 tp/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson-annotations.bnd create mode 100644 tp/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson-core.bnd create mode 100644 tp/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson-databind.bnd create mode 100644 tp/org.argeo.tp/jackson/common.bnd delete mode 100644 tp/org.argeo.tp/org.slf4j.api.bnd create mode 100644 tp/org.argeo.tp/slf4j/common.bnd create mode 100644 tp/org.argeo.tp/slf4j/org.slf4j.api.bnd create mode 100644 tp/org.argeo.tp/slf4j/org.slf4j.commons.logging.bnd diff --git a/cms/org.argeo.cms.integration/bnd.bnd b/cms/org.argeo.cms.integration/bnd.bnd index 5a4665346..b17428a78 100644 --- a/cms/org.argeo.cms.integration/bnd.bnd +++ b/cms/org.argeo.cms.integration/bnd.bnd @@ -1,4 +1,5 @@ Import-Package:\ javax.jcr.nodetype,\ org.apache.commons.logging,\ +org.apache.jackrabbit.*;version="[1,4)",\ * \ No newline at end of file diff --git a/org.argeo.slc.build/src/org/argeo/slc/build/A2Factory.java b/org.argeo.slc.build/src/org/argeo/slc/build/A2Factory.java index 8c7b11e2b..883e02fe6 100644 --- a/org.argeo.slc.build/src/org/argeo/slc/build/A2Factory.java +++ b/org.argeo.slc.build/src/org/argeo/slc/build/A2Factory.java @@ -4,6 +4,7 @@ import static java.lang.System.Logger.Level.DEBUG; import static org.argeo.slc.ManifestConstants.BUNDLE_LICENSE; import static org.argeo.slc.ManifestConstants.BUNDLE_SYMBOLICNAME; import static org.argeo.slc.ManifestConstants.BUNDLE_VERSION; +import static org.argeo.slc.ManifestConstants.EXPORT_PACKAGE; import static org.argeo.slc.ManifestConstants.SLC_ORIGIN_M2; import java.io.FileNotFoundException; @@ -226,9 +227,10 @@ public class A2Factory { } } -// if (!fileProps.contains(EXPORT_PACKAGE.toString())) { -// fileProps.put(EXPORT_PACKAGE.toString(), "*"); -// } + if (!fileProps.containsKey(EXPORT_PACKAGE.toString())) { + fileProps.put(EXPORT_PACKAGE.toString(), + "*;version=\"" + fileProps.getProperty(BUNDLE_VERSION.toString()) + "\""); + } // if (!fileProps.contains(IMPORT_PACKAGE.toString())) { // fileProps.put(IMPORT_PACKAGE.toString(), "*"); // } @@ -249,10 +251,20 @@ public class A2Factory { continue keys; } additionalEntries.put(key.toString(), value.toString()); - // logger.log(DEBUG, () -> key + "=" + value); + logger.log(DEBUG, () -> key + "=" + value); } } + +// try (Builder bndBuilder = new Builder()) { +// Jar jar = new Jar(downloaded.toFile()); +// bndBuilder.addClasspath(jar); +// Path targetBundleDir = targetCategoryBase.resolve(artifact.getName() + "." + artifact.getBranch()); +// +// Jar target = new Jar(targetBundleDir.toFile()); +// bndBuilder.setJar(target); +// return targetBundleDir; +// } } Path targetBundleDir = processBundleJar(downloaded, targetCategoryBase, additionalEntries); logger.log(Level.DEBUG, () -> "Processed " + downloaded); @@ -600,6 +612,9 @@ public class A2Factory { Path descriptorsBase = Paths.get("../tp").toAbsolutePath().normalize(); +// factory.processM2BasedDistributionUnit(descriptorsBase.resolve("org.argeo.tp/slf4j")); +// System.exit(0); + // Eclipse factory.processEclipseArchive( descriptorsBase.resolve("org.argeo.tp.eclipse.equinox").resolve("eclipse-equinox")); @@ -607,11 +622,10 @@ public class A2Factory { factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.rcp").resolve("eclipse-rcp")); // Maven - factory.processCategory(descriptorsBase.resolve("org.argeo.tp.javax")); + factory.processCategory(descriptorsBase.resolve("org.argeo.tp.sdk")); factory.processCategory(descriptorsBase.resolve("org.argeo.tp")); factory.processCategory(descriptorsBase.resolve("org.argeo.tp.apache")); factory.processCategory(descriptorsBase.resolve("org.argeo.tp.jetty")); - factory.processCategory(descriptorsBase.resolve("org.argeo.tp.sdk")); factory.processCategory(descriptorsBase.resolve("org.argeo.tp.jcr")); } } diff --git a/org.argeo.slc.jcr/bnd.bnd b/org.argeo.slc.jcr/bnd.bnd index 725fe5548..7632cef47 100644 --- a/org.argeo.slc.jcr/bnd.bnd +++ b/org.argeo.slc.jcr/bnd.bnd @@ -1,5 +1,6 @@ Import-Package: javax.jcr.nodetype,\ javax.jcr.security,\ -org.apache.jackrabbit.api,\ -org.apache.jackrabbit.commons,\ +org.apache.jackrabbit.api;version="[1,4)",\ +org.apache.jackrabbit.commons;version="[1,4)",\ +org.apache.jackrabbit.*;version="[1,4)",\ * \ No newline at end of file diff --git a/sdk/argeo-tp-rap.target b/sdk/argeo-tp-rap.target index 296f1f93f..aaa5b323d 100644 --- a/sdk/argeo-tp-rap.target +++ b/sdk/argeo-tp-rap.target @@ -9,6 +9,5 @@ - \ No newline at end of file diff --git a/tp/org.argeo.tp.apache/apache-sshd/common.bnd b/tp/org.argeo.tp.apache/apache-sshd/common.bnd new file mode 100644 index 000000000..baceb13cc --- /dev/null +++ b/tp/org.argeo.tp.apache/apache-sshd/common.bnd @@ -0,0 +1,2 @@ +Bundle-License: Apache-2.0 +SLC-Origin-M2: :2.3.0 \ No newline at end of file diff --git a/tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.cli.bnd b/tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.cli.bnd new file mode 100644 index 000000000..cca5113a3 --- /dev/null +++ b/tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.cli.bnd @@ -0,0 +1,3 @@ +Bundle-SymbolicName: org.apache.sshd.cli +SLC-Origin-M2: org.apache.sshd:sshd-cli +SLC-Origin-ManifestNotModified: true diff --git a/tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.common.bnd b/tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.common.bnd new file mode 100644 index 000000000..b8414e9d1 --- /dev/null +++ b/tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.common.bnd @@ -0,0 +1,6 @@ +Bundle-SymbolicName: org.apache.sshd.common +Fragment-Host: org.apache.sshd.core +Import-Package: org.bouncycastle.jce.provider;resolution:=optional, + net.i2p.crypto.eddsa;resolution:=optional, + * +SLC-Origin-M2: org.apache.sshd:sshd-common diff --git a/tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.core.bnd b/tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.core.bnd new file mode 100644 index 000000000..26437790e --- /dev/null +++ b/tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.core.bnd @@ -0,0 +1,3 @@ +Bundle-SymbolicName: org.apache.sshd.core +SLC-Origin-M2: org.apache.sshd:sshd-core +SLC-Origin-ManifestNotModified: true diff --git a/tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.git.bnd b/tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.git.bnd new file mode 100644 index 000000000..dc018c663 --- /dev/null +++ b/tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.git.bnd @@ -0,0 +1,3 @@ +Bundle-SymbolicName: org.apache.sshd.git +SLC-Origin-M2: org.apache.sshd:sshd-git +SLC-Origin-ManifestNotModified: true diff --git a/tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.putty.bnd b/tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.putty.bnd new file mode 100644 index 000000000..3fe912f64 --- /dev/null +++ b/tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.putty.bnd @@ -0,0 +1,3 @@ +Bundle-SymbolicName: org.apache.sshd.putty +SLC-Origin-M2: org.apache.sshd:sshd-putty +SLC-Origin-ManifestNotModified: true diff --git a/tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.scp.bnd b/tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.scp.bnd new file mode 100644 index 000000000..8170ed69b --- /dev/null +++ b/tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.scp.bnd @@ -0,0 +1,3 @@ +Bundle-SymbolicName: org.apache.sshd.scp +SLC-Origin-M2: org.apache.sshd:sshd-scp +SLC-Origin-ManifestNotModified: true diff --git a/tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.sftp.bnd b/tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.sftp.bnd new file mode 100644 index 000000000..b5e60e51e --- /dev/null +++ b/tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.sftp.bnd @@ -0,0 +1,3 @@ +Bundle-SymbolicName: org.apache.sshd.sftp +SLC-Origin-M2: org.apache.sshd:sshd-sftp +SLC-Origin-ManifestNotModified: true diff --git a/tp/org.argeo.tp.apache/org.apache.commons.cli.bnd b/tp/org.argeo.tp.apache/org.apache.commons.cli.bnd index 736dbcd68..117454629 100644 --- a/tp/org.argeo.tp.apache/org.apache.commons.cli.bnd +++ b/tp/org.argeo.tp.apache/org.apache.commons.cli.bnd @@ -1,4 +1,3 @@ Bundle-License: Apache-2.0 Bundle-SymbolicName: org.apache.commons.cli -Bundle-Version: 1.4.0 SLC-Origin-M2: commons-cli:commons-cli:1.4 diff --git a/tp/org.argeo.tp.apache/org.apache.commons.codec.bnd b/tp/org.argeo.tp.apache/org.apache.commons.codec.bnd index c664ee510..911c1e786 100644 --- a/tp/org.argeo.tp.apache/org.apache.commons.codec.bnd +++ b/tp/org.argeo.tp.apache/org.apache.commons.codec.bnd @@ -1,4 +1,3 @@ Bundle-License: Apache-2.0 Bundle-SymbolicName: org.apache.commons.codec -Bundle-Version: 1.13.0 SLC-Origin-M2: commons-codec:commons-codec:1.13 diff --git a/tp/org.argeo.tp.apache/org.apache.commons.dbcp.bnd b/tp/org.argeo.tp.apache/org.apache.commons.dbcp.bnd index 085774d79..7d03c4d30 100644 --- a/tp/org.argeo.tp.apache/org.apache.commons.dbcp.bnd +++ b/tp/org.argeo.tp.apache/org.apache.commons.dbcp.bnd @@ -1,6 +1,5 @@ Bundle-License: Apache-2.0 Bundle-SymbolicName: org.apache.commons.dbcp -Bundle-Version: 1.4.0 SLC-Origin-M2: commons-dbcp:commons-dbcp:1.4 Import-Package: javax.transaction.*; resolution:="optional",\ * diff --git a/tp/org.argeo.tp.apache/org.apache.commons.exec.bnd b/tp/org.argeo.tp.apache/org.apache.commons.exec.bnd new file mode 100644 index 000000000..b1885872d --- /dev/null +++ b/tp/org.argeo.tp.apache/org.apache.commons.exec.bnd @@ -0,0 +1,3 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: org.apache.commons.exec +SLC-Origin-M2: org.apache.commons:commons-exec:1.3 \ No newline at end of file diff --git a/tp/org.argeo.tp.apache/org.apache.commons.fileupload.bnd b/tp/org.argeo.tp.apache/org.apache.commons.fileupload.bnd index c51062fe1..40a58d2c4 100644 --- a/tp/org.argeo.tp.apache/org.apache.commons.fileupload.bnd +++ b/tp/org.argeo.tp.apache/org.apache.commons.fileupload.bnd @@ -1,6 +1,5 @@ Bundle-License: Apache-2.0 Bundle-SymbolicName: org.apache.commons.fileupload -Bundle-Version: 1.4.0 Import-Package: javax.portlet;resolution:=optional,\ * SLC-Origin-M2: commons-fileupload:commons-fileupload:1.4 diff --git a/tp/org.argeo.tp.apache/org.apache.commons.httpclient.bnd b/tp/org.argeo.tp.apache/org.apache.commons.httpclient.bnd index 9b2ecebd4..a064d487f 100644 --- a/tp/org.argeo.tp.apache/org.apache.commons.httpclient.bnd +++ b/tp/org.argeo.tp.apache/org.apache.commons.httpclient.bnd @@ -1,5 +1,3 @@ Bundle-License: Apache-2.0 Bundle-SymbolicName: org.apache.commons.httpclient -Bundle-Version: 3.1.0 SLC-Origin-M2: commons-httpclient:commons-httpclient:3.1 -Export-Package: org.apache.commons.httpclient.*;version="3.1.0" diff --git a/tp/org.argeo.tp.apache/org.apache.commons.io.bnd b/tp/org.argeo.tp.apache/org.apache.commons.io.bnd index 93e6efa4c..e7493f18a 100644 --- a/tp/org.argeo.tp.apache/org.apache.commons.io.bnd +++ b/tp/org.argeo.tp.apache/org.apache.commons.io.bnd @@ -1,5 +1,3 @@ Bundle-License: Apache-2.0 Bundle-SymbolicName: org.apache.commons.io -Bundle-Version: 2.6.0 -Export-Package: org.apache.commons.io.*;version="2.6" SLC-Origin-M2: commons-io:commons-io:2.6 diff --git a/tp/org.argeo.tp.apache/org.apache.commons.pool.bnd b/tp/org.argeo.tp.apache/org.apache.commons.pool.bnd index 776efc0f4..62fd0f039 100644 --- a/tp/org.argeo.tp.apache/org.apache.commons.pool.bnd +++ b/tp/org.argeo.tp.apache/org.apache.commons.pool.bnd @@ -1,4 +1,3 @@ Bundle-License: Apache-2.0 Bundle-SymbolicName: org.apache.commons.pool SLC-Origin-M2: commons-pool:commons-pool:1.5.7 -Export-Package: org.apache.* diff --git a/tp/org.argeo.tp.apache/org.apache.commons.vfs.bnd b/tp/org.argeo.tp.apache/org.apache.commons.vfs.bnd new file mode 100644 index 000000000..d158b85b3 --- /dev/null +++ b/tp/org.argeo.tp.apache/org.apache.commons.vfs.bnd @@ -0,0 +1,5 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: org.apache.commons.vfs +Import-Package: org.apache.tools.ant.*;resolution:=optional, +* +SLC-Origin-M2: org.apache.commons:commons-vfs2:2.0 \ No newline at end of file diff --git a/tp/org.argeo.tp.apache/org.apache.httpcomponents.httpclient.bnd b/tp/org.argeo.tp.apache/org.apache.httpcomponents.httpclient.bnd index 9622fc593..ba9e3eb20 100644 --- a/tp/org.argeo.tp.apache/org.apache.httpcomponents.httpclient.bnd +++ b/tp/org.argeo.tp.apache/org.apache.httpcomponents.httpclient.bnd @@ -1,4 +1,3 @@ Bundle-License: Apache-2.0 Bundle-SymbolicName: org.apache.httpcomponents.httpclient -SLC-Origin-M2: org.apache.httpcomponents:httpclient:4.5.9 -Export-Package: org.apache.http.*;version="4.5.9" \ No newline at end of file +SLC-Origin-M2: org.apache.httpcomponents:httpclient:4.5.9 \ No newline at end of file diff --git a/tp/org.argeo.tp.apache/org.apache.httpcomponents.httpcore.bnd b/tp/org.argeo.tp.apache/org.apache.httpcomponents.httpcore.bnd index 991778dc8..a99f9edce 100644 --- a/tp/org.argeo.tp.apache/org.apache.httpcomponents.httpcore.bnd +++ b/tp/org.argeo.tp.apache/org.apache.httpcomponents.httpcore.bnd @@ -1,4 +1,3 @@ Bundle-License: Apache-2.0 Bundle-SymbolicName: org.apache.httpcomponents.httpcore -SLC-Origin-M2: org.apache.httpcomponents:httpcore:4.4.10 -Export-Package: org.apache.http.*;version="4.4.10" \ No newline at end of file +SLC-Origin-M2: org.apache.httpcomponents:httpcore:4.4.10 \ No newline at end of file diff --git a/tp/org.argeo.tp.apache/org.apache.httpcomponents.httpmime.bnd b/tp/org.argeo.tp.apache/org.apache.httpcomponents.httpmime.bnd index 683f12a1b..e33d41339 100644 --- a/tp/org.argeo.tp.apache/org.apache.httpcomponents.httpmime.bnd +++ b/tp/org.argeo.tp.apache/org.apache.httpcomponents.httpmime.bnd @@ -1,4 +1,3 @@ Bundle-License: Apache-2.0 Bundle-SymbolicName: org.apache.httpcomponents.httpmime -SLC-Origin-M2: org.apache.httpcomponents:httpmime:4.5.9 -Export-Package: org.apache.http.*;version="4.5.9" \ No newline at end of file +SLC-Origin-M2: org.apache.httpcomponents:httpmime:4.5.9 \ No newline at end of file diff --git a/tp/org.argeo.tp.apache/org.apache.lucene.bnd b/tp/org.argeo.tp.apache/org.apache.lucene.bnd index ded36ae8b..8126ffd79 100644 --- a/tp/org.argeo.tp.apache/org.apache.lucene.bnd +++ b/tp/org.argeo.tp.apache/org.apache.lucene.bnd @@ -1,4 +1,3 @@ Bundle-License: Apache-2.0 Bundle-SymbolicName: org.apache.lucene -SLC-Origin-M2: org.apache.lucene:lucene-core:3.6.2 -Export-Package: org.apache.lucene.* \ No newline at end of file +SLC-Origin-M2: org.apache.lucene:lucene-core:3.6.2 \ No newline at end of file diff --git a/tp/org.argeo.tp.apache/org.apache.tika.core.bnd b/tp/org.argeo.tp.apache/org.apache.tika.core.bnd index 104b5e95d..f29992b65 100644 --- a/tp/org.argeo.tp.apache/org.apache.tika.core.bnd +++ b/tp/org.argeo.tp.apache/org.apache.tika.core.bnd @@ -1,5 +1,4 @@ Bundle-License: Apache-2.0 Bundle-SymbolicName: org.apache.tika.core -Bundle-Version: 1.22.0 SLC-Origin-M2: org.apache.tika:tika-core:1.22 SLC-Origin-ManifestNotModified: true diff --git a/tp/org.argeo.tp.apache/org.apache.tika.parsers.bnd b/tp/org.argeo.tp.apache/org.apache.tika.parsers.bnd index 62ed54730..4b97b3666 100644 --- a/tp/org.argeo.tp.apache/org.apache.tika.parsers.bnd +++ b/tp/org.argeo.tp.apache/org.apache.tika.parsers.bnd @@ -1,7 +1,5 @@ Bundle-Activator: org.apache.tika.parser.internal.Activator Bundle-License: Apache-2.0 Bundle-SymbolicName: org.apache.tika.parsers -Bundle-Version: 1.22.0 Import-Package: *;resolution:=optional -SLC-Origin-M2: org.apache.tika:tika-parsers:1.22 -Export-Package: org.apache.tika.* \ No newline at end of file +SLC-Origin-M2: org.apache.tika:tika-parsers:1.22 \ No newline at end of file diff --git a/tp/org.argeo.tp.apache/org.apache.xalan.bnd b/tp/org.argeo.tp.apache/org.apache.xalan.bnd index 95b25ad48..1d2106b04 100644 --- a/tp/org.argeo.tp.apache/org.apache.xalan.bnd +++ b/tp/org.argeo.tp.apache/org.apache.xalan.bnd @@ -1,4 +1,3 @@ Bundle-License: Apache-2.0 Bundle-SymbolicName: org.apache.xalan -SLC-Origin-M2: xalan:xalan:2.7.2 -Export-Package: org.apache.* +SLC-Origin-M2: xalan:xalan:2.7.2 \ No newline at end of file diff --git a/tp/org.argeo.tp.apache/org.apache.xalan.serializer.bnd b/tp/org.argeo.tp.apache/org.apache.xalan.serializer.bnd index 22a080332..e0fb19c78 100644 --- a/tp/org.argeo.tp.apache/org.apache.xalan.serializer.bnd +++ b/tp/org.argeo.tp.apache/org.apache.xalan.serializer.bnd @@ -1,4 +1,3 @@ Bundle-License: Apache-2.0 Bundle-SymbolicName: org.apache.xalan.serializer -SLC-Origin-M2: xalan:serializer:2.7.2 -Export-Package: org.apache.* +SLC-Origin-M2: xalan:serializer:2.7.2 \ No newline at end of file diff --git a/tp/org.argeo.tp.apache/org.apache.xerces.bnd b/tp/org.argeo.tp.apache/org.apache.xerces.bnd index 43b749cc7..82d009f9c 100644 --- a/tp/org.argeo.tp.apache/org.apache.xerces.bnd +++ b/tp/org.argeo.tp.apache/org.apache.xerces.bnd @@ -1,6 +1,5 @@ Bundle-License: Apache-2.0 Bundle-SymbolicName: org.apache.xerces Import-Package: sun.*;resolution:=optional, - * -SLC-Origin-M2: xerces:xercesImpl:2.12.0 -Export-Package: org.apache.* +* +SLC-Origin-M2: xerces:xercesImpl:2.12.0 \ No newline at end of file diff --git a/tp/org.argeo.tp.apache/org.apache.xml.resolver.bnd b/tp/org.argeo.tp.apache/org.apache.xml.resolver.bnd index affda3d3c..95f9a5ed9 100644 --- a/tp/org.argeo.tp.apache/org.apache.xml.resolver.bnd +++ b/tp/org.argeo.tp.apache/org.apache.xml.resolver.bnd @@ -1,4 +1,3 @@ Bundle-License: Apache-2.0 Bundle-SymbolicName: org.apache.xml.resolver -SLC-Origin-M2: xml-resolver:xml-resolver:1.2 -Export-Package: org.apache.* +SLC-Origin-M2: xml-resolver:xml-resolver:1.2 \ No newline at end of file diff --git a/tp/org.argeo.tp.apache/org.apache.xmlbeans.bnd b/tp/org.argeo.tp.apache/org.apache.xmlbeans.bnd index cdc2cbaee..83d6d31b3 100644 --- a/tp/org.argeo.tp.apache/org.apache.xmlbeans.bnd +++ b/tp/org.argeo.tp.apache/org.apache.xmlbeans.bnd @@ -2,8 +2,7 @@ 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:3.1.0 -Export-Package: org.apache.* +net.sf.saxon.*;resolution:=optional, +com.sun.*;resolution:=optional, +* +SLC-Origin-M2: org.apache.xmlbeans:xmlbeans:3.1.0 \ No newline at end of file diff --git a/tp/org.argeo.tp.jcr/EDU.oswego.cs.dl.util.concurrent.bnd b/tp/org.argeo.tp.jcr/EDU.oswego.cs.dl.util.concurrent.bnd index 8522d2e21..d2432b79b 100644 --- a/tp/org.argeo.tp.jcr/EDU.oswego.cs.dl.util.concurrent.bnd +++ b/tp/org.argeo.tp.jcr/EDU.oswego.cs.dl.util.concurrent.bnd @@ -1,4 +1,3 @@ Bundle-License: Public Domain Bundle-SymbolicName: EDU.oswego.cs.dl.util.concurrent -SLC-Origin-M2: concurrent:concurrent:1.3.4 -Export-Package: EDU.oswego.* \ No newline at end of file +SLC-Origin-M2: concurrent:concurrent:1.3.4 \ No newline at end of file diff --git a/tp/org.argeo.tp.jcr/jackrabbit/common.bnd b/tp/org.argeo.tp.jcr/jackrabbit/common.bnd index 517124884..84cfaea4e 100644 --- a/tp/org.argeo.tp.jcr/jackrabbit/common.bnd +++ b/tp/org.argeo.tp.jcr/jackrabbit/common.bnd @@ -1,3 +1,2 @@ Bundle-License: Apache-2.0 -SLC-Origin-M2: :2.18.3 -Export-Package: org.apache.jackrabbit.*;version="2.18.3" +SLC-Origin-M2: :2.18.3 \ No newline at end of file diff --git a/tp/org.argeo.tp.javax/javax.websocket.bnd b/tp/org.argeo.tp.jetty/javax.websocket.bnd similarity index 75% rename from tp/org.argeo.tp.javax/javax.websocket.bnd rename to tp/org.argeo.tp.jetty/javax.websocket.bnd index 85137ff0e..cefcff8d1 100644 --- a/tp/org.argeo.tp.javax/javax.websocket.bnd +++ b/tp/org.argeo.tp.jetty/javax.websocket.bnd @@ -1,3 +1,4 @@ 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 diff --git a/tp/org.argeo.tp.jetty/jetty-websocket/common.bnd b/tp/org.argeo.tp.jetty/jetty-websocket/common.bnd new file mode 100644 index 000000000..14a0f68d0 --- /dev/null +++ b/tp/org.argeo.tp.jetty/jetty-websocket/common.bnd @@ -0,0 +1,2 @@ +Bundle-License: Apache-2.0 +SLC-Origin-M2: :9.4.24.v20191120 diff --git a/tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.websocket.api.bnd b/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.api.bnd similarity index 100% rename from tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.websocket.api.bnd rename to tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.api.bnd diff --git a/tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.websocket.client.bnd b/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.client.bnd similarity index 100% rename from tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.websocket.client.bnd rename to tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.client.bnd diff --git a/tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.websocket.common.bnd b/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.common.bnd similarity index 100% rename from tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.websocket.common.bnd rename to tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.common.bnd diff --git a/tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.websocket.javax.websocket.bnd b/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.javax.websocket.bnd similarity index 100% rename from tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.websocket.javax.websocket.bnd rename to tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.javax.websocket.bnd diff --git a/tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.websocket.javax.websocket.server.bnd b/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.javax.websocket.server.bnd similarity index 100% rename from tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.websocket.javax.websocket.server.bnd rename to tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.javax.websocket.server.bnd diff --git a/tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.websocket.server.bnd b/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.server.bnd similarity index 100% rename from tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.websocket.server.bnd rename to tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.server.bnd diff --git a/tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.websocket.servlet.bnd b/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.servlet.bnd similarity index 100% rename from tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.websocket.servlet.bnd rename to tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.servlet.bnd diff --git a/tp/org.argeo.tp.sdk/org.eclipse.jdt.core.compiler.batch.bnd b/tp/org.argeo.tp.sdk/org.eclipse.jdt.core.compiler.batch.bnd new file mode 100644 index 000000000..b3a28caf5 --- /dev/null +++ b/tp/org.argeo.tp.sdk/org.eclipse.jdt.core.compiler.batch.bnd @@ -0,0 +1,3 @@ +Bundle-License: EPL-2.0 +SLC-Origin-M2: org.eclipse.jdt:ecj:3.28.0 +SLC-Origin-ManifestNotModified: true \ No newline at end of file diff --git a/tp/org.argeo.tp.sdk/org.eclipse.jgit.bnd b/tp/org.argeo.tp.sdk/org.eclipse.jgit.bnd new file mode 100644 index 000000000..045292198 --- /dev/null +++ b/tp/org.argeo.tp.sdk/org.eclipse.jgit.bnd @@ -0,0 +1,3 @@ +Bundle-License: BSD-3-Clause +SLC-Origin-M2: org.eclipse.jgit:org.eclipse.jgit:5.5.0.201909110433-r +SLC-Origin-ManifestNotModified: true diff --git a/tp/org.argeo.tp.sdk/org.junit.bnd b/tp/org.argeo.tp.sdk/org.junit.bnd index 82a96946a..848ac97a7 100644 --- a/tp/org.argeo.tp.sdk/org.junit.bnd +++ b/tp/org.argeo.tp.sdk/org.junit.bnd @@ -4,5 +4,4 @@ Bundle-Version: 4.12.0 Import-Package: org.hamcrest;resolution:=optional,\ org.hamcrest.core;resolution:=optional,\ * -SLC-Origin-M2: junit:junit:4.12 -Export-Package: junit.*;version="4.12.0" \ No newline at end of file +SLC-Origin-M2: junit:junit:4.12 \ No newline at end of file diff --git a/tp/org.argeo.tp.sdk/org.redline-rpm.bnd b/tp/org.argeo.tp.sdk/org.redline-rpm.bnd index 590d8779f..4a3fb8d5e 100644 --- a/tp/org.argeo.tp.sdk/org.redline-rpm.bnd +++ b/tp/org.argeo.tp.sdk/org.redline-rpm.bnd @@ -1,6 +1,5 @@ Bundle-License: MIT Bundle-SymbolicName: org.redline-rpm -Bundle-Version: 1.2.8 Import-Package: sun.security.*;resolution:=optional, org.apache.tools.ant.*;resolution:=optional, org.apache.tools.zip;resolution:=optional, diff --git a/tp/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson-annotations.bnd b/tp/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson-annotations.bnd new file mode 100644 index 000000000..94b69a187 --- /dev/null +++ b/tp/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson-annotations.bnd @@ -0,0 +1,3 @@ +Bundle-SymbolicName: com.fasterxml.jackson.core.jackson-annotations +SLC-Origin-M2: com.fasterxml.jackson.core:jackson-annotations +SLC-Origin-ManifestNotModified: true diff --git a/tp/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson-core.bnd b/tp/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson-core.bnd new file mode 100644 index 000000000..a4b359fab --- /dev/null +++ b/tp/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson-core.bnd @@ -0,0 +1,3 @@ +Bundle-SymbolicName: com.fasterxml.jackson.core.jackson-core +SLC-Origin-M2: com.fasterxml.jackson.core:jackson-core +SLC-Origin-ManifestNotModified: true diff --git a/tp/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson-databind.bnd b/tp/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson-databind.bnd new file mode 100644 index 000000000..32ded2297 --- /dev/null +++ b/tp/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson-databind.bnd @@ -0,0 +1,3 @@ +Bundle-SymbolicName: com.fasterxml.jackson.core.jackson-databind +SLC-Origin-M2: com.fasterxml.jackson.core:jackson-databind +SLC-Origin-ManifestNotModified: true diff --git a/tp/org.argeo.tp/jackson/common.bnd b/tp/org.argeo.tp/jackson/common.bnd new file mode 100644 index 000000000..1041ec8b2 --- /dev/null +++ b/tp/org.argeo.tp/jackson/common.bnd @@ -0,0 +1,2 @@ +Bundle-License: Apache-2.0 +SLC-Origin-M2: :2.10.0 diff --git a/tp/org.argeo.tp/org.slf4j.api.bnd b/tp/org.argeo.tp/org.slf4j.api.bnd deleted file mode 100644 index 3dd38ad26..000000000 --- a/tp/org.argeo.tp/org.slf4j.api.bnd +++ /dev/null @@ -1,3 +0,0 @@ -Bundle-License: Apache-2.0 -Bundle-SymbolicName: org.slf4j.api -SLC-Origin-M2: org.slf4j:slf4j-api:1.7.28 diff --git a/tp/org.argeo.tp/slf4j/common.bnd b/tp/org.argeo.tp/slf4j/common.bnd new file mode 100644 index 000000000..441a376de --- /dev/null +++ b/tp/org.argeo.tp/slf4j/common.bnd @@ -0,0 +1,2 @@ +Bundle-License: Apache-2.0 +SLC-Origin-M2: :1.7.28 diff --git a/tp/org.argeo.tp/slf4j/org.slf4j.api.bnd b/tp/org.argeo.tp/slf4j/org.slf4j.api.bnd new file mode 100644 index 000000000..75afe68f2 --- /dev/null +++ b/tp/org.argeo.tp/slf4j/org.slf4j.api.bnd @@ -0,0 +1,2 @@ +Bundle-SymbolicName: org.slf4j.api +SLC-Origin-M2: org.slf4j:slf4j-api diff --git a/tp/org.argeo.tp/slf4j/org.slf4j.commons.logging.bnd b/tp/org.argeo.tp/slf4j/org.slf4j.commons.logging.bnd new file mode 100644 index 000000000..9b2ffdbd2 --- /dev/null +++ b/tp/org.argeo.tp/slf4j/org.slf4j.commons.logging.bnd @@ -0,0 +1,3 @@ +Bundle-SymbolicName: org.slf4j.commons.logging +SLC-Origin-M2: org.slf4j:jcl-over-slf4j +Export-Package: org.apache.commons.logging.*;version="1.2" \ No newline at end of file -- 2.39.2