summaryrefslogtreecommitdiffstats
path: root/saltstack-adapter
diff options
context:
space:
mode:
authorGanesh Chandrasekaran <ganesh.c@samsung.com>2018-08-24 09:05:12 +0900
committerGanesh Chandrasekaran <ganesh.c@samsung.com>2018-08-24 09:15:48 +0900
commite8b4238924ea424b9babd49c43cabd8b74616943 (patch)
treebb075ee7f1645ba2a783c72ff3fc217b2c4726c8 /saltstack-adapter
parenteae6b96f6529e4a9f350809a5def4d82a904501b (diff)
saltstack dependency refactoring
Issue-ID: CCSDK-486 Change-Id: I5f4cebec91a1129a58b8e0b8776eb5779c637df2 Signed-off-by: Ganesh Chandrasekaran <ganesh.c@samsung.com>
Diffstat (limited to 'saltstack-adapter')
-rw-r--r--saltstack-adapter/saltstack-adapter-features/ccsdk-saltstack-adapter/pom.xml4
-rw-r--r--saltstack-adapter/saltstack-adapter-features/src/main/resources/features.xml20
-rw-r--r--saltstack-adapter/saltstack-adapter-provider/pom.xml54
3 files changed, 24 insertions, 54 deletions
diff --git a/saltstack-adapter/saltstack-adapter-features/ccsdk-saltstack-adapter/pom.xml b/saltstack-adapter/saltstack-adapter-features/ccsdk-saltstack-adapter/pom.xml
index d90b3976..bdcb052a 100644
--- a/saltstack-adapter/saltstack-adapter-features/ccsdk-saltstack-adapter/pom.xml
+++ b/saltstack-adapter/saltstack-adapter-features/ccsdk-saltstack-adapter/pom.xml
@@ -35,7 +35,7 @@
</dependency>
</dependencies>
</dependencyManagement>
- <!-- <dependencies>
+ <!-- <dependencies>
<dependency>
<groupId>org.onap.ccsdk.sli.core</groupId>
<artifactId>ccsdk-sli</artifactId>
@@ -48,5 +48,5 @@
<version>${project.version}</version>
</dependency>
</dependencies>
- -->
+ -->
</project>
diff --git a/saltstack-adapter/saltstack-adapter-features/src/main/resources/features.xml b/saltstack-adapter/saltstack-adapter-features/src/main/resources/features.xml
index abdcb5e2..cca279cd 100644
--- a/saltstack-adapter/saltstack-adapter-features/src/main/resources/features.xml
+++ b/saltstack-adapter/saltstack-adapter-features/src/main/resources/features.xml
@@ -24,25 +24,21 @@
-->
-<features xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- name="ccsdk-saltstack-adapter-${project.version}"
- xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
+<features name="ccsdk-saltstack-adapter-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
- <repository>
- mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features
- </repository>
+ <repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository>
<feature name='ccsdk-saltstack-adapter'
description="ccsdk-saltstack-adapter" version='${project.version}'>
<feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
<feature>sdnc-sli</feature>
- <bundle dependency="true">
- mvn:org.onap.appc/appc-common/${project.version}
- </bundle>
- <bundle>
- mvn:org.onap.ccsdk.sli.adaptors/saltstack-adapter-provider/${project.version}
- </bundle>
+ <bundle dependency="true">mvn:org.apache.sshd/sshd-core/0.12.0</bundle>
+ <bundle dependency="true">mvn:org.onap.appc/appc-common/1.3.0</bundle>
+ <bundle dependency="true">mvn:org.onap.appc/appc-ssh-adapter-api/1.3.0</bundle>
+ <bundle dependency="true">mvn:org.apache.commons/commons-io/1.3.2</bundle>
+ <bundle>mvn:org.onap.ccsdk.sli.adaptors/saltstack-adapter-provider/${project.version}</bundle>
</feature>
</features>
diff --git a/saltstack-adapter/saltstack-adapter-provider/pom.xml b/saltstack-adapter/saltstack-adapter-provider/pom.xml
index 81e9ba9e..4c7646d6 100644
--- a/saltstack-adapter/saltstack-adapter-provider/pom.xml
+++ b/saltstack-adapter/saltstack-adapter-provider/pom.xml
@@ -43,13 +43,25 @@
<artifactId>commons-logging</artifactId>
<version>1.2</version>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
<!-- Needed to run SSH -->
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
<version>0.12.0</version>
- <scope>provided</scope>
</dependency>
<dependency>
@@ -66,19 +78,6 @@
</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>
<groupId>org.apache.commons</groupId>
@@ -89,7 +88,6 @@
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
@@ -97,11 +95,7 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
+
<dependency>
<groupId>org.onap.ccsdk.sli.core</groupId>
<artifactId>sli-common</artifactId>
@@ -111,32 +105,12 @@
<groupId>org.onap.ccsdk.sli.core</groupId>
<artifactId>sli-provider</artifactId>
</dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
</dependency>
-
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
-
</dependencies>
</project>