From d906b3fecbc90e2fd4e0abb904eb6eb9c0792987 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20D=C3=A9nari=C3=A9?=
 <romain.denarie@exoplatform.com>
Date: Fri, 11 Aug 2023 15:19:46 +0200
Subject: [PATCH] feat: Exclude bcprov-jdk15on from wallet packaging -
 EXO-59676 - Meeds-io/MIPs#69  (#395)

Prior to this change, bcprov-jdk15on jar is added in wallet packaging as
it's coming as a compiled dependency in org.web3j.utils.

With new feature about the new Argon2IdPasswordEncoder, this dependency
is needed at gatein portal level. So this PR exclude this jar from
compiled scope, so that, if someone uninstall wallet addon, the
bcprov-jdk15on is not removed.

This commit move the exclude in the pom in order to also exlude transitive dependencies
---
 wallet-packaging/src/main/assemblies/assembly.xml | 3 ---
 wallet-services/pom.xml                           | 6 ++++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/wallet-packaging/src/main/assemblies/assembly.xml b/wallet-packaging/src/main/assemblies/assembly.xml
index e8ded594d..56b8e96a0 100644
--- a/wallet-packaging/src/main/assemblies/assembly.xml
+++ b/wallet-packaging/src/main/assemblies/assembly.xml
@@ -40,9 +40,6 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
       <includes>
         <include>*:*:jar</include>
       </includes>
-      <excludes>
-        <exclude>org.bouncycastle:bcprov-jdk15on:jar</exclude>
-      </excludes>
       <scope>compile</scope>
       <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
     </dependencySet>
diff --git a/wallet-services/pom.xml b/wallet-services/pom.xml
index af448e165..e22485321 100644
--- a/wallet-services/pom.xml
+++ b/wallet-services/pom.xml
@@ -73,6 +73,12 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
       <groupId>org.web3j</groupId>
       <artifactId>utils</artifactId>
       <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.bouncycastle</groupId>
+          <artifactId>bcprov-jdk15on</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.web3j</groupId>