From: Timoney, Dan (dt5972) Date: Fri, 13 Dec 2019 15:24:29 +0000 (-0500) Subject: Refactor features to separate installer X-Git-Tag: 1.0.4~9^2~53 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=a55a4e30507c25c21c7f1df830f5d5189e03c038;p=ccsdk%2Fsli.git 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) --- diff --git a/dblib/features/features-dblib/pom.xml b/dblib/features/features-dblib/pom.xml deleted file mode 100644 index 72af77776..000000000 --- a/dblib/features/features-dblib/pom.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - feature-repo-parent - 1.5.1-SNAPSHOT - - - - org.onap.ccsdk.sli.core - features-dblib - 0.7.0-SNAPSHOT - feature - - ccsdk-sli-core :: dblib :: ${project.artifactId} - - - - ${project.groupId} - ccsdk-dblib - ${project.version} - xml - features - - - - diff --git a/dblib/features/pom.xml b/dblib/features/pom.xml deleted file mode 100755 index 9addcdb41..000000000 --- a/dblib/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.core - dblib-feature-aggregator - 0.7.0-SNAPSHOT - pom - - ccsdk-sli-core :: dblib :: ${project.artifactId} - - - features-dblib - ccsdk-dblib - - diff --git a/dblib/installer/pom.xml b/dblib/installer/pom.xml index bf19ba0eb..caa0c0be8 100755 --- a/dblib/installer/pom.xml +++ b/dblib/installer/pom.xml @@ -25,20 +25,6 @@ - - org.onap.ccsdk.sli.core - ${application.name} - ${project.version} - xml - features - - - * - * - - - - org.onap.ccsdk.sli.core dblib-provider diff --git a/dblib/pom.xml b/dblib/pom.xml index 23284604a..2fb49cbf2 100755 --- a/dblib/pom.xml +++ b/dblib/pom.xml @@ -22,7 +22,6 @@ provider - features installer diff --git a/dblib/features/ccsdk-dblib/pom.xml b/features/ccsdk-dblib/pom.xml similarity index 100% rename from dblib/features/ccsdk-dblib/pom.xml rename to features/ccsdk-dblib/pom.xml diff --git a/dblib/features/ccsdk-dblib/src/main/feature/feature.xml b/features/ccsdk-dblib/src/main/feature/feature.xml similarity index 100% rename from dblib/features/ccsdk-dblib/src/main/feature/feature.xml rename to features/ccsdk-dblib/src/main/feature/feature.xml diff --git a/filters/features/ccsdk-filters/pom.xml b/features/ccsdk-filters/pom.xml similarity index 100% rename from filters/features/ccsdk-filters/pom.xml rename to features/ccsdk-filters/pom.xml diff --git a/sli/features/odl-sli/pom.xml b/features/ccsdk-sli/pom.xml similarity index 100% rename from sli/features/odl-sli/pom.xml rename to features/ccsdk-sli/pom.xml diff --git a/sliPluginUtils/features/ccsdk-sliPluginUtils/pom.xml b/features/ccsdk-sliPluginUtils/pom.xml similarity index 100% rename from sliPluginUtils/features/ccsdk-sliPluginUtils/pom.xml rename to features/ccsdk-sliPluginUtils/pom.xml diff --git a/sliapi/features/ccsdk-sliapi/pom.xml b/features/ccsdk-sliapi/pom.xml similarity index 100% rename from sliapi/features/ccsdk-sliapi/pom.xml rename to features/ccsdk-sliapi/pom.xml diff --git a/utils/features/ccsdk-slicore-utils/pom.xml b/features/ccsdk-slicore-utils/pom.xml similarity index 100% rename from utils/features/ccsdk-slicore-utils/pom.xml rename to features/ccsdk-slicore-utils/pom.xml diff --git a/features/installer/pom.xml b/features/installer/pom.xml index 32c177882..1cece6422 100755 --- a/features/installer/pom.xml +++ b/features/installer/pom.xml @@ -24,7 +24,84 @@ - + + org.onap.ccsdk.sli.core + ccsdk-slicore-utils + ${project.version} + xml + features + + + * + * + + + + + org.onap.ccsdk.sli.core + ccsdk-dblib + ${project.version} + xml + features + + + * + * + + + + + org.onap.ccsdk.sli.core + ccsdk-filters + ${project.version} + xml + features + + + * + * + + + + + org.onap.ccsdk.sli.core + ccsdk-sli + ${project.version} + xml + features + + + * + * + + + + + org.onap.ccsdk.sli.core + ccsdk-sliapi + ${project.version} + xml + features + + + * + * + + + + + org.onap.ccsdk.sli.core + ccsdk-sliPluginUtils + ${project.version} + xml + features + + + * + * + + + org.onap.ccsdk.sli.core ${application.name} @@ -98,7 +175,7 @@ true false false - org.onap.ccsdk.sli.core,org.apache.tomcat,org.slf4j + org.onap.ccsdk.sli.core,org.apache.tomcat,org.slf4j utils-provider,slf4j-api provided diff --git a/features/pom.xml b/features/pom.xml index 6e500172e..1dd48d6db 100755 --- a/features/pom.xml +++ b/features/pom.xml @@ -17,6 +17,12 @@ ccsdk-sli-core :: features + ccsdk-slicore-utils + ccsdk-dblib + ccsdk-filters + ccsdk-sli + ccsdk-sliapi + ccsdk-sliPluginUtils ccsdk-sli-core-all features-sli-core installer diff --git a/filters/features/features-filters/pom.xml b/filters/features/features-filters/pom.xml deleted file mode 100644 index 7ae082028..000000000 --- a/filters/features/features-filters/pom.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - feature-repo-parent - 1.5.1-SNAPSHOT - - - - org.onap.ccsdk.sli.core - features-filters - 0.7.0-SNAPSHOT - feature - - ccsdk-sli-core :: filters :: ${project.artifactId} - - - - ${project.groupId} - ccsdk-filters - ${project.version} - xml - features - - - - diff --git a/filters/features/pom.xml b/filters/features/pom.xml deleted file mode 100755 index 985e446f6..000000000 --- a/filters/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.core - filters-features-aggregator - 0.7.0-SNAPSHOT - pom - - ccsdk-sli-core :: filters :: ${project.artifactId} - - - features-filters - ccsdk-filters - - diff --git a/filters/installer/pom.xml b/filters/installer/pom.xml index 6bef4c19a..089b2f430 100755 --- a/filters/installer/pom.xml +++ b/filters/installer/pom.xml @@ -24,28 +24,11 @@ - - - org.onap.ccsdk.sli.core - ${application.name} - ${project.version} - xml - features - - - * - * - - - - org.onap.ccsdk.sli.core filters-provider ${project.version} - - diff --git a/filters/pom.xml b/filters/pom.xml index 4cd8c759e..005ce2f19 100644 --- a/filters/pom.xml +++ b/filters/pom.xml @@ -22,7 +22,6 @@ provider - features installer diff --git a/sli/features/features-sli/pom.xml b/sli/features/features-sli/pom.xml deleted file mode 100644 index 80c4102ff..000000000 --- a/sli/features/features-sli/pom.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - feature-repo-parent - 1.5.1-SNAPSHOT - - - - org.onap.ccsdk.sli.core - features-sli - 0.7.0-SNAPSHOT - feature - - ccsdk-sli-core :: sli :: ${project.artifactId} - - - - ${project.groupId} - ccsdk-sli - ${project.version} - xml - features - - - - diff --git a/sli/features/pom.xml b/sli/features/pom.xml deleted file mode 100644 index 6970f268c..000000000 --- a/sli/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.core - sli-feature-aggregator - 0.7.0-SNAPSHOT - pom - - ccsdk-sli-core :: sli :: ${project.artifactId} - - - features-sli - odl-sli - - diff --git a/sli/installer/pom.xml b/sli/installer/pom.xml index 866e9b03f..8a39f79cc 100755 --- a/sli/installer/pom.xml +++ b/sli/installer/pom.xml @@ -35,20 +35,6 @@ - - org.onap.ccsdk.sli.core - ${application.name} - ${project.version} - xml - features - - - * - * - - - - org.onap.ccsdk.sli.core sli-common diff --git a/sli/pom.xml b/sli/pom.xml index 895fae1fa..8ef0c9c90 100755 --- a/sli/pom.xml +++ b/sli/pom.xml @@ -26,7 +26,6 @@ common provider recording - features installer diff --git a/sliPluginUtils/features/features-sliPluginUtils/pom.xml b/sliPluginUtils/features/features-sliPluginUtils/pom.xml deleted file mode 100644 index eec15e64a..000000000 --- a/sliPluginUtils/features/features-sliPluginUtils/pom.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - feature-repo-parent - 1.5.1-SNAPSHOT - - - - org.onap.ccsdk.sli.core - features-sliPluginUtils - 0.7.0-SNAPSHOT - feature - - ccsdk-sli-core :: sliPluginUtils :: ${project.artifactId} - - - - ${project.groupId} - ccsdk-sliPluginUtils - ${project.version} - xml - features - - - - diff --git a/sliPluginUtils/features/pom.xml b/sliPluginUtils/features/pom.xml deleted file mode 100755 index c43c18d6e..000000000 --- a/sliPluginUtils/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.core - sliPluginUtils-features - 0.7.0-SNAPSHOT - pom - - ccsdk-sli-core :: sliPluginUtils :: ${project.artifactId} - - - features-sliPluginUtils - ccsdk-sliPluginUtils - - diff --git a/sliPluginUtils/installer/pom.xml b/sliPluginUtils/installer/pom.xml index 9d71a964f..fa99d4cc0 100755 --- a/sliPluginUtils/installer/pom.xml +++ b/sliPluginUtils/installer/pom.xml @@ -46,20 +46,6 @@ - - org.onap.ccsdk.sli.core - ${application.name} - ${project.version} - xml - features - - - * - * - - - - org.onap.ccsdk.sli.core sliPluginUtils-provider diff --git a/sliPluginUtils/pom.xml b/sliPluginUtils/pom.xml index 22b4bd90f..61e6c47b1 100755 --- a/sliPluginUtils/pom.xml +++ b/sliPluginUtils/pom.xml @@ -19,7 +19,6 @@ provider - features installer diff --git a/sliapi/features/features-sliapi/pom.xml b/sliapi/features/features-sliapi/pom.xml deleted file mode 100644 index 2acfad7b4..000000000 --- a/sliapi/features/features-sliapi/pom.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - feature-repo-parent - 1.5.1-SNAPSHOT - - - - org.onap.ccsdk.sli.core - features-sliapi - 0.7.0-SNAPSHOT - feature - - ccsdk-sli-core :: sliapi :: ${project.artifactId} - - - - ${project.groupId} - ccsdk-sliapi - ${project.version} - xml - features - - - - diff --git a/sliapi/features/pom.xml b/sliapi/features/pom.xml deleted file mode 100755 index 448c9da41..000000000 --- a/sliapi/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.core - sliapi-feature-aggregator - 0.7.0-SNAPSHOT - pom - - ccsdk-sli-core :: sliapi :: ${project.artifactId} - - - features-sliapi - ccsdk-sliapi - - diff --git a/sliapi/pom.xml b/sliapi/pom.xml index 71bb22e64..d3dd4e215 100755 --- a/sliapi/pom.xml +++ b/sliapi/pom.xml @@ -18,7 +18,6 @@ model - features provider installer diff --git a/utils/features/features-util/pom.xml b/utils/features/features-util/pom.xml deleted file mode 100644 index 6e26d1dca..000000000 --- a/utils/features/features-util/pom.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - feature-repo-parent - 1.5.1-SNAPSHOT - - - - org.onap.ccsdk.sli.core - features-util - 0.7.0-SNAPSHOT - feature - - ccsdk-sli-core :: utils :: ${project.artifactId} - - - - ${project.groupId} - ccsdk-slicore-utils - ${project.version} - xml - features - - - - diff --git a/utils/features/pom.xml b/utils/features/pom.xml deleted file mode 100755 index 594c6e1e3..000000000 --- a/utils/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.core - utils-features-aggregator - 0.7.0-SNAPSHOT - pom - - ccsdk-sli-core :: utils :: ${project.artifactId} - - - features-util - ccsdk-slicore-utils - - diff --git a/utils/installer/pom.xml b/utils/installer/pom.xml index cbe0596a6..d69cc74ad 100755 --- a/utils/installer/pom.xml +++ b/utils/installer/pom.xml @@ -25,20 +25,6 @@ - - org.onap.ccsdk.sli.core - ${application.name} - ${project.version} - xml - features - - - * - * - - - - org.onap.ccsdk.sli.core utils-provider diff --git a/utils/pom.xml b/utils/pom.xml index a5529f314..2c4211073 100755 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -22,7 +22,6 @@ provider - features installer