Merge pull request #191 from sutra/master

Fix dependency version conflict of Bouncy Castle.
This commit is contained in:
jinyu
2020-01-18 14:20:16 +08:00
committed by GitHub
3 changed files with 5 additions and 6 deletions
+5
View File
@@ -260,6 +260,11 @@
</profiles> </profiles>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk16</artifactId>
<version>1.46</version>
</dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
-1
View File
@@ -74,7 +74,6 @@
<dependency> <dependency>
<groupId>org.bouncycastle</groupId> <groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk16</artifactId> <artifactId>bcprov-jdk16</artifactId>
<version>1.46</version>
</dependency> </dependency>
<!-- 兼容 JDK 9+ 后的maven环境编译 --> <!-- 兼容 JDK 9+ 后的maven环境编译 -->
<dependency> <dependency>
-5
View File
@@ -35,11 +35,6 @@
<artifactId>commons-codec</artifactId> <artifactId>commons-codec</artifactId>
<version>1.10</version> <version>1.10</version>
</dependency> </dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>1.55</version>
</dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>