From 1c0af3c32a7e03da0d3128cda0c0db704a1ce90b Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 11 Feb 2022 09:35:58 +0100 Subject: [PATCH] Update non-Eclipse third-parties. --- Makefile | 1 - .../maintenance/backup/vfs/SystemBackup.java | 2 +- .../src/org/argeo/ssh/BasicSshServer.java | 4 ++- cms/pom.xml | 2 -- cnf/argeo.bnd | 2 +- org.argeo.slc.factory/pom.xml | 27 +++++++++++++++++++ .../src/org/argeo/slc/factory/A2Factory.java | 23 +++++++++------- org.argeo.slc.jcr/build.properties | 2 -- org.argeo.slc.rpmfactory/pom.xml | 4 +-- pom.xml | 1 + tp/org.argeo.tp.apache/apache-sshd/common.bnd | 2 +- .../apache-sshd/org.apache.sshd.cli.bnd | 1 - .../apache-sshd/org.apache.sshd.core.bnd | 4 ++- .../apache-sshd/org.apache.sshd.git.bnd | 5 +++- .../apache-sshd/org.apache.sshd.putty.bnd | 4 ++- .../apache-sshd/org.apache.sshd.scp.bnd | 1 - .../apache-sshd/org.apache.sshd.sftp.bnd | 1 - .../org.apache.commons.cli.bnd | 2 +- .../org.apache.commons.codec.bnd | 2 +- .../org.apache.commons.io.bnd | 3 ++- .../org.apache.commons.vfs.bnd | 2 +- .../org.apache.httpcomponents.httpclient.bnd | 2 +- .../org.apache.httpcomponents.httpcore.bnd | 2 +- .../org.apache.httpcomponents.httpmime.bnd | 2 +- .../org.apache.tika.core.bnd | 2 +- .../org.apache.tika.parsers.bnd | 2 +- tp/org.argeo.tp.apache/org.apache.xerces.bnd | 2 +- ...guava.bnd => com.google.guava.bnd.retired} | 0 ...om.google.guava.failureaccess.bnd.retired} | 0 tp/org.argeo.tp.jcr/jackrabbit/common.bnd | 2 +- ... => org.apache.jackrabbit.api.bnd.retired} | 0 tp/org.argeo.tp.jcr/oak/common.bnd | 2 ++ .../oak/org.apache.jackrabbit.api.bnd | 3 +++ .../org.apache.commons.collections.bnd | 0 .../org.apache.commons.dbcp.bnd | 0 .../org.apache.commons.pool.bnd | 2 +- .../jetty-websocket/common.bnd | 2 +- tp/org.argeo.tp.jetty/jetty/common.bnd | 2 +- .../jetty/org.eclipse.jetty.util.ajax.bnd | 3 +++ tp/org.argeo.tp.sdk/org.eclipse.jgit.bnd | 2 +- tp/org.argeo.tp.sdk/org.hamcrest.bnd | 2 +- tp/org.argeo.tp.sdk/org.junit.bnd | 2 +- tp/org.argeo.tp.sdk/org.redline-rpm.bnd | 8 +++--- tp/org.argeo.tp/bouncycastle/bcutil.bnd | 3 +++ tp/org.argeo.tp/bouncycastle/common.bnd | 2 +- .../com.googlecode.javaewah.JavaEWAH.bnd | 2 +- tp/org.argeo.tp/jackson/common.bnd | 2 +- tp/org.argeo.tp/org.h2.bnd | 2 +- tp/org.argeo.tp/org.postgresql.jdbc42.bnd | 2 +- tp/org.argeo.tp/slf4j/common.bnd | 2 +- 50 files changed, 98 insertions(+), 54 deletions(-) create mode 100644 org.argeo.slc.factory/pom.xml rename tp/org.argeo.tp.jcr/{com.google.guava.bnd => com.google.guava.bnd.retired} (100%) rename tp/org.argeo.tp.jcr/{com.google.guava.failureaccess.bnd => com.google.guava.failureaccess.bnd.retired} (100%) rename tp/org.argeo.tp.jcr/jackrabbit/{org.apache.jackrabbit.api.bnd => org.apache.jackrabbit.api.bnd.retired} (100%) create mode 100644 tp/org.argeo.tp.jcr/oak/common.bnd create mode 100644 tp/org.argeo.tp.jcr/oak/org.apache.jackrabbit.api.bnd rename tp/{org.argeo.tp.apache => org.argeo.tp.jcr}/org.apache.commons.collections.bnd (100%) rename tp/{org.argeo.tp.apache => org.argeo.tp.jcr}/org.apache.commons.dbcp.bnd (100%) rename tp/{org.argeo.tp.apache => org.argeo.tp.jcr}/org.apache.commons.pool.bnd (60%) create mode 100644 tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.util.ajax.bnd create mode 100644 tp/org.argeo.tp/bouncycastle/bcutil.bnd diff --git a/Makefile b/Makefile index 0f0c8455c..ffef76901 100644 --- 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 9ae0c96e5..76fc668a3 100644 --- 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 e763140bc..2a4d8f472 100644 --- 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 4d0b53387..180b0b370 100644 --- a/cms/pom.xml +++ b/cms/pom.xml @@ -14,7 +14,5 @@ org.argeo.cms.integration - org.argeo.ext.equinox.jetty - diff --git a/cnf/argeo.bnd b/cnf/argeo.bnd index d1c001a3f..7d269d17c 100644 --- 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 index 000000000..0e68578b0 --- /dev/null +++ b/org.argeo.slc.factory/pom.xml @@ -0,0 +1,27 @@ + + 4.0.0 + + org.argeo.slc + argeo-slc + 2.3-SNAPSHOT + .. + + org.argeo.slc.factory + SLC Factory + + + + org.argeo.slc + org.argeo.slc.api + 2.3-SNAPSHOT + + + + + org.argeo.tp.sdk + biz.aQute.bndlib + + + \ 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 c482f2745..9c97e5fca 100644 --- 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 55a8621a4..b0d77e98b 100644 --- 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 27cbc8628..3d2905fa5 100644 --- a/org.argeo.slc.rpmfactory/pom.xml +++ b/org.argeo.slc.rpmfactory/pom.xml @@ -8,8 +8,8 @@ 2.3-SNAPSHOT .. - org.argeo.slc.factory - SLC Factory + org.argeo.slc.rpmfactory + SLC RPM Factory diff --git a/pom.xml b/pom.xml index dbccb64e6..2ecfc6ceb 100644 --- a/pom.xml +++ b/pom.xml @@ -23,6 +23,7 @@ org.argeo.slc.api + org.argeo.slc.factory org.argeo.slc.runtime org.argeo.slc.jcr org.argeo.slc.repo diff --git a/tp/org.argeo.tp.apache/apache-sshd/common.bnd b/tp/org.argeo.tp.apache/apache-sshd/common.bnd index baceb13cc..8180da371 100644 --- 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 cca5113a3..7b00c2cbd 100644 --- 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 26437790e..3ba3f5054 100644 --- 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 dc018c663..7d9ef2b2e 100644 --- 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 3fe912f64..cf8a99a4c 100644 --- 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 8170ed69b..67444737a 100644 --- 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 b5e60e51e..b6b8b0d5a 100644 --- 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 117454629..7e34d5996 100644 --- 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 911c1e786..fe4bfa6dd 100644 --- 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.io.bnd b/tp/org.argeo.tp.apache/org.apache.commons.io.bnd index e7493f18a..e1e25b399 100644 --- 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.vfs.bnd b/tp/org.argeo.tp.apache/org.apache.commons.vfs.bnd index d158b85b3..3a7368975 100644 --- 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 ba9e3eb20..eead3b20c 100644 --- 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 a99f9edce..b0d0c7ac5 100644 --- 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 e33d41339..1623fb54e 100644 --- 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 f29992b65..38b166320 100644 --- 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 4b97b3666..380c58fba 100644 --- 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 82d009f9c..b66a199cc 100644 --- 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.retired similarity index 100% rename from tp/org.argeo.tp.jcr/com.google.guava.bnd rename to tp/org.argeo.tp.jcr/com.google.guava.bnd.retired diff --git a/tp/org.argeo.tp.jcr/com.google.guava.failureaccess.bnd b/tp/org.argeo.tp.jcr/com.google.guava.failureaccess.bnd.retired similarity index 100% rename from tp/org.argeo.tp.jcr/com.google.guava.failureaccess.bnd rename to tp/org.argeo.tp.jcr/com.google.guava.failureaccess.bnd.retired diff --git a/tp/org.argeo.tp.jcr/jackrabbit/common.bnd b/tp/org.argeo.tp.jcr/jackrabbit/common.bnd index 84cfaea4e..d48a04cef 100644 --- 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.retired similarity index 100% rename from tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.api.bnd rename to tp/org.argeo.tp.jcr/jackrabbit/org.apache.jackrabbit.api.bnd.retired diff --git a/tp/org.argeo.tp.jcr/oak/common.bnd b/tp/org.argeo.tp.jcr/oak/common.bnd new file mode 100644 index 000000000..d998340a3 --- /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 index 000000000..ebd491d6f --- /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.apache/org.apache.commons.collections.bnd b/tp/org.argeo.tp.jcr/org.apache.commons.collections.bnd similarity index 100% rename from tp/org.argeo.tp.apache/org.apache.commons.collections.bnd rename to tp/org.argeo.tp.jcr/org.apache.commons.collections.bnd diff --git a/tp/org.argeo.tp.apache/org.apache.commons.dbcp.bnd b/tp/org.argeo.tp.jcr/org.apache.commons.dbcp.bnd similarity index 100% rename from tp/org.argeo.tp.apache/org.apache.commons.dbcp.bnd rename to tp/org.argeo.tp.jcr/org.apache.commons.dbcp.bnd diff --git a/tp/org.argeo.tp.apache/org.apache.commons.pool.bnd b/tp/org.argeo.tp.jcr/org.apache.commons.pool.bnd similarity index 60% rename from tp/org.argeo.tp.apache/org.apache.commons.pool.bnd rename to tp/org.argeo.tp.jcr/org.apache.commons.pool.bnd index 62fd0f039..c0ae2706b 100644 --- a/tp/org.argeo.tp.apache/org.apache.commons.pool.bnd +++ b/tp/org.argeo.tp.jcr/org.apache.commons.pool.bnd @@ -1,3 +1,3 @@ Bundle-License: Apache-2.0 Bundle-SymbolicName: org.apache.commons.pool -SLC-Origin-M2: commons-pool:commons-pool:1.5.7 +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 14a0f68d0..4c515ce02 100644 --- 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 14a0f68d0..4c515ce02 100644 --- 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 index 000000000..ec671fa8d --- /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 365a91012..c4df6b9fc 100644 --- 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 152f6e718..f59732a0f 100644 --- 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 848ac97a7..58bf1ca17 100644 --- 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 4a3fb8d5e..6a32d2637 100644 --- 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 index 000000000..d40f6dd6e --- /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 3216e7759..4c701f361 100644 --- 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 d2d184835..4355de49b 100644 --- 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 1041ec8b2..b9a12cc62 100644 --- 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 88a41e9ad..a6090fa26 100644 --- 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 08683b9cc..e9d1393db 100644 --- 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 441a376de..2c5cf1d1c 100644 --- 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 -- 2.30.2