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>
diff --git a/sdnr/northbound/a1Adapter/feature/pom.xml b/sdnr/northbound/a1Adapter/feature/pom.xml
index ef294b3..f1ef323 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 9cc63e7..2b33aec 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 a557d3c..1fc56aa 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 bea1518..f718bbb 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 41e6391..45f07c4 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>
diff --git a/sdnr/northbound/energysavings/features/pom.xml b/sdnr/northbound/energysavings/features/pom.xml
index c3b26cf..8c645d1 100644
--- a/sdnr/northbound/energysavings/features/pom.xml
+++ b/sdnr/northbound/energysavings/features/pom.xml
@@ -11,9 +11,11 @@
<groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
<artifactId>energysavings-features</artifactId>
- <version>0.2.4-SNAPSHOT</version>
+ <version>0.7.0-SNAPSHOT</version>
<packaging>feature</packaging>
+ <name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name>
+
<dependencyManagement>
<dependencies>
<dependency>
diff --git a/sdnr/northbound/energysavings/installer/pom.xml b/sdnr/northbound/energysavings/installer/pom.xml
index b3eb383..7e87196 100755
--- a/sdnr/northbound/energysavings/installer/pom.xml
+++ b/sdnr/northbound/energysavings/installer/pom.xml
@@ -11,10 +11,10 @@
<groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
<artifactId>energysavings-installer</artifactId>
- <version>0.2.4-SNAPSHOT</version>
+ <version>0.7.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>ccsdk-features-sdnr-northbound :: energysavings :: ${project.artifactId}</name>
+ <name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name>
<properties>
<application.name>ccsdk-energysavings</application.name>
diff --git a/sdnr/northbound/energysavings/model/pom.xml b/sdnr/northbound/energysavings/model/pom.xml
index 083f516..b5ee96b 100644
--- a/sdnr/northbound/energysavings/model/pom.xml
+++ b/sdnr/northbound/energysavings/model/pom.xml
@@ -11,9 +11,11 @@
<groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
<artifactId>energysavings-model</artifactId>
- <version>0.2.4-SNAPSHOT</version>
+ <version>0.7.0-SNAPSHOT</version>
<packaging>bundle</packaging>
+ <name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name>
+
<dependencies>
<dependency>
<groupId>org.opendaylight.mdsal.model</groupId>
diff --git a/sdnr/northbound/energysavings/pom.xml b/sdnr/northbound/energysavings/pom.xml
index bedc1f3..8feda80 100644
--- a/sdnr/northbound/energysavings/pom.xml
+++ b/sdnr/northbound/energysavings/pom.xml
@@ -11,9 +11,11 @@
<groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
<artifactId>energysavings</artifactId>
- <version>0.2.4-SNAPSHOT</version>
+ <version>0.7.0-SNAPSHOT</version>
<packaging>pom</packaging>
+ <name>ccsdk-features :: sdnr-northbound :: energy-saving</name>
+
<modules>
<module>model</module>
<module>features</module>
diff --git a/sdnr/northbound/energysavings/provider/pom.xml b/sdnr/northbound/energysavings/provider/pom.xml
index 9bf96e7..0f5cde1 100644
--- a/sdnr/northbound/energysavings/provider/pom.xml
+++ b/sdnr/northbound/energysavings/provider/pom.xml
@@ -11,9 +11,11 @@
<groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
<artifactId>energysavings-provider</artifactId>
- <version>0.2.4-SNAPSHOT</version>
+ <version>0.7.0-SNAPSHOT</version>
<packaging>bundle</packaging>
+ <name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name>
+
<dependencyManagement>
<dependencies>
<dependency>
diff --git a/sdnr/northbound/features/ccsdk-features-sdnr-northbound-all/pom.xml b/sdnr/northbound/features/ccsdk-features-sdnr-northbound-all/pom.xml
index a16e0d1..87d2301 100644
--- a/sdnr/northbound/features/ccsdk-features-sdnr-northbound-all/pom.xml
+++ b/sdnr/northbound/features/ccsdk-features-sdnr-northbound-all/pom.xml
@@ -14,7 +14,7 @@
<version>0.7.0-SNAPSHOT</version>
<packaging>feature</packaging>
- <name>ccsdk-features-sdnr-northbound :: features :: ${project.artifactId}</name>
+ <name>ccsdk-features :: sdnr-northbound :: features :: ${project.artifactId}</name>
<!--
<dependencyManagement>
@@ -39,14 +39,14 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>sdnr-oofpcipoc</artifactId>
+ <artifactId>oofpcipoc-feature</artifactId>
<version>${project.version}</version>
<type>xml</type>
<classifier>features</classifier>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>sdnr-a1Adapter</artifactId>
+ <artifactId>a1Adapter-feature</artifactId>
<version>${project.version}</version>
<type>xml</type>
<classifier>features</classifier>
diff --git a/sdnr/northbound/features/installer/pom.xml b/sdnr/northbound/features/installer/pom.xml
index f3b8361..c2a4f59 100644
--- a/sdnr/northbound/features/installer/pom.xml
+++ b/sdnr/northbound/features/installer/pom.xml
@@ -14,7 +14,7 @@
<version>0.7.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>ccsdk-features-sdnr-northbound :: features :: ${project.artifactId}</name>
+ <name>ccsdk-features :: sdnr-northbound :: features :: ${project.artifactId}</name>
<properties>
<application.name>sdnr-northbound-all</application.name>
diff --git a/sdnr/northbound/features/pom.xml b/sdnr/northbound/features/pom.xml
index 878dbae..cf13193 100644
--- a/sdnr/northbound/features/pom.xml
+++ b/sdnr/northbound/features/pom.xml
@@ -14,7 +14,7 @@
<version>0.7.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>ccsdk-features-sdnr-northbound :: features</name>
+ <name>ccsdk-features :: sdnr-northbound :: features</name>
<modules>
<module>ccsdk-features-sdnr-northbound-all</module>
diff --git a/sdnr/northbound/oofpcipoc/consumer/pom.xml b/sdnr/northbound/oofpcipoc/consumer/pom.xml
index 0448fda..6d414e3 100644
--- a/sdnr/northbound/oofpcipoc/consumer/pom.xml
+++ b/sdnr/northbound/oofpcipoc/consumer/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>
diff --git a/sdnr/northbound/oofpcipoc/feature/pom.xml b/sdnr/northbound/oofpcipoc/feature/pom.xml
index a7de972..9bea8ff 100644
--- a/sdnr/northbound/oofpcipoc/feature/pom.xml
+++ b/sdnr/northbound/oofpcipoc/feature/pom.xml
@@ -10,11 +10,11 @@
</parent>
<groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
- <artifactId>sdnr-oofpcipoc</artifactId>
+ <artifactId>oofpcipoc-feature</artifactId>
<version>0.7.0-SNAPSHOT</version>
<packaging>feature</packaging>
- <name>ccsdk-features-sdnr-northbound :: oofpcipoc :: ${project.artifactId}</name>
+ <name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name>
<!--
<dependencyManagement>
diff --git a/sdnr/northbound/oofpcipoc/installer/pom.xml b/sdnr/northbound/oofpcipoc/installer/pom.xml
index 0d9ccad..a454646 100644
--- a/sdnr/northbound/oofpcipoc/installer/pom.xml
+++ b/sdnr/northbound/oofpcipoc/installer/pom.xml
@@ -14,10 +14,10 @@
<version>0.7.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>ccsdk-features-sdnr-northbound :: oofpcipoc :: ${project.artifactId}</name>
+ <name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name>
<properties>
- <application.name>sdnr-oofpcipoc</application.name>
+ <application.name>oofpcipoc</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/oofpcipoc/model/pom.xml b/sdnr/northbound/oofpcipoc/model/pom.xml
index 9a67c3e..7ad1a92 100644
--- a/sdnr/northbound/oofpcipoc/model/pom.xml
+++ b/sdnr/northbound/oofpcipoc/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/oofpcipoc/pom.xml b/sdnr/northbound/oofpcipoc/pom.xml
index 86de80c..cd28d73 100644
--- a/sdnr/northbound/oofpcipoc/pom.xml
+++ b/sdnr/northbound/oofpcipoc/pom.xml
@@ -14,7 +14,7 @@
<version>0.7.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>ccsdk-features-sdnr-northbound :: oofpcipoc</name>
+ <name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name>
<modules>
<module>model</module>
diff --git a/sdnr/northbound/oofpcipoc/provider/pom.xml b/sdnr/northbound/oofpcipoc/provider/pom.xml
index be42a39..2548a83 100644
--- a/sdnr/northbound/oofpcipoc/provider/pom.xml
+++ b/sdnr/northbound/oofpcipoc/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>
diff --git a/sdnr/northbound/pom.xml b/sdnr/northbound/pom.xml
index 0633dd3..f15f116 100644
--- a/sdnr/northbound/pom.xml
+++ b/sdnr/northbound/pom.xml
@@ -33,7 +33,7 @@
<version>0.7.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>ccsdk-sdnr-northbound :: features</name>
+ <name>ccsdk-features :: ${project.artifactId}</name>
<description>SDN-R RAN, OOF PCI ANR POC, A1 Adapter</description>
<modules>