Skip to content

Commit

Permalink
feat: Exclude bcprov-jdk15on from wallet packaging - EXO-59676 - Meed…
Browse files Browse the repository at this point in the history
…s-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
  • Loading branch information
rdenarie committed Aug 17, 2023
1 parent ab6ff15 commit 03e6baa
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
3 changes: 0 additions & 3 deletions wallet-packaging/src/main/assemblies/assembly.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 6 additions & 0 deletions wallet-services/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 03e6baa

Please sign in to comment.