Clean up netconf-parent root pom

The root pom had some long running xml fields and other small
formatting issues.  Additionally, it introduced a profile that
was unused ("integrationtests").  I also cleaned up the modules
so that they are listed in alphabetic order.

Change-Id: I1ca3e40d7520fb1fc0cd5aa277c802db8d052275
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>

diff --git a/pom.xml b/pom.xml
index e9dd7cbcd88ca1d368724f66f43c62fc9c503530..20fff3c8d81e65179639a70d0bbf81c05cbbadb1 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,9 @@
  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">
+<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>
@@ -23,23 +25,11 @@
     <name>${project.artifactId}</name>
 
     <modules>
-        <module>protocol-framework</module>
-        <module>netconf</module>
-        <module>restconf</module>
-
         <module>features</module>
         <module>karaf</module>
+        <module>netconf</module>
+        <module>protocol-framework</module>
+        <module>restconf</module>
     </modules>
 
-    <profiles>
-        <profile>
-            <id>integrationtests</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <modules>
-                <!-- module>opendaylight/netconf/netconf-it</module -->
-            </modules>
-        </profile>
-    </profiles>
 </project>