Improve formatting for visual satisfaction

Formatting for the startup poms improved to be more visually appealing
and easier to read.

Change-Id: Ibdd3828f712eed1e6864bbbbcbb316bf4e5962ac
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/api/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/api/pom.xml
index de28379337dc3bd17b04c4be59fee565f7f0dba4..6eab14b41331d7966dce7fba5b7d50560063bf7b 100644 (file)
--- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/api/pom.xml
+++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/api/pom.xml
@@ -7,6 +7,8 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution,
 and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 <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">
 and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 <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>
+

   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>


@@ -14,10 +16,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 

-  <modelVersion>4.0.0</modelVersion>

   <groupId>${groupId}</groupId>
   <artifactId>${artifactId}-api</artifactId>
   <version>${version}</version>
   <packaging>bundle</packaging>
   <groupId>${groupId}</groupId>
   <artifactId>${artifactId}-api</artifactId>
   <version>${version}</version>
   <packaging>bundle</packaging>

-

 </project>
 </project>

diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml
index 155f014fbbd76eb3c302b8bb0bbfb9d9240a8221..13e1c5c6767b58e70b4ff4c0923e2a96bc82a3b3 100644 (file)
--- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml
+++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml
@@ -10,20 +10,24 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution,
 and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 -->
 <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">
 and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 -->
 <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>
+

   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>features-parent</artifactId>
     <version>1.7.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>features-parent</artifactId>
     <version>1.7.0-SNAPSHOT</version>
     <relativePath/>
   </parent>

+

   <groupId>${groupId}</groupId>
   <artifactId>${artifactId}-features</artifactId>
   <version>${version}</version>
   <name>${project.artifactId}</name>
   <groupId>${groupId}</groupId>
   <artifactId>${artifactId}-features</artifactId>
   <version>${version}</version>
   <name>${project.artifactId}</name>

-  <modelVersion>4.0.0</modelVersion>
+

   <prerequisites>
     <maven>3.1.1</maven>
   </prerequisites>
   <prerequisites>
     <maven>3.1.1</maven>
   </prerequisites>

+

   <properties>
     <mdsal.model.version>0.9.0-SNAPSHOT</mdsal.model.version>
     <mdsal.version>1.4.0-SNAPSHOT</mdsal.version>
   <properties>
     <mdsal.model.version>0.9.0-SNAPSHOT</mdsal.model.version>
     <mdsal.version>1.4.0-SNAPSHOT</mdsal.version>


@@ -32,6 +36,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <dlux.version>0.4.0-SNAPSHOT</dlux.version>
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>
   </properties>
     <dlux.version>0.4.0-SNAPSHOT</dlux.version>
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>
   </properties>

+

   <dependencyManagement>
     <dependencies>
       <!-- project specific dependencies -->
   <dependencyManagement>
     <dependencies>
       <!-- project specific dependencies -->


@@ -58,6 +63,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       </dependency>
     </dependencies>
   </dependencyManagement>
       </dependency>
     </dependencies>
   </dependencyManagement>

+

   <dependencies>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>

diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/impl/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/impl/pom.xml
index 85c19c31414c70f29417031e450e5cb62d34cca1..12b22af94941386a69c7859506f9b25a42d4b023 100644 (file)
--- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/impl/pom.xml
+++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/impl/pom.xml
@@ -11,6 +11,7 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution,
 and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 <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">
 and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 <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>

 
   <parent>
     <groupId>org.opendaylight.controller</groupId>
 
   <parent>
     <groupId>org.opendaylight.controller</groupId>


@@ -19,11 +20,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 

-  <modelVersion>4.0.0</modelVersion>

   <groupId>${groupId}</groupId>
   <artifactId>${artifactId}-impl</artifactId>
   <version>${version}</version>
   <packaging>bundle</packaging>
   <groupId>${groupId}</groupId>
   <artifactId>${artifactId}-impl</artifactId>
   <version>${version}</version>
   <packaging>bundle</packaging>

+

   <dependencies>
     <dependency>
       <groupId>${symbol_dollar}{project.groupId}</groupId>
   <dependencies>
     <dependency>
       <groupId>${symbol_dollar}{project.groupId}</groupId>


@@ -44,5 +45,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <scope>test</scope>
     </dependency>
   </dependencies>
       <scope>test</scope>
     </dependency>
   </dependencies>

-

 </project>
 </project>

diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/it/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/it/pom.xml
index 8f784af9fa90bc0947e4ba274612927aae12a0b1..4c9058769ba62e460f39adc79cdc307d77d71d6f 100644 (file)
--- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/it/pom.xml
+++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/it/pom.xml
@@ -8,6 +8,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 
 <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">
 -->
 
 <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>

 
   <parent>
     <groupId>org.opendaylight.controller</groupId>
 
   <parent>
     <groupId>org.opendaylight.controller</groupId>


@@ -16,7 +17,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 

-  <modelVersion>4.0.0</modelVersion>

   <groupId>${groupId}</groupId>
   <artifactId>${artifactId}-it</artifactId>
   <version>${version}</version>
   <groupId>${groupId}</groupId>
   <artifactId>${artifactId}-it</artifactId>
   <version>${version}</version>


@@ -37,5 +37,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <version>${project.version}</version>
     </dependency>
   </dependencies>
       <version>${project.version}</version>
     </dependency>
   </dependencies>

-

 </project>
 </project>

diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/karaf/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/karaf/pom.xml
index c801b3bfa2d52959df9a1fd9520c765d81c8a1d8..6128a8798449bb48e354eecc899d888091b8998a 100644 (file)
--- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/karaf/pom.xml
+++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/karaf/pom.xml
@@ -9,23 +9,28 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution,
 and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 -->
 <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">
 and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 -->
 <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>
+

   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>karaf-parent</artifactId>
     <version>1.7.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>karaf-parent</artifactId>
     <version>1.7.0-SNAPSHOT</version>
     <relativePath/>
   </parent>

-  <modelVersion>4.0.0</modelVersion>
+

   <groupId>${groupId}</groupId>
   <artifactId>${artifactId}-karaf</artifactId>
   <version>${version}</version>
   <name>${project.artifactId}</name>
   <groupId>${groupId}</groupId>
   <artifactId>${artifactId}-karaf</artifactId>
   <version>${version}</version>
   <name>${project.artifactId}</name>

+

   <prerequisites>
     <maven>3.1.1</maven>
   </prerequisites>
   <prerequisites>
     <maven>3.1.1</maven>
   </prerequisites>

+

   <properties>
     <karaf.localFeature>odl-${artifactId}-ui</karaf.localFeature>
   </properties>
   <properties>
     <karaf.localFeature>odl-${artifactId}-ui</karaf.localFeature>
   </properties>

+

   <dependencyManagement>
     <dependencies>
       <dependency>
   <dependencyManagement>
     <dependencies>
       <dependency>


@@ -37,6 +42,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       </dependency>
     </dependencies>
   </dependencyManagement>
       </dependency>
     </dependencies>
   </dependencyManagement>

+

   <dependencies>
     <dependency>
       <!-- scope is compile so all features (there is only one) are installed
   <dependencies>
     <dependency>
       <!-- scope is compile so all features (there is only one) are installed


@@ -54,6 +60,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <scope>runtime</scope>
     </dependency>
   </dependencies>
       <scope>runtime</scope>
     </dependency>
   </dependencies>

+

   <!-- DO NOT install or deploy the karaf artifact -->
   <build>
     <plugins>
   <!-- DO NOT install or deploy the karaf artifact -->
   <build>
     <plugins>

diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml
index 576e0b2944aac0ef76da8a227ce0c1384f40654d..bf9c41ec69d1c60097b21364cfefc791c236b374 100644 (file)
--- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml
+++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml
@@ -20,9 +20,18 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <name>${artifactId}</name>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
   <name>${artifactId}</name>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>

+

   <prerequisites>
     <maven>3.1.1</maven>
   </prerequisites>
   <prerequisites>
     <maven>3.1.1</maven>
   </prerequisites>

+
+  <scm>
+    <connection>scm:git:ssh://git.opendaylight.org:29418/${artifactId}.git</connection>
+    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/${artifactId}.git</developerConnection>
+    <tag>HEAD</tag>
+    <url>https://wiki.opendaylight.org/view/${artifactId}:Main</url>
+  </scm>
+

   <modules>
     <module>api</module>
     <module>impl</module>
   <modules>
     <module>api</module>
     <module>impl</module>


@@ -31,6 +40,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <module>artifacts</module>
     <module>it</module>
   </modules>
     <module>artifacts</module>
     <module>it</module>
   </modules>

+

   <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
   <build>
     <plugins>
   <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
   <build>
     <plugins>


@@ -50,11 +60,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       </plugin>
     </plugins>
   </build>
       </plugin>
     </plugins>
   </build>

-
-  <scm>
-    <connection>scm:git:ssh://git.opendaylight.org:29418/${artifactId}.git</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/${artifactId}.git</developerConnection>
-    <tag>HEAD</tag>
-    <url>https://wiki.opendaylight.org/view/${artifactId}:Main</url>
-  </scm>

 </project>
 </project>