diff options
| author |   Ganesh Chandrasekaran <ganesh.c@samsung.com> | 2018-08-24 09:05:12 +0900 |
|---|---|---|
| committer | Ganesh Chandrasekaran <ganesh.c@samsung.com> | 2018-08-24 09:15:48 +0900 |
| commit | e8b4238924ea424b9babd49c43cabd8b74616943 (patch) | |
| tree | bb075ee7f1645ba2a783c72ff3fc217b2c4726c8 /saltstack-adapter/saltstack-adapter-features | |
| parent | eae6b96f6529e4a9f350809a5def4d82a904501b (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/saltstack-adapter-features')
| -rw-r--r-- | saltstack-adapter/saltstack-adapter-features/ccsdk-saltstack-adapter/pom.xml | 4 | ||||
| -rw-r--r-- | saltstack-adapter/saltstack-adapter-features/src/main/resources/features.xml | 20 |
2 files changed, 10 insertions, 14 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 d90b39763..bdcb052ab 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 abdcb5e20..cca279cdf 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> |