Move AAF/CADI Poms to 2.1.2

[aaf/authz.git] / auth / auth-certman / pom.xml

diff --git a/auth/auth-certman/pom.xml b/auth/auth-certman/pom.xml
index 0d37ac8..f0dc08f 100644 (file)
--- a/auth/auth-certman/pom.xml
+++ b/auth/auth-certman/pom.xml
@@ -15,9 +15,9 @@
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
-               <groupId>org.onap.aaf.authz.auth</groupId>
-               <artifactId>parent</artifactId>
-               <version>2.1.0-SNAPSHOT</version>
+               <groupId>org.onap.aaf.authz</groupId>
+               <artifactId>authparent</artifactId>
+               <version>2.1.2-SNAPSHOT</version>
                <relativePath>../pom.xml</relativePath>
        </parent>
 
@@ -27,7 +27,7 @@
 
        <properties>
                <!-- SONAR -->
-               <sonar.skip>true</sonar.skip>
+               <!-- <sonar.skip>true</sonar.skip> -->
                <jacoco.version>0.7.7.201606060606</jacoco.version>
                <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
                <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
@@ -41,22 +41,23 @@
                <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
                <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
                <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-               <sitePath>/content/sites/site/org/onap/aaf/authz/auth/${project.artifactId}/${project.version}</sitePath>
+               <sitePath>/content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version}</sitePath>
+               <project.bouncyCastleVersion>1.59</project.bouncyCastleVersion>
        </properties>
 
        <dependencies>
                <dependency>
-                       <groupId>org.onap.aaf.authz.auth</groupId>
+                       <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-auth-core</artifactId>
                </dependency>
 
                <dependency>
-                       <groupId>org.onap.aaf.authz.auth</groupId>
+                       <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-auth-cass</artifactId>
                </dependency>
 
                <dependency>
-                       <groupId>org.onap.aaf.authz.cadi</groupId>
+                       <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-cadi-aaf</artifactId>
                </dependency>
 
@@ -64,8 +65,28 @@
                        <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>${project.bouncyCastleVersion}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.bouncycastle</groupId>
+                       <artifactId>bcpkix-jdk15on</artifactId>
+                       <version>${project.bouncyCastleVersion}</version>
                </dependency>
-
        </dependencies>
 
        <build>
@@ -109,7 +130,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>
@@ -120,7 +140,6 @@
                        <plugin>
                                <groupId>org.jacoco</groupId>
                                <artifactId>jacoco-maven-plugin</artifactId>
-                               <version>${jacoco.version}</version>
                                <configuration>
                                        <excludes>
                                                <exclude>**/gen/**</exclude>