From 94f4b9bf8661ad75628163b46518e902b6abc834 Mon Sep 17 00:00:00 2001
From: "Singal, Kapil (ks220y)" <ks220y@att.com>
Date: Tue, 2 Mar 2021 20:00:49 -0500
Subject: Refactoring pom's name tag

Indenting pom's and running mvn tidy:pom to rearrange items

Issue-ID: CCSDK-3198

Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: Ic9c7cfd76bd98e6a101ec7788841d96316508735
---
 plugins/properties-node/installer/pom.xml            |  2 +-
 plugins/properties-node/pom.xml                      |  5 +++--
 plugins/properties-node/provider/pom.xml             | 20 ++++++++++----------
 .../ccsdk/sli/plugins/prop/TestPropertiesNode.java   |  4 ++--
 .../provider/src/test/resources/test-invalid.xml     |  8 ++++----
 .../provider/src/test/resources/test.xml             |  8 ++++----
 6 files changed, 24 insertions(+), 23 deletions(-)

(limited to 'plugins/properties-node')

diff --git a/plugins/properties-node/installer/pom.xml b/plugins/properties-node/installer/pom.xml
index fe36ad381..3d6ee7cf2 100755
--- a/plugins/properties-node/installer/pom.xml
+++ b/plugins/properties-node/installer/pom.xml
@@ -13,7 +13,7 @@
     <version>1.2.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-    <name>ccsdk-sli-plugins :: properties-node :: ${project.artifactId}</name>
+    <name>ccsdk-sli-plugins :: ${project.artifactId}</name>
 
     <properties>
         <application.name>ccsdk-properties-node</application.name>
diff --git a/plugins/properties-node/pom.xml b/plugins/properties-node/pom.xml
index 5be15e5af..70dcbf11f 100755
--- a/plugins/properties-node/pom.xml
+++ b/plugins/properties-node/pom.xml
@@ -13,9 +13,10 @@
     <version>1.2.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-    <name>ccsdk-sli-plugins :: properties-node</name>
+    <name>ccsdk-sli-plugins :: ${project.artifactId}</name>
     <description>This is an implementation of DG Execute Node that reads property file and
-    puts the properties in the DG context</description>
+        puts the properties in the DG context
+    </description>
 
     <modules>
         <module>provider</module>
diff --git a/plugins/properties-node/provider/pom.xml b/plugins/properties-node/provider/pom.xml
index d3571f197..d112ff604 100755
--- a/plugins/properties-node/provider/pom.xml
+++ b/plugins/properties-node/provider/pom.xml
@@ -13,18 +13,18 @@
     <version>1.2.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
-    <name>ccsdk-sli-plugins :: properties-node :: ${project.artifactId}</name>
+    <name>ccsdk-sli-plugins :: ${project.artifactId}</name>
 
     <dependencyManagement>
-       <dependencies>
-         <dependency>
-            <groupId>org.onap.ccsdk.sli.core</groupId>
-            <artifactId>sli-core-artifacts</artifactId>
-            <version>${project.version}</version>
-            <type>pom</type>
-            <scope>import</scope>
-          </dependency>
-       </dependencies>
+        <dependencies>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>sli-core-artifacts</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
     </dependencyManagement>
     <dependencies>
         <dependency>
diff --git a/plugins/properties-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/prop/TestPropertiesNode.java b/plugins/properties-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/prop/TestPropertiesNode.java
index a858c49b3..34ac4685f 100644
--- a/plugins/properties-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/prop/TestPropertiesNode.java
+++ b/plugins/properties-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/prop/TestPropertiesNode.java
@@ -20,7 +20,7 @@ public class TestPropertiesNode {
     private static final Logger log = LoggerFactory.getLogger(TestPropertiesNode.class);
     @Rule
     public EnvironmentVariables environmentVariables = new EnvironmentVariables();
-    
+
     @Test
     public void testJSONFileParsing() throws SvcLogicException {
         SvcLogicContext ctx = new SvcLogicContext();
@@ -535,7 +535,7 @@ public class TestPropertiesNode {
         PropertiesNode rcn = new PropertiesNode();
         rcn.readProperties(p, ctx);
 
-        assertEquals(ctx.getAttribute("NotFileBased.<name>RESTAPI"),"Call Node - Provider</name>");
+        assertEquals(ctx.getAttribute("NotFileBased.<name>ccsdk-sli-plugins"),": properties-node-provider :: test.xml</name>");
         assertEquals(ctx.getAttribute("NotFileBased.<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\">");
diff --git a/plugins/properties-node/provider/src/test/resources/test-invalid.xml b/plugins/properties-node/provider/src/test/resources/test-invalid.xml
index 50bd0fff2..3e4bd3b2d 100644
--- a/plugins/properties-node/provider/src/test/resources/test-invalid.xml
+++ b/plugins/properties-node/provider/src/test/resources/test-invalid.xml
@@ -9,9 +9,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,11 +25,11 @@
     <parent>
         <groupId>org.onap.ccsdk.sli.plugins</groupId>
         <artifactId>restapi-call-node</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
+        <version>0.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>restapi-call-node-provider</artifactId>
     <packaging>bundle</packaging>
-    <name>RESTAPI Call Node - Provider</name>
+    <name>ccsdk-sli-plugins :: properties-node-provider :: test-invalid.xml</name>
     <url>http://maven.apache.org</url>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/plugins/properties-node/provider/src/test/resources/test.xml b/plugins/properties-node/provider/src/test/resources/test.xml
index 19e3b7139..b3e1164e4 100644
--- a/plugins/properties-node/provider/src/test/resources/test.xml
+++ b/plugins/properties-node/provider/src/test/resources/test.xml
@@ -9,9 +9,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,11 +25,11 @@
     <parent>
         <groupId>org.onap.ccsdk.sli.plugins</groupId>
         <artifactId>restapi-call-node</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
+        <version>0.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>restapi-call-node-provider</artifactId>
     <packaging>bundle</packaging>
-    <name>RESTAPI Call Node - Provider</name>
+    <name>ccsdk-sli-plugins :: properties-node-provider :: test.xml</name>
     <url>http://maven.apache.org</url>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-- 
cgit 1.2.3-korg