From bc136f3650f150b96e8940c5d6cf321376338510 Mon Sep 17 00:00:00 2001
From: "Smokowski, Kevin (ks6305)" <kevin.smokowski@att.com>
Date: Wed, 29 May 2019 21:25:31 +0000
Subject: 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>
---
 grToolkit/features/ccsdk-gr-toolkit/pom.xml                      | 7 -------
 grToolkit/features/ccsdk-gr-toolkit/src/main/feature/feature.xml | 7 -------
 grToolkit/provider/pom.xml                                       | 2 ++
 3 files changed, 2 insertions(+), 14 deletions(-)
 mode change 100755 => 100644 grToolkit/features/ccsdk-gr-toolkit/pom.xml
 delete mode 100755 grToolkit/features/ccsdk-gr-toolkit/src/main/feature/feature.xml

(limited to 'grToolkit')

diff --git a/grToolkit/features/ccsdk-gr-toolkit/pom.xml b/grToolkit/features/ccsdk-gr-toolkit/pom.xml
old mode 100755
new mode 100644
index 37343c53..fdbc61b7
--- a/grToolkit/features/ccsdk-gr-toolkit/pom.xml
+++ b/grToolkit/features/ccsdk-gr-toolkit/pom.xml
@@ -23,13 +23,6 @@
             <type>xml</type>
             <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>
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>
-- 
cgit 1.2.3-korg