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/18 18:51:29 UTC

[tomee] branch tomee-9.x updated: TOMEE-4235 - Bouncy Castle 1.75

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 7db4a49e12 TOMEE-4235 - Bouncy Castle 1.75
7db4a49e12 is described below

commit 7db4a49e12188d96b46486014581e4a4d30b372a
Author: Richard Zowalla <rz...@apache.org>
AuthorDate: Tue Jul 18 20:51:20 2023 +0200

    TOMEE-4235 - Bouncy Castle 1.75
---
 boms/tomee-microprofile/pom.xml                              |  6 +++---
 boms/tomee-plume/pom.xml                                     |  6 +++---
 boms/tomee-plus/pom.xml                                      |  6 +++---
 boms/tomee-webprofile/pom.xml                                |  6 +++---
 container/openejb-core/src/main/resources/default.exclusions |  2 ++
 server/openejb-cxf/pom.xml                                   |  4 ++--
 tomee/apache-tomee/pom.xml                                   | 12 ++++++------
 .../resources/org/apache/tomee/configs/catalina.properties   |  2 +-
 8 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/boms/tomee-microprofile/pom.xml b/boms/tomee-microprofile/pom.xml
index 65f0f75156..76c8b82315 100644
--- a/boms/tomee-microprofile/pom.xml
+++ b/boms/tomee-microprofile/pom.xml
@@ -1660,7 +1660,7 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcpkix-jdk15to18</artifactId>
-      <version>1.74</version>
+      <version>1.75</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1671,7 +1671,7 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk15to18</artifactId>
-      <version>1.74</version>
+      <version>1.75</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1682,7 +1682,7 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcutil-jdk15to18</artifactId>
-      <version>1.74</version>
+      <version>1.75</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml
index 40732affc0..cdf8afb028 100644
--- a/boms/tomee-plume/pom.xml
+++ b/boms/tomee-plume/pom.xml
@@ -1771,7 +1771,7 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcpkix-jdk15to18</artifactId>
-      <version>1.74</version>
+      <version>1.75</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1782,7 +1782,7 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk15to18</artifactId>
-      <version>1.74</version>
+      <version>1.75</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1793,7 +1793,7 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcutil-jdk15to18</artifactId>
-      <version>1.74</version>
+      <version>1.75</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml
index 6f60576826..7d90c2b828 100644
--- a/boms/tomee-plus/pom.xml
+++ b/boms/tomee-plus/pom.xml
@@ -1804,7 +1804,7 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcpkix-jdk15to18</artifactId>
-      <version>1.74</version>
+      <version>1.75</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1815,7 +1815,7 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk15to18</artifactId>
-      <version>1.74</version>
+      <version>1.75</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1826,7 +1826,7 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcutil-jdk15to18</artifactId>
-      <version>1.74</version>
+      <version>1.75</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
diff --git a/boms/tomee-webprofile/pom.xml b/boms/tomee-webprofile/pom.xml
index b4817ff61a..ae08a9ac14 100644
--- a/boms/tomee-webprofile/pom.xml
+++ b/boms/tomee-webprofile/pom.xml
@@ -1198,7 +1198,7 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcpkix-jdk15to18</artifactId>
-      <version>1.74</version>
+      <version>1.75</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1209,7 +1209,7 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk15to18</artifactId>
-      <version>1.74</version>
+      <version>1.75</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -1220,7 +1220,7 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcutil-jdk15to18</artifactId>
-      <version>1.74</version>
+      <version>1.75</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
diff --git a/container/openejb-core/src/main/resources/default.exclusions b/container/openejb-core/src/main/resources/default.exclusions
index f45f2583f2..a1cb1bc134 100644
--- a/container/openejb-core/src/main/resources/default.exclusions
+++ b/container/openejb-core/src/main/resources/default.exclusions
@@ -32,6 +32,8 @@ axis-
 axis2-
 batchee-jbatch
 bcprov-
+bcutil-
+bcpkix-
 bootstrap.jar
 bsh-
 bval-core
diff --git a/server/openejb-cxf/pom.xml b/server/openejb-cxf/pom.xml
index 4d3b8de2be..18b8be715b 100644
--- a/server/openejb-cxf/pom.xml
+++ b/server/openejb-cxf/pom.xml
@@ -137,12 +137,12 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk15to18</artifactId>
-      <version>1.74</version>
+      <version>1.75</version>
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcpkix-jdk15to18</artifactId>
-      <version>1.74</version>
+      <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 75599684ae..a46213daf1 100644
--- a/tomee/apache-tomee/pom.xml
+++ b/tomee/apache-tomee/pom.xml
@@ -581,9 +581,9 @@
               <createTarGz>true</createTarGz>
               <skips>
                 <jars>
-                  <bcpkix-jdk15to18-1.74.jar>org.bouncycastle:bcpkix-jdk15to18:jar:1.74</bcpkix-jdk15to18-1.74.jar>
-                  <bcprov-jdk15to18-1.74.jar>org.bouncycastle:bcprov-jdk15to18:jar:1.74</bcprov-jdk15to18-1.74.jar>
-                  <bcutil-jdk15to18-1.74.jar>org.bouncycastle:bcutil-jdk15to18:jar:1.74</bcutil-jdk15to18-1.74.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>
@@ -814,9 +814,9 @@
               <createTarGz>true</createTarGz>
               <skips>
                 <jars>
-                  <bcpkix-jdk15to18-1.74.jar>org.bouncycastle:bcpkix-jdk15to18:jar:1.74</bcpkix-jdk15to18-1.74.jar>
-                  <bcprov-jdk15to18-1.74.jar>org.bouncycastle:bcprov-jdk15to18:jar:1.74</bcprov-jdk15to18-1.74.jar>
-                  <bcutil-jdk15to18-1.74.jar>org.bouncycastle:bcutil-jdk15to18:jar:1.74</bcutil-jdk15to18-1.74.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>
diff --git a/tomee/tomee-embedded/src/main/resources/org/apache/tomee/configs/catalina.properties b/tomee/tomee-embedded/src/main/resources/org/apache/tomee/configs/catalina.properties
index 4d9537da6f..ac7db0d4d9 100644
--- a/tomee/tomee-embedded/src/main/resources/org/apache/tomee/configs/catalina.properties
+++ b/tomee/tomee-embedded/src/main/resources/org/apache/tomee/configs/catalina.properties
@@ -95,7 +95,7 @@ tomcat-i18n-en.jar,tomcat-i18n-es.jar,tomcat-i18n-fr.jar,tomcat-i18n-ja.jar,\
 commons-beanutils*.jar,commons-collections*.jar,commons-dbcp*.jar,\
 commons-digester*.jar,commons-fileupload*.jar,commons-logging*.jar,\
 commons-pool*.jar,commons-io-*,\
-bcprov-*.jar,\
+bcprov-*.jar,bcutil-*.jar,bcpkix-*.jar\
 ant.jar,jmx.jar,jmx-tools.jar,\
 xercesImpl.jar,xmlParserAPIs.jar,xml-apis.jar,\
 dnsns.jar,ldapsec.jar,localedata.jar,sunjce_provider.jar,sunpkcs11.jar,tools.jar,\