You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rz...@apache.org on 2023/07/14 18:37:36 UTC
[tomee] 01/01: TOMEE-4234 - Bouncy Castle 1.75
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch TOMEE-4234
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 03260e12ae869647b82cd891c2fb7c959fb79ad0
Author: Richard Zowalla <rz...@apache.org>
AuthorDate: Fri Jul 14 20:37:26 2023 +0200
TOMEE-4234 - Bouncy Castle 1.75
---
boms/tomee-microprofile/pom.xml | 26 ++++++++++++++++++++++++--
boms/tomee-plume/pom.xml | 26 ++++++++++++++++++++++++--
boms/tomee-plus/pom.xml | 26 ++++++++++++++++++++++++--
server/openejb-cxf/pom.xml | 23 ++++++++++++++++++++---
tomee/apache-tomee/pom.xml | 8 ++++++--
5 files changed, 98 insertions(+), 11 deletions(-)
diff --git a/boms/tomee-microprofile/pom.xml b/boms/tomee-microprofile/pom.xml
index 66c7647b0e..a22e0e868d 100644
--- a/boms/tomee-microprofile/pom.xml
+++ b/boms/tomee-microprofile/pom.xml
@@ -1444,8 +1444,30 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- <version>1.70</version>
+ <artifactId>bcpkix-jdk15to18</artifactId>
+ <version>1.75</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15to18</artifactId>
+ <version>1.75</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcutil-jdk15to18</artifactId>
+ <version>1.75</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml
index 2265c83b3b..caf6478a38 100644
--- a/boms/tomee-plume/pom.xml
+++ b/boms/tomee-plume/pom.xml
@@ -1543,8 +1543,30 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- <version>1.70</version>
+ <artifactId>bcpkix-jdk15to18</artifactId>
+ <version>1.75</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15to18</artifactId>
+ <version>1.75</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcutil-jdk15to18</artifactId>
+ <version>1.75</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml
index 544a36231c..c6dcdfd709 100644
--- a/boms/tomee-plus/pom.xml
+++ b/boms/tomee-plus/pom.xml
@@ -1576,8 +1576,30 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- <version>1.70</version>
+ <artifactId>bcpkix-jdk15to18</artifactId>
+ <version>1.75</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15to18</artifactId>
+ <version>1.75</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcutil-jdk15to18</artifactId>
+ <version>1.75</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/server/openejb-cxf/pom.xml b/server/openejb-cxf/pom.xml
index ed1f96bd3d..e7ffa748f4 100644
--- a/server/openejb-cxf/pom.xml
+++ b/server/openejb-cxf/pom.xml
@@ -121,13 +121,30 @@
<groupId>jakarta.xml.ws</groupId>
<artifactId>jakarta.xml.ws-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk15on</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk18on</artifactId>
+ </exclusion>
</exclusions>
</dependency>
- <!-- Override the bcprov from the previous artifact -->
+ <!-- Override the bcprov & bcpkix from the previous artifact -->
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15to18</artifactId>
+ <version>1.75</version>
+ </dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- <version>1.70</version>
+ <artifactId>bcpkix-jdk15to18</artifactId>
+ <version>1.75</version>
</dependency>
<dependency>
<groupId>org.apache.wss4j</groupId>
diff --git a/tomee/apache-tomee/pom.xml b/tomee/apache-tomee/pom.xml
index 72748aa50e..e45ea70707 100644
--- a/tomee/apache-tomee/pom.xml
+++ b/tomee/apache-tomee/pom.xml
@@ -564,7 +564,9 @@
<createTarGz>true</createTarGz>
<skips>
<jars>
- <bcprov-jdk15on-1.70.jar>org.bouncycastle:bcprov-jdk15on:jar:1.70</bcprov-jdk15on-1.70.jar>
+ <bcpkix-jdk15to18-1.75.jar>org.bouncycastle:bcpkix-jdk15to18:jar:1.75</bcpkix-jdk15to18-1.75.jar>
+ <bcprov-jdk15to18-1.75.jar>org.bouncycastle:bcprov-jdk15to18:jar:1.75</bcprov-jdk15to18-1.75.jar>
+ <bcutil-jdk15to18-1.75.jar>org.bouncycastle:bcutil-jdk15to18:jar:1.75</bcutil-jdk15to18-1.75.jar>
</jars>
</skips>
</configuration>
@@ -795,7 +797,9 @@
<createTarGz>true</createTarGz>
<skips>
<jars>
- <bcprov-jdk15on-1.70.jar>org.bouncycastle:bcprov-jdk15on:jar:1.70</bcprov-jdk15on-1.70.jar>
+ <bcpkix-jdk15to18-1.75.jar>org.bouncycastle:bcpkix-jdk15to18:jar:1.75</bcpkix-jdk15to18-1.75.jar>
+ <bcprov-jdk15to18-1.75.jar>org.bouncycastle:bcprov-jdk15to18:jar:1.75</bcprov-jdk15to18-1.75.jar>
+ <bcutil-jdk15to18-1.75.jar>org.bouncycastle:bcutil-jdk15to18:jar:1.75</bcutil-jdk15to18-1.75.jar>
</jars>
</skips>
</configuration>