All Argeo layers working with the new distribution factory.

diff --git a/cms/org.argeo.cms.integration/bnd.bnd b/cms/org.argeo.cms.integration/bnd.bnd
index 5a46653466684b733e4420486a521599a7ba081b..b17428a7822802ea41db62b4381d88b33860c7b7 100644 (file)
--- 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 8c7b11e2bc25052bd703d1b2b1afc02e50ed4754..883e02fe60ef6f07a07510dfcecfdae90c96eff2 100644 (file)
--- 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 725fe55485c46aa9b16cd48895fae64805eb6ecf..7632cef47ba6409bf83423354e0164c70da86159 100644 (file)
--- 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 296f1f93f9db9cc4c39600a7b2d7fd7e5be96db7..aaa5b323d59f16e9056f79e17b0fb3578c0e66c6 100644 (file)
--- a/sdk/argeo-tp-rap.target
+++ b/sdk/argeo-tp-rap.target
@@ -9,6 +9,5 @@
                <location path="${project_loc:argeo-slc-unstable}/output/a2/org.argeo.tp.jetty" type="Directory"/>
                <location path="${project_loc:argeo-slc-unstable}/output/a2/org.argeo.tp.sdk" type="Directory"/>
                <location path="${project_loc:argeo-slc-unstable}/output/a2/org.argeo.tp.jcr" type="Directory"/>
-               <location path="${project_loc:argeo-slc-unstable}/output/a2/org.argeo.tp.javax" type="Directory"/>
        </locations>
 </target>
\ 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 (file)
index 0000000..baceb13
--- /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 (file)
index 0000000..cca5113
--- /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 (file)
index 0000000..b8414e9
--- /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 (file)
index 0000000..2643779
--- /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 (file)
index 0000000..dc018c6
--- /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 (file)
index 0000000..3fe912f
--- /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 (file)
index 0000000..8170ed6
--- /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 (file)
index 0000000..b5e60e5
--- /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 736dbcd68c9a8b7d013912a09e349c4ea0cee79f..117454629bf82321e983d6ea2f10c149eca1c954 100644 (file)
--- 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 c664ee5106a01279553ab1433e6981b68e329d85..911c1e786e3668fb1538d22eff004da61ba773e1 100644 (file)
--- 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 085774d797827b062ef55b213e66bbd478ae998c..7d03c4d30269336000bb22687e1d31f0573332e9 100644 (file)
--- 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 (file)
index 0000000..b188587
--- /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 c51062fe113fa463a223357840bc35946e6c04c5..40a58d2c4452501379418ac398dcefcc62a7a8e1 100644 (file)
--- 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 9b2ecebd4a0a55f30399bf59536c20bb8a742f62..a064d487f83894544d7f7317624d6f0b3bbb7e87 100644 (file)
--- 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 93e6efa4c347081f31f4f5d2f74580f289aee7fd..e7493f18a42f5848985b098466c29da907416d8a 100644 (file)
--- 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 776efc0f4b842f69537fe59789e07d89fdc849a9..62fd0f039a5f29280262607ff78f0908a6431989 100644 (file)
--- 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 (file)
index 0000000..d158b85
--- /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 9622fc5930688bbe789511d52c06c3d2c08a63da..ba9e3eb2090aab7a698e534c18a9daf786e8733d 100644 (file)
--- 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 991778dc8b8aff7589b50f6c2a8779f3a02caec9..a99f9edcea652fc82be1736d3c32e766d8bce386 100644 (file)
--- 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 683f12a1b881698d5a6baae000f323945ebcf643..e33d413396180acacab1045c28291963f63981d3 100644 (file)
--- 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 ded36ae8be814affb00e6c96a69200e8e7abf553..8126ffd79f2c00b4f640bff8c3e277a1d1d9d719 100644 (file)
--- 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 104b5e95d7c05be1985bfeac572aa4ab34a3a355..f29992b65cd111371d416230e9e8282e57f2af8e 100644 (file)
--- 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 62ed54730355b5bb03b6b07104cfeb60b2cc4aa4..4b97b3666ce7d01e26fb2f0ba32e12b40f89f907 100644 (file)
--- 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 95b25ad483528b57fe0b4744bc106ba7d67cdfcc..1d2106b04e8340063d6d089fc9084924acfccb1a 100644 (file)
--- 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 22a080332391d1ee9e81eaa7c1412d92d4e8f8b8..e0fb19c78a2bcdfffe43587c2a74aef1376742dd 100644 (file)
--- 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 43b749cc7b9ab60a20511d4cda99a2d03a89c920..82d009f9c54ae5664bc568ad4b3e210c6816b580 100644 (file)
--- 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 affda3d3cc28f620cdd35e55cefc72843bc74fa7..95f9a5ed94f96f97060c6245db9ebfd7bbc29b21 100644 (file)
--- 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 cdc2cbaee859e794d99ae0cf7007cd4747a11050..83d6d31b325fc081841ab8722f8316b3b89d4f5c 100644 (file)
--- 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.javax/javax.websocket.bnd b/tp/org.argeo.tp.javax/javax.websocket.bnd
deleted file mode 100644 (file)
index 85137ff..0000000
--- a/tp/org.argeo.tp.javax/javax.websocket.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-Bundle-SymbolicName: javax.websocket
-SLC-Origin-M2: javax.websocket:javax.websocket-api:1.1
-SLC-Origin-ManifestNotModified: true

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 8522d2e215be13914c8306a85ba635c6e98c99e0..d2432b79b9ebafd325a5fa8953b191035954f10c 100644 (file)
--- 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 517124884a3437e0aef34cf729a50752e0d13de2..84cfaea4e9c6f1593e9d6d76f96c3be5c415967e 100644 (file)
--- 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.jetty/javax.websocket.bnd b/tp/org.argeo.tp.jetty/javax.websocket.bnd
new file mode 100644 (file)
index 0000000..cefcff8
--- /dev/null
+++ b/tp/org.argeo.tp.jetty/javax.websocket.bnd
@@ -0,0 +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 (file)
index 0000000..14a0f68
--- /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-websocket/org.eclipse.jetty.websocket.api.bnd b/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.api.bnd
new file mode 100644 (file)
index 0000000..3de1e46
--- /dev/null
+++ b/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.api.bnd
@@ -0,0 +1,3 @@
+SLC-Origin-M2: org.eclipse.jetty.websocket:websocket-api
+SLC-Origin-ManifestNotModified: true
+Bundle-SymbolicName: org.eclipse.jetty.websocket.api

diff --git a/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.client.bnd b/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.client.bnd
new file mode 100644 (file)
index 0000000..674c775
--- /dev/null
+++ b/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.client.bnd
@@ -0,0 +1,3 @@
+SLC-Origin-M2: org.eclipse.jetty.websocket:websocket-client
+SLC-Origin-ManifestNotModified: true
+Bundle-SymbolicName: org.eclipse.jetty.websocket.client

diff --git a/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.common.bnd b/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.common.bnd
new file mode 100644 (file)
index 0000000..7e7a113
--- /dev/null
+++ b/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.common.bnd
@@ -0,0 +1,3 @@
+SLC-Origin-M2: org.eclipse.jetty.websocket:websocket-common
+SLC-Origin-ManifestNotModified: true
+Bundle-SymbolicName: org.eclipse.jetty.websocket.common

diff --git a/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.javax.websocket.bnd b/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.javax.websocket.bnd
new file mode 100644 (file)
index 0000000..1007784
--- /dev/null
+++ b/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.javax.websocket.bnd
@@ -0,0 +1,3 @@
+SLC-Origin-M2: org.eclipse.jetty.websocket:javax-websocket-client-impl
+SLC-Origin-ManifestNotModified: true
+Bundle-SymbolicName: org.eclipse.jetty.websocket.javax.websocket

diff --git a/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.javax.websocket.server.bnd b/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.javax.websocket.server.bnd
new file mode 100644 (file)
index 0000000..72860e3
--- /dev/null
+++ b/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.javax.websocket.server.bnd
@@ -0,0 +1,3 @@
+SLC-Origin-M2: org.eclipse.jetty.websocket:javax-websocket-server-impl
+SLC-Origin-ManifestNotModified: true
+Bundle-SymbolicName: org.eclipse.jetty.websocket.javax.websocket.server

diff --git a/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.server.bnd b/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.server.bnd
new file mode 100644 (file)
index 0000000..b9cad3c
--- /dev/null
+++ b/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.server.bnd
@@ -0,0 +1,3 @@
+SLC-Origin-M2: org.eclipse.jetty.websocket:websocket-server
+SLC-Origin-ManifestNotModified: true
+Bundle-SymbolicName: org.eclipse.jetty.websocket.server

diff --git a/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.servlet.bnd b/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.servlet.bnd
new file mode 100644 (file)
index 0000000..3db77e2
--- /dev/null
+++ b/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.servlet.bnd
@@ -0,0 +1,3 @@
+SLC-Origin-M2: org.eclipse.jetty.websocket:websocket-servlet
+SLC-Origin-ManifestNotModified: true
+Bundle-SymbolicName: org.eclipse.jetty.websocket.servlet

diff --git a/tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.websocket.api.bnd b/tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.websocket.api.bnd
deleted file mode 100644 (file)
index 3de1e46..0000000
--- a/tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.websocket.api.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-SLC-Origin-M2: org.eclipse.jetty.websocket:websocket-api
-SLC-Origin-ManifestNotModified: true
-Bundle-SymbolicName: org.eclipse.jetty.websocket.api

diff --git a/tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.websocket.client.bnd b/tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.websocket.client.bnd
deleted file mode 100644 (file)
index 674c775..0000000
--- a/tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.websocket.client.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-SLC-Origin-M2: org.eclipse.jetty.websocket:websocket-client
-SLC-Origin-ManifestNotModified: true
-Bundle-SymbolicName: org.eclipse.jetty.websocket.client

diff --git a/tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.websocket.common.bnd b/tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.websocket.common.bnd
deleted file mode 100644 (file)
index 7e7a113..0000000
--- a/tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.websocket.common.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-SLC-Origin-M2: org.eclipse.jetty.websocket:websocket-common
-SLC-Origin-ManifestNotModified: true
-Bundle-SymbolicName: org.eclipse.jetty.websocket.common

diff --git a/tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.websocket.javax.websocket.bnd b/tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.websocket.javax.websocket.bnd
deleted file mode 100644 (file)
index 1007784..0000000
--- a/tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.websocket.javax.websocket.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-SLC-Origin-M2: org.eclipse.jetty.websocket:javax-websocket-client-impl
-SLC-Origin-ManifestNotModified: true
-Bundle-SymbolicName: org.eclipse.jetty.websocket.javax.websocket

diff --git a/tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.websocket.javax.websocket.server.bnd b/tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.websocket.javax.websocket.server.bnd
deleted file mode 100644 (file)
index 72860e3..0000000
--- a/tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.websocket.javax.websocket.server.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-SLC-Origin-M2: org.eclipse.jetty.websocket:javax-websocket-server-impl
-SLC-Origin-ManifestNotModified: true
-Bundle-SymbolicName: org.eclipse.jetty.websocket.javax.websocket.server

diff --git a/tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.websocket.server.bnd b/tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.websocket.server.bnd
deleted file mode 100644 (file)
index b9cad3c..0000000
--- a/tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.websocket.server.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-SLC-Origin-M2: org.eclipse.jetty.websocket:websocket-server
-SLC-Origin-ManifestNotModified: true
-Bundle-SymbolicName: org.eclipse.jetty.websocket.server

diff --git a/tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.websocket.servlet.bnd b/tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.websocket.servlet.bnd
deleted file mode 100644 (file)
index 3db77e2..0000000
--- a/tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.websocket.servlet.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-SLC-Origin-M2: org.eclipse.jetty.websocket:websocket-servlet
-SLC-Origin-ManifestNotModified: true
-Bundle-SymbolicName: org.eclipse.jetty.websocket.servlet

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 (file)
index 0000000..b3a28ca
--- /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 (file)
index 0000000..0452921
--- /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 82a96946a514bf5b3b6ed8c25ab2be669b190ad4..848ac97a79cf46b88966b6c9de663805189ea3b2 100644 (file)
--- 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 590d8779f293755054b9fb35879005f9e564b254..4a3fb8d5e5bd5667abce104970d8bc218fb7b69c 100644 (file)
--- 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 (file)
index 0000000..94b69a1
--- /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 (file)
index 0000000..a4b359f
--- /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 (file)
index 0000000..32ded22
--- /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 (file)
index 0000000..1041ec8
--- /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 (file)
index 3dd38ad..0000000
--- 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 (file)
index 0000000..441a376
--- /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 (file)
index 0000000..75afe68
--- /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 (file)
index 0000000..9b2ffdb
--- /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