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 --- northbound/artifacts/pom.xml | 2 +- northbound/asdcApi/installer/pom.xml | 229 ++++++++++----------- northbound/asdcApi/model/pom.xml | 3 +- northbound/asdcApi/pom.xml | 3 +- northbound/asdcApi/provider/pom.xml | 23 +-- northbound/daexim-offsite-backup/installer/pom.xml | 2 +- northbound/daexim-offsite-backup/model/pom.xml | 3 +- northbound/daexim-offsite-backup/pom.xml | 2 +- northbound/daexim-offsite-backup/provider/pom.xml | 30 +-- northbound/dataChange/installer/pom.xml | 3 +- northbound/dataChange/model/pom.xml | 4 +- northbound/dataChange/pom.xml | 2 +- northbound/dataChange/provider/pom.xml | 44 ++-- northbound/dmaap-listener/pom.xml | 5 +- northbound/features/ccsdk-asdcApi/pom.xml | 2 +- .../features/ccsdk-daexim-offsite-backup/pom.xml | 2 +- northbound/features/ccsdk-dataChange/pom.xml | 2 +- northbound/features/ccsdk-lcm/pom.xml | 2 +- .../features/ccsdk-sli-northbound-all/pom.xml | 1 - northbound/features/installer/pom.xml | 4 +- northbound/lcm/installer/pom.xml | 3 +- northbound/lcm/model/pom.xml | 3 +- northbound/lcm/pom.xml | 2 +- northbound/lcm/provider/pom.xml | 50 ++--- northbound/pom.xml | 45 ++-- northbound/ueb-listener/pom.xml | 5 +- 26 files changed, 231 insertions(+), 245 deletions(-) (limited to 'northbound') diff --git a/northbound/artifacts/pom.xml b/northbound/artifacts/pom.xml index 50d4b23f1..e197c0a9d 100755 --- a/northbound/artifacts/pom.xml +++ b/northbound/artifacts/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-northbound :: sli-northbound-artifacts + ccsdk-sli-northbound :: ${project.artifactId} CCSDK northbound components Bill of Materials (BOM) https://wiki.onap.org diff --git a/northbound/asdcApi/installer/pom.xml b/northbound/asdcApi/installer/pom.xml index cef565c33..796cb2784 100755 --- a/northbound/asdcApi/installer/pom.xml +++ b/northbound/asdcApi/installer/pom.xml @@ -1,134 +1,133 @@ - 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.northbound - asdcApi-installer - 1.2.1-SNAPSHOT - pom + org.onap.ccsdk.sli.northbound + asdcApi-installer + 1.2.1-SNAPSHOT + pom - ccsdk-sli-northbound :: asdcApi :: ${project.artifactId} + ccsdk-sli-northbound :: ${project.artifactId} - - ccsdk-asdcApi - ${application.name} + + ccsdk-asdcApi + ${application.name} mvn:org.onap.ccsdk.sli.northbound/${features.boot}/${project.version}/xml/features - false - + false + - + org.onap.ccsdk.sli.northbound asdcApi-model ${project.version} - - org.onap.ccsdk.sli.northbound - asdcApi-provider - ${project.version} - - + + org.onap.ccsdk.sli.northbound + asdcApi-provider + ${project.version} + - + - - - - maven-assembly-plugin - 2.6 - - - 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.northbound - 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 + 2.6 + + + 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.northbound + 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/northbound/asdcApi/model/pom.xml b/northbound/asdcApi/model/pom.xml index e19f21325..a214addac 100755 --- a/northbound/asdcApi/model/pom.xml +++ b/northbound/asdcApi/model/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT bundle - ccsdk-sli-northbound :: asdcApi :: ${project.artifactId} + ccsdk-sli-northbound :: ${project.artifactId} @@ -23,6 +23,5 @@ rfc6991 - diff --git a/northbound/asdcApi/pom.xml b/northbound/asdcApi/pom.xml index fecbff0a7..c8debab38 100755 --- a/northbound/asdcApi/pom.xml +++ b/northbound/asdcApi/pom.xml @@ -14,12 +14,11 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-northbound :: asdcApi + ccsdk-sli-northbound :: ${project.artifactId} model provider installer - diff --git a/northbound/asdcApi/provider/pom.xml b/northbound/asdcApi/provider/pom.xml index a89adfb98..347ecd340 100755 --- a/northbound/asdcApi/provider/pom.xml +++ b/northbound/asdcApi/provider/pom.xml @@ -14,18 +14,18 @@ 1.2.1-SNAPSHOT bundle - ccsdk-sli-northbound :: asdcApi :: ${project.artifactId} + ccsdk-sli-northbound :: ${project.artifactId} - - - org.onap.ccsdk.sli.core - sli-core-artifacts - ${project.version} - pom - import - - + + + org.onap.ccsdk.sli.core + sli-core-artifacts + ${project.version} + pom + import + + @@ -59,10 +59,9 @@ test - org.opendaylight.mdsal - mdsal-binding-dom-adapter + mdsal-binding-dom-adapter test diff --git a/northbound/daexim-offsite-backup/installer/pom.xml b/northbound/daexim-offsite-backup/installer/pom.xml index 551c5b72a..0e4fb8d56 100755 --- a/northbound/daexim-offsite-backup/installer/pom.xml +++ b/northbound/daexim-offsite-backup/installer/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-northbound :: daexim-offsite-backup :: ${project.artifactId} + ccsdk-sli-northbound :: ${project.artifactId} ccsdk-daexim-offsite-backup diff --git a/northbound/daexim-offsite-backup/model/pom.xml b/northbound/daexim-offsite-backup/model/pom.xml index a40283e3b..8edccbb6c 100755 --- a/northbound/daexim-offsite-backup/model/pom.xml +++ b/northbound/daexim-offsite-backup/model/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT bundle - ccsdk-sli-northbound :: daexim-offsite-backup :: ${project.artifactId} + ccsdk-sli-northbound :: ${project.artifactId} @@ -22,6 +22,5 @@ rfc6991 - diff --git a/northbound/daexim-offsite-backup/pom.xml b/northbound/daexim-offsite-backup/pom.xml index 0733e51b4..71af57ce1 100755 --- a/northbound/daexim-offsite-backup/pom.xml +++ b/northbound/daexim-offsite-backup/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-northbound :: daexim-offsite-backup + ccsdk-sli-northbound :: ${project.artifactId} ODL feature used for transferring MD-SAL data to an offsite location. diff --git a/northbound/daexim-offsite-backup/provider/pom.xml b/northbound/daexim-offsite-backup/provider/pom.xml index af8cd5126..f661878a5 100755 --- a/northbound/daexim-offsite-backup/provider/pom.xml +++ b/northbound/daexim-offsite-backup/provider/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT bundle - ccsdk-sli-northbound :: daexim-offsite-backup :: ${project.artifactId} + ccsdk-sli-northbound :: ${project.artifactId} @@ -35,18 +35,18 @@ mdsal-binding-test-model test - - - - - - - - - - - - + + + + + + + + + + + + org.apache.commons commons-lang3 @@ -62,8 +62,8 @@ ${project.version} - com.google.code.findbugs - annotations + com.google.code.findbugs + annotations junit diff --git a/northbound/dataChange/installer/pom.xml b/northbound/dataChange/installer/pom.xml index 705bbff4b..849a3f32a 100755 --- a/northbound/dataChange/installer/pom.xml +++ b/northbound/dataChange/installer/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-northbound :: dataChange :: ${project.artifactId} + ccsdk-sli-northbound :: ${project.artifactId} ccsdk-dataChange @@ -37,7 +37,6 @@ ${project.version} - diff --git a/northbound/dataChange/model/pom.xml b/northbound/dataChange/model/pom.xml index 4a4e6b506..8f21714f2 100755 --- a/northbound/dataChange/model/pom.xml +++ b/northbound/dataChange/model/pom.xml @@ -14,8 +14,7 @@ 1.2.1-SNAPSHOT bundle - ccsdk-sli-northbound :: dataChange :: ${project.artifactId} - + ccsdk-sli-northbound :: ${project.artifactId} @@ -23,6 +22,5 @@ rfc6991 - diff --git a/northbound/dataChange/pom.xml b/northbound/dataChange/pom.xml index 0291e1b6d..2b64df3ce 100755 --- a/northbound/dataChange/pom.xml +++ b/northbound/dataChange/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-northbound :: dataChange + ccsdk-sli-northbound :: ${project.artifactId} model diff --git a/northbound/dataChange/provider/pom.xml b/northbound/dataChange/provider/pom.xml index e4f8aaf2b..9617e9ae9 100755 --- a/northbound/dataChange/provider/pom.xml +++ b/northbound/dataChange/provider/pom.xml @@ -14,18 +14,18 @@ 1.2.1-SNAPSHOT bundle - ccsdk-sli-northbound :: dataChange :: ${project.artifactId} + ccsdk-sli-northbound :: ${project.artifactId} - - - org.onap.ccsdk.sli.core - sli-core-artifacts - ${project.version} - pom - import - - + + + org.onap.ccsdk.sli.core + sli-core-artifacts + ${project.version} + pom + import + + @@ -58,18 +58,18 @@ test - - - - - - - - - - - - + + + + + + + + + + + + junit junit diff --git a/northbound/dmaap-listener/pom.xml b/northbound/dmaap-listener/pom.xml index acb100baa..84f6f9964 100755 --- a/northbound/dmaap-listener/pom.xml +++ b/northbound/dmaap-listener/pom.xml @@ -6,6 +6,7 @@ org.onap.ccsdk.parent standalone-parent 2.1.1 + org.onap.ccsdk.sli.northbound @@ -13,7 +14,7 @@ 1.2.1-SNAPSHOT jar - ccsdk-sli-northbound :: dmaap-listener + ccsdk-sli-northbound :: ${project.artifactId} DMAAP Listener @@ -73,7 +74,7 @@ org.apache.velocity velocity-engine-core - + org.glassfish.jersey.inject jersey-hk2 diff --git a/northbound/features/ccsdk-asdcApi/pom.xml b/northbound/features/ccsdk-asdcApi/pom.xml index efff4650a..dc1b9b244 100644 --- a/northbound/features/ccsdk-asdcApi/pom.xml +++ b/northbound/features/ccsdk-asdcApi/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT feature - ccsdk-sli-northbound :: asdcApi :: ${project.artifactId} + ccsdk-sli-northbound :: features :: ${project.artifactId} diff --git a/northbound/features/ccsdk-daexim-offsite-backup/pom.xml b/northbound/features/ccsdk-daexim-offsite-backup/pom.xml index 8def7d822..ef207f269 100644 --- a/northbound/features/ccsdk-daexim-offsite-backup/pom.xml +++ b/northbound/features/ccsdk-daexim-offsite-backup/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT feature - ccsdk-sli-northbound :: daexim-offsite-backup :: ${project.artifactId} + ccsdk-sli-northbound :: features :: ${project.artifactId} diff --git a/northbound/features/ccsdk-dataChange/pom.xml b/northbound/features/ccsdk-dataChange/pom.xml index f993ec61a..15fb23e63 100644 --- a/northbound/features/ccsdk-dataChange/pom.xml +++ b/northbound/features/ccsdk-dataChange/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT feature - ccsdk-sli-northbound :: dataChange :: ${project.artifactId} + ccsdk-sli-northbound :: features :: ${project.artifactId} diff --git a/northbound/features/ccsdk-lcm/pom.xml b/northbound/features/ccsdk-lcm/pom.xml index 3062e0fa6..af5678832 100644 --- a/northbound/features/ccsdk-lcm/pom.xml +++ b/northbound/features/ccsdk-lcm/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT feature - ccsdk-sli-northbound :: lcm :: ${project.artifactId} + ccsdk-sli-northbound :: features :: ${project.artifactId} diff --git a/northbound/features/ccsdk-sli-northbound-all/pom.xml b/northbound/features/ccsdk-sli-northbound-all/pom.xml index 7ebc66d74..7873fe4a3 100644 --- a/northbound/features/ccsdk-sli-northbound-all/pom.xml +++ b/northbound/features/ccsdk-sli-northbound-all/pom.xml @@ -39,6 +39,5 @@ features - diff --git a/northbound/features/installer/pom.xml b/northbound/features/installer/pom.xml index d1afadf18..46f990234 100755 --- a/northbound/features/installer/pom.xml +++ b/northbound/features/installer/pom.xml @@ -77,7 +77,6 @@ - org.onap.ccsdk.sli.northbound ${application.name} @@ -92,7 +91,6 @@ - @@ -151,7 +149,7 @@ true false false - org.onap.ccsdk.sli.northbound + org.onap.ccsdk.sli.northbound provided diff --git a/northbound/lcm/installer/pom.xml b/northbound/lcm/installer/pom.xml index 107aa687b..0c453c617 100755 --- a/northbound/lcm/installer/pom.xml +++ b/northbound/lcm/installer/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-northbound :: lcm :: ${project.artifactId} + ccsdk-sli-northbound :: ${project.artifactId} ccsdk-lcm @@ -36,7 +36,6 @@ ${project.version} - diff --git a/northbound/lcm/model/pom.xml b/northbound/lcm/model/pom.xml index a1a262cc2..51c6d012f 100755 --- a/northbound/lcm/model/pom.xml +++ b/northbound/lcm/model/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT bundle - ccsdk-sli-northbound :: lcm :: ${project.artifactId} + ccsdk-sli-northbound :: ${project.artifactId} @@ -23,6 +23,5 @@ rfc6991 - diff --git a/northbound/lcm/pom.xml b/northbound/lcm/pom.xml index a8d70aebe..35891a309 100755 --- a/northbound/lcm/pom.xml +++ b/northbound/lcm/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-northbound :: lcm + ccsdk-sli-northbound :: ${project.artifactId} model diff --git a/northbound/lcm/provider/pom.xml b/northbound/lcm/provider/pom.xml index 7666fe2dc..65ab60611 100755 --- a/northbound/lcm/provider/pom.xml +++ b/northbound/lcm/provider/pom.xml @@ -14,18 +14,18 @@ 1.2.1-SNAPSHOT bundle - ccsdk-sli-northbound :: lcm :: ${project.artifactId} + ccsdk-sli-northbound :: ${project.artifactId} - - - org.onap.ccsdk.sli.core - sli-core-artifacts - ${project.version} - pom - import - - + + + org.onap.ccsdk.sli.core + sli-core-artifacts + ${project.version} + pom + import + + @@ -84,26 +84,26 @@ test - org.osgi - org.osgi.core - test - + org.osgi + org.osgi.core + test + - org.apache.maven.plugins - maven-surefire-plugin - - - dummyUser - dummyPassword - dummyDatabase - - - - + org.apache.maven.plugins + maven-surefire-plugin + + + dummyUser + dummyPassword + dummyDatabase + + + + org.apache.maven.plugins maven-failsafe-plugin diff --git a/northbound/pom.xml b/northbound/pom.xml index b49c05f0f..838d065f6 100644 --- a/northbound/pom.xml +++ b/northbound/pom.xml @@ -13,7 +13,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-northbound + ${project.artifactId} The SDN-C Northbound APIs repo contains code for northbound API adaptors, typically MD-SAL applications https://wiki.onap.org @@ -73,28 +73,27 @@ - - - com.blackducksoftware.integration - hub-maven-plugin - 1.4.0 - false - - ${project.name} - ${project.basedir} - - - - create-bdio-file - package - - createHubOutput - - - - - - + + + com.blackducksoftware.integration + hub-maven-plugin + 1.4.0 + false + + ${project.name} + ${project.basedir} + + + + create-bdio-file + package + + createHubOutput + + + + + diff --git a/northbound/ueb-listener/pom.xml b/northbound/ueb-listener/pom.xml index ae854d442..7863dc880 100755 --- a/northbound/ueb-listener/pom.xml +++ b/northbound/ueb-listener/pom.xml @@ -13,7 +13,7 @@ 1.2.1-SNAPSHOT jar - ccsdk-sli-northbound :: ueb-listener + ccsdk-sli-northbound :: ${project.artifactId} UEB Listener @@ -23,7 +23,7 @@ ${maven.build.timestamp} ${project.version}-${build.number} 1.4.1 - 1.6.5 + 1.6.5 @@ -38,7 +38,6 @@ - org.onap.sdc.sdc-distribution-client -- cgit 1.2.3-korg