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 <patrick.brady@att.com>
Issue-ID: APPC-1630

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 9601b12..897df0d 100644 (file)
--- 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 @@
             <artifactId>javax.ws.rs-api</artifactId>
         </dependency>
 
-        <!-- Jersey support needed for OpenStack connector and API version logic -->
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-client</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-json</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>

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 880834a..e94452c 100644 (file)
--- 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 @@
                        <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId> 
                        <artifactId>dmaapClient</artifactId>
             <version>${dmaap.client.version}</version>
-            <classifier>jar-with-dependencies</classifier>
+<!--             <classifier>jar-with-dependencies</classifier> -->
                </dependency>
 
                <dependency>

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 b6816e8..fe85786 100644 (file)
--- 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.
             <artifactId>appc-message-adapter-api</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-server</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-servlet</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>jsr311-api</artifactId>
-        </dependency>
 <!--         <dependency> -->
 <!--             <groupId>org.glassfish.jersey.core</groupId> -->
 <!--             <artifactId>jersey-server</artifactId> -->

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 33f46e5..6351caf 100644 (file)
--- 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 @@
                                                <Bundle-Version>${project.version}</Bundle-Version>
                                                <Export-Package>org.onap.appc.adapter.message.*</Export-Package>
                                                <!--<Export-Serice>org.onap.appc.adapter.message.EventSender</Export-Serice>-->
-                                               <Import-Package>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</Import-Package>
+                                               <Import-Package>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</Import-Package>
                                                <!--<Embed-Dependency>appc-common-bundle</Embed-Dependency>-->
                                                <Embed-Dependency>*;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-*</Embed-Dependency>
                                                <Embed-Transitive>true</Embed-Transitive>

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 1a38d51..482c1da 100644 (file)
--- 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 @@
                                                <Export-Package>org.onap.appc.adapter.factory</Export-Package>
                                                <Bundle-Activator>org.onap.appc.adapter.factory.DmaapMessageAdapterFactoryActivator</Bundle-Activator>
                                                <Export-Service>org.onap.appc.adapter.message.MessageAdapterFactory</Export-Service>
-                                               <Import-Package>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</Import-Package>
+                                               <Import-Package>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</Import-Package>
                                                <Embed-Dependency>*;scope=compile|runtime;artifactId=!appc-metric-bundle|sli-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mariadb-java-client|xml-apis|pax-*</Embed-Dependency>
                                                <Embed-Transitive>true</Embed-Transitive>
                                                <Bundle-Blueprint>OSGI-INF/blueprint/blueprint.xml</Bundle-Blueprint>

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 419f66b..2a748ce 100644 (file)
--- 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 @@
             <artifactId>javax.ws.rs-api</artifactId>
             </dependency>
 
-        <!-- Jersey support needed for OpenStack connector and API version logic -->
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-client</artifactId>
-            </dependency>
-
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-json</artifactId>
-            </dependency>
-
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>

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 eee104a..ff547ad 100644 (file)
--- 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 @@
                        <artifactId>javax.ws.rs-api</artifactId>
                        </dependency>
 
-               <!-- Jersey support needed for OpenStack connector and API version logic -->
-               <dependency>
-                       <groupId>com.sun.jersey</groupId>
-                       <artifactId>jersey-client</artifactId>
-                       </dependency>
-
                <dependency>
                <groupId>org.json</groupId>
                <artifactId>json</artifactId>
                </dependency>
-               <dependency>
-                       <groupId>com.sun.jersey</groupId>
-                       <artifactId>jersey-json</artifactId>
-                       </dependency>
 
                <dependency>
                        <groupId>javax.xml.bind</groupId>

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 b5c4dcb..6eb50c1 100644 (file)
--- 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 @@
             <artifactId>javax.ws.rs-api</artifactId>
         </dependency>
 
-        <!-- Jersey support needed for OpenStack connector and API version logic -->
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-client</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-json</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>

diff --git a/appc-core/appc-common-bundle/pom.xml b/appc-core/appc-common-bundle/pom.xml
index b3cf6cd..5f2ec9d 100644 (file)
--- a/appc-core/appc-common-bundle/pom.xml
+++ b/appc-core/appc-common-bundle/pom.xml
@@ -2,7 +2,7 @@
   ============LICENSE_START=======================================================\r
   ONAP : APPC\r
   ================================================================================\r
-  Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.\r
+  Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.\r
   ================================================================================\r
   Licensed under the Apache License, Version 2.0 (the "License");\r
   you may not use this file except in compliance with the License.\r
@@ -174,8 +174,8 @@
         <configuration>\r
           <instructions>\r
             <Bundle-SymbolicName>appc-common-bundle</Bundle-SymbolicName>\r
-            <Export-Package>org.onap.appc.*, com.att.eelf.*</Export-Package>\r
-            <Embed-Dependency>eelf-core</Embed-Dependency>\r
+            <Export-Package>org.onap.appc.*</Export-Package>\r
+            <Embed-Dependency></Embed-Dependency>\r
             <Embed-Transitive>true</Embed-Transitive>\r
           </instructions>\r
         </configuration>\r

diff --git a/appc-dg-util/appc-dg-util-bundle/pom.xml b/appc-dg-util/appc-dg-util-bundle/pom.xml
index a577cd3..a4b5313 100644 (file)
--- 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 @@
             <groupId>javax.ws.rs</groupId>
             <artifactId>javax.ws.rs-api</artifactId>
         </dependency>
-        <!-- Jersey support needed for OpenStack connector and API version logic -->
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-client</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-json</artifactId>
-        </dependency>
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>

diff --git a/appc-inbound/appc-interfaces-service/bundle/pom.xml b/appc-inbound/appc-interfaces-service/bundle/pom.xml
index 6ebdcd7..2598f80 100644 (file)
--- a/appc-inbound/appc-interfaces-service/bundle/pom.xml
+++ b/appc-inbound/appc-interfaces-service/bundle/pom.xml
@@ -117,12 +117,6 @@
                    </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-client</artifactId>
-            <version>1.17</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>

diff --git a/appc-metric/appc-metric-bundle/pom.xml b/appc-metric/appc-metric-bundle/pom.xml
index fe37fea..bc6fb27 100644 (file)
--- 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 @@
     <description>appc-metric-bundle OSGi bundle project.</description>
 
     <dependencies>
+        <dependency>
+            <groupId>com.att.eelf</groupId>
+            <artifactId>eelf-core</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>

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 9226153..250651e 100644 (file)
--- 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.
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.6</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <version>${commons.collections.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-client</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.onap.appc</groupId>
             <artifactId>appc-config-params-provider</artifactId>

diff --git a/appc-outbound/appc-network-inventory-client/provider/pom.xml b/appc-outbound/appc-network-inventory-client/provider/pom.xml
index 58d0e9e..fdd1ca1 100755 (executable)
--- a/appc-outbound/appc-network-inventory-client/provider/pom.xml
+++ b/appc-outbound/appc-network-inventory-client/provider/pom.xml
@@ -51,7 +51,6 @@
         <dependency>\r
          <groupId>ch.qos.logback</groupId>\r
          <artifactId>logback-classic</artifactId>\r
-        <version>${logback.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>com.att.eelf</groupId>\r
@@ -76,13 +75,11 @@
         <dependency>\r
             <groupId>org.powermock</groupId>\r
             <artifactId>powermock-api-mockito</artifactId>\r
-            <version>1.6.4</version>\r
             <scope>test</scope>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.powermock</groupId>\r
             <artifactId>powermock-module-junit4</artifactId>\r
-            <version>1.6.4</version>\r
             <scope>test</scope>\r
         </dependency>\r
         <dependency>\r
@@ -115,12 +112,10 @@
         <dependency>\r
             <groupId>com.fasterxml.jackson.dataformat</groupId>\r
             <artifactId>jackson-dataformat-yaml</artifactId>\r
-            <version>2.3.2</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.yaml</groupId>\r
             <artifactId>snakeyaml</artifactId>\r
-            <version>${snakeyaml.version}</version>\r
         </dependency>\r
     </dependencies>\r
 \r
@@ -137,9 +132,7 @@
                         <Export-Package>org.onap.appc.instar</Export-Package>\r
                         <Import-Package>*</Import-Package>\r
                         <Embed-Dependency>jackson-dataformat-yaml,snakeyaml</Embed-Dependency>\r
-                        <DynamicImport-Package>*</DynamicImport-Package>\r
                     </instructions>\r
-                    <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>\r
                 </configuration>\r
             </plugin>\r
         </plugins>\r