Make Container Config Strategy

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

diff --git a/auth/auth-certman/pom.xml b/auth/auth-certman/pom.xml
index 5f6f452..26c3c67 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,12 +27,13 @@
 
        <properties>
                <!-- SONAR -->
+               <!-- <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>
                <!-- Default Sonar configuration -->
-               <sonar.jacoco.reportPath>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath>
-               <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
+               <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
+               <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
                <!-- Note: This list should match jacoco-maven-plugin's exclusion list 
                        below -->
                <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
@@ -41,21 +42,22 @@
                <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
                <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
                <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>
 
@@ -63,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>
@@ -98,7 +120,8 @@
                                                        <mainClass>org.onap.aaf.auth.cm.AAF_CM</mainClass>
                                                        <name>cm</name>
                                                        <commandLineArguments>
-                                                               <commandLineArgument>cadi_prop_files=${project.conf_dir}/org.osaaf.cm.props</commandLineArgument>
+                                                               <commandLineArgument>cadi_prop_files=${project.ext_root_dir}/etc/org.osaaf.aaf.cm.props</commandLineArgument>
+                                                               <commandLineArgument>cadi_log_dir=${project.ext_root_dir}/logs/cm</commandLineArgument>
                                                        </commandLineArguments>
                                                </program>
                                        </programs>
@@ -107,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>
@@ -118,7 +140,6 @@
                        <plugin>
                                <groupId>org.jacoco</groupId>
                                <artifactId>jacoco-maven-plugin</artifactId>
-                               <version>${jacoco.version}</version>
                                <configuration>
                                        <excludes>
                                                <exclude>**/gen/**</exclude>