MOdify POM files to fix sonar

Issue-ID: AAF-129
Change-Id: I450e199f94e1428a6cdeae9a1a755d9bda2754ad
Signed-off-by: Sai Gandham <sg481n@att.com>

diff --git a/auth/pom.xml b/auth/pom.xml
index 7372028..777480e 100644 (file)
--- a/auth/pom.xml
+++ b/auth/pom.xml
@@ -23,20 +23,15 @@
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
        <modelVersion>4.0.0</modelVersion>
-       <!--<parent>
+       <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>parent</artifactId>
         <version>2.1.0-SNAPSHOT</version>
-    </parent> -->
+    </parent>
        <artifactId>authparent</artifactId>
        <name>AAF Auth Parent</name>
        <packaging>pom</packaging>
 
-       <parent>
-               <groupId>org.onap.oparent</groupId>
-               <artifactId>oparent</artifactId>
-               <version>1.1.0</version>
-       </parent>
        
        <properties>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/cadi/pom.xml b/cadi/pom.xml
index a15d813..6c2dd15 100644 (file)
--- a/cadi/pom.xml
+++ b/cadi/pom.xml
@@ -21,11 +21,11 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
        <modelVersion>4.0.0</modelVersion>
-       <!--<parent>
+       <parent>
     <groupId>org.onap.aaf.authz</groupId>
     <artifactId>parent</artifactId>
     <version>2.1.0-SNAPSHOT</version>
-    </parent>  -->
+    </parent>
        <groupId>org.onap.aaf.authz</groupId>
        <artifactId>cadiparent</artifactId>
        <name>AAF CADI Parent (Code, Access, Data, Identity)</name>
@@ -36,11 +36,6 @@
        </organization>
        <packaging>pom</packaging>
 
-       <parent>
-               <groupId>org.onap.oparent</groupId>
-               <artifactId>oparent</artifactId>
-               <version>1.1.0</version>
-       </parent>
        
        <properties>
                <!-- <sonar.skip>true</sonar.skip> -->

diff --git a/misc/env/pom.xml b/misc/env/pom.xml
index 76de25f..d1e3ad9 100644 (file)
--- a/misc/env/pom.xml
+++ b/misc/env/pom.xml
@@ -174,6 +174,12 @@
                                        <artifactId>maven-surefire-plugin</artifactId>
                                        <version>2.17</version>
                                        <configuration>
+                                               <skipTests>false</skipTests>
+                                               <includes>
+                                                       <include>**/JU*.java</include>
+                                               </includes>
+                                               <excludes>
+                                               </excludes>
                                        </configuration>
                                </plugin>
 
@@ -288,6 +294,32 @@
                        <artifactId>log4j</artifactId>
                        <scope>compile</scope> <!-- Provides scope only, in case other users prefer another Logging Implementation -->
                </dependency>
+               <dependency>
+                       <groupId>org.mockito</groupId>
+                       <artifactId>mockito-all</artifactId>
+                       <version>1.9.5</version>
+                       <scope>test</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.powermock</groupId>
+                       <artifactId>powermock-module-junit4</artifactId>
+                       <version>${powermock.version}</version>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.powermock</groupId>
+                       <artifactId>powermock-api-mockito</artifactId>
+                       <version>${powermock.version}</version>
+                       <scope>test</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>junit</groupId>
+                       <artifactId>junit</artifactId>
+                       <version>4.10</version>
+                       <scope>test</scope>
+               </dependency>
        </dependencies>
 
 

diff --git a/misc/log4j/pom.xml b/misc/log4j/pom.xml
index c945b73..bcd2d25 100644 (file)
--- a/misc/log4j/pom.xml
+++ b/misc/log4j/pom.xml
@@ -71,7 +71,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>
@@ -174,6 +174,12 @@
                                        <artifactId>maven-surefire-plugin</artifactId>
                                        <version>2.17</version>
                                        <configuration>
+                                               <skipTests>false</skipTests>
+                                               <includes>
+                                                       <include>**/JU*.java</include>
+                                               </includes>
+                                               <excludes>
+                                               </excludes>
                                        </configuration>
                                </plugin>
 

diff --git a/misc/pom.xml b/misc/pom.xml
index e6c955f..d7aa53a 100644 (file)
--- a/misc/pom.xml
+++ b/misc/pom.xml
@@ -22,11 +22,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
        <modelVersion>4.0.0</modelVersion>
-       <!--<parent>
-    <groupId>org.onap.aaf.authz</groupId>
-    <artifactId>parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
-    </parent> -->
+       <parent>
+       <groupId>org.onap.aaf.authz</groupId>
+       <artifactId>parent</artifactId>
+       <version>2.1.0-SNAPSHOT</version>
+    </parent>
        <groupId>org.onap.aaf.authz</groupId>
        <artifactId>miscparent</artifactId>
        <name>AAF Misc Parent</name>
@@ -34,13 +34,6 @@
        <packaging>pom</packaging>
 
        
-
-       <parent>
-               <groupId>org.onap.oparent</groupId>
-               <artifactId>oparent</artifactId>
-               <version>1.1.0</version>
-       </parent>
-       
        <properties>
        <!--  SONAR  -->
        <!-- <sonar.skip>true</sonar.skip> -->
@@ -127,6 +120,13 @@
                </dependency>
        </dependencies>
 
+       <modules>
+               <module>env</module>
+               <module>xgen</module>
+               <module>rosetta</module>
+               <module>log4j</module> <!--  note: generates log4j, to avoid Jar conflict -->
+       </modules>
+       
        <!-- ============================================================== -->
        <!-- Define common plugins and make them available for all modules -->
        <!-- ============================================================== -->
@@ -205,6 +205,12 @@
                                        <artifactId>maven-surefire-plugin</artifactId>
                                        <version>2.17</version>
                                        <configuration>
+                                               <skipTests>false</skipTests>
+                                               <includes>
+                                                       <include>**/JU*.java</include>
+                                               </includes>
+                                               <excludes>
+                                               </excludes>
                                        </configuration>
                                </plugin>
 
@@ -319,12 +325,7 @@
                </pluginManagement>
        </build>
 
-       <modules>
-               <module>env</module>
-               <module>xgen</module>
-               <module>rosetta</module>
-               <module>log4j</module> <!--  note: generates log4j, to avoid Jar conflict -->
-       </modules>
+       
 
        <dependencyManagement>
                <dependencies>