From 04e7ba0710e74d9f18322dcc2c730f972b7ea10c Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 25 May 2022 10:30:18 +0200 Subject: [PATCH] Upgrade Apache SSHD. --- org.argeo.slc.factory/src/org/argeo/slc/factory/A2Factory.java | 3 +-- tp/org.argeo.tp.apache/apache-sshd/common.bnd | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) 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 3bebfe637..4bab07aa1 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 @@ -920,9 +920,8 @@ 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.apache/apache-sshd")); + factory.processM2BasedDistributionUnit(descriptorsBase.resolve("org.argeo.tp.apache/apache-sshd")); // factory.processM2BasedDistributionUnit(descriptorsBase.resolve("org.argeo.tp.jetty/jetty")); - factory.processCategory(descriptorsBase.resolve("org.argeo.tp.jetty")); // factory.processCategory(descriptorsBase.resolve("org.argeo.tp.jetty.websocket")); // factory.processCategory(descriptorsBase.resolve("org.argeo.tp.eclipse.rcp")); // factory.processCategory(descriptorsBase.resolve("org.argeo.tp")); diff --git a/tp/org.argeo.tp.apache/apache-sshd/common.bnd b/tp/org.argeo.tp.apache/apache-sshd/common.bnd index 8180da371..f3f8597c6 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.5.1 \ No newline at end of file +SLC-Origin-M2: :2.8.0 \ No newline at end of file -- 2.30.2