From 0190b382e4b37854c4461bfcfce594c20f5dd8a8 Mon Sep 17 00:00:00 2001 From: "Singal, Kapil (ks220y)" Date: Tue, 2 Mar 2021 20:00:49 -0500 Subject: Refactoring pom's name tag Indenting pom's and running mvn tidy:pom to rearrange items Issue-ID: CCSDK-3198 Signed-off-by: Singal, Kapil (ks220y) Change-Id: Ic9c7cfd76bd98e6a101ec7788841d96316508735 --- core/features/ccsdk-dblib/pom.xml | 104 ++++---- core/features/ccsdk-filters/pom.xml | 74 +++--- core/features/ccsdk-sli-core-all/pom.xml | 150 +++++------ core/features/ccsdk-sli/pom.xml | 101 ++++---- core/features/ccsdk-sliPluginUtils/pom.xml | 4 +- core/features/ccsdk-sliapi/pom.xml | 2 +- core/features/ccsdk-slicore-utils/pom.xml | 3 +- core/features/installer/pom.xml | 403 ++++++++++++++--------------- core/features/pom.xml | 38 +-- 9 files changed, 438 insertions(+), 441 deletions(-) (limited to 'core/features') diff --git a/core/features/ccsdk-dblib/pom.xml b/core/features/ccsdk-dblib/pom.xml index 7481c3944..656dfc628 100644 --- a/core/features/ccsdk-dblib/pom.xml +++ b/core/features/ccsdk-dblib/pom.xml @@ -1,64 +1,64 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - single-feature-parent - 2.1.1 - - + + org.onap.ccsdk.parent + single-feature-parent + 2.1.1 + + - org.onap.ccsdk.sli.core - ccsdk-dblib - 1.2.1-SNAPSHOT - feature + org.onap.ccsdk.sli.core + ccsdk-dblib + 1.2.1-SNAPSHOT + feature - ccsdk-sli-core :: dblib :: ${project.artifactId} + ccsdk-sli-core :: features :: ${project.artifactId} - + - - ${project.groupId} - dblib-provider - ${project.version} - + + ${project.groupId} + dblib-provider + ${project.version} + - - org.mariadb.jdbc - mariadb-java-client - - - org.apache.tomcat - tomcat-jdbc + + org.mariadb.jdbc + mariadb-java-client + + + org.apache.tomcat + tomcat-jdbc 9.0.30 - - - org.onap.ccsdk.sli.core - utils-provider - ${project.version} - + + + org.onap.ccsdk.sli.core + utils-provider + ${project.version} + - - org.apache.derby - derby - - + + org.apache.derby + derby + + - - - - org.apache.karaf.tooling - karaf-maven-plugin - true - - - slf4j-api - tomcat-jdbc - tomcat-juli - - - - - + + + + org.apache.karaf.tooling + karaf-maven-plugin + true + + + slf4j-api + tomcat-jdbc + tomcat-juli + + + + + diff --git a/core/features/ccsdk-filters/pom.xml b/core/features/ccsdk-filters/pom.xml index 44a5a6e1b..b7f429378 100644 --- a/core/features/ccsdk-filters/pom.xml +++ b/core/features/ccsdk-filters/pom.xml @@ -1,45 +1,45 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - single-feature-parent - 2.1.1 - - + + org.onap.ccsdk.parent + single-feature-parent + 2.1.1 + + - org.onap.ccsdk.sli.core - ccsdk-filters - 1.2.1-SNAPSHOT - feature + org.onap.ccsdk.sli.core + ccsdk-filters + 1.2.1-SNAPSHOT + feature - ccsdk-sli-core :: filters :: ${project.artifactId} + ccsdk-sli-core :: features :: ${project.artifactId} - - - ${project.groupId} - filters-provider - ${project.version} - - + + + ${project.groupId} + filters-provider + ${project.version} + + - - - - org.apache.karaf.tooling - karaf-maven-plugin - true - - - - slf4j-api - javax.annotation-api - javax.servlet-api - javax.ws.rs-api - - - - - + + + + org.apache.karaf.tooling + karaf-maven-plugin + true + + + + slf4j-api + javax.annotation-api + javax.servlet-api + javax.ws.rs-api + + + + + diff --git a/core/features/ccsdk-sli-core-all/pom.xml b/core/features/ccsdk-sli-core-all/pom.xml index 8424d8c80..748d4e4e3 100644 --- a/core/features/ccsdk-sli-core-all/pom.xml +++ b/core/features/ccsdk-sli-core-all/pom.xml @@ -1,82 +1,82 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - single-feature-parent - 2.1.1 - - + + org.onap.ccsdk.parent + single-feature-parent + 2.1.1 + + - org.onap.ccsdk.sli.core - ccsdk-sli-core-all - 1.2.1-SNAPSHOT - feature + org.onap.ccsdk.sli.core + ccsdk-sli-core-all + 1.2.1-SNAPSHOT + feature - ccsdk-sli-core :: features :: ${project.artifactId} + ccsdk-sli-core :: features :: ${project.artifactId} - - - - org.onap.ccsdk.sli.core - sli-common - ${project.version} - - - org.onap.ccsdk.sli.core - sli-provider - ${project.version} - - - org.onap.ccsdk.sli.core - dblib-provider - ${project.version} - - - - - - ${project.groupId} - ccsdk-slicore-utils - ${project.version} - xml - features - - - ${project.groupId} - ccsdk-dblib - ${project.version} - xml - features - - - ${project.groupId} - ccsdk-filters - ${project.version} - xml - features - - - ${project.groupId} - ccsdk-sli - ${project.version} - xml - features - - - ${project.groupId} - ccsdk-sliapi - ${project.version} - xml - features - - - ${project.groupId} - ccsdk-sliPluginUtils - ${project.version} - xml - features - - + + + + org.onap.ccsdk.sli.core + sli-common + ${project.version} + + + org.onap.ccsdk.sli.core + sli-provider + ${project.version} + + + org.onap.ccsdk.sli.core + dblib-provider + ${project.version} + + + + + + ${project.groupId} + ccsdk-slicore-utils + ${project.version} + xml + features + + + ${project.groupId} + ccsdk-dblib + ${project.version} + xml + features + + + ${project.groupId} + ccsdk-filters + ${project.version} + xml + features + + + ${project.groupId} + ccsdk-sli + ${project.version} + xml + features + + + ${project.groupId} + ccsdk-sliapi + ${project.version} + xml + features + + + ${project.groupId} + ccsdk-sliPluginUtils + ${project.version} + xml + features + + diff --git a/core/features/ccsdk-sli/pom.xml b/core/features/ccsdk-sli/pom.xml index 430b0dd2e..36f03842a 100644 --- a/core/features/ccsdk-sli/pom.xml +++ b/core/features/ccsdk-sli/pom.xml @@ -1,54 +1,53 @@ - 4.0.0 - - - org.onap.ccsdk.parent - single-feature-parent - 2.1.1 - - - - org.onap.ccsdk.sli.core - ccsdk-sli - 1.2.1-SNAPSHOT - feature - - ccsdk-sli-core :: sli :: ${project.artifactId} - - - - org.onap.ccsdk.sli.core - sli-common - ${project.version} - - - - org.onap.ccsdk.sli.core - sli-provider - ${project.version} - - - - org.onap.ccsdk.sli.core - dblib-provider - ${project.version} - provided - - - - org.mariadb.jdbc - mariadb-java-client - - - - org.onap.ccsdk.sli.core - ccsdk-dblib - ${project.version} - xml - features - - - - + 4.0.0 + + + org.onap.ccsdk.parent + single-feature-parent + 2.1.1 + + + + org.onap.ccsdk.sli.core + ccsdk-sli + 1.2.1-SNAPSHOT + feature + + ccsdk-sli-core :: features :: ${project.artifactId} + + + + org.onap.ccsdk.sli.core + sli-common + ${project.version} + + + + org.onap.ccsdk.sli.core + sli-provider + ${project.version} + + + + org.onap.ccsdk.sli.core + dblib-provider + ${project.version} + provided + + + + org.mariadb.jdbc + mariadb-java-client + + + + org.onap.ccsdk.sli.core + ccsdk-dblib + ${project.version} + xml + features + + + diff --git a/core/features/ccsdk-sliPluginUtils/pom.xml b/core/features/ccsdk-sliPluginUtils/pom.xml index a53214f55..d63c89e32 100644 --- a/core/features/ccsdk-sliPluginUtils/pom.xml +++ b/core/features/ccsdk-sliPluginUtils/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT feature - ccsdk-sli-core :: sliPluginUtils :: ${project.artifactId} + ccsdk-sli-core :: features :: ${project.artifactId} @@ -31,6 +31,6 @@ sliPluginUtils-provider ${project.version} - + diff --git a/core/features/ccsdk-sliapi/pom.xml b/core/features/ccsdk-sliapi/pom.xml index a4d049f6c..edd4cc39d 100644 --- a/core/features/ccsdk-sliapi/pom.xml +++ b/core/features/ccsdk-sliapi/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT feature - ccsdk-sli-core :: sliapi :: ${project.artifactId} + ccsdk-sli-core :: features :: ${project.artifactId} diff --git a/core/features/ccsdk-slicore-utils/pom.xml b/core/features/ccsdk-slicore-utils/pom.xml index 58f613fe9..a2d817335 100644 --- a/core/features/ccsdk-slicore-utils/pom.xml +++ b/core/features/ccsdk-slicore-utils/pom.xml @@ -14,11 +14,10 @@ 1.2.1-SNAPSHOT feature - ccsdk-sli-core :: utils :: ${project.artifactId} + ccsdk-sli-core :: features :: ${project.artifactId} - ${project.groupId} utils-provider diff --git a/core/features/installer/pom.xml b/core/features/installer/pom.xml index a9b684874..12255e857 100755 --- a/core/features/installer/pom.xml +++ b/core/features/installer/pom.xml @@ -1,214 +1,213 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 2.1.1 - - + + org.onap.ccsdk.parent + odlparent-lite + 2.1.1 + + - org.onap.ccsdk.sli.core - slicore-features-installer - 1.2.1-SNAPSHOT - pom + org.onap.ccsdk.sli.core + slicore-features-installer + 1.2.1-SNAPSHOT + pom - ccsdk-sli-core :: features :: ${project.artifactId} + ccsdk-sli-core :: features :: ${project.artifactId} - - ccsdk-sli-core-all - ${application.name} - mvn:org.onap.ccsdk.sli.core/${features.boot}/${project.version}/xml/features - false - + + ccsdk-sli-core-all + ${application.name} + mvn:org.onap.ccsdk.sli.core/${features.boot}/${project.version}/xml/features + false + - - - 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} - ${project.version} - xml - features - - - * - * - - - + + + 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} + ${project.version} + xml + features + + + * + * + + + + - + + + + maven-assembly-plugin + + + maven-repo-zip + + single + + package + + true + stage/${application.name}-${project.version} + + src/assembly/assemble_mvnrepo_zip.xml + + true + + + + installer-zip + + single + + package + + true + ${application.name}-${project.version}-installer + + src/assembly/assemble_installer_zip.xml + + false + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + + copy-dependencies + + prepare-package + + false + ${project.build.directory}/assembly/system + false + true + true + true + false + false + org.onap.ccsdk.sli.core,org.apache.tomcat,org.slf4j + utils-provider,slf4j-api + provided + + + + + + maven-resources-plugin + 2.6 + + + copy-version + + copy-resources + + validate + + ${basedir}/target/stage + + + src/main/resources/scripts + + install-feature.sh + + true + + + + - - - - maven-assembly-plugin - - - maven-repo-zip - - single - - package - - true - stage/${application.name}-${project.version} - - src/assembly/assemble_mvnrepo_zip.xml - - true - - - - installer-zip - - single - - package - - true - ${application.name}-${project.version}-installer - - src/assembly/assemble_installer_zip.xml - - false - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-dependencies - - copy-dependencies - - prepare-package - - false - ${project.build.directory}/assembly/system - false - true - true - true - false - false - org.onap.ccsdk.sli.core,org.apache.tomcat,org.slf4j - utils-provider,slf4j-api - provided - - - - - - maven-resources-plugin - 2.6 - - - copy-version - - copy-resources - - validate - - ${basedir}/target/stage - - - src/main/resources/scripts - - install-feature.sh - - true - - - - + + - - - - - + + diff --git a/core/features/pom.xml b/core/features/pom.xml index a027dbe76..3004e2d63 100755 --- a/core/features/pom.xml +++ b/core/features/pom.xml @@ -1,28 +1,28 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 2.1.1 - - + + org.onap.ccsdk.parent + odlparent-lite + 2.1.1 + + - org.onap.ccsdk.sli.core - slicore-feature-aggregator - 1.2.1-SNAPSHOT - pom + org.onap.ccsdk.sli.core + slicore-feature-aggregator + 1.2.1-SNAPSHOT + pom - ccsdk-sli-core :: features + ccsdk-sli-core :: features - - ccsdk-slicore-utils - ccsdk-dblib - ccsdk-filters - ccsdk-sli - ccsdk-sliapi - ccsdk-sliPluginUtils + + ccsdk-slicore-utils + ccsdk-dblib + ccsdk-filters + ccsdk-sli + ccsdk-sliapi + ccsdk-sliPluginUtils ccsdk-sli-core-all features-sli-core installer -- cgit