From 3222908ff0b148698d23f5cb3e9402d7f1a662a2 Mon Sep 17 00:00:00 2001
From: Patrick Brady <pb071s@att.com>
Date: Thu, 9 Aug 2018 12:05:53 -0700
Subject: Karaf 4 for appc-dg features

Including appc-dg-util, appc-dg-shared, and appc-ssh-adapter

Change-Id: Ia137a87c560438d23f7858e0f4068717891be076
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-ID: APPC-1137
---
 .../appc-dg-mdsal-store/appc-dg-mdsal-bundle/.gitignore     |  1 +
 .../appc-dg-mdsal-store/appc-dg-mdsal-bundle/pom.xml        | 13 ++++++++++---
 .../appc-dg-mdsal-store/appc-dg-mdsal-model/pom.xml         | 10 ++++++----
 appc-dg/appc-dg-shared/appc-dg-mdsal-store/pom.xml          |  7 ++++---
 4 files changed, 21 insertions(+), 10 deletions(-)
 create mode 100644 appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/.gitignore

(limited to 'appc-dg/appc-dg-shared/appc-dg-mdsal-store')

diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/.gitignore b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/.gitignore
new file mode 100644
index 000000000..eacf31a67
--- /dev/null
+++ b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/.gitignore
@@ -0,0 +1 @@
+/target-ide/
diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/pom.xml b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/pom.xml
index 36c51560a..482329960 100644
--- a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/pom.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/pom.xml
@@ -26,10 +26,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.onap.appc</groupId>
-        <artifactId>appc-dg-mdsal-store</artifactId>
+        <groupId>org.onap.appc.parent</groupId>
+        <artifactId>binding-parent</artifactId>
         <version>1.4.0-SNAPSHOT</version>
+        <relativePath />
     </parent>
+    <groupId>org.onap.appc</groupId>
 
     <artifactId>appc-dg-mdsal-bundle</artifactId>
     <packaging>bundle</packaging>
@@ -185,6 +187,11 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+            <version>${apache.httpcomponents.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sli-common</artifactId>
@@ -213,7 +220,7 @@
 
         <dependency>
             <groupId>org.onap.appc</groupId>
-            <artifactId>appc-common</artifactId>
+            <artifactId>appc-common-bundle</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-model/pom.xml b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-model/pom.xml
index cf66d37a5..89fca6e3b 100644
--- a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-model/pom.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-model/pom.xml
@@ -24,11 +24,13 @@
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
-  <parent>
+    <parent>
+        <groupId>org.onap.appc.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>1.4.0-SNAPSHOT</version>
+        <relativePath />
+    </parent>
     <groupId>org.onap.appc</groupId>
-    <artifactId>appc-dg-mdsal-store</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
-  </parent>
 
   <artifactId>appc-dg-mdsal-model</artifactId>
   <packaging>bundle</packaging>
diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/pom.xml b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/pom.xml
index 4377bbf15..3ec3bb9c0 100644
--- a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/pom.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/pom.xml
@@ -26,11 +26,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.onap.appc</groupId>
-        <artifactId>appc-dg-shared</artifactId>
+        <groupId>org.onap.appc.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
         <version>1.4.0-SNAPSHOT</version>
+        <relativePath />
     </parent>
-
+    <groupId>org.onap.appc</groupId>
     <artifactId>appc-dg-mdsal-store</artifactId>
     <packaging>pom</packaging>
 
-- 
cgit 1.2.3-korg