From 4869bd53408224dbc5500adc17f63bab497e8d07 Mon Sep 17 00:00:00 2001
From: "Timoney, Dan (dt5972)" <dt5972@att.com>
Date: Tue, 24 Apr 2018 11:10:08 -0400
Subject: Fix ansible-adapter dependencies

Ansible-adapter pom included unnecessary dependencies, which caused problems
when attempting to install in karaf.

Change-Id: I7017a25a4d45ab8a75dd7599d10e466ef16d2e6f
Issue-ID: CCSDK-251
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
---
 ansible-adapter/ansible-adapter-installer/pom.xml                   | 6 ++++++
 .../src/main/resources/scripts/install-feature.sh                   | 5 ++---
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'ansible-adapter/ansible-adapter-installer')

diff --git a/ansible-adapter/ansible-adapter-installer/pom.xml b/ansible-adapter/ansible-adapter-installer/pom.xml
index 79448f82e..daac66eab 100644
--- a/ansible-adapter/ansible-adapter-installer/pom.xml
+++ b/ansible-adapter/ansible-adapter-installer/pom.xml
@@ -60,6 +60,12 @@
             <artifactId>ansible-adapter-bundle</artifactId>
             <version>${project.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>javax</groupId>
+            <artifactId>javaee-api</artifactId>
+            <version>7.0</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/ansible-adapter/ansible-adapter-installer/src/main/resources/scripts/install-feature.sh b/ansible-adapter/ansible-adapter-installer/src/main/resources/scripts/install-feature.sh
index 05b4ae373..c8214c520 100644
--- a/ansible-adapter/ansible-adapter-installer/src/main/resources/scripts/install-feature.sh
+++ b/ansible-adapter/ansible-adapter-installer/src/main/resources/scripts/install-feature.sh
@@ -26,7 +26,6 @@
 
 ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}
 ODL_KARAF_CLIENT=${ODL_KARAF_CLIENT:-${ODL_HOME}/bin/client}
-ODL_KARAF_CLIENT_OPTS=${ODL_KARAF_CLIENT_OPTS:-"-u karaf"}
 INSTALLERDIR=$(dirname $0)
 
 REPOZIP=${INSTALLERDIR}/${features.boot}-${project.version}.zip
@@ -39,5 +38,5 @@ else
 	exit 1
 fi
 
-${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories}
-${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:install ${features.boot}
+${ODL_KARAF_CLIENT} feature:repo-add ${features.repositories}
+${ODL_KARAF_CLIENT} feature:install ${features.boot}
-- 
cgit 1.2.3-korg