From 4f2af7fd9845c66bf96b8da97a167961a98b75f4 Mon Sep 17 00:00:00 2001
From: Patrick Brady <patrick.brady@att.com>
Date: Thu, 3 Jan 2019 11:21:43 -0800
Subject: Fixes feature install on latest ccsdk

Updated rest adapter to resolve dependencies the same way that other
appc features do. This fixed the karaf crash during install.

Added necessary dependencies as embedded or karaf bundles to other
appc features, as needed.

Change-Id: Id04d08cd09c2ff0cae0db8ecbc61405da10882d7
Signed-off-by: Patrick Brady <patrick.brady@att.com>
Issue-ID: APPC-1304
---
 .../onap-appc-rest-adapter/pom.xml                 | 52 +---------------------
 1 file changed, 1 insertion(+), 51 deletions(-)

(limited to 'appc-adapters/appc-rest-adapter/appc-rest-adapter-features')

diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/onap-appc-rest-adapter/pom.xml b/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/onap-appc-rest-adapter/pom.xml
index 33fe957ac..36857dacd 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/onap-appc-rest-adapter/pom.xml
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/onap-appc-rest-adapter/pom.xml
@@ -61,56 +61,6 @@ limitations under the License.
             <artifactId>appc-rest-adapter-bundle</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.bundles.repackaged</groupId>
-            <artifactId>jersey-guava</artifactId>
-            <version>2.25.1</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>2.8.6</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>2.8.6</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <version>2.8.6</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.jaxrs</groupId>
-            <artifactId>jackson-jaxrs-base</artifactId>
-            <version>2.8.6</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.jaxrs</groupId>
-            <artifactId>jackson-jaxrs-json-provider</artifactId>
-            <version>2.8.6</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.core</groupId>
-            <artifactId>jersey-server</artifactId>
-            <version>2.25.1</version>
-        </dependency>
-        <dependency>
-            <groupId>com.ning</groupId>
-            <artifactId>async-http-client</artifactId>
-            <version>1.9.39</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.grizzly</groupId>
-            <artifactId>grizzly-http-servlet</artifactId>
-            <version>2.3.28</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.grizzly</groupId>
-            <artifactId>grizzly-http</artifactId>
-            <version>2.3.28</version>
-        </dependency>
         
     </dependencies>
 
@@ -121,7 +71,7 @@ limitations under the License.
                 <artifactId>karaf-maven-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
-                <includeTransitiveDependency>true</includeTransitiveDependency>
+                <includeTransitiveDependency>false</includeTransitiveDependency>
                     <excludedArtifactIds>
                         <excludedArtifactId>slf4j-api</excludedArtifactId>
                         <excludedArtifactId>tomcat-jdbc</excludedArtifactId>
-- 
cgit 1.2.3-korg