You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2021/08/27 05:23:22 UTC
[karaf] branch karaf-4.2.x updated: [KARAF-7243] Upgrade to
bouncycastle 1.69
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch karaf-4.2.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/karaf-4.2.x by this push:
new 0e3fd73 [KARAF-7243] Upgrade to bouncycastle 1.69
0e3fd73 is described below
commit 0e3fd7366bac129deba220fddfda174a23770664
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Thu Aug 26 17:06:51 2021 +0200
[KARAF-7243] Upgrade to bouncycastle 1.69
(cherry picked from commit eb434212c9857cadd3fb1e9071dc1cbcb3154ff4)
---
assemblies/features/standard/pom.xml | 6 ++++++
assemblies/features/standard/src/main/feature/feature.xml | 5 +++--
pom.xml | 2 +-
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/assemblies/features/standard/pom.xml b/assemblies/features/standard/pom.xml
index 05659dd..5ce0df6 100644
--- a/assemblies/features/standard/pom.xml
+++ b/assemblies/features/standard/pom.xml
@@ -338,6 +338,12 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcutil-jdk15on</artifactId>
+ <version>${bouncycastle.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.ssh</artifactId>
<scope>provided</scope>
diff --git a/assemblies/features/standard/src/main/feature/feature.xml b/assemblies/features/standard/src/main/feature/feature.xml
index 0bbe5bb..e7ea86c 100644
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@ -1028,8 +1028,9 @@ role=${env:ORG_APACHE_KARAF_WEBCONSOLE_ROLE:-admin}
<bundle start-level="30">mvn:org.apache.sshd/sshd-scp/${sshd.version}</bundle>
<bundle start-level="30">mvn:org.apache.sshd/sshd-sftp/${sshd.version}</bundle>
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.not-yet-commons-ssl/0.3.11_1</bundle>
- <bundle start-level="30">mvn:org.bouncycastle/bcprov-jdk15on/1.66</bundle>
- <bundle start-level="30">mvn:org.bouncycastle/bcpkix-jdk15on/1.66</bundle>
+ <bundle start-level="30">mvn:org.bouncycastle/bcutil-jdk15on/${bouncycastle.version}</bundle>
+ <bundle start-level="30">mvn:org.bouncycastle/bcprov-jdk15on/${bouncycastle.version}</bundle>
+ <bundle start-level="30">mvn:org.bouncycastle/bcpkix-jdk15on/${bouncycastle.version}</bundle>
<bundle start-level="30">mvn:org.apache.karaf.shell/org.apache.karaf.shell.ssh/${project.version}</bundle>
</feature>
diff --git a/pom.xml b/pom.xml
index 57da738..8d2631e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -171,7 +171,7 @@
<asm.version>9.2</asm.version>
<javax.annotation.version>1.3.1</javax.annotation.version>
<awaitility.version>3.1.6</awaitility.version>
- <bouncycastle.version>1.68</bouncycastle.version>
+ <bouncycastle.version>1.69</bouncycastle.version>
<camel.version>3.6.0</camel.version>
<cglib.bundle.version>3.2.9_1</cglib.bundle.version>
<cxf.version>3.4.3</cxf.version>