[brooklyn-server] branch master updated: Downgraded SSHJ from 0.31.0 back to 0.22.0 because of various issues, among which incompatibility with EDDSA, and being build with JDK9+

[iu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

iuliana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git


The following commit(s) were added to refs/heads/master by this push:
     new 7c87685   Downgraded SSHJ from 0.31.0 back to 0.22.0 because of various issues, among which incompatibility with EDDSA, and being build with JDK9+
     new d4bf475  Merge pull request #1169 from iuliana/fix/downgrade-sshj
7c87685 is described below

commit 7c876852adee73b57884c72df69afa65605567a8
Author: iuliana <iu...@cloudsoft.io>
AuthorDate: Wed Apr 28 17:57:42 2021 +0100

     Downgraded SSHJ from 0.31.0 back to 0.22.0 because of various issues, among which incompatibility with EDDSA, and being build with JDK9+
---
 karaf/features/src/main/feature/feature.xml | 1 -
 pom.xml                                     | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml
index e6da51a..0c585d9 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -158,7 +158,6 @@
         <bundle dependency="true">mvn:com.thoughtworks.xstream/xstream/${xstream.version}</bundle>
         <bundle dependency="true">mvn:org.freemarker/freemarker/${freemarker.version}</bundle>
         <bundle dependency="true">mvn:com.hierynomus/sshj/${sshj.version}</bundle>
-        <bundle dependency="true">wrap:mvn:com.hierynomus/asn-one/${asn1.version}</bundle>
         <bundle dependency="true">mvn:net.i2p.crypto/eddsa/${eddsa.version}</bundle><!-- from com.hierynomous/sshj -->
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jzlib/${jzlib.version}</bundle>
         <bundle dependency="true">mvn:org.bouncycastle/bcprov-ext-jdk15on/${bouncycastle.version}</bundle>
diff --git a/pom.xml b/pom.xml
index ad42242..b6e68fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,8 +142,7 @@
         <!-- JClouds 2.2.0 imports eddsa 0.1.0 -->
         <eddsa.version>0.2.0</eddsa.version>
         <!-- JClouds 2.2.0 imports ssjj 0.20.0 -->
-        <sshj.version>0.31.0</sshj.version>
-        <asn1.version>0.5.0</asn1.version>  <!-- used by sshj -->
+        <sshj.version>0.22.0</sshj.version>
         <!-- jzlib osgi version is 1.1.3.2, but bundle is 1.1.3_2 ; JClouds 2.2.0 pulls in 1.0.7_1 but is happy with 1.1.3.2 -->
         <jzlib.version>1.1.3_2</jzlib.version>
         <jzlib.osgi.version>1.1.3.2</jzlib.osgi.version>