diff --git a/pom.xml b/pom.xml
index bc798b361208..84b0f6a59683 100644
--- a/pom.xml
+++ b/pom.xml
@@ -701,7 +701,7 @@
       <dependency>
         <groupId>com.google.protobuf</groupId>
         <artifactId>protobuf-java</artifactId>
-        <version>2.5.0</version>
+        <version>2.6.1</version>
       </dependency>
 
       <!-- Our own Tomcat Native fork - completely optional, used for acclerating SSL with OpenSSL. -->
@@ -1295,39 +1295,39 @@
             </goals>
             <configuration>
               <target>
-                <taskdef resource="net/sf/antcontrib/antlib.xml" />
+                <taskdef resource="net/sf/antcontrib/antlib.xml"/>
 
                 <!-- Get the information about the latest commit -->
                 <exec executable="git" outputproperty="gitOutput.lastCommit" resultproperty="gitExitCode.lastCommit" failonerror="false" failifexecutionfails="false">
-                  <arg value="log" />
-                  <arg value="-1" />
-                  <arg value="--format=format:%h %H %cd" />
-                  <arg value="--date=iso" />
+                  <arg value="log"/>
+                  <arg value="-1"/>
+                  <arg value="--format=format:%h %H %cd"/>
+                  <arg value="--date=iso"/>
                 </exec>
-                <propertyregex property="shortCommitHash" input="${gitOutput.lastCommit}" regexp="^([0-9a-f]+) .*$" select="\1" casesensitive="true" defaultValue="0" />
-                <propertyregex property="longCommitHash" input="${gitOutput.lastCommit}" regexp="^[0-9a-f]+ ([0-9a-f]{40}) .*$" select="\1" casesensitive="true" defaultValue="0000000000000000000000000000000000000000" />
-                <propertyregex property="commitDate" input="${gitOutput.lastCommit}" regexp="^[0-9a-f]+ [0-9a-f]{40} (.*)$" select="\1" casesensitive="true" defaultValue="1970-01-01 00:00:00 +0000" />
+                <propertyregex property="shortCommitHash" input="${gitOutput.lastCommit}" regexp="^([0-9a-f]+) .*$" select="\1" casesensitive="true" defaultValue="0"/>
+                <propertyregex property="longCommitHash" input="${gitOutput.lastCommit}" regexp="^[0-9a-f]+ ([0-9a-f]{40}) .*$" select="\1" casesensitive="true" defaultValue="0000000000000000000000000000000000000000"/>
+                <propertyregex property="commitDate" input="${gitOutput.lastCommit}" regexp="^[0-9a-f]+ [0-9a-f]{40} (.*)$" select="\1" casesensitive="true" defaultValue="1970-01-01 00:00:00 +0000"/>
 
                 <!-- Get the information abount whether the repository is clean or dirty -->
                 <exec executable="git" outputproperty="gitOutput.repoStatus" resultproperty="gitExitCode.repoStatus" failonerror="false" failifexecutionfails="false">
-                  <arg value="status" />
-                  <arg value="--porcelain" />
+                  <arg value="status"/>
+                  <arg value="--porcelain"/>
                 </exec>
                 <if>
-                  <equals arg2="0" arg1="${gitExitCode.repoStatus}" />
+                  <equals arg2="0" arg1="${gitExitCode.repoStatus}"/>
                   <then>
                     <if>
-                      <equals arg2="" arg1="${gitOutput.repoStatus}" />
+                      <equals arg2="" arg1="${gitOutput.repoStatus}"/>
                       <then>
-                        <property name="repoStatus" value="clean" />
+                        <property name="repoStatus" value="clean"/>
                       </then>
                       <else>
-                        <property name="repoStatus" value="dirty" />
+                        <property name="repoStatus" value="dirty"/>
                       </else>
                     </if>
                   </then>
                   <else>
-                    <property name="repoStatus" value="unknown" />
+                    <property name="repoStatus" value="unknown"/>
                   </else>
                 </if>
 
@@ -1338,18 +1338,18 @@
                 <!--
                 <property name="metaInfDir" value="${project.basedir}/src/main/resources/META-INF" />
                 -->
-                <property name="metaInfDir" value="${project.build.outputDirectory}/META-INF" />
-                <property name="versionPropFile" value="${metaInfDir}/${project.groupId}.versions.properties" />
-                <mkdir dir="${metaInfDir}" />
-                <delete file="${versionPropFile}" quiet="true" />
+                <property name="metaInfDir" value="${project.build.outputDirectory}/META-INF"/>
+                <property name="versionPropFile" value="${metaInfDir}/${project.groupId}.versions.properties"/>
+                <mkdir dir="${metaInfDir}"/>
+                <delete file="${versionPropFile}" quiet="true"/>
 
                 <propertyfile file="${versionPropFile}" comment="Generated by netty-parent/pom.xml">
-                  <entry key="${project.artifactId}.version" value="${project.version}" />
-                  <entry key="${project.artifactId}.buildDate" type="date" value="now" pattern="yyyy-MM-dd HH:mm:ss Z" />
-                  <entry key="${project.artifactId}.commitDate" value="${commitDate}" />
-                  <entry key="${project.artifactId}.shortCommitHash" value="${shortCommitHash}" />
-                  <entry key="${project.artifactId}.longCommitHash" value="${longCommitHash}" />
-                  <entry key="${project.artifactId}.repoStatus" value="${repoStatus}" />
+                  <entry key="${project.artifactId}.version" value="${project.version}"/>
+                  <entry key="${project.artifactId}.buildDate" type="date" value="now" pattern="yyyy-MM-dd HH:mm:ss Z"/>
+                  <entry key="${project.artifactId}.commitDate" value="${commitDate}"/>
+                  <entry key="${project.artifactId}.shortCommitHash" value="${shortCommitHash}"/>
+                  <entry key="${project.artifactId}.longCommitHash" value="${longCommitHash}"/>
+                  <entry key="${project.artifactId}.repoStatus" value="${repoStatus}"/>
                 </propertyfile>
               </target>
             </configuration>
@@ -1496,7 +1496,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore />
+                    <ignore/>
                   </action>
                 </pluginExecution>
                 <pluginExecution>
@@ -1509,7 +1509,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore />
+                    <ignore/>
                   </action>
                 </pluginExecution>
                 <pluginExecution>
@@ -1522,7 +1522,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore />
+                    <ignore/>
                   </action>
                 </pluginExecution>
                 <pluginExecution>
@@ -1535,7 +1535,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore />
+                    <ignore/>
                   </action>
                 </pluginExecution>
                 <pluginExecution>
@@ -1548,7 +1548,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore />
+                    <ignore/>
                   </action>
                 </pluginExecution>
                 <pluginExecution>
@@ -1562,7 +1562,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore />
+                    <ignore/>
                   </action>
                 </pluginExecution>
                 <pluginExecution>
@@ -1577,7 +1577,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore />
+                    <ignore/>
                   </action>
                 </pluginExecution>
               </pluginExecutions>