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-dist.git
The following commit(s) were added to refs/heads/master by this push:
new fabd582 Updates o.a.k.features.xml to use project bouncycastle version
new c8bbe10 This closes #169
fabd582 is described below
commit fabd582df5fe198fb0b6cf6dcadb3e23414b9156
Author: Martin Harris <[email protected]>
AuthorDate: Thu Mar 4 13:59:28 2021 +0000
Updates o.a.k.features.xml to use project bouncycastle version
---
.../etc/org.apache.karaf.features.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/karaf/apache-brooklyn/src/main/resources/etc/org.apache.karaf.features.xml
b/karaf/apache-brooklyn/src/main/filtered-resources/etc/org.apache.karaf.features.xml
similarity index 95%
rename from
karaf/apache-brooklyn/src/main/resources/etc/org.apache.karaf.features.xml
rename to
karaf/apache-brooklyn/src/main/filtered-resources/etc/org.apache.karaf.features.xml
index 7234cb2..c5f5c06 100644
--- a/karaf/apache-brooklyn/src/main/resources/etc/org.apache.karaf.features.xml
+++
b/karaf/apache-brooklyn/src/main/filtered-resources/etc/org.apache.karaf.features.xml
@@ -50,11 +50,11 @@
<bundle originalUri="mvn:net.i2p.crypto/eddsa/0.1.0"
replacement="mvn:net.i2p.crypto/eddsa/0.2.0" />
<bundle originalUri="mvn:com.hierynomus/sshj/0.20.0"
- replacement="mvn:com.hierynomus/sshj/0.22.0" />
+ replacement="mvn:com.hierynomus/sshj/${sshj.version}" />
<bundle originalUri="mvn:org.bouncycastle/bcprov-ext-jdk15on/1.51"
- replacement="mvn:org.bouncycastle/bcprov-ext-jdk15on/1.61" />
+
replacement="mvn:org.bouncycastle/bcprov-ext-jdk15on/${bouncycastle.version}" />
<bundle originalUri="mvn:org.bouncycastle/bcpkix-jdk15on/1.51"
- replacement="mvn:org.bouncycastle/bcpkix-jdk15on/1.61" />
+
replacement="mvn:org.bouncycastle/bcpkix-jdk15on/${bouncycastle.version}" />
<bundle originalUri="mvn:net.i2p.crypto/eddsa/0.1.0"
replacement="mvn:net.i2p.crypto/eddsa/0.2.0" />
</bundleReplacements>
