From df195945d03dec122666e8d48e4c7ba94630468a Mon Sep 17 00:00:00 2001 From: "Singal, Kapil (ks220y)" Date: Thu, 12 Dec 2019 15:24:53 -0500 Subject: Refactoring multiple plugins Refactoring below plugins in sdnr/wt/common/pom.xml : 1) org.codehaus.mojo : exec-maven-plugin -> changing executable to bash so that it can run on windows too 2) com.github.alexcojocaru : elasticsearch-maven-plugin -> skip if tests are skipped during maven build Adding create dir step in es-intit.sh : sdnr/wt/data-provider/database/src/main/resources/es-init.sh -> cmd_initfile() -> mkdir -p $( dirname $INITFILENAME ) Change-Id: I78516406101659f802dad2fb68ca349f63a4dd2e Issue-ID: CCSDK-1994 Signed-off-by: Singal, Kapil (ks220y) --- sdnr/wt/odlux/apps/apiDemo/pom.xml | 41 +++++++++++++----------- 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 | 41 +++++++++++++----------- sdnr/wt/odlux/apps/connectApp/pom.xml | 41 +++++++++++++----------- sdnr/wt/odlux/apps/demoApp/pom.xml | 41 +++++++++++++----------- sdnr/wt/odlux/apps/eventLogApp/pom.xml | 41 +++++++++++++----------- sdnr/wt/odlux/apps/faultApp/pom.xml | 40 ++++++++++++----------- sdnr/wt/odlux/apps/helpApp/pom.xml | 41 +++++++++++++----------- sdnr/wt/odlux/apps/inventoryApp/pom.xml | 41 +++++++++++++----------- sdnr/wt/odlux/apps/maintenanceApp/pom.xml | 41 +++++++++++++----------- sdnr/wt/odlux/apps/mediatorApp/pom.xml | 40 ++++++++++++----------- sdnr/wt/odlux/apps/minimumApp/pom.xml | 41 +++++++++++++----------- sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml | 41 +++++++++++++----------- 14 files changed, 280 insertions(+), 244 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 11bf306f2..960fb745b 100644 --- a/sdnr/wt/odlux/apps/apiDemo/pom.xml +++ b/sdnr/wt/odlux/apps/apiDemo/pom.xml @@ -1,6 +1,6 @@ - + + 4.0.0 org.onap.ccsdk.parent @@ -8,18 +8,20 @@ 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 + + ccsdk-features :: ${project.artifactId} Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -46,8 +48,21 @@ org.osgi.compendium + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -96,9 +111,9 @@ - de.jacks-it-lab - frontend-maven-plugin - 1.7.1 + de.jacks-it-lab + frontend-maven-plugin + 1.7.1 install node and yarn @@ -139,17 +154,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - diff --git a/sdnr/wt/odlux/apps/app-feature/pom.xml b/sdnr/wt/odlux/apps/app-feature/pom.xml index dd67901ab..9b4a9f565 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 :: ${project.artifactId} 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 20871a4d2..60ef31348 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 :: ${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 a4e067873..6abe1f07b 100644 --- a/sdnr/wt/odlux/apps/configurationApp/pom.xml +++ b/sdnr/wt/odlux/apps/configurationApp/pom.xml @@ -1,6 +1,6 @@ - + + 4.0.0 org.onap.ccsdk.parent @@ -8,18 +8,20 @@ 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 + + ccsdk-features :: ${project.artifactId} Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -38,8 +40,21 @@ test + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -88,9 +103,9 @@ - de.jacks-it-lab - frontend-maven-plugin - 1.7.1 + de.jacks-it-lab + frontend-maven-plugin + 1.7.1 install node and yarn @@ -131,17 +146,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - diff --git a/sdnr/wt/odlux/apps/connectApp/pom.xml b/sdnr/wt/odlux/apps/connectApp/pom.xml index f52fa1111..36a5cf8bf 100644 --- a/sdnr/wt/odlux/apps/connectApp/pom.xml +++ b/sdnr/wt/odlux/apps/connectApp/pom.xml @@ -1,6 +1,6 @@ - + + 4.0.0 org.onap.ccsdk.parent @@ -8,18 +8,20 @@ 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 + + ccsdk-features :: ${project.artifactId} Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -38,8 +40,21 @@ test + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -88,9 +103,9 @@ - de.jacks-it-lab - frontend-maven-plugin - 1.7.1 + de.jacks-it-lab + frontend-maven-plugin + 1.7.1 install node and yarn @@ -131,17 +146,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - diff --git a/sdnr/wt/odlux/apps/demoApp/pom.xml b/sdnr/wt/odlux/apps/demoApp/pom.xml index 8cffb9e7a..535549ae3 100644 --- a/sdnr/wt/odlux/apps/demoApp/pom.xml +++ b/sdnr/wt/odlux/apps/demoApp/pom.xml @@ -1,6 +1,6 @@ - + + 4.0.0 org.onap.ccsdk.parent @@ -8,18 +8,20 @@ 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 + + ccsdk-features :: ${project.artifactId} Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -38,8 +40,21 @@ test + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -88,9 +103,9 @@ - de.jacks-it-lab - frontend-maven-plugin - 1.7.1 + de.jacks-it-lab + frontend-maven-plugin + 1.7.1 install node and yarn @@ -131,17 +146,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - diff --git a/sdnr/wt/odlux/apps/eventLogApp/pom.xml b/sdnr/wt/odlux/apps/eventLogApp/pom.xml index 9e369ee62..ed67399ec 100644 --- a/sdnr/wt/odlux/apps/eventLogApp/pom.xml +++ b/sdnr/wt/odlux/apps/eventLogApp/pom.xml @@ -1,6 +1,6 @@ - + + 4.0.0 org.onap.ccsdk.parent @@ -8,18 +8,20 @@ 1.5.1-SNAPSHOT - 4.0.0 + org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-eventLogApp 0.7.0-SNAPSHOT bundle - sdnr-wt-odlux-app-eventLogApp + + ccsdk-features :: ${project.artifactId} Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -38,8 +40,21 @@ test + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -88,9 +103,9 @@ - de.jacks-it-lab - frontend-maven-plugin - 1.7.1 + de.jacks-it-lab + frontend-maven-plugin + 1.7.1 install node and yarn @@ -131,17 +146,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - diff --git a/sdnr/wt/odlux/apps/faultApp/pom.xml b/sdnr/wt/odlux/apps/faultApp/pom.xml index 973c1061f..1c616a40b 100644 --- a/sdnr/wt/odlux/apps/faultApp/pom.xml +++ b/sdnr/wt/odlux/apps/faultApp/pom.xml @@ -1,6 +1,6 @@ - + + 4.0.0 org.onap.ccsdk.parent @@ -9,18 +9,19 @@ - 4.0.0 org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-faultApp 0.7.0-SNAPSHOT bundle - sdnr-wt-odlux-app-faultApp + + ccsdk-features :: ${project.artifactId} Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -39,8 +40,21 @@ test + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -89,9 +103,9 @@ - de.jacks-it-lab - frontend-maven-plugin - 1.7.1 + de.jacks-it-lab + frontend-maven-plugin + 1.7.1 install node and yarn @@ -132,17 +146,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - diff --git a/sdnr/wt/odlux/apps/helpApp/pom.xml b/sdnr/wt/odlux/apps/helpApp/pom.xml index 8180a68df..8f8b59a9a 100644 --- a/sdnr/wt/odlux/apps/helpApp/pom.xml +++ b/sdnr/wt/odlux/apps/helpApp/pom.xml @@ -1,6 +1,6 @@ - + + 4.0.0 org.onap.ccsdk.parent @@ -8,18 +8,20 @@ 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 + + ccsdk-features :: ${project.artifactId} Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -38,8 +40,21 @@ test + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -88,9 +103,9 @@ - de.jacks-it-lab - frontend-maven-plugin - 1.7.1 + de.jacks-it-lab + frontend-maven-plugin + 1.7.1 install node and yarn @@ -131,17 +146,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - diff --git a/sdnr/wt/odlux/apps/inventoryApp/pom.xml b/sdnr/wt/odlux/apps/inventoryApp/pom.xml index 081f070fc..86c5e8381 100644 --- a/sdnr/wt/odlux/apps/inventoryApp/pom.xml +++ b/sdnr/wt/odlux/apps/inventoryApp/pom.xml @@ -1,6 +1,6 @@ - + + 4.0.0 org.onap.ccsdk.parent @@ -8,18 +8,20 @@ 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 + + ccsdk-features :: ${project.artifactId} Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -38,8 +40,21 @@ test + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -88,9 +103,9 @@ - de.jacks-it-lab - frontend-maven-plugin - 1.7.1 + de.jacks-it-lab + frontend-maven-plugin + 1.7.1 install node and yarn @@ -131,17 +146,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - diff --git a/sdnr/wt/odlux/apps/maintenanceApp/pom.xml b/sdnr/wt/odlux/apps/maintenanceApp/pom.xml index be6e2ea6e..ccd0dbf09 100644 --- a/sdnr/wt/odlux/apps/maintenanceApp/pom.xml +++ b/sdnr/wt/odlux/apps/maintenanceApp/pom.xml @@ -1,6 +1,6 @@ - + + 4.0.0 org.onap.ccsdk.parent @@ -8,18 +8,20 @@ 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 + + ccsdk-features :: ${project.artifactId} Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -38,8 +40,21 @@ test + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -88,9 +103,9 @@ - de.jacks-it-lab - frontend-maven-plugin - 1.7.1 + de.jacks-it-lab + frontend-maven-plugin + 1.7.1 install node and yarn @@ -131,17 +146,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - diff --git a/sdnr/wt/odlux/apps/mediatorApp/pom.xml b/sdnr/wt/odlux/apps/mediatorApp/pom.xml index bc3355a39..80fdbf569 100644 --- a/sdnr/wt/odlux/apps/mediatorApp/pom.xml +++ b/sdnr/wt/odlux/apps/mediatorApp/pom.xml @@ -1,6 +1,6 @@ - + + 4.0.0 org.onap.ccsdk.parent @@ -9,18 +9,19 @@ - 4.0.0 org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-mediatorApp 0.7.0-SNAPSHOT bundle - sdnr-wt-odlux-app-mediatorApp + + ccsdk-features :: ${project.artifactId} Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -39,8 +40,21 @@ test + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -89,9 +103,9 @@ - de.jacks-it-lab - frontend-maven-plugin - 1.7.1 + de.jacks-it-lab + frontend-maven-plugin + 1.7.1 install node and yarn @@ -132,17 +146,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - diff --git a/sdnr/wt/odlux/apps/minimumApp/pom.xml b/sdnr/wt/odlux/apps/minimumApp/pom.xml index dc9507c9b..51a8f0a6b 100644 --- a/sdnr/wt/odlux/apps/minimumApp/pom.xml +++ b/sdnr/wt/odlux/apps/minimumApp/pom.xml @@ -1,6 +1,6 @@ - + + 4.0.0 org.onap.ccsdk.parent @@ -8,18 +8,20 @@ 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 + + ccsdk-features :: ${project.artifactId} Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -38,8 +40,21 @@ test + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -88,9 +103,9 @@ - de.jacks-it-lab - frontend-maven-plugin - 1.7.1 + de.jacks-it-lab + frontend-maven-plugin + 1.7.1 install node and yarn @@ -131,17 +146,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml b/sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml index b6ede0c36..4fc302f05 100644 --- a/sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml +++ b/sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml @@ -1,6 +1,6 @@ - + + 4.0.0 org.onap.ccsdk.parent @@ -8,18 +8,20 @@ 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 + + ccsdk-features :: ${project.artifactId} Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -38,8 +40,21 @@ test + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -88,9 +103,9 @@ - de.jacks-it-lab - frontend-maven-plugin - 1.7.1 + de.jacks-it-lab + frontend-maven-plugin + 1.7.1 install node and yarn @@ -131,17 +146,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - -- cgit 1.2.3-korg