From 05e4277510b9947e3cdcbab8c7bb3846a4211af6 Mon Sep 17 00:00:00 2001 From: "Singal, Kapil (ks220y)" Date: Thu, 12 Dec 2019 11:20:58 -0500 Subject: Refactoring POM as per tidy:pom Removing sli version property declared as project.version, and it should inherit from parent pom Change-Id: I24dc1849e2183560f4c571319be0c490c772a95e Issue-ID: CCSDK-1993 Signed-off-by: Singal, Kapil (ks220y) --- sdnr/wt/odlux/apps/apiDemo/pom.xml | 59 +++++++++++++----------- sdnr/wt/odlux/apps/app-feature/pom.xml | 13 +++--- sdnr/wt/odlux/apps/app-installer/pom.xml | 21 +++++---- sdnr/wt/odlux/apps/configurationApp/pom.xml | 59 +++++++++++++----------- sdnr/wt/odlux/apps/connectApp/pom.xml | 59 +++++++++++++----------- sdnr/wt/odlux/apps/demoApp/pom.xml | 59 +++++++++++++----------- sdnr/wt/odlux/apps/faultApp/pom.xml | 58 ++++++++++++----------- sdnr/wt/odlux/apps/helpApp/pom.xml | 59 +++++++++++++----------- sdnr/wt/odlux/apps/inventoryApp/pom.xml | 59 +++++++++++++----------- sdnr/wt/odlux/apps/maintenanceApp/pom.xml | 59 +++++++++++++----------- sdnr/wt/odlux/apps/mediatorApp/pom.xml | 58 ++++++++++++----------- sdnr/wt/odlux/apps/minimumApp/pom.xml | 59 +++++++++++++----------- sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml | 59 +++++++++++++----------- 13 files changed, 368 insertions(+), 313 deletions(-) (limited to 'sdnr/wt/odlux/apps') diff --git a/sdnr/wt/odlux/apps/apiDemo/pom.xml b/sdnr/wt/odlux/apps/apiDemo/pom.xml index 012e279db..ea8f963c3 100644 --- a/sdnr/wt/odlux/apps/apiDemo/pom.xml +++ b/sdnr/wt/odlux/apps/apiDemo/pom.xml @@ -1,5 +1,6 @@ + 4.0.0 org.onap.ccsdk.parent @@ -7,11 +8,12 @@ 1.5.1-SNAPSHOT - 4.0.0 + org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-apiDemo 0.7.0-SNAPSHOT bundle + sdnr-wt-odlux-app-apiDemo @@ -19,6 +21,7 @@ http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -45,8 +48,32 @@ org.osgi.compendium + + + + highstreet repo + https://cloud-highstreet-technologies.com/mvn/ + + true + always + + + + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -69,10 +96,10 @@ false - - bin - false - + + bin + false + @@ -138,27 +165,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - - - - highstreet repo - https://cloud-highstreet-technologies.com/mvn/ - - true - always - - - diff --git a/sdnr/wt/odlux/apps/app-feature/pom.xml b/sdnr/wt/odlux/apps/app-feature/pom.xml index 84b2611a7..adce6315b 100644 --- a/sdnr/wt/odlux/apps/app-feature/pom.xml +++ b/sdnr/wt/odlux/apps/app-feature/pom.xml @@ -14,18 +14,19 @@ 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-odlux-apps-feature - 0.7.0-SNAPSHOT - feature - ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature - org.onap.ccsdk.parent single-feature-parent 1.5.1-SNAPSHOT + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-odlux-apps-feature + 0.7.0-SNAPSHOT + feature + + ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature Apache License, Version 2.0 diff --git a/sdnr/wt/odlux/apps/app-installer/pom.xml b/sdnr/wt/odlux/apps/app-installer/pom.xml index 7437f7630..136bfc26f 100755 --- a/sdnr/wt/odlux/apps/app-installer/pom.xml +++ b/sdnr/wt/odlux/apps/app-installer/pom.xml @@ -2,12 +2,6 @@ 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-odlux-apps-installer - 0.7.0-SNAPSHOT - pom - ccsdk-features-sdnr-wt :: ${project.artifactId} - org.onap.ccsdk.parent odlparent-lite @@ -15,10 +9,12 @@ - - sdnr-wt-odlux-apps - false - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-odlux-apps-installer + 0.7.0-SNAPSHOT + pom + + ccsdk-features-sdnr-wt :: ${project.artifactId} Apache License, Version 2.0 @@ -26,6 +22,11 @@ + + sdnr-wt-odlux-apps + false + + org.onap.ccsdk.features.sdnr.wt diff --git a/sdnr/wt/odlux/apps/configurationApp/pom.xml b/sdnr/wt/odlux/apps/configurationApp/pom.xml index 62742c05e..28d035b07 100644 --- a/sdnr/wt/odlux/apps/configurationApp/pom.xml +++ b/sdnr/wt/odlux/apps/configurationApp/pom.xml @@ -1,5 +1,6 @@ + 4.0.0 org.onap.ccsdk.parent @@ -7,11 +8,12 @@ 1.5.1-SNAPSHOT - 4.0.0 + org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-configurationApp 0.7.0-SNAPSHOT bundle + sdnr-wt-odlux-app-configurationApp @@ -19,6 +21,7 @@ http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -37,8 +40,32 @@ test + + + + highstreet repo + https://cloud-highstreet-technologies.com/mvn/ + + true + always + + + + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -61,10 +88,10 @@ false - - bin - false - + + bin + false + @@ -130,27 +157,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - - - - highstreet repo - https://cloud-highstreet-technologies.com/mvn/ - - true - always - - - diff --git a/sdnr/wt/odlux/apps/connectApp/pom.xml b/sdnr/wt/odlux/apps/connectApp/pom.xml index 3da282c39..d85feb127 100644 --- a/sdnr/wt/odlux/apps/connectApp/pom.xml +++ b/sdnr/wt/odlux/apps/connectApp/pom.xml @@ -1,5 +1,6 @@ + 4.0.0 org.onap.ccsdk.parent @@ -7,11 +8,12 @@ 1.5.1-SNAPSHOT - 4.0.0 + org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-connectApp 0.7.0-SNAPSHOT bundle + sdnr-wt-odlux-app-connectApp @@ -19,6 +21,7 @@ http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -37,8 +40,32 @@ test + + + + highstreet repo + https://cloud-highstreet-technologies.com/mvn/ + + true + always + + + + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -61,10 +88,10 @@ false - - bin - false - + + bin + false + @@ -130,27 +157,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - - - - highstreet repo - https://cloud-highstreet-technologies.com/mvn/ - - true - always - - - diff --git a/sdnr/wt/odlux/apps/demoApp/pom.xml b/sdnr/wt/odlux/apps/demoApp/pom.xml index 60016b7a1..32c8cc2c5 100644 --- a/sdnr/wt/odlux/apps/demoApp/pom.xml +++ b/sdnr/wt/odlux/apps/demoApp/pom.xml @@ -1,5 +1,6 @@ + 4.0.0 org.onap.ccsdk.parent @@ -7,11 +8,12 @@ 1.5.1-SNAPSHOT - 4.0.0 + org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-demoApp 0.7.0-SNAPSHOT bundle + sdnr-wt-odlux-app-demoApp @@ -19,6 +21,7 @@ http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -37,8 +40,32 @@ test + + + + highstreet repo + https://cloud-highstreet-technologies.com/mvn/ + + true + always + + + + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -61,10 +88,10 @@ false - - bin - false - + + bin + false + @@ -130,27 +157,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - - - - highstreet repo - https://cloud-highstreet-technologies.com/mvn/ - - true - always - - - diff --git a/sdnr/wt/odlux/apps/faultApp/pom.xml b/sdnr/wt/odlux/apps/faultApp/pom.xml index b748b7d19..fc9e9762b 100644 --- a/sdnr/wt/odlux/apps/faultApp/pom.xml +++ b/sdnr/wt/odlux/apps/faultApp/pom.xml @@ -1,5 +1,6 @@ + 4.0.0 org.onap.ccsdk.parent @@ -8,11 +9,11 @@ - 4.0.0 org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-faultApp 0.7.0-SNAPSHOT bundle + sdnr-wt-odlux-app-faultApp @@ -20,6 +21,7 @@ http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -38,8 +40,32 @@ test + + + + highstreet repo + https://cloud-highstreet-technologies.com/mvn/ + + true + always + + + + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -62,10 +88,10 @@ false - - bin - false - + + bin + false + @@ -131,27 +157,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - - - - highstreet repo - https://cloud-highstreet-technologies.com/mvn/ - - true - always - - - diff --git a/sdnr/wt/odlux/apps/helpApp/pom.xml b/sdnr/wt/odlux/apps/helpApp/pom.xml index b88c233c3..a4d2ebdbc 100644 --- a/sdnr/wt/odlux/apps/helpApp/pom.xml +++ b/sdnr/wt/odlux/apps/helpApp/pom.xml @@ -1,5 +1,6 @@ + 4.0.0 org.onap.ccsdk.parent @@ -7,11 +8,12 @@ 1.5.1-SNAPSHOT - 4.0.0 + org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-helpApp 0.7.0-SNAPSHOT bundle + sdnr-wt-odlux-app-helpApp @@ -19,6 +21,7 @@ http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -37,8 +40,32 @@ test + + + + highstreet repo + https://cloud-highstreet-technologies.com/mvn/ + + true + always + + + + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -61,10 +88,10 @@ false - - bin - false - + + bin + false + @@ -130,27 +157,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - - - - highstreet repo - https://cloud-highstreet-technologies.com/mvn/ - - true - always - - - diff --git a/sdnr/wt/odlux/apps/inventoryApp/pom.xml b/sdnr/wt/odlux/apps/inventoryApp/pom.xml index a958542e3..4fa2073a8 100644 --- a/sdnr/wt/odlux/apps/inventoryApp/pom.xml +++ b/sdnr/wt/odlux/apps/inventoryApp/pom.xml @@ -1,5 +1,6 @@ + 4.0.0 org.onap.ccsdk.parent @@ -7,11 +8,12 @@ 1.5.1-SNAPSHOT - 4.0.0 + org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-inventoryApp 0.7.0-SNAPSHOT bundle + sdnr-wt-odlux-app-inventoryApp @@ -19,6 +21,7 @@ http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -37,8 +40,32 @@ test + + + + highstreet repo + https://cloud-highstreet-technologies.com/mvn/ + + true + always + + + + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -61,10 +88,10 @@ false - - bin - false - + + bin + false + @@ -130,27 +157,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - - - - highstreet repo - https://cloud-highstreet-technologies.com/mvn/ - - true - always - - - diff --git a/sdnr/wt/odlux/apps/maintenanceApp/pom.xml b/sdnr/wt/odlux/apps/maintenanceApp/pom.xml index aa574cf91..71a8aefaf 100644 --- a/sdnr/wt/odlux/apps/maintenanceApp/pom.xml +++ b/sdnr/wt/odlux/apps/maintenanceApp/pom.xml @@ -1,5 +1,6 @@ + 4.0.0 org.onap.ccsdk.parent @@ -7,11 +8,12 @@ 1.5.1-SNAPSHOT - 4.0.0 + org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-maintenanceApp 0.7.0-SNAPSHOT bundle + sdnr-wt-odlux-app-maintenanceApp @@ -19,6 +21,7 @@ http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -37,8 +40,32 @@ test + + + + highstreet repo + https://cloud-highstreet-technologies.com/mvn/ + + true + always + + + + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -61,10 +88,10 @@ false - - bin - false - + + bin + false + @@ -130,27 +157,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - - - - highstreet repo - https://cloud-highstreet-technologies.com/mvn/ - - true - always - - - diff --git a/sdnr/wt/odlux/apps/mediatorApp/pom.xml b/sdnr/wt/odlux/apps/mediatorApp/pom.xml index e1ff2d5fc..81f1798ad 100644 --- a/sdnr/wt/odlux/apps/mediatorApp/pom.xml +++ b/sdnr/wt/odlux/apps/mediatorApp/pom.xml @@ -1,5 +1,6 @@ + 4.0.0 org.onap.ccsdk.parent @@ -8,11 +9,11 @@ - 4.0.0 org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-mediatorApp 0.7.0-SNAPSHOT bundle + sdnr-wt-odlux-app-mediatorApp @@ -20,6 +21,7 @@ http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -38,8 +40,32 @@ test + + + + highstreet repo + https://cloud-highstreet-technologies.com/mvn/ + + true + always + + + + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -62,10 +88,10 @@ false - - bin - false - + + bin + false + @@ -131,27 +157,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - - - - highstreet repo - https://cloud-highstreet-technologies.com/mvn/ - - true - always - - - diff --git a/sdnr/wt/odlux/apps/minimumApp/pom.xml b/sdnr/wt/odlux/apps/minimumApp/pom.xml index bdc486ae3..529daa544 100644 --- a/sdnr/wt/odlux/apps/minimumApp/pom.xml +++ b/sdnr/wt/odlux/apps/minimumApp/pom.xml @@ -1,5 +1,6 @@ + 4.0.0 org.onap.ccsdk.parent @@ -7,11 +8,12 @@ 1.5.1-SNAPSHOT - 4.0.0 + org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-minimumApp 0.7.0-SNAPSHOT bundle + sdnr-wt-odlux-app-minimumApp @@ -19,6 +21,7 @@ http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -37,8 +40,32 @@ test + + + + highstreet repo + https://cloud-highstreet-technologies.com/mvn/ + + true + always + + + + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -61,10 +88,10 @@ false - - bin - false - + + bin + false + @@ -130,27 +157,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - - - - highstreet repo - https://cloud-highstreet-technologies.com/mvn/ - - true - always - - - diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml b/sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml index 647b9efdb..2a172f7a0 100644 --- a/sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml +++ b/sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml @@ -1,5 +1,6 @@ + 4.0.0 org.onap.ccsdk.parent @@ -7,11 +8,12 @@ 1.5.1-SNAPSHOT - 4.0.0 + org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-performanceHistoryApp 0.7.0-SNAPSHOT bundle + sdnr-wt-odlux-app-performanceHistoryApp @@ -19,6 +21,7 @@ http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -37,8 +40,32 @@ test + + + + highstreet repo + https://cloud-highstreet-technologies.com/mvn/ + + true + always + + + + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -61,10 +88,10 @@ false - - bin - false - + + bin + false + @@ -130,27 +157,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - - - - highstreet repo - https://cloud-highstreet-technologies.com/mvn/ - - true - always - - - -- cgit 1.2.3-korg