From 2e2332825447056f1c107213f2202ba537433a25 Mon Sep 17 00:00:00 2001 From: "gabe.maurer" Date: Tue, 3 Apr 2018 11:18:38 -0500 Subject: Fix for Sonar tests in POMs Change-Id: Iedeb639779b665189b4f297bca35da07a8579d00 Issue-ID: AAF-111 Signed-off-by: gabe.maurer --- auth/auth-batch/pom.xml | 111 ++++++++++++++++++++++------------------ auth/auth-cass/pom.xml | 128 ++++++++++++++++++++++++---------------------- auth/auth-certman/pom.xml | 118 +++++++++++++++++++++--------------------- auth/auth-cmd/pom.xml | 126 +++++++++++++++++++++++---------------------- auth/auth-fs/pom.xml | 116 +++++++++++++++++++++-------------------- auth/auth-gui/pom.xml | 116 +++++++++++++++++++++-------------------- auth/auth-hello/pom.xml | 84 +++++++++++++++++------------- auth/auth-locate/pom.xml | 114 +++++++++++++++++++++-------------------- auth/auth-oauth/pom.xml | 114 +++++++++++++++++++++-------------------- auth/auth-service/pom.xml | 124 ++++++++++++++++++++++---------------------- 10 files changed, 602 insertions(+), 549 deletions(-) diff --git a/auth/auth-batch/pom.xml b/auth/auth-batch/pom.xml index 842bb0cc..98cf0f33 100644 --- a/auth/auth-batch/pom.xml +++ b/auth/auth-batch/pom.xml @@ -155,56 +155,67 @@ - org.jacoco - jacoco-maven-plugin - 0.7.7.201606060606 - - true - - org.onap.aaf.* - - - - - pre-unit-test - - prepare-agent - - - ${project.build.directory}/coverage-reports/jacoco.exec - - - - - pre-integration-test - pre-integration-test - - prepare-agent - - - ${project.build.directory}/coverage-reports/jacoco-it.exec - - - - - - merge - - post-integration-test - - - - ${project.build.directory}/coverage-reports - - *.exec - - - - ${project.build.directory}/jacoco-dev.exec - - - - + org.jacoco + jacoco-maven-plugin + ${jacoco.version} + + + **/gen/** + **/generated-sources/** + **/yang-gen/** + **/pax/** + + + + + + pre-unit-test + + prepare-agent + + + ${project.build.directory}/code-coverage/jacoco-ut.exec + surefireArgLine + + + + + + post-unit-test + test + + report + + + ${project.build.directory}/code-coverage/jacoco-ut.exec + ${project.reporting.outputDirectory}/jacoco-ut + + + + pre-integration-test + pre-integration-test + + prepare-agent + + + ${project.build.directory}/code-coverage/jacoco-it.exec + failsafeArgLine + + + + + post-integration-test + post-integration-test + + report + + + ${project.build.directory}/code-coverage/jacoco-it.exec + ${project.reporting.outputDirectory}/jacoco-it + + + + diff --git a/auth/auth-cass/pom.xml b/auth/auth-cass/pom.xml index 4bec7267..bea878c9 100644 --- a/auth/auth-cass/pom.xml +++ b/auth/auth-cass/pom.xml @@ -1,24 +1,16 @@ - + 4.0.0 @@ -33,7 +25,7 @@ AAF Auth Cass Cassandra Data Libraries for AAF Auth jar - + Jonathan Gathman @@ -71,25 +63,26 @@ - - + + 0.7.7.201606060606 - 3.2 - jacoco - - target/code-coverage/jacoco-ut.exec - target/code-coverage/jacoco-it.exec - - **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** + 3.2 + jacoco + + target/code-coverage/jacoco-ut.exec + target/code-coverage/jacoco-it.exec + + **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** https://nexus.onap.org /content/repositories/snapshots/ /content/repositories/releases/ /content/repositories/staging/ /content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version} - + org.onap.aaf.authz.auth @@ -134,15 +127,15 @@ - - + + org.apache.maven.plugins maven-deploy-plugin false - + org.sonatype.plugins nexus-staging-maven-plugin 1.6.7 @@ -152,26 +145,42 @@ 176c31dfe190a ecomp-staging - + org.jacoco jacoco-maven-plugin - 0.7.7.201606060606 + ${jacoco.version} - true - - org.onap.aaf.* - + + **/gen/** + **/generated-sources/** + **/yang-gen/** + **/pax/** + + pre-unit-test prepare-agent - ${project.build.directory}/coverage-reports/jacoco.exec - + ${project.build.directory}/code-coverage/jacoco-ut.exec + surefireArgLine + + + + + + post-unit-test + test + + report + + + ${project.build.directory}/code-coverage/jacoco-ut.exec + ${project.reporting.outputDirectory}/jacoco-ut @@ -181,32 +190,27 @@ prepare-agent - ${project.build.directory}/coverage-reports/jacoco-it.exec - + ${project.build.directory}/code-coverage/jacoco-it.exec + failsafeArgLine + - - merge - - post-integration-test - - - - ${project.build.directory}/coverage-reports - - *.exec - - - - ${project.build.directory}/jacoco-dev.exec - - + post-integration-test + post-integration-test + + report + + + ${project.build.directory}/code-coverage/jacoco-it.exec + ${project.reporting.outputDirectory}/jacoco-it + + - + - + ecomp-releases diff --git a/auth/auth-certman/pom.xml b/auth/auth-certman/pom.xml index 64fee0c3..5f6f4526 100644 --- a/auth/auth-certman/pom.xml +++ b/auth/auth-certman/pom.xml @@ -1,24 +1,16 @@ - + 4.0.0 @@ -34,15 +26,16 @@ Certificate Manager API - - 0.7.7.201606060606 - 3.2 - jacoco - - target/code-coverage/jacoco-ut.exec - target/code-coverage/jacoco-it.exec - - **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** + + 0.7.7.201606060606 + 3.2 + jacoco + + target/code-coverage/jacoco-ut.exec + target/code-coverage/jacoco-it.exec + + **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** https://nexus.onap.org /content/repositories/snapshots/ /content/repositories/releases/ @@ -105,8 +98,8 @@ org.onap.aaf.auth.cm.AAF_CM cm - cadi_prop_files=${project.conf_dir}/org.osaaf.cm.props - + cadi_prop_files=${project.conf_dir}/org.osaaf.cm.props + @@ -121,26 +114,42 @@ 176c31dfe190a ecomp-staging - + org.jacoco jacoco-maven-plugin - 0.7.7.201606060606 + ${jacoco.version} - true - - org.onap.aaf.* - + + **/gen/** + **/generated-sources/** + **/yang-gen/** + **/pax/** + + pre-unit-test prepare-agent - ${project.build.directory}/coverage-reports/jacoco.exec - + ${project.build.directory}/code-coverage/jacoco-ut.exec + surefireArgLine + + + + + + post-unit-test + test + + report + + + ${project.build.directory}/code-coverage/jacoco-ut.exec + ${project.reporting.outputDirectory}/jacoco-ut @@ -150,27 +159,22 @@ prepare-agent - ${project.build.directory}/coverage-reports/jacoco-it.exec - + ${project.build.directory}/code-coverage/jacoco-it.exec + failsafeArgLine + - - merge - - post-integration-test - - - - ${project.build.directory}/coverage-reports - - *.exec - - - - ${project.build.directory}/jacoco-dev.exec - - + post-integration-test + post-integration-test + + report + + + ${project.build.directory}/code-coverage/jacoco-it.exec + ${project.reporting.outputDirectory}/jacoco-it + + diff --git a/auth/auth-cmd/pom.xml b/auth/auth-cmd/pom.xml index 6c2b61e9..4f835510 100644 --- a/auth/auth-cmd/pom.xml +++ b/auth/auth-cmd/pom.xml @@ -1,24 +1,16 @@ - + @@ -37,15 +29,16 @@ false - - 0.7.7.201606060606 - 3.2 - jacoco - - target/code-coverage/jacoco-ut.exec - target/code-coverage/jacoco-it.exec - - **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** + + 0.7.7.201606060606 + 3.2 + jacoco + + target/code-coverage/jacoco-ut.exec + target/code-coverage/jacoco-it.exec + + **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** https://nexus.onap.org /content/repositories/snapshots/ /content/repositories/releases/ @@ -90,15 +83,15 @@ - - + + org.apache.maven.plugins maven-deploy-plugin false - + org.sonatype.plugins nexus-staging-maven-plugin 1.6.7 @@ -108,26 +101,42 @@ 176c31dfe190a ecomp-staging - + org.jacoco jacoco-maven-plugin - 0.7.7.201606060606 + ${jacoco.version} - true - - org.onap.aaf.* - + + **/gen/** + **/generated-sources/** + **/yang-gen/** + **/pax/** + + pre-unit-test prepare-agent - ${project.build.directory}/coverage-reports/jacoco.exec - + ${project.build.directory}/code-coverage/jacoco-ut.exec + surefireArgLine + + + + + + post-unit-test + test + + report + + + ${project.build.directory}/code-coverage/jacoco-ut.exec + ${project.reporting.outputDirectory}/jacoco-ut @@ -137,32 +146,27 @@ prepare-agent - ${project.build.directory}/coverage-reports/jacoco-it.exec - + ${project.build.directory}/code-coverage/jacoco-it.exec + failsafeArgLine + - - merge - - post-integration-test - - - - ${project.build.directory}/coverage-reports - - *.exec - - - - ${project.build.directory}/jacoco-dev.exec - - + post-integration-test + post-integration-test + + report + + + ${project.build.directory}/code-coverage/jacoco-it.exec + ${project.reporting.outputDirectory}/jacoco-it + + - + - + org.onap.aaf.authz.cadi @@ -181,7 +185,7 @@ - + ecomp-releases diff --git a/auth/auth-fs/pom.xml b/auth/auth-fs/pom.xml index 0612f157..34e161ce 100644 --- a/auth/auth-fs/pom.xml +++ b/auth/auth-fs/pom.xml @@ -1,24 +1,16 @@ - + 4.0.0 @@ -35,21 +27,22 @@ true - - 0.7.7.201606060606 - 3.2 - jacoco - - target/code-coverage/jacoco-ut.exec - target/code-coverage/jacoco-it.exec - - **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** + + 0.7.7.201606060606 + 3.2 + jacoco + + target/code-coverage/jacoco-ut.exec + target/code-coverage/jacoco-it.exec + + **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** https://nexus.onap.org /content/repositories/snapshots/ /content/repositories/releases/ /content/repositories/staging/ /content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version} - + @@ -134,26 +127,42 @@ 176c31dfe190a ecomp-staging - + org.jacoco jacoco-maven-plugin - 0.7.7.201606060606 + ${jacoco.version} - true - - org.onap.aaf.* - + + **/gen/** + **/generated-sources/** + **/yang-gen/** + **/pax/** + + pre-unit-test prepare-agent - ${project.build.directory}/coverage-reports/jacoco.exec - + ${project.build.directory}/code-coverage/jacoco-ut.exec + surefireArgLine + + + + + + post-unit-test + test + + report + + + ${project.build.directory}/code-coverage/jacoco-ut.exec + ${project.reporting.outputDirectory}/jacoco-ut @@ -163,27 +172,22 @@ prepare-agent - ${project.build.directory}/coverage-reports/jacoco-it.exec - + ${project.build.directory}/code-coverage/jacoco-it.exec + failsafeArgLine + - - merge - - post-integration-test - - - - ${project.build.directory}/coverage-reports - - *.exec - - - - ${project.build.directory}/jacoco-dev.exec - - + post-integration-test + post-integration-test + + report + + + ${project.build.directory}/code-coverage/jacoco-it.exec + ${project.reporting.outputDirectory}/jacoco-it + + diff --git a/auth/auth-gui/pom.xml b/auth/auth-gui/pom.xml index 5fa86926..1c81fccc 100644 --- a/auth/auth-gui/pom.xml +++ b/auth/auth-gui/pom.xml @@ -1,24 +1,16 @@ - + 4.0.0 @@ -35,15 +27,16 @@ true - - 0.7.7.201606060606 - 3.2 - jacoco - - target/code-coverage/jacoco-ut.exec - target/code-coverage/jacoco-it.exec - - **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** + + 0.7.7.201606060606 + 3.2 + jacoco + + target/code-coverage/jacoco-ut.exec + target/code-coverage/jacoco-it.exec + + **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** https://nexus.onap.org /content/repositories/snapshots/ /content/repositories/releases/ @@ -136,7 +129,7 @@ theme theme - + org.sonatype.plugins @@ -148,26 +141,42 @@ 176c31dfe190a ecomp-staging - + org.jacoco jacoco-maven-plugin - 0.7.7.201606060606 + ${jacoco.version} - true - - org.onap.aaf.* - + + **/gen/** + **/generated-sources/** + **/yang-gen/** + **/pax/** + + pre-unit-test prepare-agent - ${project.build.directory}/coverage-reports/jacoco.exec - + ${project.build.directory}/code-coverage/jacoco-ut.exec + surefireArgLine + + + + + + post-unit-test + test + + report + + + ${project.build.directory}/code-coverage/jacoco-ut.exec + ${project.reporting.outputDirectory}/jacoco-ut @@ -177,27 +186,22 @@ prepare-agent - ${project.build.directory}/coverage-reports/jacoco-it.exec - + ${project.build.directory}/code-coverage/jacoco-it.exec + failsafeArgLine + - - merge - - post-integration-test - - - - ${project.build.directory}/coverage-reports - - *.exec - - - - ${project.build.directory}/jacoco-dev.exec - - + post-integration-test + post-integration-test + + report + + + ${project.build.directory}/code-coverage/jacoco-it.exec + ${project.reporting.outputDirectory}/jacoco-it + + diff --git a/auth/auth-hello/pom.xml b/auth/auth-hello/pom.xml index 919f0bf3..c304752d 100644 --- a/auth/auth-hello/pom.xml +++ b/auth/auth-hello/pom.xml @@ -26,16 +26,17 @@ Hello Service Component for testing AAF Auth Access - false - - 0.7.7.201606060606 - 3.2 - jacoco - - target/code-coverage/jacoco-ut.exec - target/code-coverage/jacoco-it.exec - - **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** + false + + 0.7.7.201606060606 + 3.2 + jacoco + + target/code-coverage/jacoco-ut.exec + target/code-coverage/jacoco-it.exec + + **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** https://nexus.onap.org /content/repositories/snapshots/ /content/repositories/releases/ @@ -103,26 +104,42 @@ 176c31dfe190a ecomp-staging - + org.jacoco jacoco-maven-plugin - 0.7.7.201606060606 + ${jacoco.version} - true - - org.onap.aaf.* - + + **/gen/** + **/generated-sources/** + **/yang-gen/** + **/pax/** + + pre-unit-test prepare-agent - ${project.build.directory}/coverage-reports/jacoco.exec - + ${project.build.directory}/code-coverage/jacoco-ut.exec + surefireArgLine + + + + + + post-unit-test + test + + report + + + ${project.build.directory}/code-coverage/jacoco-ut.exec + ${project.reporting.outputDirectory}/jacoco-ut @@ -132,27 +149,22 @@ prepare-agent - ${project.build.directory}/coverage-reports/jacoco-it.exec - + ${project.build.directory}/code-coverage/jacoco-it.exec + failsafeArgLine + - - merge - - post-integration-test - - - - ${project.build.directory}/coverage-reports - - *.exec - - - - ${project.build.directory}/jacoco-dev.exec - - + post-integration-test + post-integration-test + + report + + + ${project.build.directory}/code-coverage/jacoco-it.exec + ${project.reporting.outputDirectory}/jacoco-it + + diff --git a/auth/auth-locate/pom.xml b/auth/auth-locate/pom.xml index 9e1e1167..7f76a28f 100644 --- a/auth/auth-locate/pom.xml +++ b/auth/auth-locate/pom.xml @@ -1,24 +1,16 @@ - + 4.0.0 @@ -35,15 +27,16 @@ true - - 0.7.7.201606060606 - 3.2 - jacoco - - target/code-coverage/jacoco-ut.exec - target/code-coverage/jacoco-it.exec - - **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** + + 0.7.7.201606060606 + 3.2 + jacoco + + target/code-coverage/jacoco-ut.exec + target/code-coverage/jacoco-it.exec + + **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** https://nexus.onap.org /content/repositories/snapshots/ /content/repositories/releases/ @@ -119,26 +112,42 @@ 176c31dfe190a ecomp-staging - + org.jacoco jacoco-maven-plugin - 0.7.7.201606060606 + ${jacoco.version} - true - - org.onap.aaf.* - + + **/gen/** + **/generated-sources/** + **/yang-gen/** + **/pax/** + + pre-unit-test prepare-agent - ${project.build.directory}/coverage-reports/jacoco.exec - + ${project.build.directory}/code-coverage/jacoco-ut.exec + surefireArgLine + + + + + + post-unit-test + test + + report + + + ${project.build.directory}/code-coverage/jacoco-ut.exec + ${project.reporting.outputDirectory}/jacoco-ut @@ -148,27 +157,22 @@ prepare-agent - ${project.build.directory}/coverage-reports/jacoco-it.exec - + ${project.build.directory}/code-coverage/jacoco-it.exec + failsafeArgLine + - - merge - - post-integration-test - - - - ${project.build.directory}/coverage-reports - - *.exec - - - - ${project.build.directory}/jacoco-dev.exec - - + post-integration-test + post-integration-test + + report + + + ${project.build.directory}/code-coverage/jacoco-it.exec + ${project.reporting.outputDirectory}/jacoco-it + + diff --git a/auth/auth-oauth/pom.xml b/auth/auth-oauth/pom.xml index 55a5a9a8..93d7b93a 100644 --- a/auth/auth-oauth/pom.xml +++ b/auth/auth-oauth/pom.xml @@ -1,24 +1,16 @@ - + 4.0.0 @@ -35,15 +27,16 @@ 25 - - 0.7.7.201606060606 - 3.2 - jacoco - - target/code-coverage/jacoco-ut.exec - target/code-coverage/jacoco-it.exec - - **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** + + 0.7.7.201606060606 + 3.2 + jacoco + + target/code-coverage/jacoco-ut.exec + target/code-coverage/jacoco-it.exec + + **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** https://nexus.onap.org /content/repositories/snapshots/ /content/repositories/releases/ @@ -114,26 +107,42 @@ 176c31dfe190a ecomp-staging - + org.jacoco jacoco-maven-plugin - 0.7.7.201606060606 + ${jacoco.version} - true - - org.onap.aaf.* - + + **/gen/** + **/generated-sources/** + **/yang-gen/** + **/pax/** + + pre-unit-test prepare-agent - ${project.build.directory}/coverage-reports/jacoco.exec - + ${project.build.directory}/code-coverage/jacoco-ut.exec + surefireArgLine + + + + + + post-unit-test + test + + report + + + ${project.build.directory}/code-coverage/jacoco-ut.exec + ${project.reporting.outputDirectory}/jacoco-ut @@ -143,27 +152,22 @@ prepare-agent - ${project.build.directory}/coverage-reports/jacoco-it.exec - + ${project.build.directory}/code-coverage/jacoco-it.exec + failsafeArgLine + - - merge - - post-integration-test - - - - ${project.build.directory}/coverage-reports - - *.exec - - - - ${project.build.directory}/jacoco-dev.exec - - + post-integration-test + post-integration-test + + report + + + ${project.build.directory}/code-coverage/jacoco-it.exec + ${project.reporting.outputDirectory}/jacoco-it + + diff --git a/auth/auth-service/pom.xml b/auth/auth-service/pom.xml index 348bfa83..e6bc270b 100644 --- a/auth/auth-service/pom.xml +++ b/auth/auth-service/pom.xml @@ -1,24 +1,16 @@ - + 4.0.0 @@ -35,21 +27,22 @@ true - - 0.7.7.201606060606 - 3.2 - jacoco - - target/code-coverage/jacoco-ut.exec - target/code-coverage/jacoco-it.exec - - **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** + + 0.7.7.201606060606 + 3.2 + jacoco + + target/code-coverage/jacoco-ut.exec + target/code-coverage/jacoco-it.exec + + **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** https://nexus.onap.org /content/repositories/snapshots/ /content/repositories/releases/ /content/repositories/staging/ /content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version} - + @@ -147,26 +140,42 @@ 176c31dfe190a ecomp-staging - + org.jacoco jacoco-maven-plugin - 0.7.7.201606060606 + ${jacoco.version} - true - - org.onap.aaf.* - + + **/gen/** + **/generated-sources/** + **/yang-gen/** + **/pax/** + + pre-unit-test prepare-agent - ${project.build.directory}/coverage-reports/jacoco.exec - + ${project.build.directory}/code-coverage/jacoco-ut.exec + surefireArgLine + + + + + + post-unit-test + test + + report + + + ${project.build.directory}/code-coverage/jacoco-ut.exec + ${project.reporting.outputDirectory}/jacoco-ut @@ -176,36 +185,29 @@ prepare-agent - ${project.build.directory}/coverage-reports/jacoco-it.exec - + ${project.build.directory}/code-coverage/jacoco-it.exec + failsafeArgLine + - - merge - - post-integration-test - - - - ${project.build.directory}/coverage-reports - - *.exec - - - - ${project.build.directory}/jacoco-dev.exec - - + post-integration-test + post-integration-test + + report + + + ${project.build.directory}/code-coverage/jacoco-it.exec + ${project.reporting.outputDirectory}/jacoco-it + + - + - + ecomp-releases -- cgit 1.2.3-korg