Skip to content

Commit

Permalink
XCOMMONS-2521: Upgrade to Bouncy Castle 1.71.1
Browse files Browse the repository at this point in the history 
* improve vfs-api dependency setup
  • Loading branch information
@tmortagne
tmortagne committed Oct 14, 2022
1 parent 101ad78 commit adaa118
Showing 1 changed file with 49 additions and 32 deletions.
81 changes: 49 additions & 32 deletions xwiki-platform-core/xwiki-platform-vfs/xwiki-platform-vfs-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,6 @@
<groupId>org.xwiki.platform</groupId>
<artifactId>xwiki-platform-oldcore</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.xwiki.commons</groupId>
Expand All @@ -75,10 +69,15 @@
<artifactId>truevfs-access</artifactId>
<version>${truevfs.version}</version>
<exclusions>
<!-- Wrong ids -->
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>annotations</artifactId>
</exclusion>
<exclusion>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand All @@ -87,40 +86,41 @@
<scope>runtime</scope>
<version>${truevfs.version}</version>
<exclusions>
<!-- Wrong ids -->
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>annotations</artifactId>
</exclusion>
<!-- Wrong id -->
<exclusion>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Add back a dependency required by truevfs-driver-jar but with the right id -->
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
</dependency>
<dependency>
<groupId>net.java.truevfs</groupId>
<artifactId>truevfs-driver-zip</artifactId>
<scope>runtime</scope>
<version>${truevfs.version}</version>
<exclusions>
<!-- Wrong ids -->
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>annotations</artifactId>
</exclusion>
<exclusion>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>net.java.truevfs</groupId>
<artifactId>truevfs-kernel-impl</artifactId>
<groupId>net.java.truecommons</groupId>
<artifactId>truecommons-key-default</artifactId>
<scope>runtime</scope>
<version>${truevfs.version}</version>
<version>${truecommons.version}</version>
<exclusions>
<!-- Wrong ids -->
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>annotations</artifactId>
Expand All @@ -129,44 +129,46 @@
</dependency>
<dependency>
<groupId>net.java.truevfs</groupId>
<artifactId>truevfs-kernel-spec</artifactId>
<artifactId>truevfs-driver-http</artifactId>
<scope>runtime</scope>
<version>${truevfs.version}</version>
<exclusions>
<!-- Wrong ids -->
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>net.java.truecommons</groupId>
<artifactId>truecommons-key-default</artifactId>
<groupId>net.java.truevfs</groupId>
<artifactId>truevfs-driver-odf</artifactId>
<scope>runtime</scope>
<version>${truecommons.version}</version>
<version>${truevfs.version}</version>
<exclusions>
<!-- Wrong ids -->
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>annotations</artifactId>
</exclusion>
<exclusion>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>net.java.truevfs</groupId>
<artifactId>truevfs-driver-http</artifactId>
<scope>runtime</scope>
<version>${truevfs.version}</version>
</dependency>
<dependency>
<groupId>net.java.truevfs</groupId>
<artifactId>truevfs-driver-odf</artifactId>
<scope>runtime</scope>
<version>${truevfs.version}</version>
</dependency>
<dependency>
<groupId>net.java.truevfs</groupId>
<artifactId>truevfs-driver-tar</artifactId>
<scope>runtime</scope>
<version>${truevfs.version}</version>
<exclusions>
<!-- Wrong ids -->
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>net.java.truevfs</groupId>
Expand All @@ -191,18 +193,33 @@
<artifactId>truevfs-driver-zip-raes</artifactId>
<scope>runtime</scope>
<version>${truevfs.version}</version>
<exclusions>
<!-- Wrong ids -->
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>annotations</artifactId>
</exclusion>
<exclusion>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>net.java.truecommons</groupId>
<artifactId>truecommons-key-macosx</artifactId>
<scope>runtime</scope>
<version>${truecommons.version}</version>
</dependency>
<!-- Pull the right artifact for findbugs annotations -->
<!-- Pull the right artifacts for excluded transitive dependencies -->
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
</dependency>

<!-- Test Dependencies -->
<dependency>
Expand Down

0 comments on commit adaa118

Please sign in to comment.