diff --git a/pom.xml b/pom.xml
index 0629d1b7c41..57308c94ded 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,8 +46,8 @@
   <url>http://zookeeper.apache.org</url>
   <inceptionYear>2008</inceptionYear>
   <!-- Set here so we can consistently use the correct name, even on branches with
-       an ASF parent pom older than v15. Also uses the url from v18.
-    -->
+    an ASF parent pom older than v15. Also uses the url from v18.
+  -->
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>
@@ -248,10 +248,10 @@
       <timezone>-8</timezone>
     </developer>
     <developer>
-        <id>eolivelli</id>
-        <name>Enrico Olivelli</name>
-        <email>eolivelli@apache.org</email>
-        <timezone>+1</timezone>
+      <id>eolivelli</id>
+      <name>Enrico Olivelli</name>
+      <email>eolivelli@apache.org</email>
+      <timezone>+1</timezone>
     </developer>
     <developer>
       <id>nkalmar</id>
@@ -304,44 +304,44 @@
       </modules>
     </profile>
     <profile>
-        <id>apache-release</id>
-        <build>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-assembly-plugin</artifactId>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.apache.apache.resources</groupId>
-                            <artifactId>apache-source-release-assembly-descriptor</artifactId>
-                            <version>1.0.6</version>
-                        </dependency>
-                    </dependencies>
-                    <executions>
-                        <execution>
-                            <id>source-release-assembly-tar-gz</id>
-                            <phase>initialize</phase>
-                            <goals>
-                                <goal>single</goal>
-                            </goals>
-                            <configuration>
-                                <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
-                                <descriptorRefs>
-                                    <!-- defined in Apache Parent Pom -->
-                                    <descriptorRef>${sourceReleaseAssemblyDescriptor}</descriptorRef>
-                                </descriptorRefs>
-                                <finalName>apache-zookeeper-${project.version}</finalName>
-                                <appendAssemblyId>false</appendAssemblyId>
-                                <formats>
-                                    <format>tar.gz</format>
-                                </formats>
-                                <tarLongFileMode>posix</tarLongFileMode>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </build>
+      <id>apache-release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <dependencies>
+              <dependency>
+                <groupId>org.apache.apache.resources</groupId>
+                <artifactId>apache-source-release-assembly-descriptor</artifactId>
+                <version>1.0.6</version>
+              </dependency>
+            </dependencies>
+            <executions>
+              <execution>
+                <id>source-release-assembly-tar-gz</id>
+                <phase>initialize</phase>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+                <configuration>
+                  <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+                  <descriptorRefs>
+                    <!-- defined in Apache Parent Pom -->
+                    <descriptorRef>${sourceReleaseAssemblyDescriptor}</descriptorRef>
+                  </descriptorRefs>
+                  <finalName>apache-zookeeper-${project.version}</finalName>
+                  <appendAssemblyId>false</appendAssemblyId>
+                  <formats>
+                    <format>tar.gz</format>
+                  </formats>
+                  <tarLongFileMode>posix</tarLongFileMode>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
     </profile>
     <profile>
       <id>m2e</id>
@@ -376,19 +376,6 @@
                         <ignore />
                       </action>
                     </pluginExecution>
-                    <pluginExecution>
-                      <pluginExecutionFilter>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <versionRange>[0,)</versionRange>
-                        <goals>
-                          <goal>run</goal>
-                        </goals>
-                      </pluginExecutionFilter>
-                      <action>
-                        <ignore />
-                      </action>
-                    </pluginExecution>
                     <pluginExecution>
                       <pluginExecutionFilter>
                         <groupId>com.ruleoftech</groupId>
@@ -481,8 +468,8 @@
               </includes>
               <excludes>
                 <exclude>org/apache/zookeeper/version/**/*</exclude>
-                  <exclude>**/ReadOnlyModeTest.java</exclude>
-                  <exclude>**/KeeperStateTest.java</exclude>
+                <exclude>**/ReadOnlyModeTest.java</exclude>
+                <exclude>**/KeeperStateTest.java</exclude>
               </excludes>
             </configuration>
             <executions>
@@ -527,7 +514,7 @@
                 <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
                 <sonar.core.codeCoveragePlugin>clover</sonar.core.codeCoveragePlugin>
                 <sonar.clover.reportPath>${project.build.directory}/clover/clover.xml</sonar.clover.reportPath>
-                <sonar.surefire.reportsPath>target/surefire-reports</sonar.surefire.reportsPath>
+                <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
                 <sonar.core.codeCoveragePlugin>clover</sonar.core.codeCoveragePlugin>
                 <sonar.clover.version>${clover-maven-plugin.version}</sonar.clover.version>
               </configuration>
@@ -736,10 +723,10 @@
         <artifactId>metrics-core</artifactId>
         <version>${dropwizard.version}</version>
         <exclusions>
-           <exclusion>
-              <groupId>org.slf4j</groupId>
-              <artifactId>slf4j-api</artifactId>
-           </exclusion>
+          <exclusion>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>
@@ -784,17 +771,17 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
           <configuration>
-             <showWarnings>true</showWarnings>
-             <compilerArgs>
-               <compilerArg>-Werror</compilerArg>
-               <compilerArg>-Xlint:deprecation</compilerArg>
-               <compilerArg>-Xlint:unchecked</compilerArg>
-               <compilerArg>-Xlint:-options</compilerArg>
-               <compilerArg>-Xdoclint:-missing</compilerArg>
-               <!-- https://issues.apache.org/jira/browse/MCOMPILER-205 -->
-               <compilerArg>-Xpkginfo:always</compilerArg>
-              </compilerArgs>
-            </configuration>
+            <showWarnings>true</showWarnings>
+            <compilerArgs>
+              <compilerArg>-Werror</compilerArg>
+              <compilerArg>-Xlint:deprecation</compilerArg>
+              <compilerArg>-Xlint:unchecked</compilerArg>
+              <compilerArg>-Xlint:-options</compilerArg>
+              <compilerArg>-Xdoclint:-missing</compilerArg>
+              <!-- https://issues.apache.org/jira/browse/MCOMPILER-205 -->
+              <compilerArg>-Xpkginfo:always</compilerArg>
+            </compilerArgs>
+          </configuration>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -825,10 +812,6 @@
           <artifactId>maven-assembly-plugin</artifactId>
           <version>3.6.0</version>
         </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-release-plugin</artifactId>
-        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-scm-plugin</artifactId>
@@ -838,14 +821,10 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
           <configuration>
-              <trimStackTrace>false</trimStackTrace>
-              <redirectTestOutputToFile>${redirectTestOutputToFile}</redirectTestOutputToFile>
+            <trimStackTrace>false</trimStackTrace>
+            <redirectTestOutputToFile>${redirectTestOutputToFile}</redirectTestOutputToFile>
           </configuration>
         </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-antrun-plugin</artifactId>
-        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-dependency-plugin</artifactId>
@@ -866,7 +845,7 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>build-helper-maven-plugin</artifactId>
-          <version>3.0.0</version>
+          <version>3.6.0</version>
         </plugin>
         <plugin>
           <groupId>net.nicoulaj.maven.plugins</groupId>
@@ -918,8 +897,8 @@
           <artifactId>maven-remote-resources-plugin</artifactId>
           <executions>
             <execution>
-               <id>process-resource-bundles</id>
-               <phase>none</phase>
+              <id>process-resource-bundles</id>
+              <phase>none</phase>
             </execution>
           </executions>
         </plugin>
@@ -932,7 +911,7 @@
           <groupId>org.cyclonedx</groupId>
           <artifactId>cyclonedx-maven-plugin</artifactId>
           <version>2.7.9</version>
-       </plugin>
+        </plugin>
       </plugins>
     </pluginManagement>
 
@@ -951,21 +930,23 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
         <executions>
+          <execution>
+            <id>parse-version</id>
+            <goals>
+              <goal>parse-version</goal>
+            </goals>
+          </execution>
           <execution>
             <id>set-hostname-property</id>
             <phase>validate</phase>
             <goals>
-              <goal>run</goal>
+              <goal>hostname</goal>
             </goals>
             <configuration>
-              <exportAntProperties>true</exportAntProperties>
-              <target>
-                <property environment="env" />
-                <exec executable="hostname" outputproperty="host.name" />
-              </target>
+              <hostnameProperty>host.name</hostnameProperty>
             </configuration>
           </execution>
         </executions>
@@ -1103,48 +1084,17 @@
         </configuration>
       </plugin>
       <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-release-plugin</artifactId>
-          <inherited>false</inherited>
-          <configuration>
-            <!-- update the version inside the C sources -->
-            <preparationGoals>clean verify -DskipTests antrun:run@replace-cclient-files-during-release scm:add@add-cclient-files-during-release scm:checkin@commit-cclient-files-during-release</preparationGoals>
-            <completionGoals>clean verify -DskipTests antrun:run@replace-cclient-files-during-release scm:add@add-cclient-files-during-release scm:checkin@commit-cclient-files-during-release</completionGoals>
-            <pushChanges>false</pushChanges>
-            <localCheckout>true</localCheckout>
-            <autoVersionSubmodules>true</autoVersionSubmodules>
-            <tagNameFormat>release-@{project.version}</tagNameFormat>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-scm-plugin</artifactId>
-          <inherited>false</inherited>
-          <executions>
-             <execution>
-               <id>add-cclient-files-during-release</id>
-               <phase>none</phase>
-               <goals>
-                 <goal>add</goal>
-               </goals>
-               <configuration>
-                 <pushChanges>false</pushChanges>
-                 <includes>zookeeper-client/zookeeper-client-c/CMakeLists.txt,zookeeper-client/zookeeper-client-c/configure.ac,zookeeper-client/zookeeper-client-c/include/zookeeper_version.h</includes>
-               </configuration>
-            </execution>
-            <execution>
-               <id>commit-cclient-files-during-release</id>
-               <phase>none</phase>
-               <goals>
-                   <!-- git commit -->
-                <goal>checkin</goal>
-              </goals>
-              <configuration>
-                 <pushChanges>false</pushChanges>
-                 <message>Prepared ${project.version}</message>
-              </configuration>
-            </execution>
-        </executions>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-release-plugin</artifactId>
+        <inherited>false</inherited>
+        <configuration>
+          <preparationGoals>clean verify -DskipTests</preparationGoals>
+          <completionGoals>clean verify -DskipTests</completionGoals>
+          <pushChanges>false</pushChanges>
+          <localCheckout>true</localCheckout>
+          <autoVersionSubmodules>true</autoVersionSubmodules>
+          <tagNameFormat>release-@{project.version}</tagNameFormat>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
diff --git a/zookeeper-client/zookeeper-client-c/.gitignore b/zookeeper-client/zookeeper-client-c/.gitignore
new file mode 100644
index 00000000000..ef201f916e1
--- /dev/null
+++ b/zookeeper-client/zookeeper-client-c/.gitignore
@@ -0,0 +1,4 @@
+# Ignore generated files from the Maven build to patch the ZooKeeper version
+/CMakeLists.txt
+/configure.ac
+/include/zookeeper_version.h
diff --git a/zookeeper-client/zookeeper-client-c/pom.xml b/zookeeper-client/zookeeper-client-c/pom.xml
index 91e45cff3e8..57cb412181f 100644
--- a/zookeeper-client/zookeeper-client-c/pom.xml
+++ b/zookeeper-client/zookeeper-client-c/pom.xml
@@ -32,12 +32,13 @@
   <description>ZooKeeper c client</description>
 
   <properties>
+    <filteredBuildComment>This file is GENERATED. Developers should edit the template in src/main/c-filtered/</filteredBuildComment>
     <c-test-coverage-arg> </c-test-coverage-arg>
   </properties>
 
   <build>
     <plugins>
-        <plugin>
+      <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
         <executions>
@@ -69,7 +70,7 @@
               <executable>${project.basedir}/configure</executable>
               <environmentVariables>
                 <base_dir>${project.basedir}/../..</base_dir>
-                <CALLER>ANT</CALLER>
+                <CALLER>EXECMAVENPLUGIN</CALLER>
               </environmentVariables>
               <arguments>
                 <argument>--with-openssl=${c-client-openssl}</argument>
@@ -79,64 +80,63 @@
               </arguments>
             </configuration>
           </execution>
+          <execution>
+            <id>build-c-client</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <workingDirectory>${project.build.directory}/c</workingDirectory>
+              <executable>make</executable>
+              <arguments>
+                <argument>clean</argument>
+                <argument>install</argument>
+              </arguments>
+              <environmentVariables>
+                <LD_LIBRARY_PATH>${env.LD_LIBRARY_PATH}${path.separator}/usr/lib</LD_LIBRARY_PATH>
+                <PATH>${env.PATH}${path.separator}${basedir}</PATH>
+                <CALLER>EXECMAVENPLUGIN</CALLER>
+                <CLOVER_HOME>${basedir}/../../zookeeper-server/target</CLOVER_HOME>
+                <base_dir>${basedir}/../..</base_dir>
+              </environmentVariables>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
+        <artifactId>maven-resources-plugin</artifactId>
         <executions>
           <execution>
-            <id>generate-sources</id>
+            <id>mkdir-target-c</id>
             <phase>generate-sources</phase>
-            <configuration>
-              <target>
-                <mkdir dir="target/c" />
-              </target>
-            </configuration>
             <goals>
-              <goal>run</goal>
+              <goal>copy-resources</goal>
             </goals>
-          </execution>
-          <execution>
-            <id>build-c-client</id>
-            <phase>compile</phase>
             <configuration>
-              <target>
-                <exec dir="${basedir}/target/c" executable="make" failonerror="true">
-                  <env key="LD_LIBRARY_PATH" value="${env.LD_LIBRARY_PATH};/usr/lib" />
-                  <env key="PATH" path="${env.PATH};${basedir};" />
-                  <env key="CALLER" value="ANT" />
-                  <env key="CLOVER_HOME" value="${basedir}/../../zookeeper-server/target" />
-                  <env key="base_dir" value="${basedir}/../.." />
-                  <arg line="clean install" />
-                </exec>
-              </target>
+              <outputDirectory>${project.build.directory}/c</outputDirectory>
+              <resources />
             </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
           </execution>
           <execution>
-            <id>replace-cclient-files-during-release</id>
-            <phase>none</phase>
+            <id>prepare-filtered-c-source</id>
             <goals>
-               <goal>run</goal>
+              <goal>copy-resources</goal>
             </goals>
+            <phase>generate-sources</phase>
             <configuration>
-               <target>
-                  <replaceregexp file="include/zookeeper_version.h" match="\#define ZOO_VERSION.*" replace="#define ZOO_VERSION &quot;${project.version}&quot;" byline="true" />
-                  <replace file="include/zookeeper_version.h" value="">
-                      <replaceToken>-SNAPSHOT</replaceToken>
-                  </replace>
-                  <replaceregexp file="CMakeLists.txt" match="project.*" replace="project(zookeeper VERSION ${project.version})" byline="true" />
-                  <replace file="CMakeLists.txt" value="">
-                      <replaceToken>-SNAPSHOT</replaceToken>
-                  </replace>
-                  <replaceregexp file="configure.ac" match="AC_INIT.*" replace="AC_INIT([zookeeper C client],${project.version},[user@zookeeper.apache.org],[zookeeper])" byline="true" />
-                  <replace file="configure.ac" value="">
-                      <replaceToken>-SNAPSHOT</replaceToken>
-                  </replace>
-               </target>
+              <outputDirectory>./</outputDirectory>
+              <useDefaultDelimiters>false</useDefaultDelimiters>
+              <delimiters>
+                <delimiter>@</delimiter>
+              </delimiters>
+              <resources>
+                <resource>
+                  <directory>src/main/c-filtered</directory>
+                  <filtering>true</filtering>
+                </resource>
+              </resources>
             </configuration>
           </execution>
         </executions>
@@ -162,29 +162,31 @@
       <build>
         <plugins>
           <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-antrun-plugin</artifactId>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>exec-maven-plugin</artifactId>
             <executions>
               <execution>
                 <id>test-cppunit</id>
                 <phase>test</phase>
+                <goals>
+                  <goal>exec</goal>
+                </goals>
                 <configuration>
+                  <workingDirectory>${project.build.directory}/c</workingDirectory>
+                  <executable>make</executable>
+                  <arguments>
+                    <argument>check</argument>
+                  </arguments>
                   <!-- do not run cpp tests if tests are globally skipped -->
                   <skip>${skipTests}</skip>
-                  <target>
-                    <exec dir="${basedir}/target/c" executable="make" failonerror="true">
-                      <env key="LD_LIBRARY_PATH" value="${env.LD_LIBRARY_PATH};/usr/lib" />
-                      <env key="PATH" path="${env.PATH};${basedir};" />
-                      <env key="CALLER" value="ANT" />
-                      <env key="CLOVER_HOME" value="${basedir}/../../zookeeper-server/target" />
-                      <env key="base_dir" value="${basedir}/../.." />
-                      <arg line="check" />
-                    </exec>
-                  </target>
+                  <environmentVariables>
+                    <LD_LIBRARY_PATH>${env.LD_LIBRARY_PATH}${path.separator}/usr/lib</LD_LIBRARY_PATH>
+                    <PATH>${env.PATH}${path.separator}${basedir}</PATH>
+                    <CALLER>EXECMAVENPLUGIN</CALLER>
+                    <CLOVER_HOME>${basedir}/../../zookeeper-server/target</CLOVER_HOME>
+                    <base_dir>${basedir}/../..</base_dir>
+                  </environmentVariables>
                 </configuration>
-                <goals>
-                  <goal>run</goal>
-                </goals>
               </execution>
             </executions>
           </plugin>
diff --git a/zookeeper-client/zookeeper-client-c/CMakeLists.txt b/zookeeper-client/zookeeper-client-c/src/main/c-filtered/CMakeLists.txt
similarity index 98%
rename from zookeeper-client/zookeeper-client-c/CMakeLists.txt
rename to zookeeper-client/zookeeper-client-c/src/main/c-filtered/CMakeLists.txt
index da1351e20f5..caa628e355b 100644
--- a/zookeeper-client/zookeeper-client-c/CMakeLists.txt
+++ b/zookeeper-client/zookeeper-client-c/src/main/c-filtered/CMakeLists.txt
@@ -14,9 +14,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# @filteredBuildComment@
+
 cmake_minimum_required(VERSION 3.5)
 
-project(zookeeper VERSION 3.10.0)
+project(zookeeper VERSION @parsedVersion.majorVersion@.@parsedVersion.minorVersion@.@parsedVersion.incrementalVersion@)
 set(email user@zookeeper.apache.org)
 set(description "zookeeper C client")
 
diff --git a/zookeeper-client/zookeeper-client-c/configure.ac b/zookeeper-client/zookeeper-client-c/src/main/c-filtered/configure.ac
similarity index 97%
rename from zookeeper-client/zookeeper-client-c/configure.ac
rename to zookeeper-client/zookeeper-client-c/src/main/c-filtered/configure.ac
index 0de8427e5bb..5967aa9a650 100644
--- a/zookeeper-client/zookeeper-client-c/configure.ac
+++ b/zookeeper-client/zookeeper-client-c/src/main/c-filtered/configure.ac
@@ -1,9 +1,11 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
+# @filteredBuildComment@
+
 AC_PREREQ(2.59)
 
-AC_INIT([zookeeper C client],3.10.0,[user@zookeeper.apache.org],[zookeeper])
+AC_INIT([zookeeper C client],@parsedVersion.majorVersion@.@parsedVersion.minorVersion@.@parsedVersion.incrementalVersion@,[user@zookeeper.apache.org],[zookeeper])
 AC_CONFIG_SRCDIR([src/zookeeper.c])
 
 # Save initial CFLAGS and CXXFLAGS values before AC_PROG_CC and AC_PROG_CXX
@@ -66,7 +68,7 @@ else
 fi
 AM_CONDITIONAL([WANT_OPENSSL],[test "x$with_openssl" != xno])
 
-if test "$CALLER" = "ANT" ; then
+if test "$CALLER" = "EXECMAVENPLUGIN" ; then
 CPPUNIT_CFLAGS="$CPPUNIT_CFLAGS -DZKSERVER_CMD=\"\\\"${base_dir}/zookeeper-client/zookeeper-client-c/tests/zkServer.sh\\\"\""
 else
 CPPUNIT_CFLAGS="$CPPUNIT_CFLAGS -DZKSERVER_CMD=\"\\\"./tests/zkServer.sh\\\"\""
diff --git a/zookeeper-client/zookeeper-client-c/include/zookeeper_version.h b/zookeeper-client/zookeeper-client-c/src/main/c-filtered/include/zookeeper_version.h
similarity index 86%
rename from zookeeper-client/zookeeper-client-c/include/zookeeper_version.h
rename to zookeeper-client/zookeeper-client-c/src/main/c-filtered/include/zookeeper_version.h
index 639eaf5fe28..d0c2ed4793e 100644
--- a/zookeeper-client/zookeeper-client-c/include/zookeeper_version.h
+++ b/zookeeper-client/zookeeper-client-c/src/main/c-filtered/include/zookeeper_version.h
@@ -15,6 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+/* @filteredBuildComment@ */
+
 #ifndef ZOOKEEPER_VERSION_H_
 #define ZOOKEEPER_VERSION_H_
 
@@ -22,7 +25,7 @@
 extern "C" {
 #endif
 
-#define ZOO_VERSION "3.10.0"
+#define ZOO_VERSION "@parsedVersion.majorVersion@.@parsedVersion.minorVersion@.@parsedVersion.incrementalVersion@"
 
 #ifdef __cplusplus
 }
diff --git a/zookeeper-server/pom.xml b/zookeeper-server/pom.xml
index 495e4847919..331097ab99f 100644
--- a/zookeeper-server/pom.xml
+++ b/zookeeper-server/pom.xml
@@ -121,9 +121,9 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-       <groupId>io.dropwizard.metrics</groupId>
-       <artifactId>metrics-core</artifactId>
-       <scope>provided</scope>
+      <groupId>io.dropwizard.metrics</groupId>
+      <artifactId>metrics-core</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.kerby</groupId>
@@ -211,12 +211,6 @@
               <timeZone>UTC</timeZone>
             </configuration>
           </execution>
-          <execution>
-            <id>parse-version</id>
-            <goals>
-              <goal>parse-version</goal>
-            </goals>
-          </execution>
           <execution>
             <phase>generate-sources</phase>
             <goals>
@@ -281,7 +275,7 @@
           </includes>
           <forkCount>${surefire-forkcount}</forkCount>
           <reuseForks>false</reuseForks>
-          <argLine>-Xmx512m -Dtest.junit.threads=${surefire-forkcount} -Dzookeeper.junit.threadid=${surefire.forkNumber} -javaagent:${org.jmockit:jmockit:jar}</argLine>
+          <argLine>-Xmx512m -Dtest.junit.threads=${surefire-forkcount} -Dzookeeper.junit.threadid=${surefire.forkNumber} -javaagent:${settings.localRepository}/org/jmockit/jmockit/${jmockit.version}/jmockit-${jmockit.version}.jar</argLine>
           <basedir>${project.basedir}</basedir>
           <systemPropertyVariables>
             <build.test.dir>${project.build.directory}/surefire</build.test.dir>
@@ -346,7 +340,7 @@
           </execution>
         </executions>
       </plugin>
-     </plugins>
+    </plugins>
   </build>
 
 </project>