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/wt/featureaggregator/installer/pom.xml | 300 ++++++++++++++--------------
 1 file changed, 149 insertions(+), 151 deletions(-)

(limited to 'sdnr/wt/featureaggregator/installer')

diff --git a/sdnr/wt/featureaggregator/installer/pom.xml b/sdnr/wt/featureaggregator/installer/pom.xml
index 805075b06..be29408c3 100755
--- a/sdnr/wt/featureaggregator/installer/pom.xml
+++ b/sdnr/wt/featureaggregator/installer/pom.xml
@@ -20,162 +20,160 @@
  * ============LICENSE_END=========================================================
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-  <artifactId>sdnr-wt-feature-aggregator-installer</artifactId>
-  <version>0.7.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-  <parent>
-    <groupId>org.onap.ccsdk.parent</groupId>
-    <artifactId>odlparent-lite</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-feature-aggregator-installer</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-  <properties>
-    <application.name>sdnr-wt-feature-aggregator</application.name>
-    <include.transitive.dependencies>true</include.transitive.dependencies>
-    <ccsdk.features.version>${project.version}</ccsdk.features.version>
-  </properties>
+    <name>ccsdk-features :: ${project.artifactId}</name>
 
-  <dependencyManagement>
+    <properties>
+        <application.name>sdnr-wt-feature-aggregator</application.name>
+        <include.transitive.dependencies>true</include.transitive.dependencies>
+        <ccsdk.features.version>${project.version}</ccsdk.features.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>${odl.controller.mdsal.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <dependencies>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>${odl.controller.mdsal.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+            <artifactId>${application.name}</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+            <!--       <exclusions> -->
+            <!--         <exclusion> -->
+            <!--           <groupId>*</groupId> -->
+            <!--           <artifactId>*</artifactId> -->
+            <!--         </exclusion> -->
+            <!--       </exclusions> -->
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.yaml/snakeyaml -->
     </dependencies>
-  </dependencyManagement>
-
-
-  <dependencies>
-    <dependency>
-      <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-      <artifactId>${application.name}</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>features</classifier>
-<!--       <exclusions> -->
-<!--         <exclusion> -->
-<!--           <groupId>*</groupId> -->
-<!--           <artifactId>*</artifactId> -->
-<!--         </exclusion> -->
-<!--       </exclusions> -->
-    </dependency>
-      <!-- https://mvnrepository.com/artifact/org.yaml/snakeyaml -->
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>maven-repo-zip</id>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <phase>package</phase>
-            <configuration>
-              <attach>true</attach>
-              <finalName>stage/${application.name}-${project.version}</finalName>
-              <descriptors>
-                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
-              </descriptors>
-              <appendAssemblyId>true</appendAssemblyId>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-<!--           <execution> -->
-<!--             <id>copy-dependencies</id> -->
-<!--             <goals> -->
-<!--               <goal>copy-dependencies</goal> -->
-<!--             </goals> -->
-<!--             <phase>prepare-package</phase> -->
-<!--             <configuration> -->
-<!--               <transitive>false</transitive> -->
-<!--               <outputDirectory>${project.build.directory}/assembly/system</outputDirectory> -->
-<!--               <overWriteReleases>false</overWriteReleases> -->
-<!--               <overWriteSnapshots>true</overWriteSnapshots> -->
-<!--               <overWriteIfNewer>true</overWriteIfNewer> -->
-<!--               <useRepositoryLayout>true</useRepositoryLayout> -->
-<!--               <addParentPoms>false</addParentPoms> -->
-<!--               <copyPom>false</copyPom> -->
-<!--               <includeArtifactIds>${application.name}-model,${application.name}-provider,${application.name}</includeArtifactIds> -->
-<!--               <scope>provided</scope> -->
-<!--             </configuration> -->
-<!--           </execution> -->
-          <execution>
-            <id>copy-nested-dependencies</id>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <phase>prepare-package</phase>
-            <configuration>
-              <transitive>true</transitive>
-              <outputDirectory>${project.build.directory}/assembly/system</outputDirectory>
-              <overWriteReleases>false</overWriteReleases>
-              <overWriteSnapshots>true</overWriteSnapshots>
-              <overWriteIfNewer>true</overWriteIfNewer>
-              <useRepositoryLayout>true</useRepositoryLayout>
-              <addParentPoms>false</addParentPoms>
-              <copyPom>false</copyPom>
-            </configuration>
-          </execution>
-          <execution>
-             <!-- Copy yang schema preload for schema cache -->
-            <id>unpack-cache-schema</id>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <phase>prepare-package</phase>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-                  <artifactId>sdnr-wt-devicemanager-provider</artifactId>
-                  <version>${project.version}</version>
-                  <type>jar</type>
-                  <includes>preload.cache.schema/**</includes>
-                  <outputDirectory>${project.build.directory}/assembly</outputDirectory>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-          <execution>
-            <!-- Copy database initialization script -->
-          	<id>unpack-es-init</id>
-          	<phase>prepare-package</phase>
-          	<goals>
-          		<goal>unpack</goal>
-          	</goals>
-          	<configuration>
-          		<artifactItems>
-          			<artifactItem>
-          				<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-          				<artifactId>sdnr-wt-data-provider-database</artifactId>
-          				<version>${project.version}</version>
-          				<type>jar</type>
-         				<includes>es-init.sh</includes>
-                        <outputDirectory>${project.build.directory}/assembly/opt/onap/sdnc/bin</outputDirectory>
-          			</artifactItem>
-          		</artifactItems>
-          	</configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
 
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>maven-repo-zip</id>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <attach>true</attach>
+                            <finalName>stage/${application.name}-${project.version}</finalName>
+                            <descriptors>
+                                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
+                            </descriptors>
+                            <appendAssemblyId>true</appendAssemblyId>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <!--           <execution> -->
+                    <!--             <id>copy-dependencies</id> -->
+                    <!--             <goals> -->
+                    <!--               <goal>copy-dependencies</goal> -->
+                    <!--             </goals> -->
+                    <!--             <phase>prepare-package</phase> -->
+                    <!--             <configuration> -->
+                    <!--               <transitive>false</transitive> -->
+                    <!--               <outputDirectory>${project.build.directory}/assembly/system</outputDirectory> -->
+                    <!--               <overWriteReleases>false</overWriteReleases> -->
+                    <!--               <overWriteSnapshots>true</overWriteSnapshots> -->
+                    <!--               <overWriteIfNewer>true</overWriteIfNewer> -->
+                    <!--               <useRepositoryLayout>true</useRepositoryLayout> -->
+                    <!--               <addParentPoms>false</addParentPoms> -->
+                    <!--               <copyPom>false</copyPom> -->
+                    <!--               <includeArtifactIds>${application.name}-model,${application.name}-provider,${application.name}</includeArtifactIds> -->
+                    <!--               <scope>provided</scope> -->
+                    <!--             </configuration> -->
+                    <!--           </execution> -->
+                    <execution>
+                        <id>copy-nested-dependencies</id>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <phase>prepare-package</phase>
+                        <configuration>
+                            <transitive>true</transitive>
+                            <outputDirectory>${project.build.directory}/assembly/system</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                            <overWriteIfNewer>true</overWriteIfNewer>
+                            <useRepositoryLayout>true</useRepositoryLayout>
+                            <addParentPoms>false</addParentPoms>
+                            <copyPom>false</copyPom>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <!-- Copy yang schema preload for schema cache -->
+                        <id>unpack-cache-schema</id>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <phase>prepare-package</phase>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+                                    <artifactId>sdnr-wt-devicemanager-provider</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>jar</type>
+                                    <includes>preload.cache.schema/**</includes>
+                                    <outputDirectory>${project.build.directory}/assembly</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <!-- Copy database initialization script -->
+                        <id>unpack-es-init</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+                                    <artifactId>sdnr-wt-data-provider-database</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>jar</type>
+                                    <includes>es-init.sh</includes>
+                                    <outputDirectory>${project.build.directory}/assembly/opt/onap/sdnc/bin</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
-- 
cgit 1.2.3-korg