diff --git a/pom.xml b/pom.xml
index 47dc489..a9c83fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,7 @@
             </dependency>
 
 
-             <dependency>
+            <dependency>
                 <groupId>io.netty</groupId>
                 <artifactId>netty</artifactId>
                 <version>3.9.0.Final</version>
@@ -103,13 +103,13 @@
             </dependency>
 
             <dependency>
-              <groupId>com.googlecode.concurrent-trees</groupId>
-              <artifactId>concurrent-trees</artifactId>
-              <version>2.4.0</version>
+                <groupId>com.googlecode.concurrent-trees</groupId>
+                <artifactId>concurrent-trees</artifactId>
+                <version>2.4.0</version>
             </dependency>
 
             <dependency>
-              <groupId>commons-lang</groupId>
+                <groupId>commons-lang</groupId>
                 <artifactId>commons-lang</artifactId>
                 <version>2.6</version>
             </dependency>
@@ -131,12 +131,12 @@
                 <version>1.9.13</version>
             </dependency>
 
-	    <dependency>
-	        <groupId>org.easymock</groupId>
-	        <artifactId>easymock</artifactId>
-	        <version>3.2</version>
-	        <scope>test</scope>
-	    </dependency>
+            <dependency>
+                <groupId>org.easymock</groupId>
+                <artifactId>easymock</artifactId>
+                <version>3.2</version>
+                <scope>test</scope>
+            </dependency>
 
             <!-- Web related -->
             <dependency>
@@ -191,9 +191,9 @@
             </dependency>
 
             <dependency>
-              <groupId>com.hazelcast</groupId>
-              <artifactId>hazelcast</artifactId>
-              <version>3.3</version>
+                <groupId>com.hazelcast</groupId>
+                <artifactId>hazelcast</artifactId>
+                <version>3.3</version>
             </dependency>
             <dependency>
                 <groupId>com.eclipsesource.minimal-json</groupId>
@@ -270,9 +270,9 @@
             </dependency>
 
             <dependency>
-              <groupId>org.onlab.onos</groupId>
-              <artifactId>onlab-thirdparty</artifactId>
-	      <version>${project.version}</version>
+                <groupId>org.onlab.onos</groupId>
+                <artifactId>onlab-thirdparty</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
@@ -283,39 +283,39 @@
                 <scope>test</scope>
             </dependency>
             <dependency>
-              <groupId>commons-pool</groupId>
-              <artifactId>commons-pool</artifactId>
-              <version>1.6</version>
+                <groupId>commons-pool</groupId>
+                <artifactId>commons-pool</artifactId>
+                <version>1.6</version>
             </dependency>
             <dependency>
-              <groupId>io.netty</groupId>
-              <artifactId>netty-common</artifactId>
-              <version>${netty4.version}</version>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-common</artifactId>
+                <version>${netty4.version}</version>
             </dependency>
             <dependency>
-              <groupId>io.netty</groupId>
-              <artifactId>netty-buffer</artifactId>
-              <version>${netty4.version}</version>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-buffer</artifactId>
+                <version>${netty4.version}</version>
             </dependency>
             <dependency>
-              <groupId>io.netty</groupId>
-              <artifactId>netty-transport</artifactId>
-              <version>${netty4.version}</version>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-transport</artifactId>
+                <version>${netty4.version}</version>
             </dependency>
             <dependency>
-              <groupId>io.netty</groupId>
-              <artifactId>netty-handler</artifactId>
-              <version>${netty4.version}</version>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-handler</artifactId>
+                <version>${netty4.version}</version>
             </dependency>
             <dependency>
-              <groupId>io.netty</groupId>
-              <artifactId>netty-codec</artifactId>
-              <version>${netty4.version}</version>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-codec</artifactId>
+                <version>${netty4.version}</version>
             </dependency>
             <dependency>
-              <groupId>io.netty</groupId>
-              <artifactId>netty-transport-native-epoll</artifactId>
-              <version>${netty4.version}</version>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-transport-native-epoll</artifactId>
+                <version>${netty4.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -363,7 +363,8 @@
                     <artifactId>maven-surefire-plugin</artifactId>
                     <version>2.17</version>
                     <configuration>
-                        <redirectTestOutputToFile>true</redirectTestOutputToFile>
+                        <redirectTestOutputToFile>true
+                        </redirectTestOutputToFile>
                         <printSummary>true</printSummary>
                     </configuration>
                 </plugin>
@@ -418,32 +419,32 @@
                 <!-- TODO: add findbugs plugin for static code analysis; for explicit invocation only -->
                 <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
                 <plugin>
-                        <groupId>org.eclipse.m2e</groupId>
-                        <artifactId>lifecycle-mapping</artifactId>
-                        <version>1.0.0</version>
-                        <configuration>
-                                <lifecycleMappingMetadata>
-                                        <pluginExecutions>
-                                                <pluginExecution>
-                                                        <pluginExecutionFilter>
-                                                                <groupId>org.jacoco</groupId>
-                                                                <artifactId>
-                                                                        jacoco-maven-plugin
-                                                                </artifactId>
-                                                                <versionRange>
-                                                                        [0.7.1.201405082137,)
-                                                                </versionRange>
-                                                                <goals>
-                                                                        <goal>prepare-agent</goal>
-                                                                </goals>
-                                                        </pluginExecutionFilter>
-                                                        <action>
-                                                                <ignore></ignore>
-                                                        </action>
-                                                </pluginExecution>
-                                        </pluginExecutions>
-                                </lifecycleMappingMetadata>
-                        </configuration>
+                    <groupId>org.eclipse.m2e</groupId>
+                    <artifactId>lifecycle-mapping</artifactId>
+                    <version>1.0.0</version>
+                    <configuration>
+                        <lifecycleMappingMetadata>
+                            <pluginExecutions>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>org.jacoco</groupId>
+                                        <artifactId>
+                                            jacoco-maven-plugin
+                                        </artifactId>
+                                        <versionRange>
+                                            [0.7.1.201405082137,)
+                                        </versionRange>
+                                        <goals>
+                                            <goal>prepare-agent</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <ignore></ignore>
+                                    </action>
+                                </pluginExecution>
+                            </pluginExecutions>
+                        </lifecycleMappingMetadata>
+                    </configuration>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -532,7 +533,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.9.1</version>
+                <version>2.10.1</version>
                 <configuration>
                     <show>package</show>
                     <docfilessubdirs>true</docfilessubdirs>
@@ -547,7 +548,7 @@
                         <group>
                             <title>Core Subsystems</title>
                             <packages>
-                                org.onlab.onos.impl:org.onlab.onos.cluster.impl:org.onlab.onos.net.device.impl:org.onlab.onos.net.link.impl:org.onlab.onos.net.host.impl:org.onlab.onos.net.topology.impl:org.onlab.onos.net.packet.impl:org.onlab.onos.net.flow.impl:org.onlab.onos.store.trivial.*:org.onlab.onos.net.*.impl:org.onlab.onos.event.impl:org.onlab.onos.store.*:org.onlab.onos.net.intent.impl:org.onlab.onos.net.proxyarp.impl:org.onlab.onos.mastership.impl:org.onlab.onos.json:org.onlab.onos.json.*
+                                org.onlab.onos.impl:org.onlab.onos.cluster.impl:org.onlab.onos.net.device.impl:org.onlab.onos.net.link.impl:org.onlab.onos.net.host.impl:org.onlab.onos.net.topology.impl:org.onlab.onos.net.packet.impl:org.onlab.onos.net.flow.impl:org.onlab.onos.store.trivial.*:org.onlab.onos.net.*.impl:org.onlab.onos.event.impl:org.onlab.onos.store.*:org.onlab.onos.net.intent.impl:org.onlab.onos.net.proxyarp.impl:org.onlab.onos.mastership.impl:org.onlab.onos.json:org.onlab.onos.json.*:org.onlab.onos.provider.host.impl:org.onlab.onos.provider.lldp.impl:org.onlab.onos.net.statistic.impl
                             </packages>
                         </group>
                         <group>
@@ -572,11 +573,12 @@
                         <group>
                             <title>Sample Applications</title>
                             <packages>
-                                org.onlab.onos.tvue:org.onlab.onos.fwd:org.onlab.onos.ifwd:org.onlab.onos.mobility:org.onlab.onos.proxyarp:org.onlab.onos.foo:org.onlab.onos.calendar:org.onlab.onos.sdnip:org.onlab.onos.sdnip.*:org.onlab.onos.optical:org.onlab.onos.optical.*
+                                org.onlab.onos.tvue:org.onlab.onos.fwd:org.onlab.onos.ifwd:org.onlab.onos.mobility:org.onlab.onos.proxyarp:org.onlab.onos.foo:org.onlab.onos.calendar:org.onlab.onos.sdnip:org.onlab.onos.sdnip.*:org.onlab.onos.optical:org.onlab.onos.optical.*:org.onlab.onos.metrics.*
                             </packages>
                         </group>
                     </groups>
-                    <excludePackageNames>org.onlab.thirdparty</excludePackageNames>
+                    <excludePackageNames>org.onlab.thirdparty
+                    </excludePackageNames>
                 </configuration>
             </plugin>