From 893680f892ab0dc6871c35cdf21af1da2d38edf2 Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Fri, 13 Dec 2019 14:48:58 -0500 Subject: 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) --- asdcApi/features/ccsdk-asdcApi/pom.xml | 44 ------------------ asdcApi/features/features-asdcApi/pom.xml | 33 -------------- asdcApi/features/pom.xml | 22 --------- asdcApi/installer/pom.xml | 13 ------ asdcApi/pom.xml | 1 - .../features/ccsdk-daexim-offsite-backup/pom.xml | 49 -------------------- .../src/main/feature/feature.xml | 7 --- .../features-daexim-offsite-backup/pom.xml | 28 ------------ daexim-offsite-backup/features/pom.xml | 22 --------- daexim-offsite-backup/installer/pom.xml | 13 ------ daexim-offsite-backup/pom.xml | 1 - dataChange/features/ccsdk-dataChange/pom.xml | 45 ------------------ dataChange/features/features-dataChange/pom.xml | 33 -------------- dataChange/features/pom.xml | 23 ---------- dataChange/installer/pom.xml | 13 ------ dataChange/pom.xml | 1 - features/ccsdk-asdcApi/pom.xml | 44 ++++++++++++++++++ features/ccsdk-daexim-offsite-backup/pom.xml | 49 ++++++++++++++++++++ .../src/main/feature/feature.xml | 7 +++ features/ccsdk-dataChange/pom.xml | 45 ++++++++++++++++++ features/ccsdk-lcm/pom.xml | 45 ++++++++++++++++++ features/installer/pom.xml | 53 ++++++++++++++++++++++ features/pom.xml | 4 ++ lcm/features/ccsdk-lcm/pom.xml | 45 ------------------ lcm/features/features-lcm/pom.xml | 33 -------------- lcm/features/pom.xml | 22 --------- lcm/installer/pom.xml | 13 ------ lcm/pom.xml | 1 - 28 files changed, 247 insertions(+), 462 deletions(-) delete mode 100644 asdcApi/features/ccsdk-asdcApi/pom.xml delete mode 100644 asdcApi/features/features-asdcApi/pom.xml delete mode 100755 asdcApi/features/pom.xml delete mode 100644 daexim-offsite-backup/features/ccsdk-daexim-offsite-backup/pom.xml delete mode 100644 daexim-offsite-backup/features/ccsdk-daexim-offsite-backup/src/main/feature/feature.xml delete mode 100644 daexim-offsite-backup/features/features-daexim-offsite-backup/pom.xml delete mode 100755 daexim-offsite-backup/features/pom.xml delete mode 100644 dataChange/features/ccsdk-dataChange/pom.xml delete mode 100644 dataChange/features/features-dataChange/pom.xml delete mode 100755 dataChange/features/pom.xml create mode 100644 features/ccsdk-asdcApi/pom.xml create mode 100644 features/ccsdk-daexim-offsite-backup/pom.xml create mode 100644 features/ccsdk-daexim-offsite-backup/src/main/feature/feature.xml create mode 100644 features/ccsdk-dataChange/pom.xml create mode 100644 features/ccsdk-lcm/pom.xml delete mode 100644 lcm/features/ccsdk-lcm/pom.xml delete mode 100644 lcm/features/features-lcm/pom.xml delete mode 100755 lcm/features/pom.xml diff --git a/asdcApi/features/ccsdk-asdcApi/pom.xml b/asdcApi/features/ccsdk-asdcApi/pom.xml deleted file mode 100644 index 35e2a54b..00000000 --- a/asdcApi/features/ccsdk-asdcApi/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - single-feature-parent - 1.5.1-SNAPSHOT - - - - org.onap.ccsdk.sli.northbound - ccsdk-asdcApi - 0.7.0-SNAPSHOT - feature - - ccsdk-sli-northbound :: asdcApi :: ${project.artifactId} - - - ${project.version} - ${project.version} - - - - - org.onap.ccsdk.sli.core - ccsdk-sli - ${ccsdk.sli.core.version} - xml - features - - - ${project.groupId} - asdcApi-model - ${project.version} - - - ${project.groupId} - asdcApi-provider - ${project.version} - - - - 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 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - feature-repo-parent - 1.5.1-SNAPSHOT - - - - org.onap.ccsdk.sli.northbound - features-asdcApi - 0.7.0-SNAPSHOT - feature - - ccsdk-sli-northbound :: asdcApi :: ${project.artifactId} - - - ${project.version} - - - - - ${project.groupId} - ccsdk-asdcApi - ${project.version} - xml - features - - - - 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 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - - org.onap.ccsdk.sli.northbound - asdcApi-features - 0.7.0-SNAPSHOT - pom - - ccsdk-sli-northbound :: asdcApi :: ${project.artifactId} - - - ccsdk-asdcApi - features-asdcApi - - 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 @@ - - org.onap.ccsdk.sli.northbound - ${application.name} - ${project.version} - xml - features - - - * - * - - - org.onap.ccsdk.sli.northbound asdcApi-model 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 @@ model - features provider installer diff --git a/daexim-offsite-backup/features/ccsdk-daexim-offsite-backup/pom.xml b/daexim-offsite-backup/features/ccsdk-daexim-offsite-backup/pom.xml deleted file mode 100644 index bdf789fa..00000000 --- a/daexim-offsite-backup/features/ccsdk-daexim-offsite-backup/pom.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - single-feature-parent - 1.5.1-SNAPSHOT - - - - org.onap.ccsdk.sli.northbound - ccsdk-daexim-offsite-backup - 0.7.0-SNAPSHOT - feature - - ccsdk-sli-northbound :: daexim-offsite-backup :: ${project.artifactId} - - - ${project.version} - - - - - org.opendaylight.controller - odl-mdsal-broker - xml - features - - - org.onap.ccsdk.sli.core - ccsdk-sli - ${ccsdk.sli.core.version} - xml - features - provided - - - ${project.groupId} - daexim-offsite-backup-model - ${project.version} - - - ${project.groupId} - daexim-offsite-backup-provider - ${project.version} - - - diff --git a/daexim-offsite-backup/features/ccsdk-daexim-offsite-backup/src/main/feature/feature.xml b/daexim-offsite-backup/features/ccsdk-daexim-offsite-backup/src/main/feature/feature.xml deleted file mode 100644 index 3dcb9002..00000000 --- a/daexim-offsite-backup/features/ccsdk-daexim-offsite-backup/src/main/feature/feature.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - mvn:org.onap.ccsdk.sli.core/ccsdk-sli/LATEST/xml/features - - ccsdk-sli - - 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 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - feature-repo-parent - 1.5.1-SNAPSHOT - - - - org.onap.ccsdk.sli.northbound - features-daexim-offsite-backup - 0.7.0-SNAPSHOT - feature - - ccsdk-sli-northbound :: daexim-offsite-backup :: ${project.artifactId} - - - - ${project.groupId} - ccsdk-daexim-offsite-backup - ${project.version} - xml - features - - - 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 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - - org.onap.ccsdk.sli.northbound - daexim-offsite-backup-features - 0.7.0-SNAPSHOT - pom - - ccsdk-sli-northbound :: daexim-offsite-backup :: ${project.artifactId} - - - ccsdk-daexim-offsite-backup - features-daexim-offsite-backup - - 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 @@ -20,19 +20,6 @@ false - - org.onap.ccsdk.sli.northbound - ${application.name} - ${project.version} - xml - features - - - * - * - - - org.onap.ccsdk.sli.northbound daexim-offsite-backup-provider 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 @@ model provider - features installer diff --git a/dataChange/features/ccsdk-dataChange/pom.xml b/dataChange/features/ccsdk-dataChange/pom.xml deleted file mode 100644 index 6621ee9c..00000000 --- a/dataChange/features/ccsdk-dataChange/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - single-feature-parent - 1.5.1-SNAPSHOT - - - - org.onap.ccsdk.sli.northbound - ccsdk-dataChange - 0.7.0-SNAPSHOT - feature - - ccsdk-sli-northbound :: dataChange :: ${project.artifactId} - - - ${project.version} - ${project.version} - - - - - - org.onap.ccsdk.sli.core - ccsdk-sli - ${ccsdk.sli.core.version} - xml - features - - - ${project.groupId} - dataChange-model - ${project.version} - - - ${project.groupId} - dataChange-provider - ${project.version} - - - - 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 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - feature-repo-parent - 1.5.1-SNAPSHOT - - - - org.onap.ccsdk.sli.northbound - features-dataChange - 0.7.0-SNAPSHOT - feature - - ccsdk-sli-northbound :: dataChange :: ${project.artifactId} - - - ${project.version} - - - - - ${project.groupId} - ccsdk-dataChange - ${project.version} - xml - features - - - - 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 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - - - org.onap.ccsdk.sli.northbound - dataChange-features - 0.7.0-SNAPSHOT - pom - - ccsdk-sli-northbound :: dataChange :: ${project.artifactId} - - - ccsdk-dataChange - features-dataChange - - 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 @@ -25,19 +25,6 @@ - - org.onap.ccsdk.sli.northbound - ${application.name} - ${project.version} - xml - features - - - * - * - - - org.onap.ccsdk.sli.northbound dataChange-model 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 @@ model - features provider installer diff --git a/features/ccsdk-asdcApi/pom.xml b/features/ccsdk-asdcApi/pom.xml new file mode 100644 index 00000000..35e2a54b --- /dev/null +++ b/features/ccsdk-asdcApi/pom.xml @@ -0,0 +1,44 @@ + + + 4.0.0 + + + org.onap.ccsdk.parent + single-feature-parent + 1.5.1-SNAPSHOT + + + + org.onap.ccsdk.sli.northbound + ccsdk-asdcApi + 0.7.0-SNAPSHOT + feature + + ccsdk-sli-northbound :: asdcApi :: ${project.artifactId} + + + ${project.version} + ${project.version} + + + + + org.onap.ccsdk.sli.core + ccsdk-sli + ${ccsdk.sli.core.version} + xml + features + + + ${project.groupId} + asdcApi-model + ${project.version} + + + ${project.groupId} + asdcApi-provider + ${project.version} + + + + diff --git a/features/ccsdk-daexim-offsite-backup/pom.xml b/features/ccsdk-daexim-offsite-backup/pom.xml new file mode 100644 index 00000000..bdf789fa --- /dev/null +++ b/features/ccsdk-daexim-offsite-backup/pom.xml @@ -0,0 +1,49 @@ + + + 4.0.0 + + + org.onap.ccsdk.parent + single-feature-parent + 1.5.1-SNAPSHOT + + + + org.onap.ccsdk.sli.northbound + ccsdk-daexim-offsite-backup + 0.7.0-SNAPSHOT + feature + + ccsdk-sli-northbound :: daexim-offsite-backup :: ${project.artifactId} + + + ${project.version} + + + + + org.opendaylight.controller + odl-mdsal-broker + xml + features + + + org.onap.ccsdk.sli.core + ccsdk-sli + ${ccsdk.sli.core.version} + xml + features + provided + + + ${project.groupId} + daexim-offsite-backup-model + ${project.version} + + + ${project.groupId} + daexim-offsite-backup-provider + ${project.version} + + + diff --git a/features/ccsdk-daexim-offsite-backup/src/main/feature/feature.xml b/features/ccsdk-daexim-offsite-backup/src/main/feature/feature.xml new file mode 100644 index 00000000..3dcb9002 --- /dev/null +++ b/features/ccsdk-daexim-offsite-backup/src/main/feature/feature.xml @@ -0,0 +1,7 @@ + + + mvn:org.onap.ccsdk.sli.core/ccsdk-sli/LATEST/xml/features + + ccsdk-sli + + diff --git a/features/ccsdk-dataChange/pom.xml b/features/ccsdk-dataChange/pom.xml new file mode 100644 index 00000000..6621ee9c --- /dev/null +++ b/features/ccsdk-dataChange/pom.xml @@ -0,0 +1,45 @@ + + + 4.0.0 + + + org.onap.ccsdk.parent + single-feature-parent + 1.5.1-SNAPSHOT + + + + org.onap.ccsdk.sli.northbound + ccsdk-dataChange + 0.7.0-SNAPSHOT + feature + + ccsdk-sli-northbound :: dataChange :: ${project.artifactId} + + + ${project.version} + ${project.version} + + + + + + org.onap.ccsdk.sli.core + ccsdk-sli + ${ccsdk.sli.core.version} + xml + features + + + ${project.groupId} + dataChange-model + ${project.version} + + + ${project.groupId} + dataChange-provider + ${project.version} + + + + diff --git a/features/ccsdk-lcm/pom.xml b/features/ccsdk-lcm/pom.xml new file mode 100644 index 00000000..69ea1f2e --- /dev/null +++ b/features/ccsdk-lcm/pom.xml @@ -0,0 +1,45 @@ + + + 4.0.0 + + + org.onap.ccsdk.parent + single-feature-parent + 1.5.1-SNAPSHOT + + + + org.onap.ccsdk.sli.northbound + ccsdk-lcm + 0.7.0-SNAPSHOT + feature + + ccsdk-sli-northbound :: lcm :: ${project.artifactId} + + + ${project.version} + ${project.version} + + + + + + org.onap.ccsdk.sli.core + ccsdk-sli + ${ccsdk.sli.core.version} + xml + features + + + ${project.groupId} + lcm-model + ${project.version} + + + ${project.groupId} + lcm-provider + ${project.version} + + + + 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 @@ + + org.onap.ccsdk.sli.northbound + ccsdk-asdcApi + ${project.version} + xml + features + + + * + * + + + + + org.onap.ccsdk.sli.northbound + ccsdk-daexim-offsite-backup + ${project.version} + xml + features + + + * + * + + + + + org.onap.ccsdk.sli.northbound + ccsdk-dataChange + ${project.version} + xml + features + + + * + * + + + + + org.onap.ccsdk.sli.northbound + ccsdk-lcm + ${project.version} + xml + features + + + * + * + + + + org.onap.ccsdk.sli.northbound 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 @@ ccsdk-sli-northbound :: features + ccsdk-asdcApi + ccsdk-daexim-offsite-backup + ccsdk-dataChange + ccsdk-lcm ccsdk-sli-northbound-all features-sli-northbound installer diff --git a/lcm/features/ccsdk-lcm/pom.xml b/lcm/features/ccsdk-lcm/pom.xml deleted file mode 100644 index 69ea1f2e..00000000 --- a/lcm/features/ccsdk-lcm/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - single-feature-parent - 1.5.1-SNAPSHOT - - - - org.onap.ccsdk.sli.northbound - ccsdk-lcm - 0.7.0-SNAPSHOT - feature - - ccsdk-sli-northbound :: lcm :: ${project.artifactId} - - - ${project.version} - ${project.version} - - - - - - org.onap.ccsdk.sli.core - ccsdk-sli - ${ccsdk.sli.core.version} - xml - features - - - ${project.groupId} - lcm-model - ${project.version} - - - ${project.groupId} - lcm-provider - ${project.version} - - - - 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 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - feature-repo-parent - 1.5.1-SNAPSHOT - - - - org.onap.ccsdk.sli.northbound - features-lcm - 0.7.0-SNAPSHOT - feature - - ccsdk-sli-northbound :: lcm :: ${project.artifactId} - - - ${project.version} - - - - - ${project.groupId} - ccsdk-lcm - ${project.version} - xml - features - - - - 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 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - - org.onap.ccsdk.sli.northbound - lcm-features - 0.7.0-SNAPSHOT - pom - - ccsdk-sli-northbound :: lcm :: ${project.artifactId} - - - ccsdk-lcm - features-lcm - - 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 @@ -25,19 +25,6 @@ - - org.onap.ccsdk.sli.northbound - ${application.name} - ${project.version} - xml - features - - - * - * - - - org.onap.ccsdk.sli.northbound lcm-model 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 @@ model - features provider installer -- cgit 1.2.3-korg