summaryrefslogtreecommitdiffstats
path: root/sli
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dtimoney@att.com>2019-12-13 10:24:29 -0500
committerTimoney, Dan (dt5972) <dtimoney@att.com>2019-12-13 10:24:29 -0500
commita55a4e30507c25c21c7f1df830f5d5189e03c038 (patch)
treec1c23e7259521fd3bbd1711c837f6ea939ed001d /sli
parent6fd84f1422338180459ca6442be96440f116da44 (diff)
Refactor features to separate installer
Refactor karaf feature.xml files to separate installer Change-Id: I2afade9862227175853d9fe36c5bc9b113e3d582 Issue-ID: CCSDK-1754 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Diffstat (limited to 'sli')
-rw-r--r--sli/features/features-sli/pom.xml29
-rw-r--r--sli/features/odl-sli/pom.xml61
-rw-r--r--sli/features/pom.xml23
-rwxr-xr-xsli/installer/pom.xml14
-rwxr-xr-xsli/pom.xml1
5 files changed, 0 insertions, 128 deletions
diff --git a/sli/features/features-sli/pom.xml b/sli/features/features-sli/pom.xml
deleted file mode 100644
index 80c4102f..00000000
--- a/sli/features/features-sli/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.core</groupId>
- <artifactId>features-sli</artifactId>
- <version>0.7.0-SNAPSHOT</version>
- <packaging>feature</packaging>
-
- <name>ccsdk-sli-core :: sli :: ${project.artifactId}</name>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ccsdk-sli</artifactId>
- <version>${project.version}</version>
- <type>xml</type>
- <classifier>features</classifier>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/sli/features/odl-sli/pom.xml b/sli/features/odl-sli/pom.xml
deleted file mode 100644
index f810e43a..00000000
--- a/sli/features/odl-sli/pom.xml
+++ /dev/null
@@ -1,61 +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.core</groupId>
- <artifactId>ccsdk-sli</artifactId>
- <version>0.7.0-SNAPSHOT</version>
- <packaging>feature</packaging>
-
- <name>ccsdk-sli-core :: sli :: ${project.artifactId}</name>
-
-
- <dependencies>
- <dependency>
- <groupId>org.onap.ccsdk.sli.core</groupId>
- <artifactId>sli-common</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.onap.ccsdk.sli.core</groupId>
- <artifactId>sli-provider</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.onap.ccsdk.sli.core</groupId>
- <artifactId>sli-recording</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.onap.ccsdk.sli.core</groupId>
- <artifactId>dblib-provider</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.mariadb.jdbc</groupId>
- <artifactId>mariadb-java-client</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.onap.ccsdk.sli.core</groupId>
- <artifactId>ccsdk-dblib</artifactId>
- <version>${project.version}</version>
- <type>xml</type>
- <classifier>features</classifier>
- </dependency>
-
-
- </dependencies>
-</project>
diff --git a/sli/features/pom.xml b/sli/features/pom.xml
deleted file mode 100644
index 6970f268..00000000
--- a/sli/features/pom.xml
+++ /dev/null
@@ -1,23 +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>
-
- <groupId>org.onap.ccsdk.sli.core</groupId>
- <artifactId>sli-feature-aggregator</artifactId>
- <version>0.7.0-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <name>ccsdk-sli-core :: sli :: ${project.artifactId}</name>
-
- <modules>
- <module>features-sli</module>
- <module>odl-sli</module>
- </modules>
-</project>
diff --git a/sli/installer/pom.xml b/sli/installer/pom.xml
index 866e9b03..8a39f79c 100755
--- a/sli/installer/pom.xml
+++ b/sli/installer/pom.xml
@@ -37,20 +37,6 @@
<dependency>
<groupId>org.onap.ccsdk.sli.core</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.core</groupId>
<artifactId>sli-common</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/sli/pom.xml b/sli/pom.xml
index 895fae1f..8ef0c9c9 100755
--- a/sli/pom.xml
+++ b/sli/pom.xml
@@ -26,7 +26,6 @@
<module>common</module>
<module>provider</module>
<module>recording</module>
- <module>features</module>
<module>installer</module>
</modules>
</project>