summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dt5972@att.com>2018-04-25 16:52:22 +0000
committerGerrit Code Review <gerrit@onap.org>2018-04-25 16:52:22 +0000
commit063a0a49c800770154ed072fa2335e80836443bb (patch)
tree86f30c165a7038c81a3e37376ac4b37142578c8a
parent8ed112cc25f33315e453b238478c4a1fde3e257e (diff)
parent4869bd53408224dbc5500adc17f63bab497e8d07 (diff)
Merge "Fix ansible-adapter dependencies"v0.2.1
-rw-r--r--ansible-adapter/ansible-adapter-bundle/pom.xml35
-rw-r--r--ansible-adapter/ansible-adapter-installer/pom.xml6
-rw-r--r--ansible-adapter/ansible-adapter-installer/src/main/resources/scripts/install-feature.sh5
3 files changed, 11 insertions, 35 deletions
diff --git a/ansible-adapter/ansible-adapter-bundle/pom.xml b/ansible-adapter/ansible-adapter-bundle/pom.xml
index 2a8c744c..912ec471 100644
--- a/ansible-adapter/ansible-adapter-bundle/pom.xml
+++ b/ansible-adapter/ansible-adapter-bundle/pom.xml
@@ -45,27 +45,20 @@
<version>${apache.httpcomponents.client.version}</version>
</dependency>
- <!-- http://mvnrepository.com/artifact/org.apache.httpcomponents/httpcore -->
-
-
- <dependency>
- <groupId>javax</groupId>
- <artifactId>javaee-api</artifactId>
- <version>7.0</version>
- </dependency>
-
<!-- Needed to run test cases -->
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-common</artifactId>
<version>2.9.1</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-jaxrs</artifactId>
<version>1.9.13</version>
+ <scope>test</scope>
</dependency>
<dependency>
@@ -76,6 +69,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.onap.ccsdk.sli.core</groupId>
@@ -113,31 +107,8 @@
<artifactId>guava</artifactId>
</dependency>
- <!-- <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId>
- <version>2.8.0</version> </dependency> -->
</dependencies>
-<!-- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>appc-ansible-adapter</Bundle-SymbolicName>
- <Bundle-Activator>org.onap.appc.adapter.ansible.AnsibleActivator</Bundle-Activator>
- <Export-Package>org.onap.appc.adapter.ansible</Export-Package>
- <Import-Package>org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,org.slf4j.*,
- javax.net.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*,javax.naming.*,
- javax.security.*</Import-Package>
- <Embed-Dependency>*;scope=compile|runtime;artifactId=!sli-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mariadb-java-client|xml-apis</Embed-Dependency>
- <Embed-Transitive>true</Embed-Transitive>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build> -->
</project>
diff --git a/ansible-adapter/ansible-adapter-installer/pom.xml b/ansible-adapter/ansible-adapter-installer/pom.xml
index 79448f82..daac66ea 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 05b4ae37..c8214c52 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}