This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 3aaa6e83da908986e166eae403dd90cd7a37eb46
Author: Andriy Redko <drr...@gmail.com>
AuthorDate: Sat Dec 2 12:27:09 2023 -0500
CXF-8964: Update Bouncycastle from unsupported xxx-jdk15on to xxx-jdk18on
(addressing CVEs) (#1541)
(cherry picked from commit b608027f5f352affd3d2228ae4733b47049f2590)
# Conflicts:
# parent/pom.xml
(cherry picked from commit f42770e9431645ff3e078eb7be801523bdb6e8b4)
---
distribution/javadoc/pom.xml | 2 +-
osgi/karaf/features/src/main/resources/features.xml | 12 ++++++------
parent/pom.xml | 4 ++--
rt/rs/security/jose-parent/jose/pom.xml | 2 +-
rt/ws/security/pom.xml | 2 +-
services/sts/systests/advanced/pom.xml | 2 +-
systests/jaxrs/pom.xml | 2 +-
systests/kerberos/pom.xml | 2 +-
systests/ldap/pom.xml | 2 +-
systests/rs-security/pom.xml | 2 +-
systests/transports/pom.xml | 2 +-
systests/ws-security/pom.xml | 2 +-
12 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/distribution/javadoc/pom.xml b/distribution/javadoc/pom.xml
index 0fb6f403d0..cda1a238b7 100644
--- a/distribution/javadoc/pom.xml
+++ b/distribution/javadoc/pom.xml
@@ -322,7 +322,7 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
+ <artifactId>bcprov-jdk18on</artifactId>
</dependency>
<dependency>
<groupId>org.ehcache</groupId>
diff --git a/osgi/karaf/features/src/main/resources/features.xml
b/osgi/karaf/features/src/main/resources/features.xml
index 9b0fbda41a..4a280bf074 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -191,9 +191,9 @@
<feature name="cxf-http-netty-client" version="${project.version}">
<feature version="${project.version}">cxf-http</feature>
<bundle dependency="true"
start-level="40">mvn:${cxf.servlet-api.group}/${cxf.servlet-api.artifact}/${cxf.servlet-api.version}</bundle>
- <bundle
start-level="40">mvn:org.bouncycastle/bcprov-jdk15on/${cxf.bcprov.version}</bundle>
- <bundle
start-level="40">mvn:org.bouncycastle/bcutil-jdk15on/${cxf.bcprov.version}</bundle>
- <bundle
start-level="40">mvn:org.bouncycastle/bctls-jdk15on/${cxf.bcprov.version}</bundle>
+ <bundle
start-level="40">mvn:org.bouncycastle/bcprov-jdk18on/${cxf.bcprov.version}</bundle>
+ <bundle
start-level="40">mvn:org.bouncycastle/bcutil-jdk18on/${cxf.bcprov.version}</bundle>
+ <bundle
start-level="40">mvn:org.bouncycastle/bctls-jdk18on/${cxf.bcprov.version}</bundle>
<bundle
start-level="40">mvn:io.netty/netty-tcnative-classes/${cxf.netty.tcnative.version}</bundle>
<bundle
start-level="40">mvn:io.netty/netty-common/${cxf.netty.version}</bundle>
<bundle
start-level="40">mvn:io.netty/netty-transport-native-unix-common/${cxf.netty.version}</bundle>
@@ -208,9 +208,9 @@
</feature>
<feature name="cxf-http-netty-server" version="${project.version}">
<feature version="${project.version}">cxf-http</feature>
- <bundle
start-level="40">mvn:org.bouncycastle/bcprov-jdk15on/${cxf.bcprov.version}</bundle>
- <bundle
start-level="40">mvn:org.bouncycastle/bcutil-jdk15on/${cxf.bcprov.version}</bundle>
- <bundle
start-level="40">mvn:org.bouncycastle/bctls-jdk15on/${cxf.bcprov.version}</bundle>
+ <bundle
start-level="40">mvn:org.bouncycastle/bcprov-jdk18on/${cxf.bcprov.version}</bundle>
+ <bundle
start-level="40">mvn:org.bouncycastle/bcutil-jdk18on/${cxf.bcprov.version}</bundle>
+ <bundle
start-level="40">mvn:org.bouncycastle/bctls-jdk18on/${cxf.bcprov.version}</bundle>
<bundle
start-level="40">mvn:io.netty/netty-tcnative-classes/${cxf.netty.tcnative.version}</bundle>
<bundle
start-level="40">mvn:io.netty/netty-common/${cxf.netty.version}</bundle>
<bundle
start-level="40">mvn:io.netty/netty-transport-native-unix-common/${cxf.netty.version}</bundle>
diff --git a/parent/pom.xml b/parent/pom.xml
index 79f83f7423..c4ab81a7af 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -89,7 +89,7 @@
<cxf.assertj.version>3.24.2</cxf.assertj.version>
<cxf.atmosphere.version.range>[2.4,3.0)</cxf.atmosphere.version.range>
<cxf.atmosphere.version>2.6.1</cxf.atmosphere.version>
- <cxf.bcprov.version>1.70</cxf.bcprov.version>
+ <cxf.bcprov.version>1.77</cxf.bcprov.version>
<cxf.brave.reporter.version>2.16.4</cxf.brave.reporter.version>
<cxf.brave.version>5.16.0</cxf.brave.version>
<cxf.brave.zipkin.version>2.24.2</cxf.brave.zipkin.version>
@@ -1753,7 +1753,7 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
+ <artifactId>bcprov-jdk18on</artifactId>
<version>${cxf.bcprov.version}</version>
</dependency>
<dependency>
diff --git a/rt/rs/security/jose-parent/jose/pom.xml
b/rt/rs/security/jose-parent/jose/pom.xml
index 69c33d10ba..468fc2f034 100644
--- a/rt/rs/security/jose-parent/jose/pom.xml
+++ b/rt/rs/security/jose-parent/jose/pom.xml
@@ -51,7 +51,7 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
+ <artifactId>bcprov-jdk18on</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
diff --git a/rt/ws/security/pom.xml b/rt/ws/security/pom.xml
index 65072881a7..5ef5e7ed2a 100644
--- a/rt/ws/security/pom.xml
+++ b/rt/ws/security/pom.xml
@@ -126,7 +126,7 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
+ <artifactId>bcprov-jdk18on</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/services/sts/systests/advanced/pom.xml
b/services/sts/systests/advanced/pom.xml
index ade4b25032..48eec9211b 100644
--- a/services/sts/systests/advanced/pom.xml
+++ b/services/sts/systests/advanced/pom.xml
@@ -104,7 +104,7 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
+ <artifactId>bcprov-jdk18on</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml
index 7ce88c941e..d33c3bc5c3 100644
--- a/systests/jaxrs/pom.xml
+++ b/systests/jaxrs/pom.xml
@@ -493,7 +493,7 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
+ <artifactId>bcprov-jdk18on</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/systests/kerberos/pom.xml b/systests/kerberos/pom.xml
index e650fbfb7a..9ba7599234 100644
--- a/systests/kerberos/pom.xml
+++ b/systests/kerberos/pom.xml
@@ -219,7 +219,7 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
+ <artifactId>bcprov-jdk18on</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/systests/ldap/pom.xml b/systests/ldap/pom.xml
index 54b4afee38..564c3870ce 100644
--- a/systests/ldap/pom.xml
+++ b/systests/ldap/pom.xml
@@ -193,7 +193,7 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
+ <artifactId>bcprov-jdk18on</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/systests/rs-security/pom.xml b/systests/rs-security/pom.xml
index 34b093384b..16684517ab 100644
--- a/systests/rs-security/pom.xml
+++ b/systests/rs-security/pom.xml
@@ -177,7 +177,7 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
+ <artifactId>bcprov-jdk18on</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/systests/transports/pom.xml b/systests/transports/pom.xml
index 4207a64aea..3acbb3897f 100644
--- a/systests/transports/pom.xml
+++ b/systests/transports/pom.xml
@@ -319,7 +319,7 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bctls-jdk15on</artifactId>
+ <artifactId>bctls-jdk18on</artifactId>
<version>${cxf.bcprov.version}</version>
<scope>test</scope>
</dependency>
diff --git a/systests/ws-security/pom.xml b/systests/ws-security/pom.xml
index 5cb3b5ee4e..7aca6ae94d 100644
--- a/systests/ws-security/pom.xml
+++ b/systests/ws-security/pom.xml
@@ -226,7 +226,7 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
+ <artifactId>bcprov-jdk18on</artifactId>
<scope>test</scope>
</dependency>
<dependency>
