Enable sonar code coverage with oparent

Remove commented-out property sonar.java.binaries.

Change-Id: I14f0597e472b387d48abc2cb1e55777a2fa55708
Issue-ID: PORTAL-50
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>

diff --git a/ecomp-portal-BE-common/pom.xml b/ecomp-portal-BE-common/pom.xml
index 942680e..894bb7f 100644 (file)
--- a/ecomp-portal-BE-common/pom.xml
+++ b/ecomp-portal-BE-common/pom.xml
@@ -19,69 +19,6 @@
                <finalName>${project.artifactId}</finalName>
 
                <plugins>
-                       <plugin>
-                               <groupId>org.jacoco</groupId>
-                               <artifactId>jacoco-maven-plugin</artifactId>
-                               <version>0.7.6.201602180812</version>
-                               <inherited>True</inherited>
-                               <executions>
-                                       <!-- Unit-Tests -->
-                                       <execution>
-                                               <id>prepare-agent</id>
-                                               <goals>
-                                                       <goal>prepare-agent</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <skipTests>false</skipTests>
-                                                       <destFile>${sonar.jacoco.reportPath}</destFile>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>default-instrument</id>
-                                               <goals>
-                                                       <goal>instrument</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <skipTests>false</skipTests>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>default-restore-instrumented-classes</id>
-                                               <phase>test</phase>
-                                               <goals>
-                                                       <goal>restore-instrumented-classes</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <skipTests>false</skipTests>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>post-unit-test</id>
-                                               <phase>test</phase>
-                                               <goals>
-                                                       <goal>report</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <skipTests>false</skipTests>
-                                                       <dataFile>${sonar.jacoco.reportPath}</dataFile>
-                                                       <outputDirectory>${project.basedir}/target/site/jacoco</outputDirectory>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>report-integration</id>
-                                               <phase>test</phase>
-                                               <goals>
-                                                       <goal>report-integration</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <skipTests>false</skipTests>
-                                                       <dataFile>${sonar.jacoco.itReportPath}</dataFile>
-                                                       <outputDirectory>${project.basedir}/target/site/it-jacoco</outputDirectory>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-
                        <!-- Generate javadoc jar; see profile for Java 8 -->
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
@@ -596,11 +533,6 @@
                        <artifactId>mockito-core</artifactId>
                        <version>1.8.5</version>
                </dependency>
-               <dependency>
-                       <groupId>org.jacoco</groupId>
-                       <artifactId>jacoco-maven-plugin</artifactId>
-                       <version>0.7.6.201602180812</version>
-               </dependency>
 
                <dependency>
                        <groupId>commons-beanutils</groupId>

diff --git a/ecomp-portal-BE-os/pom.xml b/ecomp-portal-BE-os/pom.xml
index 7807091..901f684 100644 (file)
--- a/ecomp-portal-BE-os/pom.xml
+++ b/ecomp-portal-BE-os/pom.xml
@@ -22,11 +22,6 @@
                <finalName>${project.artifactId}</finalName>
 
                <plugins>
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>sonar-maven-plugin</artifactId>
-                               <version>3.2</version>
-                       </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-site-plugin</artifactId>
@@ -39,73 +34,6 @@
                                        </dependency>
                                </dependencies>
                        </plugin>
-                       <plugin>
-                               <groupId>org.jacoco</groupId>
-                               <artifactId>jacoco-maven-plugin</artifactId>
-                               <version>0.7.6.201602180812</version>
-                               <inherited>True</inherited>
-                               <executions>
-                                       <!-- Unit-Tests -->
-                                       <execution>
-                                               <id>prepare-agent</id>
-                                               <goals>
-                                                       <goal>prepare-agent</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <skipTests>false</skipTests>
-                                                       <destFile>${sonar.jacoco.reportPath}</destFile>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>default-instrument</id>
-                                               <goals>
-                                                       <goal>instrument</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <skipTests>false</skipTests>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>default-restore-instrumented-classes</id>
-                                               <phase>test</phase>
-                                               <goals>
-                                                       <goal>restore-instrumented-classes</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <skipTests>false</skipTests>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>post-unit-test</id>
-                                               <phase>test</phase>
-
-                                               <goals>
-                                                       <goal>report</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <skipTests>false</skipTests>
-                                                       <dataFile>${sonar.jacoco.reportPath}</dataFile>
-                                                       <outputDirectory>${project.basedir}/target/site/jacoco</outputDirectory>
-                                               </configuration>
-                                       </execution>
-                                       <!-- Will see build errors while running the test cases because of dual 
-                                               instrumentation -->
-
-                                       <!-- Integration Tests (Only report goal) -->
-                                       <execution>
-                                               <id>report-integration</id>
-                                               <phase>test</phase>
-                                               <goals>
-                                                       <goal>report-integration</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <skipTests>false</skipTests>
-                                                       <dataFile>${sonar.jacoco.itReportPath}</dataFile>
-                                                       <outputDirectory>${project.basedir}/target/site/it-jacoco</outputDirectory>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-surefire-plugin</artifactId>

diff --git a/ecomp-portal-FE-os/pom.xml b/ecomp-portal-FE-os/pom.xml
index f0dffd7..4b59658 100644 (file)
--- a/ecomp-portal-FE-os/pom.xml
+++ b/ecomp-portal-FE-os/pom.xml
@@ -41,14 +41,6 @@
                                        </filesets>
                                </configuration>
                        </plugin>
-                       <plugin>
-                               <groupId>org.jacoco</groupId>
-                               <artifactId>jacoco-maven-plugin</artifactId>
-                               <version>0.7.6.201602180812</version>
-                               <configuration>
-                                       <skip>true</skip>
-                               </configuration>
-                       </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-resources-plugin</artifactId>

diff --git a/ecomp-portal-widget-ms/common-widgets/pom.xml b/ecomp-portal-widget-ms/common-widgets/pom.xml
index c5cd3cd..232f933 100644 (file)
--- a/ecomp-portal-widget-ms/common-widgets/pom.xml
+++ b/ecomp-portal-widget-ms/common-widgets/pom.xml
@@ -76,40 +76,6 @@
                                         <skip>true</skip>
                                 </configuration>
                         </plugin>
-
-                                               <plugin>
-                                                       <groupId>org.jacoco</groupId>
-                                                       <artifactId>jacoco-maven-plugin</artifactId>
-                                                       <version>0.7.6.201602180812</version>
-                                                       <configuration>
-                                                               <skip>true</skip>
-                                                       </configuration>
-                                                       <inherited>True</inherited>
-                                                       <executions>
-                                                               <!-- Unit-Tests -->
-                                                               <execution>
-                                                                       <id>prepare-agent</id>
-                                                                       <goals>
-                                                                               <goal>prepare-agent</goal>
-                                                                       </goals>
-                                                                       <phase>test</phase>
-                                                                       <configuration>
-                                                                               <destFile>${sonar.jacoco.reportPath}</destFile>
-                                                                       </configuration>
-                                                               </execution>
-                                                               <execution>
-                                                                       <id>report</id>
-                                                                       <goals>
-                                                                               <goal>report</goal>
-                                                                       </goals>
-                                                                       <phase>test</phase>
-                                                                       <configuration>
-                                                                               <dataFile>${sonar.jacoco.reportPath}</dataFile>
-                                                                               <outputDirectory>${project.basedir}/target/site/jacoco</outputDirectory>
-                                                                       </configuration>
-                                                               </execution>
-                                                       </executions>
-                                               </plugin>
                </plugins>
        </build>
 

diff --git a/ecomp-portal-widget-ms/pom.xml b/ecomp-portal-widget-ms/pom.xml
index 03e8942..a16fc64 100644 (file)
--- a/ecomp-portal-widget-ms/pom.xml
+++ b/ecomp-portal-widget-ms/pom.xml
@@ -29,40 +29,6 @@
                                        <skip>true</skip>
                                </configuration>
                        </plugin>
-
-                       <plugin>
-                               <groupId>org.jacoco</groupId>
-                               <artifactId>jacoco-maven-plugin</artifactId>
-                               <version>0.7.6.201602180812</version>
-                               <configuration>
-                                       <skip>true</skip>
-                               </configuration>
-                               <inherited>True</inherited>
-                               <executions>
-                                       <!-- Unit-Tests -->
-                                       <execution>
-                                               <id>prepare-agent</id>
-                                               <goals>
-                                                       <goal>prepare-agent</goal>
-                                               </goals>
-                                               <phase>test</phase>
-                                               <configuration>
-                                                       <destFile>${sonar.jacoco.reportPath}</destFile>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>report</id>
-                                               <goals>
-                                                       <goal>report</goal>
-                                               </goals>
-                                               <phase>test</phase>
-                                               <configuration>
-                                                       <dataFile>${sonar.jacoco.reportPath}</dataFile>
-                                                       <outputDirectory>${project.basedir}/target/site/jacoco</outputDirectory>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
                </plugins>
        </build>
 

diff --git a/ecomp-portal-widget-ms/widget-ms/pom.xml b/ecomp-portal-widget-ms/widget-ms/pom.xml
index 58baed4..da6eb99 100644 (file)
--- a/ecomp-portal-widget-ms/widget-ms/pom.xml
+++ b/ecomp-portal-widget-ms/widget-ms/pom.xml
@@ -164,41 +164,6 @@
                                        <skip>true</skip>
                                </configuration>
                        </plugin>
-                       
-                       <plugin>
-                               <groupId>org.jacoco</groupId>
-                               <artifactId>jacoco-maven-plugin</artifactId>
-                               <version>0.7.6.201602180812</version>
-                               <configuration>
-                                       <skip>true</skip>
-                               </configuration>
-                               <inherited>True</inherited>
-                               <executions>
-                                       <!-- Unit-Tests -->
-                                       <execution>
-                                               <id>prepare-agent</id>
-                                               <goals>
-                                                       <goal>prepare-agent</goal>
-                                               </goals>
-                                               <phase>test</phase>
-                                               <configuration>
-                                                       <destFile>${sonar.jacoco.reportPath}</destFile>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>report</id>
-                                               <goals>
-                                                       <goal>report</goal>
-                                               </goals>
-                                               <phase>test</phase>
-                                               <configuration>
-                                                       <dataFile>${sonar.jacoco.reportPath}</dataFile>
-                                                       <outputDirectory>${project.basedir}/target/site/jacoco</outputDirectory>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-
                </plugins>
 
        </build>

diff --git a/pom.xml b/pom.xml
index 3f46cef..7456765 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -3,12 +3,12 @@
        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.oparent</groupId>
                <artifactId>oparent</artifactId>
                <version>0.1.1</version>
                <relativePath />
-       </parent>-->
+       </parent>
 
        <groupId>org.onap.portal</groupId>
        <artifactId>onap-portal-parent</artifactId>
@@ -34,19 +34,8 @@
                <eelf.version>1.0.0</eelf.version>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                <encoding>UTF-8</encoding>
-               <sonar.language>java</sonar.language>
-               <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
-               <sonar.skipDesign>true</sonar.skipDesign>
-               <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
-               <sonar.jacoco.reportPath>${project.basedir}/target/jacoco.exec</sonar.jacoco.reportPath>
-               <sonar.jacoco.itReportPath>${project.basedir}/target/it-jacoco.exec</sonar.jacoco.itReportPath>
-               <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
-               <sonar.projectVersion>${project.version}</sonar.projectVersion>
-               <sonar.skipDesign>true</sonar.skipDesign>
-               <sonar.projectBaseDir>${project.basedir}</sonar.projectBaseDir>
-               <sonar.exclusions>**/scripts/**/*,**.js</sonar.exclusions>
-               <sonar.test.exclusions>**/test/**/*,**/tests/**/*</sonar.test.exclusions>
-               <!--<sonar.java.binaries>.</sonar.java.binaries>-->
+                <sonar.exclusions>**/scripts/**/*,**.js</sonar.exclusions>
+                <sonar.test.exclusions>**/test/**/*,**/tests/**/*</sonar.test.exclusions>
        </properties>
 
        <!-- Specify the repositories here to avoid coordination of ~/.m2/settings.xml 
@@ -150,11 +139,6 @@
                                                <target>1.8</target>
                                        </configuration>
                                </plugin>
-                               <plugin>
-                                       <groupId>org.sonarsource.scanner.maven</groupId>
-                                       <artifactId>sonar-maven-plugin</artifactId>
-                                       <version>3.0.2</version>
-                               </plugin>
                        </plugins>
                </pluginManagement>
                <plugins>