From 3c795555cc129fbc1b0e1c11d4588316b47ad66e Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Mon, 2 Oct 2017 11:20:39 -0700 Subject: 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 Signed-off-by: Christopher Lott (cl778h) --- ecomp-portal-BE-common/pom.xml | 68 ------------------------- ecomp-portal-BE-os/pom.xml | 72 --------------------------- ecomp-portal-FE-os/pom.xml | 8 --- ecomp-portal-widget-ms/common-widgets/pom.xml | 34 ------------- ecomp-portal-widget-ms/pom.xml | 34 ------------- ecomp-portal-widget-ms/widget-ms/pom.xml | 35 ------------- pom.xml | 24 ++------- 7 files changed, 4 insertions(+), 271 deletions(-) diff --git a/ecomp-portal-BE-common/pom.xml b/ecomp-portal-BE-common/pom.xml index 942680e5..894bb7f8 100644 --- a/ecomp-portal-BE-common/pom.xml +++ b/ecomp-portal-BE-common/pom.xml @@ -19,69 +19,6 @@ ${project.artifactId} - - org.jacoco - jacoco-maven-plugin - 0.7.6.201602180812 - True - - - - prepare-agent - - prepare-agent - - - false - ${sonar.jacoco.reportPath} - - - - default-instrument - - instrument - - - false - - - - default-restore-instrumented-classes - test - - restore-instrumented-classes - - - false - - - - post-unit-test - test - - report - - - false - ${sonar.jacoco.reportPath} - ${project.basedir}/target/site/jacoco - - - - report-integration - test - - report-integration - - - false - ${sonar.jacoco.itReportPath} - ${project.basedir}/target/site/it-jacoco - - - - - org.apache.maven.plugins @@ -596,11 +533,6 @@ mockito-core 1.8.5 - - org.jacoco - jacoco-maven-plugin - 0.7.6.201602180812 - commons-beanutils diff --git a/ecomp-portal-BE-os/pom.xml b/ecomp-portal-BE-os/pom.xml index 7807091c..901f6841 100644 --- a/ecomp-portal-BE-os/pom.xml +++ b/ecomp-portal-BE-os/pom.xml @@ -22,11 +22,6 @@ ${project.artifactId} - - org.codehaus.mojo - sonar-maven-plugin - 3.2 - org.apache.maven.plugins maven-site-plugin @@ -39,73 +34,6 @@ - - org.jacoco - jacoco-maven-plugin - 0.7.6.201602180812 - True - - - - prepare-agent - - prepare-agent - - - false - ${sonar.jacoco.reportPath} - - - - default-instrument - - instrument - - - false - - - - default-restore-instrumented-classes - test - - restore-instrumented-classes - - - false - - - - post-unit-test - test - - - report - - - false - ${sonar.jacoco.reportPath} - ${project.basedir}/target/site/jacoco - - - - - - - report-integration - test - - report-integration - - - false - ${sonar.jacoco.itReportPath} - ${project.basedir}/target/site/it-jacoco - - - - org.apache.maven.plugins maven-surefire-plugin diff --git a/ecomp-portal-FE-os/pom.xml b/ecomp-portal-FE-os/pom.xml index f0dffd75..4b596580 100644 --- a/ecomp-portal-FE-os/pom.xml +++ b/ecomp-portal-FE-os/pom.xml @@ -41,14 +41,6 @@ - - org.jacoco - jacoco-maven-plugin - 0.7.6.201602180812 - - true - - org.apache.maven.plugins maven-resources-plugin diff --git a/ecomp-portal-widget-ms/common-widgets/pom.xml b/ecomp-portal-widget-ms/common-widgets/pom.xml index c5cd3cd7..232f9331 100644 --- a/ecomp-portal-widget-ms/common-widgets/pom.xml +++ b/ecomp-portal-widget-ms/common-widgets/pom.xml @@ -76,40 +76,6 @@ true - - - org.jacoco - jacoco-maven-plugin - 0.7.6.201602180812 - - true - - True - - - - prepare-agent - - prepare-agent - - test - - ${sonar.jacoco.reportPath} - - - - report - - report - - test - - ${sonar.jacoco.reportPath} - ${project.basedir}/target/site/jacoco - - - - diff --git a/ecomp-portal-widget-ms/pom.xml b/ecomp-portal-widget-ms/pom.xml index 03e89429..a16fc64e 100644 --- a/ecomp-portal-widget-ms/pom.xml +++ b/ecomp-portal-widget-ms/pom.xml @@ -29,40 +29,6 @@ true - - - org.jacoco - jacoco-maven-plugin - 0.7.6.201602180812 - - true - - True - - - - prepare-agent - - prepare-agent - - test - - ${sonar.jacoco.reportPath} - - - - report - - report - - test - - ${sonar.jacoco.reportPath} - ${project.basedir}/target/site/jacoco - - - - diff --git a/ecomp-portal-widget-ms/widget-ms/pom.xml b/ecomp-portal-widget-ms/widget-ms/pom.xml index 58baed49..da6eb99d 100644 --- a/ecomp-portal-widget-ms/widget-ms/pom.xml +++ b/ecomp-portal-widget-ms/widget-ms/pom.xml @@ -164,41 +164,6 @@ true - - - org.jacoco - jacoco-maven-plugin - 0.7.6.201602180812 - - true - - True - - - - prepare-agent - - prepare-agent - - test - - ${sonar.jacoco.reportPath} - - - - report - - report - - test - - ${sonar.jacoco.reportPath} - ${project.basedir}/target/site/jacoco - - - - - diff --git a/pom.xml b/pom.xml index 3f46cef1..74567657 100644 --- 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"> 4.0.0 - + org.onap.portal onap-portal-parent @@ -34,19 +34,8 @@ 1.0.0 UTF-8 UTF-8 - java - jacoco - true - ${project.build.directory}/surefire-reports - ${project.basedir}/target/jacoco.exec - ${project.basedir}/target/it-jacoco.exec - true - ${project.version} - true - ${project.basedir} - **/scripts/**/*,**.js - **/test/**/*,**/tests/**/* - + **/scripts/**/*,**.js + **/test/**/*,**/tests/**/*