summaryrefslogtreecommitdiffstats
path: root/grToolkit
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dtimoney@att.com>2019-12-12 14:08:33 -0500
committerTimoney, Dan (dt5972) <dtimoney@att.com>2019-12-12 14:08:33 -0500
commitdffc1fd635470b0fc0e940f78e69d8f0ab0d14f0 (patch)
tree92d6f8c71d390223e0b47520a5befd12f59126c7 /grToolkit
parent3e8b55b9d3841c175776d84d54edf2a284f1f4b5 (diff)
Refactor karaf features into single module
Refactor karaf features installation into a single installation bundle instead of embedding in each module's installer. Change-Id: I281973c5d6fda5eeb0483cf9e6d058b8a4992ed3 Issue-ID: CCSDK-1754 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Diffstat (limited to 'grToolkit')
-rwxr-xr-xgrToolkit/features/.gitignore2
-rw-r--r--grToolkit/features/ccsdk-gr-toolkit/pom.xml37
-rwxr-xr-xgrToolkit/features/features-gr-toolkit/pom.xml29
-rwxr-xr-xgrToolkit/features/pom.xml21
-rwxr-xr-xgrToolkit/installer/pom.xml13
-rwxr-xr-xgrToolkit/pom.xml8
6 files changed, 0 insertions, 110 deletions
diff --git a/grToolkit/features/.gitignore b/grToolkit/features/.gitignore
deleted file mode 100755
index 05a0d25f8..000000000
--- a/grToolkit/features/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/target-ide/
-/bin/
diff --git a/grToolkit/features/ccsdk-gr-toolkit/pom.xml b/grToolkit/features/ccsdk-gr-toolkit/pom.xml
deleted file mode 100644
index 1ac3f96b3..000000000
--- a/grToolkit/features/ccsdk-gr-toolkit/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.onap.ccsdk.parent</groupId>
- <artifactId>single-feature-parent</artifactId>
- <version>1.5.1-SNAPSHOT</version>
- <relativePath/>
- </parent>
-
- <groupId>org.onap.ccsdk.sli.plugins</groupId>
- <artifactId>ccsdk-gr-toolkit</artifactId>
- <version>0.7.0-SNAPSHOT</version>
- <packaging>feature</packaging>
-
- <name>ccsdk-sli-plugins :: gr-toolkit :: ${project.artifactId}</name>
-
- <dependencies>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>odl-mdsal-broker</artifactId>
- <type>xml</type>
- <classifier>features</classifier>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>gr-toolkit-model</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>gr-toolkit-provider</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-</project>
diff --git a/grToolkit/features/features-gr-toolkit/pom.xml b/grToolkit/features/features-gr-toolkit/pom.xml
deleted file mode 100755
index f19e2d8e1..000000000
--- a/grToolkit/features/features-gr-toolkit/pom.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.onap.ccsdk.parent</groupId>
- <artifactId>feature-repo-parent</artifactId>
- <version>1.5.1-SNAPSHOT</version>
- <relativePath/>
- </parent>
-
- <groupId>org.onap.ccsdk.sli.plugins</groupId>
- <artifactId>features-gr-toolkit</artifactId>
- <version>0.7.0-SNAPSHOT</version>
- <packaging>feature</packaging>
-
- <name>ccsdk-sli-plugins :: gr-toolkit :: ${project.artifactId}</name>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ccsdk-gr-toolkit</artifactId>
- <version>${project.version}</version>
- <type>xml</type>
- <classifier>features</classifier>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/grToolkit/features/pom.xml b/grToolkit/features/pom.xml
deleted file mode 100755
index 8a351ca90..000000000
--- a/grToolkit/features/pom.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.onap.ccsdk.parent</groupId>
- <artifactId>odlparent-lite</artifactId>
- <version>1.5.1-SNAPSHOT</version>
- <relativePath/>
- </parent>
-
- <name>ccsdk-sli-plugins :: gr-toolkit :: ${project.artifactId}</name>
- <artifactId>gr-toolkit-features</artifactId>
- <groupId>org.onap.ccsdk.sli.plugins</groupId>
- <version>0.7.0-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <modules>
- <module>ccsdk-gr-toolkit</module>
- <module>features-gr-toolkit</module>
- </modules>
-</project>
diff --git a/grToolkit/installer/pom.xml b/grToolkit/installer/pom.xml
index 8830fdc4b..6350e2653 100755
--- a/grToolkit/installer/pom.xml
+++ b/grToolkit/installer/pom.xml
@@ -22,19 +22,6 @@
<dependencies>
<dependency>
<groupId>org.onap.ccsdk.sli.plugins</groupId>
- <artifactId>${application.name}</artifactId>
- <version>${project.version}</version>
- <type>xml</type>
- <classifier>features</classifier>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.onap.ccsdk.sli.plugins</groupId>
<artifactId>gr-toolkit-provider</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/grToolkit/pom.xml b/grToolkit/pom.xml
index 770c40b33..4102c8caa 100755
--- a/grToolkit/pom.xml
+++ b/grToolkit/pom.xml
@@ -19,7 +19,6 @@
<modules>
<module>model</module>
- <module>features</module>
<module>installer</module>
<module>provider</module>
</modules>
@@ -28,13 +27,6 @@
<dependencies>
<dependency>
<groupId>org.onap.ccsdk.sli.plugins</groupId>
- <artifactId>gr-toolkit-features</artifactId>
- <classifier>features</classifier>
- <type>xml</type>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.onap.ccsdk.sli.plugins</groupId>
<artifactId>gr-toolkit-model</artifactId>
<version>${project.version}</version>
</dependency>