Include all modules in AAF parent

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

diff --git a/auth/auth-deforg/pom.xml b/auth/auth-deforg/pom.xml
index cf86a78..771660f 100644 (file)
--- a/auth/auth-deforg/pom.xml
+++ b/auth/auth-deforg/pom.xml
@@ -23,9 +23,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>
-               <artifactId>parent</artifactId>
+               <artifactId>authparent</artifactId>
                <relativePath>../pom.xml</relativePath>
-               <groupId>org.onap.aaf.authz.auth</groupId>
+               <groupId>org.onap.aaf.authz</groupId>
                <version>2.1.0-SNAPSHOT</version>
        </parent>
 
@@ -74,12 +74,13 @@
        <properties>
                <maven.test.failure.ignore>false</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>
            <!-- 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>
                <nexusproxy>https://nexus.onap.org</nexusproxy>
@@ -92,13 +93,15 @@
 
        <dependencies>
                <dependency>
-                       <groupId>org.onap.aaf.authz.cadi</groupId>
+                       <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-cadi-core</artifactId>
+                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
-                       <groupId>org.onap.aaf.authz.auth</groupId>
+                       <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-auth-core</artifactId>
+                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
@@ -157,7 +160,6 @@
                                                </excludes>
                                        </configuration>
                                        <executions>
-
                                                <execution>
                                                        <id>pre-unit-test</id>
                                                        <goals>
@@ -168,8 +170,6 @@
                                                                <propertyName>surefireArgLine</propertyName>
                                                        </configuration>
                                                </execution>
-
-
                                                <execution>
                                                        <id>post-unit-test</id>
                                                        <phase>test</phase>
@@ -192,7 +192,6 @@
                                                                <propertyName>failsafeArgLine</propertyName>
                                                        </configuration>
                                                </execution>
-
                                                <execution>
                                                        <id>post-integration-test</id>
                                                        <phase>post-integration-test</phase>