From e8b4238924ea424b9babd49c43cabd8b74616943 Mon Sep 17 00:00:00 2001 From: Ganesh Chandrasekaran Date: Fri, 24 Aug 2018 09:05:12 +0900 Subject: saltstack dependency refactoring Issue-ID: CCSDK-486 Change-Id: I5f4cebec91a1129a58b8e0b8776eb5779c637df2 Signed-off-by: Ganesh Chandrasekaran --- .../ccsdk-saltstack-adapter/pom.xml | 4 +- .../src/main/resources/features.xml | 20 ++++---- .../saltstack-adapter-provider/pom.xml | 54 ++++++---------------- 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 @@ - + --> 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 @@ --> - - - mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features - + mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features odl-mdsal-broker sdnc-sli - - mvn:org.onap.appc/appc-common/${project.version} - - - mvn:org.onap.ccsdk.sli.adaptors/saltstack-adapter-provider/${project.version} - + mvn:org.apache.sshd/sshd-core/0.12.0 + mvn:org.onap.appc/appc-common/1.3.0 + mvn:org.onap.appc/appc-ssh-adapter-api/1.3.0 + mvn:org.apache.commons/commons-io/1.3.2 + mvn:org.onap.ccsdk.sli.adaptors/saltstack-adapter-provider/${project.version} 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 @@ commons-logging 1.2 + + org.osgi + org.osgi.core + provided + + + org.slf4j + slf4j-api + + + org.slf4j + jcl-over-slf4j + org.apache.sshd sshd-core 0.12.0 - provided @@ -66,19 +78,6 @@ - - org.glassfish.jersey.core - jersey-common - 2.9.1 - test - - - - org.codehaus.jackson - jackson-jaxrs - 1.9.13 - test - org.apache.commons @@ -89,7 +88,6 @@ org.codehaus.jettison jettison - provided @@ -97,11 +95,7 @@ junit test - - org.mockito - mockito-core - test - + org.onap.ccsdk.sli.core sli-common @@ -111,32 +105,12 @@ org.onap.ccsdk.sli.core sli-provider - - org.osgi - org.osgi.core - provided - - - org.slf4j - slf4j-api - - - - org.slf4j - jcl-over-slf4j - org.json json - - - com.google.guava - guava - - -- cgit 1.2.3-korg