This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/main by this push:
new 7a5ff94052 KARAF-7710 - Update BouncyCastle to 1.75
new 997a909f5f Merge pull request #1726 from coheigea/coheigea/KARAF-7710
7a5ff94052 is described below
commit 7a5ff94052c6963a65b9cc5469d2f83f0cd5bf51
Author: Colm O hEigeartaigh <cohei...@apache.org>
AuthorDate: Wed Jul 19 10:02:18 2023 +0100
KARAF-7710 - Update BouncyCastle to 1.75
---
assemblies/features/standard/pom.xml | 6 +++---
assemblies/features/standard/src/main/feature/feature.xml | 8 ++++----
itests/test/pom.xml | 4 ++--
itests/test/src/test/filtered-resources/etc/feature.xml | 4 ++--
jaas/spring-security-crypto/pom.xml | 2 +-
pom.xml | 2 +-
shell/ssh/pom.xml | 4 ++--
7 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/assemblies/features/standard/pom.xml
b/assemblies/features/standard/pom.xml
index 8c7d6d6114..65dc4e4aeb 100644
--- a/assemblies/features/standard/pom.xml
+++ b/assemblies/features/standard/pom.xml
@@ -316,19 +316,19 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
+ <artifactId>bcprov-jdk18on</artifactId>
<version>${bouncycastle.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
+ <artifactId>bcpkix-jdk18on</artifactId>
<version>${bouncycastle.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcutil-jdk15on</artifactId>
+ <artifactId>bcutil-jdk18on</artifactId>
<version>${bouncycastle.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/assemblies/features/standard/src/main/feature/feature.xml
b/assemblies/features/standard/src/main/feature/feature.xml
index 0d07990190..c1ac1889b6 100644
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@ -998,9 +998,9 @@ role=admin
<bundle
start-level="30">mvn:org.apache.sshd/sshd-osgi/${sshd.version}</bundle>
<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.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.bouncycastle/bcutil-jdk18on/${bouncycastle.version}</bundle>
+ <bundle
start-level="30">mvn:org.bouncycastle/bcprov-jdk18on/${bouncycastle.version}</bundle>
+ <bundle
start-level="30">mvn:org.bouncycastle/bcpkix-jdk18on/${bouncycastle.version}</bundle>
<bundle
start-level="30">mvn:org.apache.karaf.shell/org.apache.karaf.shell.ssh/${project.version}</bundle>
</feature>
@@ -1455,7 +1455,7 @@ org.apache.felix.eventadmin.AddSubject=true
<feature name="spring-security-crypto-encryption" description="Advanced
encryption support for Karaf security" version="${project.version}">
<feature>jaas</feature>
- <bundle dependency="true"
start-level="30">mvn:org.bouncycastle/bcprov-jdk15on/${bouncycastle.version}</bundle>
+ <bundle dependency="true"
start-level="30">mvn:org.bouncycastle/bcprov-jdk18on/${bouncycastle.version}</bundle>
<bundle dependency="true"
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-crypto/${spring.security53.version}</bundle>
<bundle
start-level="30">mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.spring-security-crypto/${project.version}</bundle>
</feature>
diff --git a/itests/test/pom.xml b/itests/test/pom.xml
index 86a70ef59a..5a2c823672 100644
--- a/itests/test/pom.xml
+++ b/itests/test/pom.xml
@@ -185,13 +185,13 @@
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
+ <artifactId>bcprov-jdk18on</artifactId>
<scope>test</scope>
<version>${bouncycastle.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
+ <artifactId>bcpkix-jdk18on</artifactId>
<scope>test</scope>
<version>${bouncycastle.version}</version>
</dependency>
diff --git a/itests/test/src/test/filtered-resources/etc/feature.xml
b/itests/test/src/test/filtered-resources/etc/feature.xml
index f827ff6184..dc68377ab8 100644
--- a/itests/test/src/test/filtered-resources/etc/feature.xml
+++ b/itests/test/src/test/filtered-resources/etc/feature.xml
@@ -629,8 +629,8 @@
<bundle start="true"
start-level="30">mvn:org.apache.sshd/sshd-osgi/${sshd.version}</bundle>
<bundle start="true"
start-level="30">mvn:org.apache.sshd/sshd-scp/${sshd.version}</bundle>
<bundle start="true"
start-level="30">mvn:org.apache.sshd/sshd-sftp/${sshd.version}</bundle>
- <bundle start="true"
start-level="30">mvn:org.bouncycastle/bcprov-jdk15on/${bouncycastle.version}</bundle>
- <bundle start="true"
start-level="30">mvn:org.bouncycastle/bcpkix-jdk15on/${bouncycastle.version}</bundle>
+ <bundle start="true"
start-level="30">mvn:org.bouncycastle/bcprov-jdk18on/${bouncycastle.version}</bundle>
+ <bundle start="true"
start-level="30">mvn:org.bouncycastle/bcpkix-jdk18on/${bouncycastle.version}</bundle>
<bundle start="true"
start-level="30">mvn:org.apache.karaf.shell/org.apache.karaf.shell.ssh/${project.version}</bundle>
</feature>
diff --git a/jaas/spring-security-crypto/pom.xml
b/jaas/spring-security-crypto/pom.xml
index 5b9100955e..55de1b74ba 100644
--- a/jaas/spring-security-crypto/pom.xml
+++ b/jaas/spring-security-crypto/pom.xml
@@ -131,7 +131,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
+ <artifactId>bcprov-jdk18on</artifactId>
<scope>test</scope>
<version>${bouncycastle.version}</version>
</dependency>
diff --git a/pom.xml b/pom.xml
index a86a9c89c2..e99fe48a33 100644
--- a/pom.xml
+++ b/pom.xml
@@ -169,7 +169,7 @@
<asm.version>9.4</asm.version>
<javax.annotation.version>1.3.2</javax.annotation.version>
<awaitility.version>3.1.6</awaitility.version>
- <bouncycastle.version>1.70</bouncycastle.version>
+ <bouncycastle.version>1.75</bouncycastle.version>
<camel.version>3.6.0</camel.version>
<cglib.bundle.version>3.2.9_1</cglib.bundle.version>
<cxf.version>3.5.5</cxf.version>
diff --git a/shell/ssh/pom.xml b/shell/ssh/pom.xml
index dd9667c57a..e80138020a 100644
--- a/shell/ssh/pom.xml
+++ b/shell/ssh/pom.xml
@@ -93,13 +93,13 @@
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
+ <artifactId>bcprov-jdk18on</artifactId>
<scope>compile</scope>
<version>${bouncycastle.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
+ <artifactId>bcpkix-jdk18on</artifactId>
<scope>compile</scope>
<version>${bouncycastle.version}</version>
</dependency>
