This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch tomee-8.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/tomee-8.x by this push:
new 78b52c5c05 Revert "TOMEE-4204 | TOMEE-4181 - Exclude bcpkix, bcprov
and bcutil from patch plugin for profile "plume""
78b52c5c05 is described below
commit 78b52c5c05cd0677add99687061392351ce38113
Author: Richard Zowalla <[email protected]>
AuthorDate: Mon May 8 13:59:36 2023 +0200
Revert "TOMEE-4204 | TOMEE-4181 - Exclude bcpkix, bcprov and bcutil from
patch plugin for profile "plume""
This reverts commit e8cf3c9548ed77215bbadf2fdbeb00348831900f.
---
tomee/apache-tomee/pom.xml | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/tomee/apache-tomee/pom.xml b/tomee/apache-tomee/pom.xml
index 3dda7642b2..83f68e47ad 100644
--- a/tomee/apache-tomee/pom.xml
+++ b/tomee/apache-tomee/pom.xml
@@ -564,9 +564,7 @@
<createTarGz>true</createTarGz>
<skips>
<jars>
-
<bcpkix-jdk15to18-1.73.jar>org.bouncycastle:bcpkix-jdk15to18:jar:1.73</bcpkix-jdk15to18-1.73.jar>
-
<bcprov-jdk15to18-1.73.jar>org.bouncycastle:bcprov-jdk15to18:jar:1.73</bcprov-jdk15to18-1.73.jar>
-
<bcutil-jdk15to18-1.73.jar>org.bouncycastle:bcutil-jdk15to18:jar:1.73</bcutil-jdk15to18-1.73.jar>
+
<bcprov-jdk15on-1.70.jar>org.bouncycastle:bcprov-jdk15on:jar:1.70</bcprov-jdk15on-1.70.jar>
</jars>
</skips>
</configuration>
@@ -795,13 +793,11 @@
<select>apache-tomee-(plus|plume|webprofile|microprofile).*\.zip</select>
<skipTransform>true</skipTransform>
<createTarGz>true</createTarGz>
- <skips>
- <jars>
-
<bcpkix-jdk15to18-1.73.jar>org.bouncycastle:bcpkix-jdk15to18:jar:1.73</bcpkix-jdk15to18-1.73.jar>
-
<bcprov-jdk15to18-1.73.jar>org.bouncycastle:bcprov-jdk15to18:jar:1.73</bcprov-jdk15to18-1.73.jar>
-
<bcutil-jdk15to18-1.73.jar>org.bouncycastle:bcutil-jdk15to18:jar:1.73</bcutil-jdk15to18-1.73.jar>
- </jars>
- </skips>
+ <replace>
+ <resources>
+
<ServerInfo.properties>${project.build.sourceDirectory}/ServerInfo.properties</ServerInfo.properties>
+ </resources>
+ </replace>
</configuration>
<executions>
<execution>
