aboutsummaryrefslogtreecommitdiffstats
path: root/resource-assignment
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dtimoney@att.com>2019-12-13 12:42:39 -0500
committerTimoney, Dan (dt5972) <dtimoney@att.com>2019-12-13 12:42:39 -0500
commitbc18e2c019f4b16752ae25fa50b436e7cd65c8e8 (patch)
tree7e1c5f91d12f8fc854105d888938e572e3c76737 /resource-assignment
parent9ed4144aa7a72da788306a420b8a9a26fd0d4401 (diff)
Refactor features to separate installer
Refactor karaf feature.xml files to separate installer Change-Id: I4dc4ad3c139522b12f41f1786ef16bfdd556f2b9 Issue-ID: CCSDK-1754 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Diffstat (limited to 'resource-assignment')
-rw-r--r--resource-assignment/features/ccsdk-resource-assignment/pom.xml53
-rwxr-xr-xresource-assignment/features/features-resource-assignment/pom.xml33
-rwxr-xr-xresource-assignment/features/pom.xml23
-rwxr-xr-xresource-assignment/installer/pom.xml14
-rwxr-xr-xresource-assignment/pom.xml1
5 files changed, 0 insertions, 124 deletions
diff --git a/resource-assignment/features/ccsdk-resource-assignment/pom.xml b/resource-assignment/features/ccsdk-resource-assignment/pom.xml
deleted file mode 100644
index 03feeaad..00000000
--- a/resource-assignment/features/ccsdk-resource-assignment/pom.xml
+++ /dev/null
@@ -1,53 +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.adaptors</groupId>
- <artifactId>ccsdk-resource-assignment</artifactId>
- <version>0.7.0-SNAPSHOT</version>
- <packaging>feature</packaging>
-
- <name>ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId}</name>
-
-
- <properties>
- <ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
- <ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.version>
- </properties>
-
- <dependencies>
-
- <dependency>
- <groupId>org.onap.ccsdk.sli.core</groupId>
- <artifactId>ccsdk-sli</artifactId>
- <version>${ccsdk.sli.core.version}</version>
- <type>xml</type>
- <classifier>features</classifier>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.onap.ccsdk.sli.core</groupId>
- <artifactId>ccsdk-dblib</artifactId>
- <version>${ccsdk.sli.core.version}</version>
- <type>xml</type>
- <classifier>features</classifier>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>resource-assignment-provider</artifactId>
- <version>${project.version}</version>
- </dependency>
-
-
- </dependencies>
-</project>
diff --git a/resource-assignment/features/features-resource-assignment/pom.xml b/resource-assignment/features/features-resource-assignment/pom.xml
deleted file mode 100755
index 6919271a..00000000
--- a/resource-assignment/features/features-resource-assignment/pom.xml
+++ /dev/null
@@ -1,33 +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.adaptors</groupId>
- <artifactId>features-resource-assignment</artifactId>
- <version>0.7.0-SNAPSHOT</version>
- <packaging>feature</packaging>
-
- <name>ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId}</name>
-
- <properties>
- <ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ccsdk-resource-assignment</artifactId>
- <version>${project.version}</version>
- <type>xml</type>
- <classifier>features</classifier>
- </dependency>
-
- </dependencies>
-</project>
diff --git a/resource-assignment/features/pom.xml b/resource-assignment/features/pom.xml
deleted file mode 100755
index 94a45aa1..00000000
--- a/resource-assignment/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.adaptors</groupId>
- <artifactId>resource-assignment-features</artifactId>
- <version>0.7.0-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <name>ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId}</name>
-
- <modules>
- <module>ccsdk-resource-assignment</module>
- <module>features-resource-assignment</module>
- </modules>
-</project>
diff --git a/resource-assignment/installer/pom.xml b/resource-assignment/installer/pom.xml
index 7055ebf6..6a24ba52 100755
--- a/resource-assignment/installer/pom.xml
+++ b/resource-assignment/installer/pom.xml
@@ -27,20 +27,6 @@
<dependency>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
- <artifactId>ccsdk-resource-assignment</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.adaptors</groupId>
<artifactId>resource-assignment-provider</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/resource-assignment/pom.xml b/resource-assignment/pom.xml
index b03a6582..2046c1b3 100755
--- a/resource-assignment/pom.xml
+++ b/resource-assignment/pom.xml
@@ -19,7 +19,6 @@
<modules>
<module>provider</module>
- <module>features</module>
<module>installer</module>
</modules>