Indenting POM's and running mvn tidy:pom

Issue-ID: CCSDK-3058
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: I8cdc657c832cffba05373b1bd0a6819b4a711f7e

diff --git a/lib/doorman/pom.xml b/lib/doorman/pom.xml
index b32d924..0dbab76 100644 (file)
--- a/lib/doorman/pom.xml
+++ b/lib/doorman/pom.xml
@@ -1,49 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>
 
-       <parent>
-               <groupId>org.onap.ccsdk.features</groupId>
-               <artifactId>ccsdk-features</artifactId>
-               <version>1.0.4-SNAPSHOT</version>
-               <relativePath>../..</relativePath>
-       </parent>
+    <parent>
+        <groupId>org.onap.ccsdk.features</groupId>
+        <artifactId>ccsdk-features</artifactId>
+        <version>1.0.4-SNAPSHOT</version>
+        <relativePath>../..</relativePath>
+    </parent>
 
-       <groupId>org.onap.ccsdk.features.lib.doorman</groupId>
-       <artifactId>doorman</artifactId>
+    <groupId>org.onap.ccsdk.features.lib.doorman</groupId>
+    <artifactId>doorman</artifactId>
 
-       <name>ccsdk-features :: ${project.artifactId}</name>
-       <description>Doorman - Request prioritization and aggregation queue</description>
+    <name>ccsdk-features :: lib :: ${project.artifactId}</name>
+    <description>Doorman - Request prioritization and aggregation queue</description>
 
-       <dependencies>
-               <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>servlet-api</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>slf4j-api</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.features.lib.rlock</groupId>
-                       <artifactId>rlock</artifactId>
-                       <version>1.0.4-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>com.h2database</groupId>
-                       <artifactId>h2</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>slf4j-simple</artifactId>
-                       <scope>test</scope>
-               </dependency>
-
-           </dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.features.lib.rlock</groupId>
+            <artifactId>rlock</artifactId>
+            <version>1.0.4-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 </project>

diff --git a/lib/rlock/pom.xml b/lib/rlock/pom.xml
index cd977f9..5f617ce 100644 (file)
--- a/lib/rlock/pom.xml
+++ b/lib/rlock/pom.xml
@@ -1,40 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>
 
-       <parent>
-               <groupId>org.onap.ccsdk.features</groupId>
-               <artifactId>ccsdk-features</artifactId>
-               <version>1.0.4-SNAPSHOT</version>
-               <relativePath>../..</relativePath>
-       </parent>
+    <parent>
+        <groupId>org.onap.ccsdk.features</groupId>
+        <artifactId>ccsdk-features</artifactId>
+        <version>1.0.4-SNAPSHOT</version>
+        <relativePath>../..</relativePath>
+    </parent>
 
-       <groupId>org.onap.ccsdk.features.lib.rlock</groupId>
-       <artifactId>rlock</artifactId>
+    <groupId>org.onap.ccsdk.features.lib.rlock</groupId>
+    <artifactId>rlock</artifactId>
 
-       <name>ccsdk-features :: ${project.artifactId}</name>
-       <description>Resource Lock - Distributed locking feature using database</description>
+    <name>ccsdk-features :: lib :: ${project.artifactId}</name>
+    <description>Resource Lock - Distributed locking feature using database</description>
 
-       <dependencies>
-               <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>slf4j-api</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>com.h2database</groupId>
-                       <artifactId>h2</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>slf4j-simple</artifactId>
-                       <scope>test</scope>
-               </dependency>
-
-           </dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 </project>

diff --git a/sdnr/northbound/CMNotify/installer/pom.xml b/sdnr/northbound/CMNotify/installer/pom.xml
index ad62ebb..1dc85dd 100644 (file)
--- a/sdnr/northbound/CMNotify/installer/pom.xml
+++ b/sdnr/northbound/CMNotify/installer/pom.xml
@@ -43,7 +43,6 @@
     </properties>
 
     <dependencies>
-
         <dependency>
             <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
             <artifactId>${application.name}-feature</artifactId>

diff --git a/sdnr/northbound/CMNotify/provider/pom.xml b/sdnr/northbound/CMNotify/provider/pom.xml
index aabd07c..cbda3fb 100644 (file)
--- a/sdnr/northbound/CMNotify/provider/pom.xml
+++ b/sdnr/northbound/CMNotify/provider/pom.xml
@@ -48,7 +48,6 @@
                   <scope>import</scope>
               </dependency>
             -->
-
             <dependency>
                 <groupId>org.onap.ccsdk.sli.core</groupId>
                 <artifactId>sli-core-artifacts</artifactId>

diff --git a/sdnr/northbound/ranSlice/model/pom.xml b/sdnr/northbound/ranSlice/model/pom.xml
index 2e7c6ce..f2d6c58 100644 (file)
--- a/sdnr/northbound/ranSlice/model/pom.xml
+++ b/sdnr/northbound/ranSlice/model/pom.xml
@@ -43,6 +43,4 @@
             <artifactId>rfc6991</artifactId>
         </dependency>
     </dependencies>
-
-
 </project>

diff --git a/sdnr/northbound/ranSlice/provider/pom.xml b/sdnr/northbound/ranSlice/provider/pom.xml
index a87459a..7882446 100644 (file)
--- a/sdnr/northbound/ranSlice/provider/pom.xml
+++ b/sdnr/northbound/ranSlice/provider/pom.xml
@@ -123,9 +123,9 @@
             <!-- <version>${sdnctl.sli.version}</version> -->
         </dependency>
         <dependency>
-                       <groupId>org.osgi</groupId>
-                       <artifactId>org.osgi.core</artifactId>
-                       <scope>test</scope>
+  <groupId>org.osgi</groupId>
+  <artifactId>org.osgi.core</artifactId>
+  <scope>test</scope>
                </dependency>
       <dependency>
           <groupId>org.onap.ccsdk.sli.core</groupId>

diff --git a/sdnr/wt/apigateway/installer/pom.xml b/sdnr/wt/apigateway/installer/pom.xml
index a2d8a02..d4e2401 100755 (executable)
--- a/sdnr/wt/apigateway/installer/pom.xml
+++ b/sdnr/wt/apigateway/installer/pom.xml
@@ -43,7 +43,6 @@
     </properties>
 
     <dependencies>
-
         <dependency>
             <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
             <artifactId>${application.name}-feature</artifactId>

diff --git a/sdnr/wt/common/pom.xml b/sdnr/wt/common/pom.xml
index fe3b9ac..e989682 100644 (file)
--- a/sdnr/wt/common/pom.xml
+++ b/sdnr/wt/common/pom.xml
@@ -92,8 +92,8 @@
             <artifactId>jackson-databind</artifactId>
         </dependency>
         <dependency>
-              <groupId>com.google.code.findbugs</groupId>
-              <artifactId>annotations</artifactId>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>annotations</artifactId>
         </dependency>
     </dependencies>
 

diff --git a/sdnr/wt/common/src/test/resources/testpom.xml b/sdnr/wt/common/src/test/resources/testpom.xml
index 6fba87a..e989682 100644 (file)
--- a/sdnr/wt/common/src/test/resources/testpom.xml
+++ b/sdnr/wt/common/src/test/resources/testpom.xml
@@ -29,13 +29,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.2</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
     <artifactId>sdnr-wt-common</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.4-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>ccsdk-features :: ${project.artifactId}</name>
@@ -92,8 +92,8 @@
             <artifactId>jackson-databind</artifactId>
         </dependency>
         <dependency>
-              <groupId>com.google.code.findbugs</groupId>
-              <artifactId>annotations</artifactId>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>annotations</artifactId>
         </dependency>
     </dependencies>
 

diff --git a/sdnr/wt/data-provider/provider/pom.xml b/sdnr/wt/data-provider/provider/pom.xml
index 06edae2..42b81bd 100644 (file)
--- a/sdnr/wt/data-provider/provider/pom.xml
+++ b/sdnr/wt/data-provider/provider/pom.xml
@@ -92,11 +92,11 @@
             <artifactId>org.apache.karaf.shell.core</artifactId>
             <scope>provided</scope>
         </dependency>
-<!--          <dependency> -->
-<!--             <groupId>org.apache.karaf.bundle</groupId> -->
-<!--             <artifactId>org.apache.karaf.bundle.core</artifactId> -->
-<!--             <scope>provided</scope> -->
-<!--         </dependency> -->
+        <!--          <dependency> -->
+        <!--             <groupId>org.apache.karaf.bundle</groupId> -->
+        <!--             <artifactId>org.apache.karaf.bundle.core</artifactId> -->
+        <!--             <scope>provided</scope> -->
+        <!--         </dependency> -->
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>sal-netconf-connector</artifactId>

diff --git a/sdnr/wt/data-provider/setup/pom.xml b/sdnr/wt/data-provider/setup/pom.xml
index c69e7dd..f9655a8 100644 (file)
--- a/sdnr/wt/data-provider/setup/pom.xml
+++ b/sdnr/wt/data-provider/setup/pom.xml
@@ -62,9 +62,9 @@
             <artifactId>commons-cli</artifactId>
         </dependency>
         <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-       </dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>sdnr-wt-common</artifactId>
@@ -76,6 +76,7 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
+
     <build>
         <plugins>
             <plugin>
@@ -131,7 +132,7 @@
                 </executions>
                 <configuration>
                     <finalName>sdnr-dmt</finalName>
-                  <appendAssemblyId>false</appendAssemblyId>
+                    <appendAssemblyId>false</appendAssemblyId>
                     <archive>
                         <manifest>
                             <mainClass>org.onap.ccsdk.features.sdnr.wt.dataprovider.setup.Program</mainClass>
@@ -142,7 +143,6 @@
                     </descriptorRefs>
                 </configuration>
             </plugin>
-
         </plugins>
     </build>
 </project>

diff --git a/sdnr/wt/devicemanager-onf14/provider/pom.xml b/sdnr/wt/devicemanager-onf14/provider/pom.xml
index 9043c6d..1bfc829 100644 (file)
--- a/sdnr/wt/devicemanager-onf14/provider/pom.xml
+++ b/sdnr/wt/devicemanager-onf14/provider/pom.xml
@@ -59,7 +59,6 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
-
         <!-- end for testing -->
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/sdnr/wt/devicemanager-openroadm/pom.xml b/sdnr/wt/devicemanager-openroadm/pom.xml
index 2c8f1ef..4dc89dd 100755 (executable)
--- a/sdnr/wt/devicemanager-openroadm/pom.xml
+++ b/sdnr/wt/devicemanager-openroadm/pom.xml
@@ -48,13 +48,15 @@
     <properties>
         <feature-name>sdnr-wt-devicemanager-openroadm</feature-name>
     </properties>
-    <!--          <reporting>
-        <plugins>           
+    <!--
+    <reporting>
+        <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
                 <version>2.9</version>
-            </plugin>           
-        </plugins>    
-    </reporting> -->
+            </plugin>
+        </plugins>
+    </reporting>
+    -->
 </project>

diff --git a/sdnr/wt/devicemanager-openroadm/provider/pom.xml b/sdnr/wt/devicemanager-openroadm/provider/pom.xml
index 82c7e1b..db29287 100644 (file)
--- a/sdnr/wt/devicemanager-openroadm/provider/pom.xml
+++ b/sdnr/wt/devicemanager-openroadm/provider/pom.xml
@@ -65,7 +65,6 @@
             <version>1.9.10</version>
             <scope>test</scope>
         </dependency>
-
         <!-- end for testing -->
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/sdnr/wt/featureaggregator/installer/pom.xml b/sdnr/wt/featureaggregator/installer/pom.xml
index ad50be1..a3fe32c 100755 (executable)
--- a/sdnr/wt/featureaggregator/installer/pom.xml
+++ b/sdnr/wt/featureaggregator/installer/pom.xml
@@ -152,7 +152,7 @@
                     </execution>
                 </executions>
             </plugin>
-             <plugin>
+            <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
                 <version>2.6</version>
                 <executions>
@@ -175,7 +175,7 @@
                         </configuration>
                     </execution>
                 </executions>
-             </plugin>
+            </plugin>
         </plugins>
     </build>
 </project>

diff --git a/sdnr/wt/helpserver/installer/pom.xml b/sdnr/wt/helpserver/installer/pom.xml
index 7633a5d..577047c 100755 (executable)
--- a/sdnr/wt/helpserver/installer/pom.xml
+++ b/sdnr/wt/helpserver/installer/pom.xml
@@ -46,7 +46,6 @@
     </properties>
 
     <dependencies>
-
         <dependency>
             <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
             <artifactId>${application.name}-feature</artifactId>

diff --git a/sdnr/wt/helpserver/provider/pom.xml b/sdnr/wt/helpserver/provider/pom.xml
index 03beaba..0b269e3 100644 (file)
--- a/sdnr/wt/helpserver/provider/pom.xml
+++ b/sdnr/wt/helpserver/provider/pom.xml
@@ -71,7 +71,6 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
-
     </dependencies>
 
     <build>

diff --git a/sdnr/wt/odlux/apps/app-feature/pom.xml b/sdnr/wt/odlux/apps/app-feature/pom.xml
index 4ae67f8..46a33c8 100644 (file)
--- a/sdnr/wt/odlux/apps/app-feature/pom.xml
+++ b/sdnr/wt/odlux/apps/app-feature/pom.xml
@@ -97,7 +97,7 @@
             <artifactId>sdnr-wt-odlux-app-configurationApp</artifactId>
             <version>${project.version}</version>
         </dependency>
-         <dependency>
+        <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>sdnr-wt-odlux-app-networkMapApp</artifactId>
             <version>${project.version}</version>
@@ -107,8 +107,5 @@
             <artifactId>sdnr-wt-odlux-app-linkCalculationApp</artifactId>
             <version>${project.version}</version>
         </dependency>
-
-        
-        
     </dependencies>
 </project>

diff --git a/sdnr/wt/odlux/apps/app-installer/pom.xml b/sdnr/wt/odlux/apps/app-installer/pom.xml
index 626de7c..0c78efb 100755 (executable)
--- a/sdnr/wt/odlux/apps/app-installer/pom.xml
+++ b/sdnr/wt/odlux/apps/app-installer/pom.xml
@@ -132,7 +132,6 @@
             <artifactId>sdnr-wt-odlux-app-linkCalculationApp</artifactId>
             <version>${project.version}</version>
         </dependency>
-
     </dependencies>
 
     <build>

diff --git a/sdnr/wt/odlux/core/provider/pom.xml b/sdnr/wt/odlux/core/provider/pom.xml
index cf9f6a7..70b38de 100644 (file)
--- a/sdnr/wt/odlux/core/provider/pom.xml
+++ b/sdnr/wt/odlux/core/provider/pom.xml
@@ -64,7 +64,6 @@
             <artifactId>jetty-server</artifactId>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>

diff --git a/sdnr/wt/odlux/framework/pom.xml b/sdnr/wt/odlux/framework/pom.xml
index d98efaa..2f9577b 100644 (file)
--- a/sdnr/wt/odlux/framework/pom.xml
+++ b/sdnr/wt/odlux/framework/pom.xml
@@ -183,7 +183,7 @@
                             <token>##odlux.version##</token>
                             <value>${odlux.version}</value>
                         </replacement>
-                         <replacement>
+                        <replacement>
                             <token>##buildno##</token>
                             <value>${buildno}</value>
                         </replacement>

diff --git a/sdnr/wt/odlux/installer/pom.xml b/sdnr/wt/odlux/installer/pom.xml
index 15fe281..e2009a9 100644 (file)
--- a/sdnr/wt/odlux/installer/pom.xml
+++ b/sdnr/wt/odlux/installer/pom.xml
@@ -155,7 +155,7 @@
                                     <type>jar</type>
                                     <overWrite>false</overWrite>
                                 </artifactItem>
-                                 <!-- networkMapApp-->
+                                <!-- networkMapApp-->
                                 <artifactItem>
                                     <groupId>${project.groupId}</groupId>
                                     <artifactId>sdnr-wt-odlux-app-networkMapApp</artifactId>
@@ -163,7 +163,7 @@
                                     <type>jar</type>
                                     <overWrite>false</overWrite>
                                 </artifactItem>
-                                 <!-- linkCalculationApp-->
+                                <!-- linkCalculationApp-->
                                 <artifactItem>
                                     <groupId>${project.groupId}</groupId>
                                     <artifactId>sdnr-wt-odlux-app-linkCalculationApp</artifactId>

diff --git a/sdnr/wt/pom.xml b/sdnr/wt/pom.xml
index 3bea0bd..b156c97 100644 (file)
--- a/sdnr/wt/pom.xml
+++ b/sdnr/wt/pom.xml
@@ -54,8 +54,8 @@
         <module>devicemanager-onf14</module>
         <module>devicemanager-openroadm</module>
         <module>devicemanager-adapter-manager</module>
-        <module>mountpoint-registrar</module> 
-        <module>odlux</module> 
-        <module>featureaggregator</module> 
+        <module>mountpoint-registrar</module>
+        <module>odlux</module>
+        <module>featureaggregator</module>
     </modules>
 </project>