Update Bouncey Castle Version

Issue-ID: AAF-228
Change-Id: Ica02b8640b692c3bd192e6728ea0cb7645f469ca
Signed-off-by: Instrumental <jcgmisc@stl.gathman.org>

diff --git a/auth/auth-certman/pom.xml b/auth/auth-certman/pom.xml
index 2345a27..8fe3e60 100644 (file)
--- a/auth/auth-certman/pom.xml
+++ b/auth/auth-certman/pom.xml
@@ -48,25 +48,43 @@
                <dependency>
                        <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-auth-core</artifactId>
-                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
                        <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-auth-cass</artifactId>
-                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
                        <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-cadi-aaf</artifactId>
-                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
                        <groupId>com.google.code.jscep</groupId>
                        <artifactId>jscep</artifactId>
                        <version>2.4.0</version>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>org.bouncycastle</groupId>
+                                       <artifactId>bcprov-jdk15on</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.bouncycastle</groupId>
+                                       <artifactId>bcpkix-jdk15on</artifactId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
+               <!-- JSCEP does not use latest "Bouncy Castle" -->
+               <dependency>
+                 <groupId>org.bouncycastle</groupId>
+                 <artifactId>bcprov-jdk15on</artifactId>
+                 <version>1.59</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.bouncycastle</groupId>
+                       <artifactId>bcpkix-jdk15on</artifactId>
+                       <version>1.59</version>
                </dependency>
        </dependencies>
 
@@ -111,7 +129,6 @@
                        <plugin>
                                <groupId>org.sonatype.plugins</groupId>
                                <artifactId>nexus-staging-maven-plugin</artifactId>
-                               <version>1.6.7</version>
                                <extensions>true</extensions>
                                <configuration>
                                        <nexusUrl>${nexusproxy}</nexusUrl>
@@ -122,7 +139,6 @@
                        <plugin>
                                <groupId>org.jacoco</groupId>
                                <artifactId>jacoco-maven-plugin</artifactId>
-                               <version>${jacoco.version}</version>
                                <configuration>
                                        <excludes>
                                                <exclude>**/gen/**</exclude>

diff --git a/cadi/shiro/pom.xml b/cadi/shiro/pom.xml
index b5838c5..af0bfd5 100644 (file)
--- a/cadi/shiro/pom.xml
+++ b/cadi/shiro/pom.xml
@@ -97,13 +97,13 @@
                        <artifactId>shiro-core</artifactId>
                        <version>1.4.0</version>
                </dependency>
+               
        </dependencies>
        <build>
                <plugins>
                        <plugin>
                                <groupId>org.sonatype.plugins</groupId>
                                <artifactId>nexus-staging-maven-plugin</artifactId>
-                               <version>1.6.7</version>
                                <extensions>true</extensions>
                                <configuration>
                                        <nexusUrl>${nexusproxy}</nexusUrl>
@@ -114,7 +114,6 @@
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-deploy-plugin</artifactId>
-                               <version>2.8.1</version>
                                <configuration>
                                        <skip>false</skip>
                                </configuration>
@@ -122,7 +121,6 @@
                        <plugin>
                                <groupId>org.jacoco</groupId>
                                <artifactId>jacoco-maven-plugin</artifactId>
-                               <version>${jacoco.version}</version>
                                <configuration>
                                        <excludes>
                                                <exclude>**/gen/**</exclude>