From d97041c12ad87a4861557200f502b094e1b08535 Mon Sep 17 00:00:00 2001 From: Sai Gandham Date: Tue, 3 Apr 2018 01:57:59 -0500 Subject: [PATCH] Fix sonar issues & modify deploy property Added oparent on submodule parent pom's. Add license to missing java files. Issue-ID: AAF-208 Change-Id: I1d5efe8f91e2bc60af8b2cec67f31d511b44b62c Signed-off-by: Sai Gandham --- auth/auth-batch/pom.xml | 2 +- auth/auth-cass/pom.xml | 2 +- auth/auth-certman/pom.xml | 2 +- auth/auth-client/pom.xml | 2 +- auth/auth-cmd/pom.xml | 2 +- auth/auth-core/pom.xml | 2 +- .../onap/aaf/auth/org/test/JU_Organization.java | 21 ++++ .../org/onap/aaf/auth/rserv/test/JU_Route.java | 21 ++++ auth/auth-deforg/pom.xml | 2 +- auth/auth-fs/pom.xml | 2 +- auth/auth-gui/pom.xml | 2 +- .../org/onap/aaf/auth/gui/OrgLookupFilter.java | 21 ++++ auth/auth-hello/pom.xml | 2 +- auth/auth-locate/pom.xml | 2 +- auth/auth-oauth/pom.xml | 2 +- auth/auth-service/pom.xml | 2 +- auth/pom.xml | 8 +- cadi/aaf/jenkins-pom.xml | 2 +- cadi/aaf/pom.xml | 112 +++++++++++-------- cadi/cass/pom.xml | 113 ++++++++++--------- cadi/client/pom.xml | 113 ++++++++++--------- cadi/core/pom.xml | 112 +++++++++++-------- cadi/oauth-enduser/pom.xml | 115 ++++++++++--------- cadi/pom.xml | 121 +++++++++++--------- cadi/shiro/pom.xml | 124 ++++++++++++--------- misc/log4j/pom.xml | 2 +- misc/pom.xml | 6 +- pom.xml | 2 +- 28 files changed, 545 insertions(+), 374 deletions(-) diff --git a/auth/auth-batch/pom.xml b/auth/auth-batch/pom.xml index 8969de0e..842bb0cc 100644 --- a/auth/auth-batch/pom.xml +++ b/auth/auth-batch/pom.xml @@ -140,7 +140,7 @@ org.apache.maven.plugins maven-deploy-plugin - true + false diff --git a/auth/auth-cass/pom.xml b/auth/auth-cass/pom.xml index 41540887..4bec7267 100644 --- a/auth/auth-cass/pom.xml +++ b/auth/auth-cass/pom.xml @@ -139,7 +139,7 @@ org.apache.maven.plugins maven-deploy-plugin - true + false diff --git a/auth/auth-certman/pom.xml b/auth/auth-certman/pom.xml index f4860727..64fee0c3 100644 --- a/auth/auth-certman/pom.xml +++ b/auth/auth-certman/pom.xml @@ -93,7 +93,7 @@ org.apache.maven.plugins maven-deploy-plugin - true + false diff --git a/auth/auth-client/pom.xml b/auth/auth-client/pom.xml index c53b9597..1049d452 100644 --- a/auth/auth-client/pom.xml +++ b/auth/auth-client/pom.xml @@ -120,7 +120,7 @@ maven-deploy-plugin 2.5 - true + false diff --git a/auth/auth-cmd/pom.xml b/auth/auth-cmd/pom.xml index 87ff3630..6c2b61e9 100644 --- a/auth/auth-cmd/pom.xml +++ b/auth/auth-cmd/pom.xml @@ -95,7 +95,7 @@ org.apache.maven.plugins maven-deploy-plugin - true + false diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml index 7281cee2..8e218632 100644 --- a/auth/auth-core/pom.xml +++ b/auth/auth-core/pom.xml @@ -128,7 +128,7 @@ org.apache.maven.plugins maven-deploy-plugin - true + false diff --git a/auth/auth-core/src/test/java/org/onap/aaf/auth/org/test/JU_Organization.java b/auth/auth-core/src/test/java/org/onap/aaf/auth/org/test/JU_Organization.java index 9631e326..7599241e 100644 --- a/auth/auth-core/src/test/java/org/onap/aaf/auth/org/test/JU_Organization.java +++ b/auth/auth-core/src/test/java/org/onap/aaf/auth/org/test/JU_Organization.java @@ -1,3 +1,24 @@ +/******************************************************************************* + * ============LICENSE_START==================================================== + * * org.onap.aaf + * * =========================================================================== + * * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * * =========================================================================== + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * * ============LICENSE_END==================================================== + * * + * * + ******************************************************************************/ package org.onap.aaf.auth.org.test; import static org.mockito.Mockito.mock; diff --git a/auth/auth-core/src/test/java/org/onap/aaf/auth/rserv/test/JU_Route.java b/auth/auth-core/src/test/java/org/onap/aaf/auth/rserv/test/JU_Route.java index d5953b10..4448a0bb 100644 --- a/auth/auth-core/src/test/java/org/onap/aaf/auth/rserv/test/JU_Route.java +++ b/auth/auth-core/src/test/java/org/onap/aaf/auth/rserv/test/JU_Route.java @@ -1,3 +1,24 @@ +/******************************************************************************* + * ============LICENSE_START==================================================== + * * org.onap.aaf + * * =========================================================================== + * * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * * =========================================================================== + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * * ============LICENSE_END==================================================== + * * + * * + ******************************************************************************/ package org.onap.aaf.auth.rserv.test; import static org.junit.Assert.*; diff --git a/auth/auth-deforg/pom.xml b/auth/auth-deforg/pom.xml index ed9c5914..cf86a783 100644 --- a/auth/auth-deforg/pom.xml +++ b/auth/auth-deforg/pom.xml @@ -114,7 +114,7 @@ org.apache.maven.plugins maven-deploy-plugin - true + false diff --git a/auth/auth-fs/pom.xml b/auth/auth-fs/pom.xml index c1af6e44..0612f157 100644 --- a/auth/auth-fs/pom.xml +++ b/auth/auth-fs/pom.xml @@ -106,7 +106,7 @@ org.apache.maven.plugins maven-deploy-plugin - true + false diff --git a/auth/auth-gui/pom.xml b/auth/auth-gui/pom.xml index 946f2a3e..5fa86926 100644 --- a/auth/auth-gui/pom.xml +++ b/auth/auth-gui/pom.xml @@ -111,7 +111,7 @@ org.apache.maven.plugins maven-deploy-plugin - true + false diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/OrgLookupFilter.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/OrgLookupFilter.java index 411ecdb8..15b71b94 100644 --- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/OrgLookupFilter.java +++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/OrgLookupFilter.java @@ -1,3 +1,24 @@ +/******************************************************************************* + * ============LICENSE_START==================================================== + * * org.onap.aaf + * * =========================================================================== + * * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * * =========================================================================== + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * * ============LICENSE_END==================================================== + * * + * * + ******************************************************************************/ package org.onap.aaf.auth.gui; import java.io.IOException; diff --git a/auth/auth-hello/pom.xml b/auth/auth-hello/pom.xml index 0b64aa90..919f0bf3 100644 --- a/auth/auth-hello/pom.xml +++ b/auth/auth-hello/pom.xml @@ -75,7 +75,7 @@ org.apache.maven.plugins maven-deploy-plugin - true + false diff --git a/auth/auth-locate/pom.xml b/auth/auth-locate/pom.xml index dc69368b..9e1e1167 100644 --- a/auth/auth-locate/pom.xml +++ b/auth/auth-locate/pom.xml @@ -91,7 +91,7 @@ org.apache.maven.plugins maven-deploy-plugin - true + false diff --git a/auth/auth-oauth/pom.xml b/auth/auth-oauth/pom.xml index 3941702c..55a5a9a8 100644 --- a/auth/auth-oauth/pom.xml +++ b/auth/auth-oauth/pom.xml @@ -86,7 +86,7 @@ org.apache.maven.plugins maven-deploy-plugin - true + false diff --git a/auth/auth-service/pom.xml b/auth/auth-service/pom.xml index 8c71d58f..348bfa83 100644 --- a/auth/auth-service/pom.xml +++ b/auth/auth-service/pom.xml @@ -119,7 +119,7 @@ org.apache.maven.plugins maven-deploy-plugin - true + false diff --git a/auth/pom.xml b/auth/pom.xml index 7be3406b..cab82b89 100644 --- a/auth/pom.xml +++ b/auth/pom.xml @@ -28,6 +28,12 @@ 2.1.0-SNAPSHOT AAF Auth Parent pom + + + org.onap.oparent + oparent + 1.1.0 + UTF-8 2.10-SNAPSHOT @@ -106,7 +112,7 @@ maven-deploy-plugin 2.6 - true + false diff --git a/cadi/aaf/jenkins-pom.xml b/cadi/aaf/jenkins-pom.xml index 7125258a..026f9ee5 100644 --- a/cadi/aaf/jenkins-pom.xml +++ b/cadi/aaf/jenkins-pom.xml @@ -153,7 +153,7 @@ org.apache.maven.plugins maven-jarsigner-plugin - true + false diff --git a/cadi/aaf/pom.xml b/cadi/aaf/pom.xml index a682aab7..25655d0b 100644 --- a/cadi/aaf/pom.xml +++ b/cadi/aaf/pom.xml @@ -130,55 +130,69 @@ - org.jacoco - jacoco-maven-plugin - - 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 + + + + - - - - 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/cadi/client/pom.xml b/cadi/client/pom.xml index dce500bd..da0286b0 100644 --- a/cadi/client/pom.xml +++ b/cadi/client/pom.xml @@ -121,56 +121,69 @@ - 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/cadi/core/pom.xml b/cadi/core/pom.xml index 9a2a127d..35c5a2ee 100644 --- a/cadi/core/pom.xml +++ b/cadi/core/pom.xml @@ -126,55 +126,69 @@ - org.jacoco - jacoco-maven-plugin - - 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/cadi/oauth-enduser/pom.xml b/cadi/oauth-enduser/pom.xml index 581d8a6a..ba04a9a1 100644 --- a/cadi/oauth-enduser/pom.xml +++ b/cadi/oauth-enduser/pom.xml @@ -134,62 +134,75 @@ - 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 + + + + org.apache.maven.plugins maven-deploy-plugin 2.8.1 - true + false diff --git a/cadi/pom.xml b/cadi/pom.xml index 81708a4d..5c72f5bc 100644 --- a/cadi/pom.xml +++ b/cadi/pom.xml @@ -31,7 +31,11 @@ pom - + + org.onap.oparent + oparent + 1.1.0 + true @@ -330,7 +334,7 @@ maven-deploy-plugin 2.8.1 - true + false @@ -393,56 +397,69 @@ - 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/cadi/shiro/pom.xml b/cadi/shiro/pom.xml index 799622b6..21b67f68 100644 --- a/cadi/shiro/pom.xml +++ b/cadi/shiro/pom.xml @@ -109,67 +109,81 @@ 176c31dfe190a ecomp-staging - - - 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.apache.maven.plugins maven-deploy-plugin 2.8.1 - true + false - + + + 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/misc/log4j/pom.xml b/misc/log4j/pom.xml index f6237052..98df9d0d 100644 --- a/misc/log4j/pom.xml +++ b/misc/log4j/pom.xml @@ -100,7 +100,7 @@ maven-deploy-plugin 2.6 - true + false diff --git a/misc/pom.xml b/misc/pom.xml index ff5b49e7..d5773146 100644 --- a/misc/pom.xml +++ b/misc/pom.xml @@ -28,7 +28,11 @@ 1.3.0-SNAPSHOT pom - + + org.onap.oparent + oparent + 1.1.0 + 0.7.6.201602180812 diff --git a/pom.xml b/pom.xml index dbcd41ca..809d0ff5 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ org.apache.maven.plugins maven-deploy-plugin - true + false -- 2.16.6