summaryrefslogtreecommitdiffstats
path: root/grToolkit
diff options
context:
space:
mode:
authorSmokowski, Kevin (ks6305) <kevin.smokowski@att.com>2019-05-29 21:25:31 +0000
committerDan Timoney <dtimoney@att.com>2019-06-25 18:48:34 +0000
commitbc136f3650f150b96e8940c5d6cf321376338510 (patch)
tree041a3f18767f289c44e039120a0af2f7912bd852 /grToolkit
parent743cf1a6bb13e952c0e36ac8fd7b39371c643a4d (diff)
feature file cleanup
instead of each feature file starting ccsdk-sli let it be handled by bootfeatures Change-Id: Ie7f20c8861bf329471c6317ede8128a9c420a9f8 Issue-ID: CCSDK-1370 Signed-off-by: Smokowski, Kevin (ks6305) <kevin.smokowski@att.com>
Diffstat (limited to 'grToolkit')
-rw-r--r--[-rwxr-xr-x]grToolkit/features/ccsdk-gr-toolkit/pom.xml7
-rwxr-xr-xgrToolkit/features/ccsdk-gr-toolkit/src/main/feature/feature.xml7
-rwxr-xr-xgrToolkit/provider/pom.xml2
3 files changed, 2 insertions, 14 deletions
diff --git a/grToolkit/features/ccsdk-gr-toolkit/pom.xml b/grToolkit/features/ccsdk-gr-toolkit/pom.xml
index 37343c53..fdbc61b7 100755..100644
--- a/grToolkit/features/ccsdk-gr-toolkit/pom.xml
+++ b/grToolkit/features/ccsdk-gr-toolkit/pom.xml
@@ -24,13 +24,6 @@
<classifier>features</classifier>
</dependency>
<dependency>
- <groupId>org.onap.ccsdk.sli.core</groupId>
- <artifactId>ccsdk-sli</artifactId>
- <version>${ccsdk.sli.core.version}</version>
- <type>xml</type>
- <classifier>features</classifier>
- </dependency>
- <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>gr-toolkit-model</artifactId>
<version>${project.version}</version>
diff --git a/grToolkit/features/ccsdk-gr-toolkit/src/main/feature/feature.xml b/grToolkit/features/ccsdk-gr-toolkit/src/main/feature/feature.xml
deleted file mode 100755
index 4a21ca55..00000000
--- a/grToolkit/features/ccsdk-gr-toolkit/src/main/feature/feature.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="ccsdk-gr-toolkit">
- <repository>mvn:org.onap.ccsdk.sli.core/ccsdk-sli/LATEST/xml/features</repository>
- <feature name="ccsdk-gr-toolkit">
- <feature version="${ccsdk.sli.core.version}">ccsdk-sli</feature>
- </feature>
-</features>
diff --git a/grToolkit/provider/pom.xml b/grToolkit/provider/pom.xml
index b624e069..67c71177 100755
--- a/grToolkit/provider/pom.xml
+++ b/grToolkit/provider/pom.xml
@@ -48,11 +48,13 @@
<groupId>org.onap.ccsdk.sli.core</groupId>
<artifactId>sli-common</artifactId>
<version>${ccsdk.sli.core.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.onap.ccsdk.sli.core</groupId>
<artifactId>sli-provider</artifactId>
<version>${ccsdk.sli.core.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<artifactId>sal-test-model</artifactId>