From 61f8fdfa4be59b1c6172bec7ab54369c20b59f2e Mon Sep 17 00:00:00 2001 From: Sai Gandham Date: Tue, 3 Apr 2018 12:07:07 -0500 Subject: [PATCH] Modify deprecated sonar properties in AAF Modified Misc pom files. Issue-ID: AAF-208 Change-Id: Iaf4e12c81f98fdca18992ffb24b78cd0135996df Signed-off-by: Sai Gandham --- auth/auth-batch/pom.xml | 4 +- auth/auth-cass/pom.xml | 4 +- auth/auth-certman/pom.xml | 4 +- auth/auth-client/pom.xml | 4 +- auth/auth-cmd/pom.xml | 4 +- auth/auth-core/pom.xml | 4 +- auth/auth-deforg/pom.xml | 4 +- auth/auth-fs/pom.xml | 4 +- auth/auth-gui/pom.xml | 4 +- auth/auth-hello/pom.xml | 4 +- auth/auth-locate/pom.xml | 4 +- auth/auth-oauth/pom.xml | 4 +- auth/auth-service/pom.xml | 4 +- auth/pom.xml | 4 +- cadi/aaf/pom.xml | 4 +- cadi/cass/pom.xml | 4 +- cadi/client/pom.xml | 4 +- cadi/core/pom.xml | 4 +- cadi/oauth-enduser/pom.xml | 4 +- cadi/pom.xml | 4 +- cadi/shiro/pom.xml | 4 +- misc/env/pom.xml | 271 ++++++++++++++++++++++++++++-------------- misc/log4j/pom.xml | 135 +++++++++++++++++---- misc/pom.xml | 132 ++++++++++++++++----- misc/rosetta/pom.xml | 286 ++++++++++++++++++++++++++++++--------------- misc/xgen/pom.xml | 266 ++++++++++++++++++++++++++++------------- pom.xml | 4 +- 27 files changed, 819 insertions(+), 359 deletions(-) diff --git a/auth/auth-batch/pom.xml b/auth/auth-batch/pom.xml index 98cf0f33..b98ff568 100644 --- a/auth/auth-batch/pom.xml +++ b/auth/auth-batch/pom.xml @@ -80,8 +80,8 @@ 3.2 jacoco - target/code-coverage/jacoco-ut.exec - target/code-coverage/jacoco-it.exec + target/code-coverage/jacoco-ut.exec + target/code-coverage/jacoco-it.exec **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** https://nexus.onap.org diff --git a/auth/auth-cass/pom.xml b/auth/auth-cass/pom.xml index bea878c9..b458cff4 100644 --- a/auth/auth-cass/pom.xml +++ b/auth/auth-cass/pom.xml @@ -71,8 +71,8 @@ 3.2 jacoco - target/code-coverage/jacoco-ut.exec - target/code-coverage/jacoco-it.exec + target/code-coverage/jacoco-ut.exec + target/code-coverage/jacoco-it.exec **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** diff --git a/auth/auth-certman/pom.xml b/auth/auth-certman/pom.xml index 5f6f4526..48e8f0b1 100644 --- a/auth/auth-certman/pom.xml +++ b/auth/auth-certman/pom.xml @@ -31,8 +31,8 @@ 3.2 jacoco - target/code-coverage/jacoco-ut.exec - target/code-coverage/jacoco-it.exec + target/code-coverage/jacoco-ut.exec + target/code-coverage/jacoco-it.exec **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** diff --git a/auth/auth-client/pom.xml b/auth/auth-client/pom.xml index 1049d452..0414f2f9 100644 --- a/auth/auth-client/pom.xml +++ b/auth/auth-client/pom.xml @@ -39,8 +39,8 @@ 3.2 jacoco - target/code-coverage/jacoco-ut.exec - target/code-coverage/jacoco-it.exec + target/code-coverage/jacoco-ut.exec + target/code-coverage/jacoco-it.exec **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** https://nexus.onap.org diff --git a/auth/auth-cmd/pom.xml b/auth/auth-cmd/pom.xml index 4f835510..88daac40 100644 --- a/auth/auth-cmd/pom.xml +++ b/auth/auth-cmd/pom.xml @@ -34,8 +34,8 @@ 3.2 jacoco - target/code-coverage/jacoco-ut.exec - target/code-coverage/jacoco-it.exec + target/code-coverage/jacoco-ut.exec + target/code-coverage/jacoco-it.exec **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml index 0bfc0ffb..d0d2fb6e 100644 --- a/auth/auth-core/pom.xml +++ b/auth/auth-core/pom.xml @@ -77,8 +77,8 @@ 3.2 jacoco - target/code-coverage/jacoco-ut.exec - target/code-coverage/jacoco-it.exec + target/code-coverage/jacoco-ut.exec + target/code-coverage/jacoco-it.exec **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** https://nexus.onap.org diff --git a/auth/auth-deforg/pom.xml b/auth/auth-deforg/pom.xml index f5162b7c..d4dc5525 100644 --- a/auth/auth-deforg/pom.xml +++ b/auth/auth-deforg/pom.xml @@ -78,8 +78,8 @@ 3.2 jacoco - target/code-coverage/jacoco-ut.exec - target/code-coverage/jacoco-it.exec + target/code-coverage/jacoco-ut.exec + target/code-coverage/jacoco-it.exec **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** https://nexus.onap.org diff --git a/auth/auth-fs/pom.xml b/auth/auth-fs/pom.xml index 34e161ce..b109e9bc 100644 --- a/auth/auth-fs/pom.xml +++ b/auth/auth-fs/pom.xml @@ -32,8 +32,8 @@ 3.2 jacoco - target/code-coverage/jacoco-ut.exec - target/code-coverage/jacoco-it.exec + target/code-coverage/jacoco-ut.exec + target/code-coverage/jacoco-it.exec **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** diff --git a/auth/auth-gui/pom.xml b/auth/auth-gui/pom.xml index 1c81fccc..4678461b 100644 --- a/auth/auth-gui/pom.xml +++ b/auth/auth-gui/pom.xml @@ -32,8 +32,8 @@ 3.2 jacoco - target/code-coverage/jacoco-ut.exec - target/code-coverage/jacoco-it.exec + target/code-coverage/jacoco-ut.exec + target/code-coverage/jacoco-it.exec **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** diff --git a/auth/auth-hello/pom.xml b/auth/auth-hello/pom.xml index c304752d..ea6c6186 100644 --- a/auth/auth-hello/pom.xml +++ b/auth/auth-hello/pom.xml @@ -32,8 +32,8 @@ 3.2 jacoco - target/code-coverage/jacoco-ut.exec - target/code-coverage/jacoco-it.exec + target/code-coverage/jacoco-ut.exec + target/code-coverage/jacoco-it.exec **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** diff --git a/auth/auth-locate/pom.xml b/auth/auth-locate/pom.xml index 7f76a28f..68a33eee 100644 --- a/auth/auth-locate/pom.xml +++ b/auth/auth-locate/pom.xml @@ -32,8 +32,8 @@ 3.2 jacoco - target/code-coverage/jacoco-ut.exec - target/code-coverage/jacoco-it.exec + target/code-coverage/jacoco-ut.exec + target/code-coverage/jacoco-it.exec **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** diff --git a/auth/auth-oauth/pom.xml b/auth/auth-oauth/pom.xml index 93d7b93a..513b4b83 100644 --- a/auth/auth-oauth/pom.xml +++ b/auth/auth-oauth/pom.xml @@ -32,8 +32,8 @@ 3.2 jacoco - target/code-coverage/jacoco-ut.exec - target/code-coverage/jacoco-it.exec + target/code-coverage/jacoco-ut.exec + target/code-coverage/jacoco-it.exec **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** diff --git a/auth/auth-service/pom.xml b/auth/auth-service/pom.xml index e6bc270b..339b5bc7 100644 --- a/auth/auth-service/pom.xml +++ b/auth/auth-service/pom.xml @@ -32,8 +32,8 @@ 3.2 jacoco - target/code-coverage/jacoco-ut.exec - target/code-coverage/jacoco-it.exec + target/code-coverage/jacoco-ut.exec + target/code-coverage/jacoco-it.exec **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** diff --git a/auth/pom.xml b/auth/pom.xml index cab82b89..d6d3d94b 100644 --- a/auth/pom.xml +++ b/auth/pom.xml @@ -48,8 +48,8 @@ 3.2 jacoco - target/code-coverage/jacoco-ut.exec - target/code-coverage/jacoco-it.exec + target/code-coverage/jacoco-ut.exec + target/code-coverage/jacoco-it.exec **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** https://nexus.onap.org diff --git a/cadi/aaf/pom.xml b/cadi/aaf/pom.xml index c9b59a61..2fe2a5d3 100644 --- a/cadi/aaf/pom.xml +++ b/cadi/aaf/pom.xml @@ -39,8 +39,8 @@ 3.2 jacoco - target/code-coverage/jacoco-ut.exec - target/code-coverage/jacoco-it.exec + target/code-coverage/jacoco-ut.exec + target/code-coverage/jacoco-it.exec **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** https://nexus.onap.org diff --git a/cadi/cass/pom.xml b/cadi/cass/pom.xml index e6327055..41accd82 100644 --- a/cadi/cass/pom.xml +++ b/cadi/cass/pom.xml @@ -39,8 +39,8 @@ 3.2 jacoco - target/code-coverage/jacoco-ut.exec - target/code-coverage/jacoco-it.exec + target/code-coverage/jacoco-ut.exec + target/code-coverage/jacoco-it.exec **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** https://nexus.onap.org diff --git a/cadi/client/pom.xml b/cadi/client/pom.xml index fa9cd892..a880dbc8 100644 --- a/cadi/client/pom.xml +++ b/cadi/client/pom.xml @@ -37,8 +37,8 @@ 3.2 jacoco - target/code-coverage/jacoco-ut.exec - target/code-coverage/jacoco-it.exec + target/code-coverage/jacoco-ut.exec + target/code-coverage/jacoco-it.exec **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** https://nexus.onap.org diff --git a/cadi/core/pom.xml b/cadi/core/pom.xml index 93d5a8f6..2412651e 100644 --- a/cadi/core/pom.xml +++ b/cadi/core/pom.xml @@ -30,8 +30,8 @@ 3.2 jacoco - target/code-coverage/jacoco-ut.exec - target/code-coverage/jacoco-it.exec + target/code-coverage/jacoco-ut.exec + target/code-coverage/jacoco-it.exec **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** https://nexus.onap.org diff --git a/cadi/oauth-enduser/pom.xml b/cadi/oauth-enduser/pom.xml index b11805bc..96f9a73c 100644 --- a/cadi/oauth-enduser/pom.xml +++ b/cadi/oauth-enduser/pom.xml @@ -35,8 +35,8 @@ 3.2 jacoco - target/code-coverage/jacoco-ut.exec - target/code-coverage/jacoco-it.exec + target/code-coverage/jacoco-ut.exec + target/code-coverage/jacoco-it.exec **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** https://nexus.onap.org diff --git a/cadi/pom.xml b/cadi/pom.xml index a9d8a998..862743c1 100644 --- a/cadi/pom.xml +++ b/cadi/pom.xml @@ -49,8 +49,8 @@ 3.2 jacoco - target/code-coverage/jacoco-ut.exec - target/code-coverage/jacoco-it.exec + target/code-coverage/jacoco-ut.exec + target/code-coverage/jacoco-it.exec **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** https://nexus.onap.org diff --git a/cadi/shiro/pom.xml b/cadi/shiro/pom.xml index 4edabecf..d0ca7658 100644 --- a/cadi/shiro/pom.xml +++ b/cadi/shiro/pom.xml @@ -39,8 +39,8 @@ 3.2 jacoco - target/code-coverage/jacoco-ut.exec - target/code-coverage/jacoco-it.exec + target/code-coverage/jacoco-ut.exec + target/code-coverage/jacoco-it.exec **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** https://nexus.onap.org diff --git a/misc/env/pom.xml b/misc/env/pom.xml index 37020365..6ee52e45 100644 --- a/misc/env/pom.xml +++ b/misc/env/pom.xml @@ -70,13 +70,15 @@ - 0.7.6.201602180812 - UTF-8 - UTF-8 - **/scripts/**/*,**.js - **/test/**/*,**/tests/**/* - 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/** https://nexus.onap.org /content/repositories/snapshots/ /content/repositories/releases/ @@ -84,94 +86,191 @@ /content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version} + + + - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ${nexusproxy} - 176c31dfe190a - ecomp-staging - - - - org.sonarsource.scanner.maven - sonar-maven-plugin - 3.2 - - - - org.jacoco - jacoco-maven-plugin - ${jacoco.version} - - - **/gen/** - **/generated-sources/** - **/yang-gen/** - **/pax/** - - - - - pre-unit-test - - prepare-agent - + src/test/java + + + + + + true + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.7 + 1.7 + + + + + org.apache.maven.plugins + 2.4 + maven-jar-plugin + + target + + + true + + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10 + + org.opendaylight.* + + + + + maven-release-plugin + 2.5.2 - ${project.build.directory}/code-coverage/jacoco-ut.exec - surefireArgLine + -s ${mvn.settings} deploy - - - post-unit-test - test - - report - + + + + maven-assembly-plugin + 2.5.5 + + + + org.apache.maven.plugins + maven-deploy-plugin + 2.8.1 + + false + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.10 + + + + + maven-surefire-plugin + 2.17 + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 - ${project.build.directory}/code-coverage/jacoco-ut.exec - ${project.reporting.outputDirectory}/jacoco-ut + + + + + + org.codehaus.mojo + + + jaxb2-maven-plugin + + + [1.3,) + + + xjc + + + + + + + + - - - pre-integration-test - pre-integration-test - - prepare-agent - + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true - ${project.build.directory}/code-coverage/jacoco-it.exec - failsafeArgLine + ${nexusproxy} + 176c31dfe190a + ecomp-staging - - - post-integration-test - post-integration-test - - report - + + + org.jacoco + jacoco-maven-plugin + ${jacoco.version} - ${project.build.directory}/code-coverage/jacoco-it.exec - ${project.reporting.outputDirectory}/jacoco-it + + **/gen/** + **/generated-sources/** + **/yang-gen/** + **/pax/** + - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - ${project.build.directory}/code-coverage/jacoco-ut.exec - - - - - + + + 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/misc/log4j/pom.xml b/misc/log4j/pom.xml index b7f19602..0a12fdd7 100644 --- a/misc/log4j/pom.xml +++ b/misc/log4j/pom.xml @@ -70,12 +70,15 @@ - 0.7.6.201602180812 - UTF-8 - UTF-8 - **/scripts/**/*,**.js - **/test/**/*,**/tests/**/* - 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/** https://nexus.onap.org /content/repositories/snapshots/ @@ -92,16 +95,118 @@ + + + + src/test/java + + + + true + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.7 + 1.7 + + + + + org.apache.maven.plugins + 2.4 + maven-jar-plugin + + target + + + true + + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10 + + org.opendaylight.* + + + + + maven-release-plugin + 2.5.2 + + -s ${mvn.settings} deploy + + + + + maven-assembly-plugin + 2.5.5 + + org.apache.maven.plugins maven-deploy-plugin - 2.6 + 2.8.1 false + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.10 + + + + + maven-surefire-plugin + 2.17 + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.codehaus.mojo + + + jaxb2-maven-plugin + + + [1.3,) + + + xjc + + + + + + + + + org.sonatype.plugins @@ -114,12 +219,6 @@ ecomp-staging - - org.sonarsource.scanner.maven - sonar-maven-plugin - 3.2 - - org.jacoco jacoco-maven-plugin @@ -178,16 +277,6 @@ - - - org.apache.maven.plugins - maven-surefire-plugin - - - ${project.build.directory}/code-coverage/jacoco-ut.exec - - - diff --git a/misc/pom.xml b/misc/pom.xml index fc27550f..5e8dc379 100644 --- a/misc/pom.xml +++ b/misc/pom.xml @@ -35,13 +35,15 @@ - 0.7.6.201602180812 - UTF-8 - UTF-8 - **/scripts/**/*,**.js - **/test/**/*,**/tests/**/* - 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/** UTF-8 1.5.1 https://nexus.onap.org @@ -117,27 +119,117 @@ + + + src/test/java + + + + true + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.7 + 1.7 + + + org.apache.maven.plugins 2.4 maven-jar-plugin target + + + true + + + - true org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 + maven-javadoc-plugin + 2.10 - 1.7 - 1.7 + org.opendaylight.* + + + + + maven-release-plugin + 2.5.2 + + -s ${mvn.settings} deploy + + + + + maven-assembly-plugin + 2.5.5 + + + + org.apache.maven.plugins + maven-deploy-plugin + 2.8.1 + + false + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.10 + + + + + maven-surefire-plugin + 2.17 + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.codehaus.mojo + + + jaxb2-maven-plugin + + + [1.3,) + + + xjc + + + + + + + + @@ -151,12 +243,6 @@ ecomp-staging - - org.sonarsource.scanner.maven - sonar-maven-plugin - 3.2 - - org.jacoco jacoco-maven-plugin @@ -215,16 +301,6 @@ - - - org.apache.maven.plugins - maven-surefire-plugin - - - ${project.build.directory}/code-coverage/jacoco-ut.exec - - - diff --git a/misc/rosetta/pom.xml b/misc/rosetta/pom.xml index 5bebf561..0c5228ec 100644 --- a/misc/rosetta/pom.xml +++ b/misc/rosetta/pom.xml @@ -70,12 +70,15 @@ - 0.7.6.201602180812 - UTF-8 - UTF-8 - **/scripts/**/*,**.js - **/test/**/*,**/tests/**/* - 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/** https://nexus.onap.org /content/repositories/snapshots/ @@ -92,9 +95,27 @@ + + + + + - - + src/test/java + + + + true + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.7 + 1.7 + + + + org.jvnet.jaxb2.maven2 maven-jaxb2-plugin 0.8.2 @@ -109,93 +130,170 @@ src/main/xsd - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ${nexusproxy} - 176c31dfe190a - ecomp-staging - - - - org.sonarsource.scanner.maven - sonar-maven-plugin - 3.2 - - - - 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 - - - - + + + org.apache.maven.plugins + 2.4 + maven-jar-plugin + + target + + + true + + + + - - org.apache.maven.plugins - maven-surefire-plugin - - - ${project.build.directory}/code-coverage/jacoco-ut.exec - - - - + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10 + + org.opendaylight.* + + + + + maven-release-plugin + 2.5.2 + + -s ${mvn.settings} deploy + + + + + maven-assembly-plugin + 2.5.5 + + + + org.apache.maven.plugins + maven-deploy-plugin + 2.8.1 + + false + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.10 + + + + + maven-surefire-plugin + 2.17 + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.codehaus.mojo + + + jaxb2-maven-plugin + + + [1.3,) + + + xjc + + + + + + + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + ${nexusproxy} + 176c31dfe190a + ecomp-staging + + + + 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 + + + + + @@ -215,4 +313,4 @@ - + \ No newline at end of file diff --git a/misc/xgen/pom.xml b/misc/xgen/pom.xml index 08b4e1a4..f34c1eb2 100644 --- a/misc/xgen/pom.xml +++ b/misc/xgen/pom.xml @@ -70,12 +70,15 @@ - 0.7.6.201602180812 - UTF-8 - UTF-8 - **/scripts/**/*,**.js - **/test/**/*,**/tests/**/* - 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/** https://nexus.onap.org /content/repositories/snapshots/ @@ -92,95 +95,190 @@ + + + - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ${nexusproxy} - 176c31dfe190a - ecomp-staging - - - - org.sonarsource.scanner.maven - sonar-maven-plugin - 3.2 - + src/test/java + + + + + + true + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.7 + 1.7 + + - - - org.jacoco - jacoco-maven-plugin - ${jacoco.version} - - - **/gen/** - **/generated-sources/** - **/yang-gen/** - **/pax/** - - - - - pre-unit-test - - prepare-agent - + + org.apache.maven.plugins + 2.4 + maven-jar-plugin - ${project.build.directory}/code-coverage/jacoco-ut.exec - surefireArgLine + target + + + true + + - - - post-unit-test - test - - report - + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10 - ${project.build.directory}/code-coverage/jacoco-ut.exec - ${project.reporting.outputDirectory}/jacoco-ut + org.opendaylight.* - - - pre-integration-test - pre-integration-test - - prepare-agent - + + + + maven-release-plugin + 2.5.2 - ${project.build.directory}/code-coverage/jacoco-it.exec - failsafeArgLine + -s ${mvn.settings} deploy - - - post-integration-test - post-integration-test - - report - + + + + maven-assembly-plugin + 2.5.5 + + + + org.apache.maven.plugins + maven-deploy-plugin + 2.8.1 - ${project.build.directory}/code-coverage/jacoco-it.exec - ${project.reporting.outputDirectory}/jacoco-it + false - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - ${project.build.directory}/code-coverage/jacoco-ut.exec - - - - + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.10 + + + + + maven-surefire-plugin + 2.17 + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.codehaus.mojo + + + jaxb2-maven-plugin + + + [1.3,) + + + xjc + + + + + + + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + ${nexusproxy} + 176c31dfe190a + ecomp-staging + + + + 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/pom.xml b/pom.xml index 48b0c0ab..ff137c76 100644 --- a/pom.xml +++ b/pom.xml @@ -46,8 +46,8 @@ 3.2 jacoco - target/code-coverage/jacoco-ut.exec - target/code-coverage/jacoco-it.exec + target/code-coverage/jacoco-ut.exec + target/code-coverage/jacoco-it.exec **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** https://nexus.onap.org -- 2.16.6