From df195945d03dec122666e8d48e4c7ba94630468a Mon Sep 17 00:00:00 2001
From: "Singal, Kapil (ks220y)" <ks220y@att.com>
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) <ks220y@att.com>
---
 sdnr/northbound/a1Adapter/feature/pom.xml   | 4 ++--
 sdnr/northbound/a1Adapter/installer/pom.xml | 6 +++---
 sdnr/northbound/a1Adapter/model/pom.xml     | 2 ++
 sdnr/northbound/a1Adapter/pom.xml           | 2 +-
 sdnr/northbound/a1Adapter/provider/pom.xml  | 2 ++
 5 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'sdnr/northbound/a1Adapter')

diff --git a/sdnr/northbound/a1Adapter/feature/pom.xml b/sdnr/northbound/a1Adapter/feature/pom.xml
index ef294b370..f1ef323d1 100644
--- a/sdnr/northbound/a1Adapter/feature/pom.xml
+++ b/sdnr/northbound/a1Adapter/feature/pom.xml
@@ -10,11 +10,11 @@
     </parent>
 
     <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
-    <artifactId>sdnr-a1Adapter</artifactId>
+    <artifactId>a1Adapter-feature</artifactId>
     <version>0.7.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
-    <name>ccsdk-features-sdnr-northbound :: a1Adapter :: ${project.artifactId}</name>
+    <name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name>
 
     <dependencies>
 
diff --git a/sdnr/northbound/a1Adapter/installer/pom.xml b/sdnr/northbound/a1Adapter/installer/pom.xml
index 9cc63e7b7..2b33aecf7 100644
--- a/sdnr/northbound/a1Adapter/installer/pom.xml
+++ b/sdnr/northbound/a1Adapter/installer/pom.xml
@@ -14,10 +14,10 @@
     <version>0.7.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-    <name>ccsdk-features-sdnr-northbound :: a1Adapter :: ${project.artifactId}</name>
+    <name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name>
 
     <properties>
-        <application.name>sdnr-a1Adapter</application.name>
+        <application.name>a1Adapter</application.name>
         <include.transitive.dependencies>false</include.transitive.dependencies>
     </properties>
 
@@ -25,7 +25,7 @@
 
         <dependency>
             <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
-            <artifactId>${application.name}</artifactId>
+            <artifactId>${application.name}-feature</artifactId>
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
diff --git a/sdnr/northbound/a1Adapter/model/pom.xml b/sdnr/northbound/a1Adapter/model/pom.xml
index a557d3c76..1fc56aa31 100644
--- a/sdnr/northbound/a1Adapter/model/pom.xml
+++ b/sdnr/northbound/a1Adapter/model/pom.xml
@@ -14,6 +14,8 @@
     <version>0.7.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
+    <name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name>
+
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
diff --git a/sdnr/northbound/a1Adapter/pom.xml b/sdnr/northbound/a1Adapter/pom.xml
index bea1518ff..f718bbb25 100644
--- a/sdnr/northbound/a1Adapter/pom.xml
+++ b/sdnr/northbound/a1Adapter/pom.xml
@@ -14,7 +14,7 @@
     <version>0.7.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-    <name>ccsdk-features-sdnr-northbound :: a1Adapter</name>
+    <name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name>
 
     <modules>
         <module>model</module>
diff --git a/sdnr/northbound/a1Adapter/provider/pom.xml b/sdnr/northbound/a1Adapter/provider/pom.xml
index 41e639152..45f07c487 100644
--- a/sdnr/northbound/a1Adapter/provider/pom.xml
+++ b/sdnr/northbound/a1Adapter/provider/pom.xml
@@ -14,6 +14,8 @@
     <version>0.7.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
+    <name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name>
+
     <properties>
         <ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
     </properties>
-- 
cgit 1.2.3-korg