summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dtimoney@att.com>2019-12-13 14:48:58 -0500
committerTimoney, Dan (dt5972) <dtimoney@att.com>2019-12-13 14:48:58 -0500
commit893680f892ab0dc6871c35cdf21af1da2d38edf2 (patch)
treeba752c48daad086ddf649315579df36ad5916b15
parent3b423f520594457ab8bf98d576ea1f8987ba3aab (diff)
Refactor features to separate installer
Refactor karaf feature.xml files to separate installer Change-Id: I32eace0e537ff302bf52c664f8c90dfbbe01a545 Issue-ID: CCSDK-1754 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
-rw-r--r--asdcApi/features/features-asdcApi/pom.xml33
-rwxr-xr-xasdcApi/features/pom.xml22
-rwxr-xr-xasdcApi/installer/pom.xml13
-rwxr-xr-xasdcApi/pom.xml1
-rw-r--r--daexim-offsite-backup/features/features-daexim-offsite-backup/pom.xml28
-rwxr-xr-xdaexim-offsite-backup/features/pom.xml22
-rwxr-xr-xdaexim-offsite-backup/installer/pom.xml13
-rwxr-xr-xdaexim-offsite-backup/pom.xml1
-rw-r--r--dataChange/features/features-dataChange/pom.xml33
-rwxr-xr-xdataChange/features/pom.xml23
-rwxr-xr-xdataChange/installer/pom.xml13
-rwxr-xr-xdataChange/pom.xml1
-rw-r--r--features/ccsdk-asdcApi/pom.xml (renamed from asdcApi/features/ccsdk-asdcApi/pom.xml)0
-rw-r--r--features/ccsdk-daexim-offsite-backup/pom.xml (renamed from daexim-offsite-backup/features/ccsdk-daexim-offsite-backup/pom.xml)0
-rw-r--r--features/ccsdk-daexim-offsite-backup/src/main/feature/feature.xml (renamed from daexim-offsite-backup/features/ccsdk-daexim-offsite-backup/src/main/feature/feature.xml)0
-rw-r--r--features/ccsdk-dataChange/pom.xml (renamed from dataChange/features/ccsdk-dataChange/pom.xml)0
-rw-r--r--features/ccsdk-lcm/pom.xml (renamed from lcm/features/ccsdk-lcm/pom.xml)0
-rwxr-xr-xfeatures/installer/pom.xml53
-rwxr-xr-xfeatures/pom.xml4
-rw-r--r--lcm/features/features-lcm/pom.xml33
-rwxr-xr-xlcm/features/pom.xml22
-rwxr-xr-xlcm/installer/pom.xml13
-rwxr-xr-xlcm/pom.xml1
23 files changed, 57 insertions, 272 deletions
diff --git a/asdcApi/features/features-asdcApi/pom.xml b/asdcApi/features/features-asdcApi/pom.xml
deleted file mode 100644
index 571175b9..00000000
--- a/asdcApi/features/features-asdcApi/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.northbound</groupId>
- <artifactId>features-asdcApi</artifactId>
- <version>0.7.0-SNAPSHOT</version>
- <packaging>feature</packaging>
-
- <name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name>
-
- <properties>
- <ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ccsdk-asdcApi</artifactId>
- <version>${project.version}</version>
- <type>xml</type>
- <classifier>features</classifier>
- </dependency>
-
- </dependencies>
-</project>
diff --git a/asdcApi/features/pom.xml b/asdcApi/features/pom.xml
deleted file mode 100755
index 36d0245b..00000000
--- a/asdcApi/features/pom.xml
+++ /dev/null
@@ -1,22 +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>
- </parent>
-
- <groupId>org.onap.ccsdk.sli.northbound</groupId>
- <artifactId>asdcApi-features</artifactId>
- <version>0.7.0-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name>
-
- <modules>
- <module>ccsdk-asdcApi</module>
- <module>features-asdcApi</module>
- </modules>
-</project>
diff --git a/asdcApi/installer/pom.xml b/asdcApi/installer/pom.xml
index 93ddb55f..cad3fb8b 100755
--- a/asdcApi/installer/pom.xml
+++ b/asdcApi/installer/pom.xml
@@ -25,19 +25,6 @@
<dependencies>
- <dependency>
- <groupId>org.onap.ccsdk.sli.northbound</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.northbound</groupId>
<artifactId>asdcApi-model</artifactId>
diff --git a/asdcApi/pom.xml b/asdcApi/pom.xml
index 6dcaf5cc..baac617c 100755
--- a/asdcApi/pom.xml
+++ b/asdcApi/pom.xml
@@ -22,7 +22,6 @@
<modules>
<module>model</module>
- <module>features</module>
<module>provider</module>
<module>installer</module>
</modules>
diff --git a/daexim-offsite-backup/features/features-daexim-offsite-backup/pom.xml b/daexim-offsite-backup/features/features-daexim-offsite-backup/pom.xml
deleted file mode 100644
index 3a9d260c..00000000
--- a/daexim-offsite-backup/features/features-daexim-offsite-backup/pom.xml
+++ /dev/null
@@ -1,28 +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.northbound</groupId>
- <artifactId>features-daexim-offsite-backup</artifactId>
- <version>0.7.0-SNAPSHOT</version>
- <packaging>feature</packaging>
-
- <name>ccsdk-sli-northbound :: daexim-offsite-backup :: ${project.artifactId}</name>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ccsdk-daexim-offsite-backup</artifactId>
- <version>${project.version}</version>
- <type>xml</type>
- <classifier>features</classifier>
- </dependency>
- </dependencies>
-</project>
diff --git a/daexim-offsite-backup/features/pom.xml b/daexim-offsite-backup/features/pom.xml
deleted file mode 100755
index 9152cf59..00000000
--- a/daexim-offsite-backup/features/pom.xml
+++ /dev/null
@@ -1,22 +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>
- </parent>
-
- <groupId>org.onap.ccsdk.sli.northbound</groupId>
- <artifactId>daexim-offsite-backup-features</artifactId>
- <version>0.7.0-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <name>ccsdk-sli-northbound :: daexim-offsite-backup :: ${project.artifactId}</name>
-
- <modules>
- <module>ccsdk-daexim-offsite-backup</module>
- <module>features-daexim-offsite-backup</module>
- </modules>
-</project>
diff --git a/daexim-offsite-backup/installer/pom.xml b/daexim-offsite-backup/installer/pom.xml
index 3e36f56e..dae4a4fd 100755
--- a/daexim-offsite-backup/installer/pom.xml
+++ b/daexim-offsite-backup/installer/pom.xml
@@ -22,19 +22,6 @@
<dependencies>
<dependency>
<groupId>org.onap.ccsdk.sli.northbound</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.northbound</groupId>
<artifactId>daexim-offsite-backup-provider</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/daexim-offsite-backup/pom.xml b/daexim-offsite-backup/pom.xml
index 3af57535..65cf987d 100755
--- a/daexim-offsite-backup/pom.xml
+++ b/daexim-offsite-backup/pom.xml
@@ -20,7 +20,6 @@
<modules>
<module>model</module>
<module>provider</module>
- <module>features</module>
<module>installer</module>
</modules>
diff --git a/dataChange/features/features-dataChange/pom.xml b/dataChange/features/features-dataChange/pom.xml
deleted file mode 100644
index 9a34429c..00000000
--- a/dataChange/features/features-dataChange/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.northbound</groupId>
- <artifactId>features-dataChange</artifactId>
- <version>0.7.0-SNAPSHOT</version>
- <packaging>feature</packaging>
-
- <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name>
-
- <properties>
- <ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ccsdk-dataChange</artifactId>
- <version>${project.version}</version>
- <type>xml</type>
- <classifier>features</classifier>
- </dependency>
-
- </dependencies>
-</project>
diff --git a/dataChange/features/pom.xml b/dataChange/features/pom.xml
deleted file mode 100755
index f16ed695..00000000
--- a/dataChange/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.northbound</groupId>
- <artifactId>dataChange-features</artifactId>
- <version>0.7.0-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name>
-
- <modules>
- <module>ccsdk-dataChange</module>
- <module>features-dataChange</module>
- </modules>
-</project>
diff --git a/dataChange/installer/pom.xml b/dataChange/installer/pom.xml
index abd4cc8b..7516f0b5 100755
--- a/dataChange/installer/pom.xml
+++ b/dataChange/installer/pom.xml
@@ -27,19 +27,6 @@
<dependency>
<groupId>org.onap.ccsdk.sli.northbound</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.northbound</groupId>
<artifactId>dataChange-model</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/dataChange/pom.xml b/dataChange/pom.xml
index 617f6b36..75637886 100755
--- a/dataChange/pom.xml
+++ b/dataChange/pom.xml
@@ -18,7 +18,6 @@
<modules>
<module>model</module>
- <module>features</module>
<module>provider</module>
<module>installer</module>
</modules>
diff --git a/asdcApi/features/ccsdk-asdcApi/pom.xml b/features/ccsdk-asdcApi/pom.xml
index 35e2a54b..35e2a54b 100644
--- a/asdcApi/features/ccsdk-asdcApi/pom.xml
+++ b/features/ccsdk-asdcApi/pom.xml
diff --git a/daexim-offsite-backup/features/ccsdk-daexim-offsite-backup/pom.xml b/features/ccsdk-daexim-offsite-backup/pom.xml
index bdf789fa..bdf789fa 100644
--- a/daexim-offsite-backup/features/ccsdk-daexim-offsite-backup/pom.xml
+++ b/features/ccsdk-daexim-offsite-backup/pom.xml
diff --git a/daexim-offsite-backup/features/ccsdk-daexim-offsite-backup/src/main/feature/feature.xml b/features/ccsdk-daexim-offsite-backup/src/main/feature/feature.xml
index 3dcb9002..3dcb9002 100644
--- a/daexim-offsite-backup/features/ccsdk-daexim-offsite-backup/src/main/feature/feature.xml
+++ b/features/ccsdk-daexim-offsite-backup/src/main/feature/feature.xml
diff --git a/dataChange/features/ccsdk-dataChange/pom.xml b/features/ccsdk-dataChange/pom.xml
index 6621ee9c..6621ee9c 100644
--- a/dataChange/features/ccsdk-dataChange/pom.xml
+++ b/features/ccsdk-dataChange/pom.xml
diff --git a/lcm/features/ccsdk-lcm/pom.xml b/features/ccsdk-lcm/pom.xml
index 69ea1f2e..69ea1f2e 100644
--- a/lcm/features/ccsdk-lcm/pom.xml
+++ b/features/ccsdk-lcm/pom.xml
diff --git a/features/installer/pom.xml b/features/installer/pom.xml
index 49196e71..b9ad99f1 100755
--- a/features/installer/pom.xml
+++ b/features/installer/pom.xml
@@ -24,6 +24,59 @@
</properties>
<dependencies>
+ <dependency>
+ <groupId>org.onap.ccsdk.sli.northbound</groupId>
+ <artifactId>ccsdk-asdcApi</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.northbound</groupId>
+ <artifactId>ccsdk-daexim-offsite-backup</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.northbound</groupId>
+ <artifactId>ccsdk-dataChange</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.northbound</groupId>
+ <artifactId>ccsdk-lcm</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.northbound</groupId>
diff --git a/features/pom.xml b/features/pom.xml
index 560f3a0f..4f3c2ae1 100755
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -17,6 +17,10 @@
<name>ccsdk-sli-northbound :: features</name>
<modules>
+ <module>ccsdk-asdcApi</module>
+ <module>ccsdk-daexim-offsite-backup</module>
+ <module>ccsdk-dataChange</module>
+ <module>ccsdk-lcm</module>
<module>ccsdk-sli-northbound-all</module>
<module>features-sli-northbound</module>
<module>installer</module>
diff --git a/lcm/features/features-lcm/pom.xml b/lcm/features/features-lcm/pom.xml
deleted file mode 100644
index 600ed430..00000000
--- a/lcm/features/features-lcm/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.northbound</groupId>
- <artifactId>features-lcm</artifactId>
- <version>0.7.0-SNAPSHOT</version>
- <packaging>feature</packaging>
-
- <name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name>
-
- <properties>
- <ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ccsdk-lcm</artifactId>
- <version>${project.version}</version>
- <type>xml</type>
- <classifier>features</classifier>
- </dependency>
-
- </dependencies>
-</project>
diff --git a/lcm/features/pom.xml b/lcm/features/pom.xml
deleted file mode 100755
index ac0258b7..00000000
--- a/lcm/features/pom.xml
+++ /dev/null
@@ -1,22 +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>
- </parent>
-
- <groupId>org.onap.ccsdk.sli.northbound</groupId>
- <artifactId>lcm-features</artifactId>
- <version>0.7.0-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name>
-
- <modules>
- <module>ccsdk-lcm</module>
- <module>features-lcm</module>
- </modules>
-</project>
diff --git a/lcm/installer/pom.xml b/lcm/installer/pom.xml
index b7aa65f7..38b4f84b 100755
--- a/lcm/installer/pom.xml
+++ b/lcm/installer/pom.xml
@@ -27,19 +27,6 @@
<dependency>
<groupId>org.onap.ccsdk.sli.northbound</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.northbound</groupId>
<artifactId>lcm-model</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/lcm/pom.xml b/lcm/pom.xml
index 55590037..4f19f8cd 100755
--- a/lcm/pom.xml
+++ b/lcm/pom.xml
@@ -18,7 +18,6 @@
<modules>
<module>model</module>
- <module>features</module>
<module>provider</module>
<module>installer</module>
</modules>