diff --git a/pom.xml b/pom.xml
index cb02cda..14c3079 100755
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,6 @@
         <relativePath>tools/build/pom.xml</relativePath>
     </parent>
 
-    <groupId>org.onosproject</groupId>
     <artifactId>onos</artifactId>
     <packaging>pom</packaging>
     <version>1.3.0-SNAPSHOT</version>
@@ -43,18 +42,23 @@
         <module>core</module>
         <module>web</module>
         <module>cli</module>
+
+        <module>openflow</module>
+        <module>ovsdb</module>
+        <module>pcep</module>
+
         <module>providers</module>
         <module>drivers</module>
-        <module>openflow</module>
+
         <module>apps</module>
         <module>incubator</module>
         <module>features</module>
-        <module>pcep</module>
-	<module>tools/package/archetypes</module>
+
+        <module>tools/package/archetypes</module>
         <module>tools/package/branding</module>
+
         <!-- FIXME remove before release -->
         <module>tools/package/maven-plugin</module>
-        <module>ovsdb</module>
     </modules>
 
     <url>http://onosproject.org/</url>
@@ -412,7 +416,7 @@
 
             <dependency>
                 <groupId>org.onosproject</groupId>
-				<artifactId>onos-app-pcep-api</artifactId>
+                <artifactId>onos-app-pcep-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
@@ -515,9 +519,11 @@
                     <artifactId>maven-surefire-plugin</artifactId>
                     <version>2.18.1</version>
                     <configuration>
-                        <redirectTestOutputToFile>true</redirectTestOutputToFile>
+                        <redirectTestOutputToFile>true
+                        </redirectTestOutputToFile>
                         <printSummary>true</printSummary>
-                        <excludedGroups>org.onlab.junit.IntegrationTest</excludedGroups>
+                        <excludedGroups>org.onlab.junit.IntegrationTest
+                        </excludedGroups>
                         <rerunFailingTestsCount>1</rerunFailingTestsCount>
                     </configuration>
                 </plugin>
@@ -618,7 +624,7 @@
                         </execution>
                         <execution>
                             <id>swagger</id>
-                            <phase>generate-resources</phase>
+                            <phase>generate-sources</phase>
                             <goals>
                                 <goal>swagger</goal>
                             </goals>