From f2c1c952765c0a4df2545ebec7b7f6e5c59617b1 Mon Sep 17 00:00:00 2001 From: Patrick Brady Date: Mon, 26 Aug 2019 13:54:22 -0700 Subject: Changes to fix feature installs Feature installs were causing karaf to freeze following the upgrade to the Fluorine SR2 version of ODL. These changes correct the problems. Change-Id: I8e5a41ba6816da782fea3ebaef3b6918cfc1ad4c Signed-off-by: Patrick Brady Issue-ID: APPC-1630 --- .../appc-chef-adapter-bundle/pom.xml | 13 +----------- .../appc-dmaap-adapter-bundle/pom.xml | 2 +- .../onap-appc-dmaap-adapter/pom.xml | 16 --------------- .../appc-message-adapter-api/pom.xml | 2 +- .../appc-message-adapter-factory/pom.xml | 4 ++-- .../appc-netconf-adapter-bundle/pom.xml | 11 ---------- .../appc-rest-adapter-bundle/pom.xml | 10 --------- .../appc-rest-healthcheck-adapter-bundle/pom.xml | 11 ---------- appc-core/appc-common-bundle/pom.xml | 6 +++--- appc-dg-util/appc-dg-util-bundle/pom.xml | 11 +--------- .../appc-interfaces-service/bundle/pom.xml | 6 ------ appc-metric/appc-metric-bundle/pom.xml | 6 +++++- .../onap-appc-network-inventory-client/pom.xml | 24 +--------------------- .../appc-network-inventory-client/provider/pom.xml | 7 ------- 14 files changed, 15 insertions(+), 114 deletions(-) diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml index 9601b1267..897df0d1f 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml @@ -3,7 +3,7 @@ ============LICENSE_START======================================================= ONAP : APPC ================================================================================ - Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. ================================================================================ Copyright (C) 2017 Amdocs ============================================================================= @@ -121,17 +121,6 @@ javax.ws.rs-api - - - com.sun.jersey - jersey-client - - - - com.sun.jersey - jersey-json - - javax.xml.bind jaxb-api diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/pom.xml index 880834a71..e94452c4b 100644 --- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/pom.xml +++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/pom.xml @@ -167,7 +167,7 @@ org.onap.dmaap.messagerouter.dmaapclient dmaapClient ${dmaap.client.version} - jar-with-dependencies + diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/onap-appc-dmaap-adapter/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/onap-appc-dmaap-adapter/pom.xml index b6816e85b..fe857866b 100644 --- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/onap-appc-dmaap-adapter/pom.xml +++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/onap-appc-dmaap-adapter/pom.xml @@ -58,22 +58,6 @@ limitations under the License. appc-message-adapter-api ${project.version} - - com.sun.jersey - jersey-server - - - com.sun.jersey - jersey-servlet - - - com.sun.jersey - jersey-core - - - javax.ws.rs - jsr311-api - diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/pom.xml index 33f46e55f..6351caf6b 100644 --- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/pom.xml +++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/pom.xml @@ -145,7 +145,7 @@ ${project.version} org.onap.appc.adapter.message.* - org.w3c.*,org.onap.appc.metricservice.*,com.att.nsa.*,org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,!org.osgi.service.event.*,org.osgi.service.*,org.osgi.util.*,com.vmware.*,org.apache.xerces.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.*,javax.naming.*,javax.crypto.*, com.sun.jersey.spi.container.servlet,org.eclipse.jetty.servlets + org.w3c.*,org.onap.appc.metricservice.*,com.att.nsa.*,org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,!org.osgi.service.event.*,org.osgi.service.*,org.osgi.util.*,com.vmware.*,org.apache.xerces.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.*,javax.naming.*,javax.crypto.*, org.eclipse.jetty.servlets *;scope=compile|runtime;artifactId=!appc-metric-bundle|sli-common|sli-provider|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mariadb-java-client|xml-apis|pax-* true diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/pom.xml index 1a38d51d8..482c1da7f 100644 --- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/pom.xml +++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/pom.xml @@ -3,7 +3,7 @@ ============LICENSE_START======================================================= ONAP : APPC ================================================================================ - Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. Copyright (C) 2017 Amdocs ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); @@ -156,7 +156,7 @@ org.onap.appc.adapter.factory org.onap.appc.adapter.factory.DmaapMessageAdapterFactoryActivator org.onap.appc.adapter.message.MessageAdapterFactory - org.onap.appc.adapter.messaging.*,org.onap.appc.adapter.message.*,org.onap.appc.metricservice.*,com.att.nsa.*org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,!org.osgi.service.event.*,org.osgi.service.*,org.osgi.util.*,com.vmware.*,org.apache.xerces.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.*,javax.naming.*,javax.crypto.*, com.sun.jersey.spi.container.servlet,org.eclipse.jetty.servlets + org.onap.appc.adapter.messaging.*,org.onap.appc.adapter.message.*,org.onap.appc.metricservice.*,com.att.nsa.*org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,!org.osgi.service.event.*,org.osgi.service.*,org.osgi.util.*,com.vmware.*,org.apache.xerces.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.*,javax.naming.*,javax.crypto.*,org.eclipse.jetty.servlets *;scope=compile|runtime;artifactId=!appc-metric-bundle|sli-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mariadb-java-client|xml-apis|pax-* true OSGI-INF/blueprint/blueprint.xml diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/pom.xml b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/pom.xml index 419f66b0a..2a748ce06 100644 --- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/pom.xml +++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/pom.xml @@ -83,17 +83,6 @@ javax.ws.rs-api - - - com.sun.jersey - jersey-client - - - - com.sun.jersey - jersey-json - - javax.xml.bind jaxb-api diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml index eee104a88..ff547ad7f 100644 --- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml +++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml @@ -92,20 +92,10 @@ javax.ws.rs-api - - - com.sun.jersey - jersey-client - - org.json json - - com.sun.jersey - jersey-json - javax.xml.bind diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/pom.xml b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/pom.xml index b5c4dcbfe..6eb50c1f7 100644 --- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/pom.xml +++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/pom.xml @@ -101,17 +101,6 @@ javax.ws.rs-api - - - com.sun.jersey - jersey-client - - - - com.sun.jersey - jersey-json - - javax.xml.bind jaxb-api diff --git a/appc-core/appc-common-bundle/pom.xml b/appc-core/appc-common-bundle/pom.xml index b3cf6cdf7..5f2ec9dfd 100644 --- a/appc-core/appc-common-bundle/pom.xml +++ b/appc-core/appc-common-bundle/pom.xml @@ -2,7 +2,7 @@ ============LICENSE_START======================================================= ONAP : APPC ================================================================================ - Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2018-2019 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. @@ -174,8 +174,8 @@ appc-common-bundle - org.onap.appc.*, com.att.eelf.* - eelf-core + org.onap.appc.* + true diff --git a/appc-dg-util/appc-dg-util-bundle/pom.xml b/appc-dg-util/appc-dg-util-bundle/pom.xml index a577cd3c6..a4b53139a 100644 --- a/appc-dg-util/appc-dg-util-bundle/pom.xml +++ b/appc-dg-util/appc-dg-util-bundle/pom.xml @@ -3,7 +3,7 @@ ============LICENSE_START======================================================= ONAP : APPC ================================================================================ - Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. Copyright (C) 2017 Amdocs ================================================================================ Modifications Copyright (C) 2018 Nokia @@ -60,15 +60,6 @@ javax.ws.rs javax.ws.rs-api - - - com.sun.jersey - jersey-client - - - com.sun.jersey - jersey-json - javax.xml.bind jaxb-api diff --git a/appc-inbound/appc-interfaces-service/bundle/pom.xml b/appc-inbound/appc-interfaces-service/bundle/pom.xml index 6ebdcd76f..2598f8066 100644 --- a/appc-inbound/appc-interfaces-service/bundle/pom.xml +++ b/appc-inbound/appc-interfaces-service/bundle/pom.xml @@ -117,12 +117,6 @@ - - com.sun.jersey - jersey-client - 1.17 - provided - com.fasterxml.jackson.dataformat jackson-dataformat-yaml diff --git a/appc-metric/appc-metric-bundle/pom.xml b/appc-metric/appc-metric-bundle/pom.xml index fe37fea63..bc6fb271b 100644 --- a/appc-metric/appc-metric-bundle/pom.xml +++ b/appc-metric/appc-metric-bundle/pom.xml @@ -3,7 +3,7 @@ ============LICENSE_START======================================================= ONAP : APPC ================================================================================ - Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. Copyright (C) 2017 Amdocs ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,6 +35,10 @@ appc-metric-bundle OSGi bundle project. + + com.att.eelf + eelf-core + org.osgi org.osgi.core diff --git a/appc-outbound/appc-network-inventory-client/features/onap-appc-network-inventory-client/pom.xml b/appc-outbound/appc-network-inventory-client/features/onap-appc-network-inventory-client/pom.xml index 922615336..250651e79 100644 --- a/appc-outbound/appc-network-inventory-client/features/onap-appc-network-inventory-client/pom.xml +++ b/appc-outbound/appc-network-inventory-client/features/onap-appc-network-inventory-client/pom.xml @@ -3,7 +3,7 @@ ============LICENSE_START======================================================= ONAP : APPC ================================================================================ -Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. +Copyright (C) 2018-2019 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. @@ -49,28 +49,6 @@ limitations under the License. xml features - - commons-lang - commons-lang - 2.6 - - - commons-collections - commons-collections - ${commons.collections.version} - - - com.sun.jersey - jersey-client - - - ch.qos.logback - logback-core - - - ch.qos.logback - logback-classic - org.onap.appc appc-config-params-provider diff --git a/appc-outbound/appc-network-inventory-client/provider/pom.xml b/appc-outbound/appc-network-inventory-client/provider/pom.xml index 58d0e9e39..fdd1ca110 100755 --- a/appc-outbound/appc-network-inventory-client/provider/pom.xml +++ b/appc-outbound/appc-network-inventory-client/provider/pom.xml @@ -51,7 +51,6 @@ ch.qos.logback logback-classic - ${logback.version} com.att.eelf @@ -76,13 +75,11 @@ org.powermock powermock-api-mockito - 1.6.4 test org.powermock powermock-module-junit4 - 1.6.4 test @@ -115,12 +112,10 @@ com.fasterxml.jackson.dataformat jackson-dataformat-yaml - 2.3.2 org.yaml snakeyaml - ${snakeyaml.version} @@ -137,9 +132,7 @@ org.onap.appc.instar * jackson-dataformat-yaml,snakeyaml - * - ${project.basedir}/src/main/resources/META-INF -- cgit 1.2.3-korg