Update to 2.1.11-SNAPSHOT

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

diff --git a/auth/auth-gui/pom.xml b/auth/auth-gui/pom.xml
index bfb65e9..40a9924 100644 (file)
--- a/auth/auth-gui/pom.xml
+++ b/auth/auth-gui/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.11-SNAPSHOT</version>
                <relativePath>../pom.xml</relativePath>
        </parent>
 
@@ -28,7 +28,7 @@
        <properties>
                <maven.test.failure.ignore>true</maven.test.failure.ignore>
                <!-- 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>
@@ -48,17 +48,17 @@
 
        <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-client</artifactId>
                </dependency>
 
                <dependency>
-                       <groupId>org.onap.aaf.authz.auth</groupId>
+                       <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-auth-cmd</artifactId>
                </dependency>
 
@@ -66,22 +66,22 @@
                        you have something else Match with Property Entry: Organization.<root ns>, 
                        i.e. Organization.onap.org=org.onap.org.DefaultOrg -->
                <dependency>
-                       <groupId>org.onap.aaf.authz.auth</groupId>
+                       <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-auth-deforg</artifactId>
                </dependency>
 
                <dependency>
-                       <groupId>org.onap.aaf.authz.cadi</groupId>
+                       <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-cadi-aaf</artifactId>
                </dependency>
 
                <dependency>
-                       <groupId>org.onap.aaf.authz.cadi</groupId>
+                       <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-cadi-client</artifactId>
                </dependency>
 
                <dependency>
-                       <groupId>org.onap.aaf.authz.misc</groupId>
+                       <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-misc-xgen</artifactId>
                </dependency>
 
@@ -117,7 +117,9 @@
                                                        <mainClass>org.onap.aaf.auth.gui.AAF_GUI</mainClass>
                                                        <name>gui</name>
                                                        <commandLineArguments>
-                                                               <commandLineArgument>cadi_prop_files=${project.conf_dir}/org.osaaf.gui.props</commandLineArgument>
+                                                               <commandLineArgument>cadi_prop_files=${project.ext_root_dir}/etc/org.osaaf.aaf.gui.props</commandLineArgument>
+                                                               <commandLineArgument>cadi_log_dir=${project.ext_root_dir}/logs/gui</commandLineArgument>
+                                                               <commandLineArgument>cadi_etc_dir=${project.ext_root_dir}/etc</commandLineArgument>
                                                        </commandLineArguments>
                                                        <jvmSettings>
                                                                <extraArguments>
@@ -135,7 +137,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>
@@ -146,7 +147,6 @@
                        <plugin>
                                <groupId>org.jacoco</groupId>
                                <artifactId>jacoco-maven-plugin</artifactId>
-                               <version>${jacoco.version}</version>
                                <configuration>
                                        <excludes>
                                                <exclude>**/gen/**</exclude>