Move AAF/CADI Poms to 2.1.2

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

diff --git a/auth/auth-fs/pom.xml b/auth/auth-fs/pom.xml
index b109e9b..0559bed 100644 (file)
--- a/auth/auth-fs/pom.xml
+++ b/auth/auth-fs/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>
 
@@ -28,6 +28,7 @@
        <properties>
                <maven.test.failure.ignore>true</maven.test.failure.ignore>
                <!-- 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>
@@ -83,12 +84,12 @@
 
        <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.cadi</groupId>
+                       <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-cadi-core</artifactId>
                </dependency>
        </dependencies>
@@ -111,7 +112,8 @@
                                                        <mainClass>org.onap.aaf.auth.fs.AAF_FS</mainClass>
                                                        <name>fs</name>
                                                        <commandLineArguments>
-                                                               <commandLineArgument>cadi_prop_files=${project.conf_dir}/org.osaaf.fs.props</commandLineArgument>
+                                                               <commandLineArgument>cadi_prop_files=${project.ext_root_dir}/etc/org.osaaf.fs.props</commandLineArgument>
+                                                               <commandLineArgument>cadi_log_dir=${project.ext_root_dir}/logs/fs</commandLineArgument>
                                                        </commandLineArguments>
                                                </program>
                                        </programs>
@@ -120,7 +122,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>
@@ -131,7 +132,6 @@
                        <plugin>
                                <groupId>org.jacoco</groupId>
                                <artifactId>jacoco-maven-plugin</artifactId>
-                               <version>${jacoco.version}</version>
                                <configuration>
                                        <excludes>
                                                <exclude>**/gen/**</exclude>