This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch tomee-9.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/tomee-9.x by this push:
new 76ca73e79d TOMEE-4204 - Upgrade Bouncycastle to 1.73
76ca73e79d is described below
commit 76ca73e79d63af3ca6c53a759c34ac327bb9bd0d
Author: Richard Zowalla <[email protected]>
AuthorDate: Tue Apr 25 21:13:51 2023 +0200
TOMEE-4204 - Upgrade Bouncycastle to 1.73
---
boms/tomee-microprofile/pom.xml | 32 +++++---------------------------
boms/tomee-plume/pom.xml | 32 +++++---------------------------
boms/tomee-plus/pom.xml | 32 +++++---------------------------
boms/tomee-webprofile/pom.xml | 24 +++++++++++++++++++++++-
server/openejb-client/pom.xml | 2 +-
server/openejb-cxf/pom.xml | 21 +++++++++++++++++++--
tomee/tomee-embedded/pom.xml | 2 +-
7 files changed, 59 insertions(+), 86 deletions(-)
diff --git a/boms/tomee-microprofile/pom.xml b/boms/tomee-microprofile/pom.xml
index 3df04e4c70..b4bbb25e5b 100644
--- a/boms/tomee-microprofile/pom.xml
+++ b/boms/tomee-microprofile/pom.xml
@@ -1659,19 +1659,8 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
- <version>1.70</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- <version>1.70</version>
+ <artifactId>bcpkix-jdk15to18</artifactId>
+ <version>1.73</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1682,18 +1671,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15to18</artifactId>
- <version>1.70</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk18on</artifactId>
- <version>1.71</version>
+ <version>1.73</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1703,8 +1681,8 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcutil-jdk15on</artifactId>
- <version>1.70</version>
+ <artifactId>bcutil-jdk15to18</artifactId>
+ <version>1.73</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml
index a1245f0d8d..026aaa14c2 100644
--- a/boms/tomee-plume/pom.xml
+++ b/boms/tomee-plume/pom.xml
@@ -1770,19 +1770,8 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
- <version>1.70</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- <version>1.70</version>
+ <artifactId>bcpkix-jdk15to18</artifactId>
+ <version>1.73</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1793,18 +1782,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15to18</artifactId>
- <version>1.70</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk18on</artifactId>
- <version>1.71</version>
+ <version>1.73</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1814,8 +1792,8 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcutil-jdk15on</artifactId>
- <version>1.70</version>
+ <artifactId>bcutil-jdk15to18</artifactId>
+ <version>1.73</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml
index 168e811a06..c23dcf26e8 100644
--- a/boms/tomee-plus/pom.xml
+++ b/boms/tomee-plus/pom.xml
@@ -1803,19 +1803,8 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
- <version>1.70</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- <version>1.70</version>
+ <artifactId>bcpkix-jdk15to18</artifactId>
+ <version>1.73</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1826,18 +1815,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15to18</artifactId>
- <version>1.70</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk18on</artifactId>
- <version>1.71</version>
+ <version>1.73</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1847,8 +1825,8 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcutil-jdk15on</artifactId>
- <version>1.70</version>
+ <artifactId>bcutil-jdk15to18</artifactId>
+ <version>1.73</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-webprofile/pom.xml b/boms/tomee-webprofile/pom.xml
index 6124bf72b2..9b194c79ae 100644
--- a/boms/tomee-webprofile/pom.xml
+++ b/boms/tomee-webprofile/pom.xml
@@ -1195,10 +1195,32 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk15to18</artifactId>
+ <version>1.73</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15to18</artifactId>
- <version>1.70</version>
+ <version>1.73</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcutil-jdk15to18</artifactId>
+ <version>1.73</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/server/openejb-client/pom.xml b/server/openejb-client/pom.xml
index 3927a6aec1..df9c72ce01 100644
--- a/server/openejb-client/pom.xml
+++ b/server/openejb-client/pom.xml
@@ -155,7 +155,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcmail-jdk15to18</artifactId>
- <version>1.70</version>
+ <version>1.73</version>
<scope>test</scope>
</dependency>
diff --git a/server/openejb-cxf/pom.xml b/server/openejb-cxf/pom.xml
index 59a4e5d7b1..88e1dd118d 100644
--- a/server/openejb-cxf/pom.xml
+++ b/server/openejb-cxf/pom.xml
@@ -119,13 +119,30 @@
<artifactId>jakarta.activation-api</artifactId>
<groupId>jakarta.activation</groupId>
</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.70</version>
+ <version>1.73</version>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk15to18</artifactId>
+ <version>1.73</version>
</dependency>
<dependency>
<groupId>org.apache.wss4j</groupId>
diff --git a/tomee/tomee-embedded/pom.xml b/tomee/tomee-embedded/pom.xml
index 0afaa372ea..c2bee3c4c9 100644
--- a/tomee/tomee-embedded/pom.xml
+++ b/tomee/tomee-embedded/pom.xml
@@ -512,7 +512,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcmail-jdk15to18</artifactId>
- <version>1.70</version>
+ <version>1.73</version>
<scope>test</scope>
</dependency>
