You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2022/07/18 16:56:20 UTC
[brooklyn-server] branch master updated: bump the version of sshj
This is an automated email from the ASF dual-hosted git repository.
heneveld 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 97f54bd07b bump the version of sshj
new db09463ca3 Merge branch 'bump-sshj'
97f54bd07b is described below
commit 97f54bd07b56d7690952584d86bae07241a24312
Author: Alex Heneveld <al...@cloudsoft.io>
AuthorDate: Mon Jul 18 17:06:12 2022 +0100
bump the version of sshj
fixes issues sshing to recent OSs
requires adding asn1 dependency; unfortunately all of them have to be wrapped, but it seems to work as amended
---
core/pom.xml | 5 +++++
karaf/features/src/main/feature/feature.xml | 15 ++++++++-------
pom.xml | 5 +++--
3 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 17a98bd09f..157e2fb70d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -72,6 +72,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>com.hierynomus</groupId>
+ <artifactId>asn-one</artifactId>
+ <version>${sshj.asn1.version}</version>
+ </dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml
index d1bee17f2d..11b43981eb 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -66,14 +66,15 @@
<bundle>mvn:org.bouncycastle/bcprov-ext-jdk15on/${bouncycastle.version}</bundle>
<bundle>mvn:org.bouncycastle/bcpkix-jdk15on/${bouncycastle.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jzlib/${jzlib.version}</bundle>
- <!-- wrapped to import and export eddsa.math subpackage which sshj seems to need to compare equality on the Curve class;
- i can't tell what magic made this work in the past; sshj in Ed25519PublicKey does a `xxx.getCurve().equals(yyy.getCurve())`,
- so doesn't need to import it, but with OSGi we get a NoClassDefFound if we don't export that package from eddsa then import it into sshj :( -->
-<!-- <bundle>mvn:net.i2p.crypto/eddsa/${eddsa.version}</bundle>-->
-<!-- <bundle>mvn:com.hierynomus/sshj/${sshj.version}</bundle>-->
+ <!-- wrapped to import/export eddsa.math subpackage, and fix various other refs too -->
<bundle>wrap:mvn:net.i2p.crypto/eddsa/${eddsa.version}$overwrite=merge&Bundle-SymbolicName=net.i2p.crypto.eddsa_wrapped&Bundle-Version=${eddsa.version}&Export-Package=*;version="${eddsa.version}"</bundle>
- <bundle>wrap:mvn:com.hierynomus/sshj/${sshj.version}$overwrite=merge&Bundle-SymbolicName=com.hierynomus.sshj_wrapped&Bundle-Version=${sshj.version}&Import-Package=net.i2p.crypto.eddsa.math,javax.crypto,javax.crypto.interfaces,javax.crypto.spec,net.i2p.crypto.eddsa;version="[0.2,1)",net.i2p.crypto.eddsa.spec;version="[0.2,1)",com.jcraft.jzlib;version="[1.1,2)";resolution:=optional,org.slf4j;version="[1.7,5)",org.bouncycastle.asn1;resolution:=optional;version="[1.60,2)" [...]
-
+ <bundle>wrap:mvn:com.hierynomus/asn-one/${sshj.asn1.version}$overwrite=merge&Bundle-SymbolicName=com.hierynomus.asn-one_wrapped&Bundle-Version=${sshj.asn1.version}</bundle>
+ <bundle>wrap:mvn:com.hierynomus/sshj/${sshj.version}$overwrite=merge&Bundle-SymbolicName=com.hierynomus.sshj_wrapped&Bundle-Version=${sshj.version}&Import-Package=net.i2p.crypto.eddsa.math,javax.crypto,javax.crypto.interfaces,javax.crypto.spec,net.i2p.crypto.eddsa;version="[0.2,1)",net.i2p.crypto.eddsa.spec;version="[0.2,1)",com.jcraft.jzlib;version="[1.1,2)";resolution:=optional,org.slf4j;version="[1.7,5)",com.hierynomous.asn1;resolution:=optional;version="${sshj.asn [...]
+<!--
+ <bundle>mvn:net.i2p.crypto/eddsa/${eddsa.version}</bundle>
+ <bundle>mvn:com.hierynomus/asn-one/${sshj.asn1.version}</bundle>
+ <bundle>mvn:com.hierynomus/sshj/${sshj.version}</bundle>
+-->
</feature>
<feature name="brooklyn-utils-common" version="${project.version}" description="Brooklyn Common Utils">
diff --git a/pom.xml b/pom.xml
index 8c8793d0dd..9c5a1ad454 100644
--- a/pom.xml
+++ b/pom.xml
@@ -144,8 +144,9 @@
<swagger.version>1.6.2</swagger.version>
<mx4j.version>3.0.1</mx4j.version>
<bouncycastle.version>1.69</bouncycastle.version> <!-- beyond this gives asn1 errors, needs a new dep probably -->
- <eddsa.version>0.2.0</eddsa.version> <!-- eddsa 0.3.0 needs sun x509 -->
- <sshj.version>0.27.0</sshj.version> <!-- jclouds 2.4 uses 0.27; 0.32 needs eddsa 0.3.0 -->
+ <eddsa.version>0.3.0</eddsa.version> <!-- eddsa 0.3.0 needs sun x509 -->
+ <sshj.version>0.33.0</sshj.version> <!-- jclouds 2.4 uses 0.27; 0.32 needs eddsa 0.3.0 -->
+ <sshj.asn1.version>0.6.0</sshj.asn1.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>