From d70bd72e226b3921d15195b3c123115d14e3d5d1 Mon Sep 17 00:00:00 2001
From: "Singal, Kapil (ks220y)" <ks220y@att.com>
Date: Thu, 17 Jun 2021 16:06:17 -0400
Subject: [PATCH] Minor Refactoring of sliboot pom

Issue-ID: CCSDK-3343
Change-Id: I66d4e2840ff86e092a23453384d02ce49b7048ac
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
---
 ms/sliboot/pom.xml | 94 ++++++++++++++++++++++++++----------------------------
 1 file changed, 46 insertions(+), 48 deletions(-)

diff --git a/ms/sliboot/pom.xml b/ms/sliboot/pom.xml
index 8dc79566..7ae99ae4 100644
--- a/ms/sliboot/pom.xml
+++ b/ms/sliboot/pom.xml
@@ -105,22 +105,25 @@
             <version>${ccsdk.sli.core.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>sliapi-model-swagger</artifactId>
+            <version>${ccsdk.sli.core.version}</version>
+            <type>yaml</type>
         </dependency>
         <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-            <scope>test</scope>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>sliPluginUtils-provider</artifactId>
+            <version>${ccsdk.sli.core.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.mariadb.jdbc</groupId>
-            <artifactId>mariadb-java-client</artifactId>
+            <groupId>org.onap.ccsdk.sli.plugins</groupId>
+            <artifactId>restapi-call-node-provider</artifactId>
+            <version>${ccsdk.sli.plugins.version}</version>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
+            <groupId>org.onap.ccsdk.sli.plugins</groupId>
+            <artifactId>properties-node-provider</artifactId>
+            <version>${ccsdk.sli.plugins.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onap.logging-analytics</groupId>
@@ -128,29 +131,26 @@
             <version>1.6.6</version>
         </dependency>
         <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>javax.ws.rs-api</artifactId>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.onap.ccsdk.sli.core</groupId>
-            <artifactId>sliapi-model-swagger</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
-            <type>yaml</type>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.onap.ccsdk.sli.core</groupId>
-            <artifactId>sliPluginUtils-provider</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.onap.ccsdk.sli.plugins</groupId>
-            <artifactId>restapi-call-node-provider</artifactId>
-            <version>${ccsdk.sli.plugins.version}</version>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.onap.ccsdk.sli.plugins</groupId>
-            <artifactId>properties-node-provider</artifactId>
-            <version>${ccsdk.sli.plugins.version}</version>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>javax.ws.rs-api</artifactId>
         </dependency>
         <!-- this jersey jar is needed for rest api call node to function properly -->
         <dependency>
@@ -184,7 +184,7 @@
 
                 <executions>
                     <execution>
-                        <id>get-sliapi-yaml</id>
+                        <id>copy-sliapi-model-swagger</id>
                         <phase>initialize</phase>
                         <goals>
                             <goal>copy-dependencies</goal>
@@ -294,18 +294,18 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
                 <executions>
-                  <execution>
-                    <goals>
-                      <goal>integration-test</goal>
-                      <goal>verify</goal>
-                    </goals>
-                  </execution>
+                    <execution>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                    </execution>
                 </executions>
                 <configuration>
-                  <skipITs>true</skipITs>
+                    <skipITs>true</skipITs>
                 </configuration>
-              </plugin>
-              <plugin>
+            </plugin>
+            <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
                 <version>2.6</version>
                 <executions>
@@ -411,20 +411,20 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-failsafe-plugin</artifactId>
                         <executions>
-                          <execution>
-                            <goals>
-                              <goal>integration-test</goal>
-                              <goal>verify</goal>
-                            </goals>
-                          </execution>
+                            <execution>
+                                <goals>
+                                    <goal>integration-test</goal>
+                                    <goal>verify</goal>
+                                </goals>
+                            </execution>
                         </executions>
                         <configuration>
-                          <skipITs>false</skipITs>
-                          <environmentVariables>
-                            <SLIBOOT_PORT>${sliboot.port}</SLIBOOT_PORT>
-                          </environmentVariables>
+                            <skipITs>false</skipITs>
+                            <environmentVariables>
+                                <SLIBOOT_PORT>${sliboot.port}</SLIBOOT_PORT>
+                            </environmentVariables>
                         </configuration>
-                      </plugin>
+                    </plugin>
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
@@ -455,7 +455,6 @@
                                     <goal>build</goal>
                                 </goals>
                             </execution>
-        
                             <execution>
                                 <id>start-it-instance</id>
                                 <phase>pre-integration-test</phase>
@@ -537,7 +536,6 @@
                             </execution>
                         </executions>
                     </plugin>
-
                 </plugins>
             </build>
         </profile>
-- 
2.16.6