From: Timoney, Dan (dt5972) Date: Fri, 13 Dec 2019 19:48:58 +0000 (-0500) Subject: Refactor features to separate installer X-Git-Tag: 0.7.0~5 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=893680f892ab0dc6871c35cdf21af1da2d38edf2;p=ccsdk%2Fsli%2Fnorthbound.git 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) --- 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/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/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/asdcApi/features/ccsdk-asdcApi/pom.xml b/features/ccsdk-asdcApi/pom.xml similarity index 100% rename from asdcApi/features/ccsdk-asdcApi/pom.xml rename to 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 similarity index 100% rename from daexim-offsite-backup/features/ccsdk-daexim-offsite-backup/pom.xml rename to 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 similarity index 100% rename from daexim-offsite-backup/features/ccsdk-daexim-offsite-backup/src/main/feature/feature.xml rename to 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 similarity index 100% rename from dataChange/features/ccsdk-dataChange/pom.xml rename to features/ccsdk-dataChange/pom.xml diff --git a/lcm/features/ccsdk-lcm/pom.xml b/features/ccsdk-lcm/pom.xml similarity index 100% rename from lcm/features/ccsdk-lcm/pom.xml rename to 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 @@ + + 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/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