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 2021/04/20 15:58:51 UTC
[brooklyn-server] branch master updated: recent sshj version bump
needs new dep asn-one -- added to pom and feature
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 2d508b3 recent sshj version bump needs new dep asn-one -- added to pom and feature
2d508b3 is described below
commit 2d508b39aad65d6d7be601970116798cffcc2a2b
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Tue Apr 20 16:58:26 2021 +0100
recent sshj version bump needs new dep asn-one -- added to pom and feature
---
karaf/features/src/main/feature/feature.xml | 1 +
pom.xml | 1 +
2 files changed, 2 insertions(+)
diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml
index 0c585d9..e6da51a 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -158,6 +158,7 @@
<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 1aaf49f..ad42242 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,6 +143,7 @@
<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 -->
<!-- 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>