Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

TOMEE-4204 - Upgrade Bouncycastle to 1.73 #1037

Merged
merged 1 commit into from
Apr 26, 2023
Merged

TOMEE-4204 - Upgrade Bouncycastle to 1.73 #1037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 5 additions & 27 deletions boms/tomee-microprofile/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
32 changes: 5 additions & 27 deletions boms/tomee-plume/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
32 changes: 5 additions & 27 deletions boms/tomee-plus/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
24 changes: 23 additions & 1 deletion boms/tomee-webprofile/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion server/openejb-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
21 changes: 19 additions & 2 deletions server/openejb-cxf/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion tomee/tomee-embedded/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down