From ea9b8559daaf7f1511d6288a6461324dcef2b05f Mon Sep 17 00:00:00 2001 From: Taka Cho Date: Fri, 23 Mar 2018 15:57:59 -0400 Subject: fix eelf and logback nexus iq issue Change-Id: Id42f77fc86cbbfff28bfde404181938d358515b9 Issue-ID: APPC-784 Signed-off-by: Taka Cho --- appc-client/pom.xml | 6 +- appc-directed-graph/dg-loader/pom.xml | 2 +- appc-directed-graph/pom.xml | 4 +- .../appc-network-inventory-client/pom.xml | 95 ++++++++++------------ pom.xml | 50 ++++++------ 5 files changed, 73 insertions(+), 84 deletions(-) diff --git a/appc-client/pom.xml b/appc-client/pom.xml index 71a2420bf..0f5a239d9 100644 --- a/appc-client/pom.xml +++ b/appc-client/pom.xml @@ -3,7 +3,7 @@ ============LICENSE_START======================================================= ONAP : APPC ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. ================================================================================ Copyright (C) 2017 Amdocs ============================================================================= @@ -18,8 +18,6 @@ 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. - - ECOMP is a trademark and service mark of AT&T Intellectual Property. ============LICENSE_END========================================================= --> 2.5.0 0.0.1 1.0.0 - 0.0.4 + 1.0.0 2.3.23 1.8 4.12 diff --git a/appc-directed-graph/dg-loader/pom.xml b/appc-directed-graph/dg-loader/pom.xml index 02ef801fe..03ead254f 100644 --- a/appc-directed-graph/dg-loader/pom.xml +++ b/appc-directed-graph/dg-loader/pom.xml @@ -45,7 +45,7 @@ UTF-8 1.8 1.8 - 1.1.1 + 1.2.0 3.2.2 2.5 1.3.7 diff --git a/appc-directed-graph/pom.xml b/appc-directed-graph/pom.xml index 345f2c8cc..e241de66a 100644 --- a/appc-directed-graph/pom.xml +++ b/appc-directed-graph/pom.xml @@ -2,7 +2,7 @@ ============LICENSE_START======================================================= ONAP : APPC ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. ================================================================================ Copyright (C) 2017 Amdocs ============================================================================= @@ -17,8 +17,6 @@ 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. - - ECOMP is a trademark and service mark of AT&T Intellectual Property. ============LICENSE_END========================================================= --> diff --git a/appc-outbound/appc-network-inventory-client/pom.xml b/appc-outbound/appc-network-inventory-client/pom.xml index bd380656f..c5059a607 100755 --- a/appc-outbound/appc-network-inventory-client/pom.xml +++ b/appc-outbound/appc-network-inventory-client/pom.xml @@ -3,70 +3,65 @@ ============LICENSE_START======================================================= ONAP : APPC ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. Copyright (C) 2017 Amdocs ================================================================================ 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========================================================= - ECOMP is a trademark and service mark of AT&T Intellectual Property. --> - - org.onap.appc - appc-outbound - 1.3.0-SNAPSHOT - - - 4.0.0 - pom - appc-network-inventory-client - APPC Network Inventory Client - - - - UTF-8 - 1.1.1 - 3.2.2 - 2.5 - 1.3.7 - 1.7 - 2.3.2 - 1.12 - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + org.onap.appc + appc-outbound + 1.3.0-SNAPSHOT + - + 4.0.0 + pom + appc-network-inventory-client + APPC Network Inventory Client - - - org.onap.appc - appc-network-inventory-client-features - features - xml - ${project.version} - + + UTF-8 + 1.2.0 + 3.2.2 + 2.5 + 1.3.7 + 1.7 + 2.3.2 + 1.12 + - - org.onap.appc - appc-network-inventory-client-provider - ${project.version} - - - - - provider - features - installer - - + + + + org.onap.appc + appc-network-inventory-client-features + features + xml + ${project.version} + + + org.onap.appc + appc-network-inventory-client-provider + ${project.version} + + + + + provider + features + installer + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index f99714b29..d9bfb895f 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ ============LICENSE_START======================================================= ONAP : APPC ================================================================================ -Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. ================================================================================ Copyright (C) 2017 Amdocs ============================================================================= @@ -18,8 +18,6 @@ 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. - -ECOMP is a trademark and service mark of AT&T Intellectual Property. ============LICENSE_END========================================================= --> 1.1.25.6-oss 0.2.12 - 0.0.1 - 0.0.1 + 1.0.0 + 1.0.0 1.3.0 1.2.11 3.1.200 @@ -64,7 +62,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. 4.4 3.4 4.5.1 - 1.1.1 + 1.2.0 1.1.0 1.2.2 2.3.2 @@ -84,7 +82,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. features.xml target/generated-sources/yang-gen-config - + https://nexus.onap.org @@ -293,7 +291,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. dblib-provider ${sdnctl.dblib.version} - org.onap.ccsdk.sli.adaptors @@ -357,13 +355,13 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. ch.qos.logback logback-core - 1.1.1 + 1.2.0 compile ch.qos.logback logback-classic - 1.1.1 + 1.2.0 compile @@ -518,18 +516,18 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ${onap.nexus.url} - 176c31dfe190a - ecomp-staging - - + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + ${onap.nexus.url} + 176c31dfe190a + ecomp-staging + + org.apache.maven.plugins @@ -569,10 +567,10 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. -