Update non-Eclipse third-parties.

diff --git a/Makefile b/Makefile
index 0f0c8455c725750545a07174a8555047ad012dcb..ffef76901c837dfa1a880c31a26a8bdaa012e915 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -90,7 +90,6 @@ clean:
        rm -rf $(BUILD_BASE)/ext
        rm -rf $(BUILD_BASE)/build
        rm -rf $(BUILD_BASE)/deb
-       rm -rf $(BUILD_BASE)/bootstrap
 
 # SDK level
 $(SDK_BUILD_BASE)/cnf/%.bnd: cnf/%.bnd

diff --git a/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/SystemBackup.java b/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/SystemBackup.java
index 9ae0c96e58a3b624166d03453b918b5ebcac5fef..76fc668a33f544d54559f832cb2d7f706c140ddb 100644 (file)
--- a/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/SystemBackup.java
+++ b/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/SystemBackup.java
@@ -45,7 +45,7 @@ public class SystemBackup implements Runnable {
                FileSystemOptions opts = new FileSystemOptions();
                try {
                        DefaultFileSystemConfigBuilder.getInstance().setUserAuthenticator(opts, userAuthenticator);
-               } catch (FileSystemException e) {
+               } catch (Exception e) {
                        throw new MaintenanceException("Cannot create authentication", e);
                }
 

diff --git a/cms/org.argeo.cms.integration/src/org/argeo/ssh/BasicSshServer.java b/cms/org.argeo.cms.integration/src/org/argeo/ssh/BasicSshServer.java
index e763140bcb206f29b5d6a7362535d3477841af46..2a4d8f472227b8e97ce6c31fc103d18f76cec42a 100644 (file)
--- a/cms/org.argeo.cms.integration/src/org/argeo/ssh/BasicSshServer.java
+++ b/cms/org.argeo.cms.integration/src/org/argeo/ssh/BasicSshServer.java
@@ -33,7 +33,9 @@ public class BasicSshServer {
                        // sshd.setShellFactory(new ProcessShellFactory(new String[] { "/bin/sh", "-i",
                        // "-l" }));
                        String[] shellCommand = OS.LOCAL.getDefaultShellCommand();
-                       sshd.setShellFactory(new ProcessShellFactory(shellCommand));
+                       // FIXME transfer args
+//                     sshd.setShellFactory(new ProcessShellFactory(shellCommand));
+//                     sshd.setShellFactory(new ProcessShellFactory(shellCommand[0], shellCommand));
                        sshd.setCommandFactory(new ScpCommandFactory());
                        sshd.start();
                } catch (Exception e) {

diff --git a/cms/pom.xml b/cms/pom.xml
index 4d0b53387862d71b9f2668dd65b05b7f392c0d7e..180b0b370ca393bac5c18f00c159b275bc60cba3 100644 (file)
--- a/cms/pom.xml
+++ b/cms/pom.xml
@@ -14,7 +14,5 @@
        <modules>
                <!-- Argeo CMS extensions -->
                <module>org.argeo.cms.integration</module>
-               <module>org.argeo.ext.equinox.jetty</module>
-
        </modules>
 </project>

diff --git a/cnf/argeo.bnd b/cnf/argeo.bnd
index d1c001a3fef44ea2693407bbc1516ad5122065bc..7d269d17cd93a04036525e98615a123425341eb0 100644 (file)
--- a/cnf/argeo.bnd
+++ b/cnf/argeo.bnd
@@ -2,7 +2,7 @@
 Bundle-Version: ${version.released}${qualifier}
 Private-Package: *.internal.*
 Export-Package: !*.internal.*, *
--consumer-policy : ${range;[==,=+)}
+#-consumer-policy : ${range;[==,=+)}
 -savemanifest : META-INF/MANIFEST.MF
 -includeresource.default : OSGI-INF/=-OSGI-INF/,e4xmi/=-e4xmi/,icons/=-icons/,img/=-img/
 -compression STORE

diff --git a/org.argeo.slc.factory/pom.xml b/org.argeo.slc.factory/pom.xml
new file mode 100644 (file)
index 0000000..0e68578
--- /dev/null
+++ b/org.argeo.slc.factory/pom.xml
@@ -0,0 +1,27 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.slc</groupId>
+               <artifactId>argeo-slc</artifactId>
+               <version>2.3-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.slc.factory</artifactId>
+       <name>SLC Factory</name>
+       <dependencies>
+               <!-- SLC -->
+               <dependency>
+                       <groupId>org.argeo.slc</groupId>
+                       <artifactId>org.argeo.slc.api</artifactId>
+                       <version>2.3-SNAPSHOT</version>
+               </dependency>
+
+               <!-- BND -->
+               <dependency>
+                       <groupId>org.argeo.tp.sdk</groupId>
+                       <artifactId>biz.aQute.bndlib</artifactId>
+               </dependency>
+       </dependencies>
+</project>
\ No newline at end of file

diff --git a/org.argeo.slc.factory/src/org/argeo/slc/factory/A2Factory.java b/org.argeo.slc.factory/src/org/argeo/slc/factory/A2Factory.java
index c482f274543641bc116184a1bc7b59b59b2ec9e5..9c97e5fca2817e8134c730889fec92e360bbdb60 100644 (file)
--- a/org.argeo.slc.factory/src/org/argeo/slc/factory/A2Factory.java
+++ b/org.argeo.slc.factory/src/org/argeo/slc/factory/A2Factory.java
@@ -211,6 +211,16 @@ public class A2Factory {
                        boolean doNotModify = Boolean.parseBoolean(fileProps
                                        .getOrDefault(ManifestConstants.SLC_ORIGIN_MANIFEST_NOT_MODIFIED.toString(), "false").toString());
 
+                       // we always force the symbolic name
+                       if (artifact != null) {
+                               if (!fileProps.containsKey(BUNDLE_SYMBOLICNAME.toString())) {
+                                       fileProps.put(BUNDLE_SYMBOLICNAME.toString(), artifact.getName());
+                               }
+                               if (!fileProps.containsKey(BUNDLE_VERSION.toString())) {
+                                       fileProps.put(BUNDLE_VERSION.toString(), artifact.getVersion());
+                               }
+                       }
+                       
                        if (doNotModify) {
                                fileEntries: for (Object key : fileProps.keySet()) {
                                        if (ManifestConstants.SLC_ORIGIN_M2.toString().equals(key))
@@ -219,14 +229,6 @@ public class A2Factory {
                                        additionalEntries.put(key.toString(), value);
                                }
                        } else {
-                               if (artifact != null) {
-                                       if (!fileProps.containsKey(BUNDLE_SYMBOLICNAME.toString())) {
-                                               fileProps.put(BUNDLE_SYMBOLICNAME.toString(), artifact.getName());
-                                       }
-                                       if (!fileProps.containsKey(BUNDLE_VERSION.toString())) {
-                                               fileProps.put(BUNDLE_VERSION.toString(), artifact.getVersion());
-                                       }
-                               }
 
                                if (!fileProps.containsKey(EXPORT_PACKAGE.toString())) {
                                        fileProps.put(EXPORT_PACKAGE.toString(),
@@ -617,8 +619,9 @@ public class A2Factory {
                Path descriptorsBase = Paths.get("../tp").toAbsolutePath().normalize();
 
 //             factory.processSingleM2ArtifactDistributionUnit(descriptorsBase.resolve("org.argeo.tp.apache").resolve("org.apache.xml.resolver.bnd"));
-//             factory.processM2BasedDistributionUnit(descriptorsBase.resolve("org.argeo.tp/slf4j"));
-//             System.exit(0);
+               factory.processM2BasedDistributionUnit(descriptorsBase.resolve("org.argeo.tp.apache/apache-sshd"));
+//             factory.processM2BasedDistributionUnit(descriptorsBase.resolve("org.argeo.tp.jcr/oak"));
+               System.exit(0);
 
                // Eclipse
                factory.processEclipseArchive(

diff --git a/org.argeo.slc.jcr/build.properties b/org.argeo.slc.jcr/build.properties
index 55a8621a4adb34306f4a3fac5ee98dcac5d2220e..b0d77e98b636a6b3f9f1873df43484b6e578e8ff 100644 (file)
--- a/org.argeo.slc.jcr/build.properties
+++ b/org.argeo.slc.jcr/build.properties
@@ -17,8 +17,6 @@ additional.bundles = org.junit,\
                      org.apache.lucene,\
                      org.apache.tika.core,\
                      org.apache.commons.dbcp,\
-                     org.apache.commons.pool,\
-                     com.google.guava,\
                      org.apache.jackrabbit.jcr2spi,\
                      org.apache.jackrabbit.spi2dav,\
                      org.apache.httpcomponents.httpclient,\

diff --git a/org.argeo.slc.rpmfactory/pom.xml b/org.argeo.slc.rpmfactory/pom.xml
index 27cbc8628642d14f7cc32ea38809a329745f923e..3d2905fa5d0ceb2bbc0a8a4fa5b7e931fd69ecc1 100644 (file)
--- a/org.argeo.slc.rpmfactory/pom.xml
+++ b/org.argeo.slc.rpmfactory/pom.xml
@@ -8,8 +8,8 @@
                <version>2.3-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
-       <artifactId>org.argeo.slc.factory</artifactId>
-       <name>SLC Factory</name>
+       <artifactId>org.argeo.slc.rpmfactory</artifactId>
+       <name>SLC RPM Factory</name>
        <dependencies>
                <!-- SLC -->
                <dependency>

diff --git a/pom.xml b/pom.xml
index dbccb64e629768f8ef4aa8275360c732b25160d2..2ecfc6cebd3e0991884bdf9626a2e3968deef5d5 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -23,6 +23,7 @@
        <modules>
                <!-- SLC framework -->
                <module>org.argeo.slc.api</module>
+               <module>org.argeo.slc.factory</module>
                <module>org.argeo.slc.runtime</module>
                <module>org.argeo.slc.jcr</module>
                <module>org.argeo.slc.repo</module>

diff --git a/tp/org.argeo.tp.apache/apache-sshd/common.bnd b/tp/org.argeo.tp.apache/apache-sshd/common.bnd
index baceb13cca7575e1f3de905a9a14b8a7520917b0..8180da371f190e87001a63751d20199fe0a5f30e 100644 (file)
--- a/tp/org.argeo.tp.apache/apache-sshd/common.bnd
+++ b/tp/org.argeo.tp.apache/apache-sshd/common.bnd
@@ -1,2 +1,2 @@
 Bundle-License: Apache-2.0
-SLC-Origin-M2: :2.3.0
\ No newline at end of file
+SLC-Origin-M2: :2.5.1
\ 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
index cca5113a39a7f8c613c1efb955a5473973235676..7b00c2cbd1d3136323fe6d3c76ecf9bc38f78569 100644 (file)
--- 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
@@ -1,3 +1,2 @@
 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.core.bnd b/tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.core.bnd
index 26437790ecfea8d5df38f9e59f6ebd1c628ba3db..3ba3f50549844db95f7fdb79385e803a39128ecf 100644 (file)
--- 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
@@ -1,3 +1,5 @@
 Bundle-SymbolicName: org.apache.sshd.core
 SLC-Origin-M2: org.apache.sshd:sshd-core
-SLC-Origin-ManifestNotModified: true
+Import-Package: \
+org.apache.tomcat.jni.*;resolution:=optional,\
+*
\ No newline at end of file

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
index dc018c663cdfaec1adbd8782151f542513a8f682..7d9ef2b2ea94f93aff56e2e861fb5fa5ef01b52b 100644 (file)
--- 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
@@ -1,3 +1,6 @@
 Bundle-SymbolicName: org.apache.sshd.git
 SLC-Origin-M2: org.apache.sshd:sshd-git
-SLC-Origin-ManifestNotModified: true
+Import-Package: \
+org.eclipse.jgit.pgm.*;resolution:=optional,\
+org.kohsuke.*;resolution:=optional,\
+*
\ No newline at end of file

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
index 3fe912f64878e7018599d5b6a5838126576701c6..cf8a99a4cb85f65213ecec80ea5d845ce900455b 100644 (file)
--- 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
@@ -1,3 +1,5 @@
 Bundle-SymbolicName: org.apache.sshd.putty
 SLC-Origin-M2: org.apache.sshd:sshd-putty
-SLC-Origin-ManifestNotModified: true
+Import-Package: \
+net.i2p.*;resolution:=optional,\
+*
\ No newline at end of file

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
index 8170ed69b8569719380855e62dd569c37a4baa5a..67444737a1b23ab9e43bd9c6654e0aff7b288589 100644 (file)
--- 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
@@ -1,3 +1,2 @@
 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
index b5e60e51e9bc68d2f613f444295d94827d07d328..b6b8b0d5a1c07365ac40f249b990a03aab78d78d 100644 (file)
--- 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
@@ -1,3 +1,2 @@
 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 117454629bf82321e983d6ea2f10c149eca1c954..7e34d5996a0c09ae59102bbc3732dc503a872744 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,3 +1,3 @@
 Bundle-License: Apache-2.0
 Bundle-SymbolicName: org.apache.commons.cli
-SLC-Origin-M2: commons-cli:commons-cli:1.4
+SLC-Origin-M2: commons-cli:commons-cli:1.5.0

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 911c1e786e3668fb1538d22eff004da61ba773e1..fe4bfa6dd0f07d3a1935b193d4ceade24bd5f010 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,3 +1,3 @@
 Bundle-License: Apache-2.0
 Bundle-SymbolicName: org.apache.commons.codec
-SLC-Origin-M2: commons-codec:commons-codec:1.13
+SLC-Origin-M2: commons-codec:commons-codec:1.15

diff --git a/tp/org.argeo.tp.apache/org.apache.commons.collections.bnd b/tp/org.argeo.tp.apache/org.apache.commons.collections.bnd
deleted file mode 100644 (file)
index b81a7e3..0000000
--- a/tp/org.argeo.tp.apache/org.apache.commons.collections.bnd
+++ /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/tp/org.argeo.tp.apache/org.apache.commons.dbcp.bnd b/tp/org.argeo.tp.apache/org.apache.commons.dbcp.bnd
deleted file mode 100644 (file)
index 7d03c4d..0000000
--- a/tp/org.argeo.tp.apache/org.apache.commons.dbcp.bnd
+++ /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/tp/org.argeo.tp.apache/org.apache.commons.io.bnd b/tp/org.argeo.tp.apache/org.apache.commons.io.bnd
index e7493f18a42f5848985b098466c29da907416d8a..e1e25b3998d91c49fa15f63b2ea38c4300b77cae 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,3 +1,4 @@
 Bundle-License: Apache-2.0
 Bundle-SymbolicName: org.apache.commons.io
-SLC-Origin-M2: commons-io:commons-io:2.6
+SLC-Origin-M2: commons-io:commons-io:2.11.0
+Import-Package: sun.*;resolution:=optional, *

diff --git a/tp/org.argeo.tp.apache/org.apache.commons.pool.bnd b/tp/org.argeo.tp.apache/org.apache.commons.pool.bnd
deleted file mode 100644 (file)
index 62fd0f0..0000000
--- a/tp/org.argeo.tp.apache/org.apache.commons.pool.bnd
+++ /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.5.7

diff --git a/tp/org.argeo.tp.apache/org.apache.commons.vfs.bnd b/tp/org.argeo.tp.apache/org.apache.commons.vfs.bnd
index d158b85b32b9cbd42eb46bcd606626b8924cbc5c..3a7368975be277001789258a7f54086053405eac 100644 (file)
--- a/tp/org.argeo.tp.apache/org.apache.commons.vfs.bnd
+++ b/tp/org.argeo.tp.apache/org.apache.commons.vfs.bnd
@@ -2,4 +2,4 @@ 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
+SLC-Origin-M2: org.apache.commons:commons-vfs2:2.9.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 ba9e3eb2090aab7a698e534c18a9daf786e8733d..eead3b20c4f746c5da060f703d48191b70594083 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,3 +1,3 @@
 Bundle-License: Apache-2.0
 Bundle-SymbolicName: org.apache.httpcomponents.httpclient
-SLC-Origin-M2: org.apache.httpcomponents:httpclient:4.5.9
\ No newline at end of file
+SLC-Origin-M2: org.apache.httpcomponents:httpclient:4.5.13
\ 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 a99f9edcea652fc82be1736d3c32e766d8bce386..b0d0c7ac5006e8f80e98fb65ed73fe915773b988 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,3 +1,3 @@
 Bundle-License: Apache-2.0
 Bundle-SymbolicName: org.apache.httpcomponents.httpcore
-SLC-Origin-M2: org.apache.httpcomponents:httpcore:4.4.10
\ No newline at end of file
+SLC-Origin-M2: org.apache.httpcomponents:httpcore:4.4.15
\ 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 e33d413396180acacab1045c28291963f63981d3..1623fb54e9c7ed6147eb2fcb1fdf456eaddaa3e9 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,3 +1,3 @@
 Bundle-License: Apache-2.0
 Bundle-SymbolicName: org.apache.httpcomponents.httpmime
-SLC-Origin-M2: org.apache.httpcomponents:httpmime:4.5.9
\ No newline at end of file
+SLC-Origin-M2: org.apache.httpcomponents:httpmime:4.5.13
\ 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 f29992b65cd111371d416230e9e8282e57f2af8e..38b1663202cf6e71e5e790c3e29e3c9ebc7627fe 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,4 +1,4 @@
 Bundle-License: Apache-2.0
 Bundle-SymbolicName: org.apache.tika.core
-SLC-Origin-M2: org.apache.tika:tika-core:1.22
+SLC-Origin-M2: org.apache.tika:tika-core:1.27
 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 4b97b3666ce7d01e26fb2f0ba32e12b40f89f907..380c58fba20ab2a5ea548acfd102f32f2b5b3e59 100644 (file)
--- a/tp/org.argeo.tp.apache/org.apache.tika.parsers.bnd
+++ b/tp/org.argeo.tp.apache/org.apache.tika.parsers.bnd
@@ -2,4 +2,4 @@ Bundle-Activator: org.apache.tika.parser.internal.Activator
 Bundle-License: Apache-2.0
 Bundle-SymbolicName: org.apache.tika.parsers
 Import-Package: *;resolution:=optional
-SLC-Origin-M2: org.apache.tika:tika-parsers:1.22
\ No newline at end of file
+SLC-Origin-M2: org.apache.tika:tika-parsers:1.27
\ 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 82d009f9c54ae5664bc568ad4b3e210c6816b580..b66a199cce612d26a0287b4ebf73ecc4049efd6d 100644 (file)
--- a/tp/org.argeo.tp.apache/org.apache.xerces.bnd
+++ b/tp/org.argeo.tp.apache/org.apache.xerces.bnd
@@ -2,4 +2,4 @@ Bundle-License: Apache-2.0
 Bundle-SymbolicName: org.apache.xerces
 Import-Package: sun.*;resolution:=optional,
 *
-SLC-Origin-M2: xerces:xercesImpl:2.12.0
\ No newline at end of file
+SLC-Origin-M2: xerces:xercesImpl:2.12.2
\ No newline at end of file

diff --git a/tp/org.argeo.tp.jcr/com.google.guava.bnd b/tp/org.argeo.tp.jcr/com.google.guava.bnd
deleted file mode 100644 (file)
index a8a926f..0000000
--- a/tp/org.argeo.tp.jcr/com.google.guava.bnd
+++ /dev/null
@@ -1,5 +0,0 @@
-Bundle-License: Apache-2.0
-Bundle-SymbolicName: com.google.guava
-Bundle-Version: 27.1.0.jre
-SLC-Origin-M2: com.google.guava:guava:27.1-jre
-SLC-Origin-ManifestNotModified: true

diff --git a/tp/org.argeo.tp.jcr/com.google.guava.bnd.retired b/tp/org.argeo.tp.jcr/com.google.guava.bnd.retired
new file mode 100644 (file)
index 0000000..a8a926f
--- /dev/null
+++ b/tp/org.argeo.tp.jcr/com.google.guava.bnd.retired
@@ -0,0 +1,5 @@
+Bundle-License: Apache-2.0
+Bundle-SymbolicName: com.google.guava
+Bundle-Version: 27.1.0.jre
+SLC-Origin-M2: com.google.guava:guava:27.1-jre
+SLC-Origin-ManifestNotModified: true

diff --git a/tp/org.argeo.tp.jcr/com.google.guava.failureaccess.bnd b/tp/org.argeo.tp.jcr/com.google.guava.failureaccess.bnd
deleted file mode 100644 (file)
index e7c19ce..0000000
--- a/tp/org.argeo.tp.jcr/com.google.guava.failureaccess.bnd
+++ /dev/null
@@ -1,4 +0,0 @@
-Bundle-License: Apache-2.0
-Bundle-SymbolicName: com.google.guava.failureaccess
-SLC-Origin-M2: com.google.guava:failureaccess:1.0.1
-SLC-Origin-ManifestNotModified: true

diff --git a/tp/org.argeo.tp.jcr/com.google.guava.failureaccess.bnd.retired b/tp/org.argeo.tp.jcr/com.google.guava.failureaccess.bnd.retired
new file mode 100644 (file)
index 0000000..e7c19ce
--- /dev/null
+++ b/tp/org.argeo.tp.jcr/com.google.guava.failureaccess.bnd.retired
@@ -0,0 +1,4 @@
+Bundle-License: Apache-2.0
+Bundle-SymbolicName: com.google.guava.failureaccess
+SLC-Origin-M2: com.google.guava:failureaccess:1.0.1
+SLC-Origin-ManifestNotModified: true

diff --git a/tp/org.argeo.tp.jcr/jackrabbit/common.bnd b/tp/org.argeo.tp.jcr/jackrabbit/common.bnd
index 84cfaea4e9c6f1593e9d6d76f96c3be5c415967e..d48a04cefa0eb344f41abffeeb5ec758f915ab47 100644 (file)
--- a/tp/org.argeo.tp.jcr/jackrabbit/common.bnd
+++ b/tp/org.argeo.tp.jcr/jackrabbit/common.bnd
@@ -1,2 +1,2 @@
 Bundle-License: Apache-2.0
-SLC-Origin-M2: :2.18.3
\ No newline at end of file
+SLC-Origin-M2: :2.20.4
\ No newline at end of file

diff --git a/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.api.bnd b/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.api.bnd
deleted file mode 100644 (file)
index 6ebc779..0000000
--- a/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.api.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-SLC-Origin-M2: org.apache.jackrabbit:jackrabbit-api
-Bundle-SymbolicName: org.apache.jackrabbit.api
-Export-Package: org.apache.jackrabbit.*

diff --git a/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.api.bnd.retired b/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.api.bnd.retired
new file mode 100644 (file)
index 0000000..6ebc779
--- /dev/null
+++ b/tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.api.bnd.retired
@@ -0,0 +1,3 @@
+SLC-Origin-M2: org.apache.jackrabbit:jackrabbit-api
+Bundle-SymbolicName: org.apache.jackrabbit.api
+Export-Package: org.apache.jackrabbit.*

diff --git a/tp/org.argeo.tp.jcr/oak/common.bnd b/tp/org.argeo.tp.jcr/oak/common.bnd
new file mode 100644 (file)
index 0000000..d998340
--- /dev/null
+++ b/tp/org.argeo.tp.jcr/oak/common.bnd
@@ -0,0 +1,2 @@
+Bundle-License: Apache-2.0
+SLC-Origin-M2: :1.40.0
\ No newline at end of file

diff --git a/tp/org.argeo.tp.jcr/oak/org.apache.jackrabbit.api.bnd b/tp/org.argeo.tp.jcr/oak/org.apache.jackrabbit.api.bnd
new file mode 100644 (file)
index 0000000..ebd491d
--- /dev/null
+++ b/tp/org.argeo.tp.jcr/oak/org.apache.jackrabbit.api.bnd
@@ -0,0 +1,3 @@
+SLC-Origin-M2: org.apache.jackrabbit:oak-jackrabbit-api
+Bundle-SymbolicName: org.apache.jackrabbit.api
+Export-Package: org.apache.jackrabbit.*

diff --git a/tp/org.argeo.tp.jcr/org.apache.commons.collections.bnd b/tp/org.argeo.tp.jcr/org.apache.commons.collections.bnd
new file mode 100644 (file)
index 0000000..b81a7e3
--- /dev/null
+++ b/tp/org.argeo.tp.jcr/org.apache.commons.collections.bnd
@@ -0,0 +1,3 @@
+Bundle-License: Apache-2.0
+Bundle-SymbolicName: org.apache.commons.collections
+SLC-Origin-M2: commons-collections:commons-collections:3.2.2

diff --git a/tp/org.argeo.tp.jcr/org.apache.commons.dbcp.bnd b/tp/org.argeo.tp.jcr/org.apache.commons.dbcp.bnd
new file mode 100644 (file)
index 0000000..7d03c4d
--- /dev/null
+++ b/tp/org.argeo.tp.jcr/org.apache.commons.dbcp.bnd
@@ -0,0 +1,5 @@
+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/tp/org.argeo.tp.jcr/org.apache.commons.pool.bnd b/tp/org.argeo.tp.jcr/org.apache.commons.pool.bnd
new file mode 100644 (file)
index 0000000..c0ae270
--- /dev/null
+++ b/tp/org.argeo.tp.jcr/org.apache.commons.pool.bnd
@@ -0,0 +1,3 @@
+Bundle-License: Apache-2.0
+Bundle-SymbolicName: org.apache.commons.pool
+SLC-Origin-M2: commons-pool:commons-pool:1.6

diff --git a/tp/org.argeo.tp.jetty/jetty-websocket/common.bnd b/tp/org.argeo.tp.jetty/jetty-websocket/common.bnd
index 14a0f68d06c19bb5481381c59c25042a19e7307d..4c515ce02f6e992e45b50e656a807acfcaf7b6b4 100644 (file)
--- a/tp/org.argeo.tp.jetty/jetty-websocket/common.bnd
+++ b/tp/org.argeo.tp.jetty/jetty-websocket/common.bnd
@@ -1,2 +1,2 @@
 Bundle-License: Apache-2.0
-SLC-Origin-M2: :9.4.24.v20191120
+SLC-Origin-M2: :9.4.45.v20220203

diff --git a/tp/org.argeo.tp.jetty/jetty/common.bnd b/tp/org.argeo.tp.jetty/jetty/common.bnd
index 14a0f68d06c19bb5481381c59c25042a19e7307d..4c515ce02f6e992e45b50e656a807acfcaf7b6b4 100644 (file)
--- a/tp/org.argeo.tp.jetty/jetty/common.bnd
+++ b/tp/org.argeo.tp.jetty/jetty/common.bnd
@@ -1,2 +1,2 @@
 Bundle-License: Apache-2.0
-SLC-Origin-M2: :9.4.24.v20191120
+SLC-Origin-M2: :9.4.45.v20220203

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

diff --git a/tp/org.argeo.tp.sdk/org.eclipse.jgit.bnd b/tp/org.argeo.tp.sdk/org.eclipse.jgit.bnd
index 365a910122ca833babd05177e958c4cc61821736..c4df6b9fc5c66a339e6134449f5d4376b61eba4e 100644 (file)
--- a/tp/org.argeo.tp.sdk/org.eclipse.jgit.bnd
+++ b/tp/org.argeo.tp.sdk/org.eclipse.jgit.bnd
@@ -1,5 +1,5 @@
 Bundle-License: BSD-3-Clause
-SLC-Origin-M2: org.eclipse.jgit:org.eclipse.jgit:5.5.0.201909110433-r
+SLC-Origin-M2: org.eclipse.jgit:org.eclipse.jgit:5.13.0.202109080827-r
 Import-Package: \
 sun.*;resolution:=optional, \
 com.jcraft.jsch;resolution:=optional, \

diff --git a/tp/org.argeo.tp.sdk/org.hamcrest.bnd b/tp/org.argeo.tp.sdk/org.hamcrest.bnd
index 152f6e718bddc456e38e73522c67650e03f56a4d..f59732a0fed1cce8e780c4d2460df522681c2e1f 100644 (file)
--- a/tp/org.argeo.tp.sdk/org.hamcrest.bnd
+++ b/tp/org.argeo.tp.sdk/org.hamcrest.bnd
@@ -1,5 +1,5 @@
 Bundle-License: BSD-3-Clause
 Bundle-SymbolicName: org.hamcrest
 Bundle-Version: 2.1.0
-SLC-Origin-M2: org.hamcrest:hamcrest:2.1
+SLC-Origin-M2: org.hamcrest:hamcrest:2.2
 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 848ac97a79cf46b88966b6c9de663805189ea3b2..58bf1ca179027f41049362b2e5e46f02a3507900 100644 (file)
--- a/tp/org.argeo.tp.sdk/org.junit.bnd
+++ b/tp/org.argeo.tp.sdk/org.junit.bnd
@@ -4,4 +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
\ No newline at end of file
+SLC-Origin-M2: junit:junit:4.13.2
\ 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 4a3fb8d5e5bd5667abce104970d8bc218fb7b69c..6a32d263722c2f3d3d96fcbb9b84e2c345ba6625 100644 (file)
--- a/tp/org.argeo.tp.sdk/org.redline-rpm.bnd
+++ b/tp/org.argeo.tp.sdk/org.redline-rpm.bnd
@@ -1,7 +1,7 @@
 Bundle-License: MIT
 Bundle-SymbolicName: org.redline-rpm
 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.8
+org.apache.tools.ant.*;resolution:=optional,
+org.apache.tools.zip;resolution:=optional,
+*
+SLC-Origin-M2: org.redline-rpm:redline:1.2.10

diff --git a/tp/org.argeo.tp/bouncycastle/bcutil.bnd b/tp/org.argeo.tp/bouncycastle/bcutil.bnd
new file mode 100644 (file)
index 0000000..d40f6dd
--- /dev/null
+++ b/tp/org.argeo.tp/bouncycastle/bcutil.bnd
@@ -0,0 +1,3 @@
+Bundle-SymbolicName: bcutil
+SLC-Origin-ManifestNotModified: true
+SLC-Origin-M2: org.bouncycastle:bcutil-jdk15on

diff --git a/tp/org.argeo.tp/bouncycastle/common.bnd b/tp/org.argeo.tp/bouncycastle/common.bnd
index 3216e775996398ade9d5385167d2fcb765c19fe2..4c701f3616293d8717eda27f05e10c1da12ac6d3 100644 (file)
--- a/tp/org.argeo.tp/bouncycastle/common.bnd
+++ b/tp/org.argeo.tp/bouncycastle/common.bnd
@@ -1,2 +1,2 @@
 Bundle-License: MIT
-SLC-Origin-M2: :1.64
+SLC-Origin-M2: :1.70

diff --git a/tp/org.argeo.tp/com.googlecode.javaewah.JavaEWAH.bnd b/tp/org.argeo.tp/com.googlecode.javaewah.JavaEWAH.bnd
index d2d18483519448f0aef5e9af8ec7fb500346ba8f..4355de49b761335afe44e77fe50d5e4b0e0d519b 100644 (file)
--- a/tp/org.argeo.tp/com.googlecode.javaewah.JavaEWAH.bnd
+++ b/tp/org.argeo.tp/com.googlecode.javaewah.JavaEWAH.bnd
@@ -1,4 +1,4 @@
 Bundle-License: Apache-2.0
 Bundle-SymbolicName: com.googlecode.javaewah.JavaEWAH
-SLC-Origin-M2: com.googlecode.javaewah:JavaEWAH:1.1.6
+SLC-Origin-M2: com.googlecode.javaewah:JavaEWAH:1.1.13
 SLC-Origin-ManifestNotModified: true

diff --git a/tp/org.argeo.tp/jackson/common.bnd b/tp/org.argeo.tp/jackson/common.bnd
index 1041ec8b25c6794e8163637e4e5f30ea03a767a3..b9a12cc62c90eb0837ce6615ad481c4e629ee9ce 100644 (file)
--- a/tp/org.argeo.tp/jackson/common.bnd
+++ b/tp/org.argeo.tp/jackson/common.bnd
@@ -1,2 +1,2 @@
 Bundle-License: Apache-2.0
-SLC-Origin-M2: :2.10.0
+SLC-Origin-M2: :2.13.1

diff --git a/tp/org.argeo.tp/org.h2.bnd b/tp/org.argeo.tp/org.h2.bnd
index 88a41e9adb0cba4cfd9af7c065cf9395cc31bd71..a6090fa26416a740668b2ea926f14890bcc5adda 100644 (file)
--- a/tp/org.argeo.tp/org.h2.bnd
+++ b/tp/org.argeo.tp/org.h2.bnd
@@ -1,4 +1,4 @@
 Bundle-License: MPL-2.0
 Bundle-SymbolicName: org.h2
-SLC-Origin-M2: com.h2database:h2:1.4.199
+SLC-Origin-M2: com.h2database:h2:1.4.200
 SLC-Origin-ManifestNotModified: true

diff --git a/tp/org.argeo.tp/org.postgresql.jdbc42.bnd b/tp/org.argeo.tp/org.postgresql.jdbc42.bnd
index 08683b9ccb7e1b5c8503ac40715f37a8d6fce98b..e9d1393dbbe972b2ca2472e68b8790e4f41563ee 100644 (file)
--- a/tp/org.argeo.tp/org.postgresql.jdbc42.bnd
+++ b/tp/org.argeo.tp/org.postgresql.jdbc42.bnd
@@ -1,4 +1,4 @@
 Bundle-License: BSD-2-Clause
 Bundle-SymbolicName: org.postgresql.jdbc42
-SLC-Origin-M2: org.postgresql:postgresql:42.2.8
+SLC-Origin-M2: org.postgresql:postgresql:42.3.2
 SLC-Origin-ManifestNotModified: true

diff --git a/tp/org.argeo.tp/slf4j/common.bnd b/tp/org.argeo.tp/slf4j/common.bnd
index 441a376deae0a21b5b5657e8dab88e63f12a79f0..2c5cf1d1ced890864659b53439acefeb6a30d47c 100644 (file)
--- a/tp/org.argeo.tp/slf4j/common.bnd
+++ b/tp/org.argeo.tp/slf4j/common.bnd
@@ -1,2 +1,2 @@
 Bundle-License: Apache-2.0
-SLC-Origin-M2: :1.7.28
+SLC-Origin-M2: :1.7.36