diff --git a/pom.xml b/pom.xml
index 0629d1b7c41..57308c94ded 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,8 +46,8 @@
http://zookeeper.apache.org
2008
+ an ASF parent pom older than v15. Also uses the url from v18.
+ -->
Apache License, Version 2.0
@@ -248,10 +248,10 @@
-8
- eolivelli
- Enrico Olivelli
- eolivelli@apache.org
- +1
+ eolivelli
+ Enrico Olivelli
+ eolivelli@apache.org
+ +1
nkalmar
@@ -304,44 +304,44 @@
- apache-release
-
-
-
- org.apache.maven.plugins
- maven-assembly-plugin
-
-
- org.apache.apache.resources
- apache-source-release-assembly-descriptor
- 1.0.6
-
-
-
-
- source-release-assembly-tar-gz
- initialize
-
- single
-
-
- true
-
-
- ${sourceReleaseAssemblyDescriptor}
-
- apache-zookeeper-${project.version}
- false
-
- tar.gz
-
- posix
-
-
-
-
-
-
+ apache-release
+
+
+
+ org.apache.maven.plugins
+ maven-assembly-plugin
+
+
+ org.apache.apache.resources
+ apache-source-release-assembly-descriptor
+ 1.0.6
+
+
+
+
+ source-release-assembly-tar-gz
+ initialize
+
+ single
+
+
+ true
+
+
+ ${sourceReleaseAssemblyDescriptor}
+
+ apache-zookeeper-${project.version}
+ false
+
+ tar.gz
+
+ posix
+
+
+
+
+
+
m2e
@@ -376,19 +376,6 @@
-
-
- org.apache.maven.plugins
- maven-antrun-plugin
- [0,)
-
- run
-
-
-
-
-
-
com.ruleoftech
@@ -481,8 +468,8 @@
org/apache/zookeeper/version/**/*
- **/ReadOnlyModeTest.java
- **/KeeperStateTest.java
+ **/ReadOnlyModeTest.java
+ **/KeeperStateTest.java
@@ -527,7 +514,7 @@
reuseReports
clover
${project.build.directory}/clover/clover.xml
- target/surefire-reports
+ ${project.build.directory}/surefire-reports
clover
${clover-maven-plugin.version}
@@ -736,10 +723,10 @@
metrics-core
${dropwizard.version}
-
- org.slf4j
- slf4j-api
-
+
+ org.slf4j
+ slf4j-api
+
@@ -784,17 +771,17 @@
org.apache.maven.plugins
maven-compiler-plugin
- true
-
- -Werror
- -Xlint:deprecation
- -Xlint:unchecked
- -Xlint:-options
- -Xdoclint:-missing
-
- -Xpkginfo:always
-
-
+ true
+
+ -Werror
+ -Xlint:deprecation
+ -Xlint:unchecked
+ -Xlint:-options
+ -Xdoclint:-missing
+
+ -Xpkginfo:always
+
+
org.apache.maven.plugins
@@ -825,10 +812,6 @@
maven-assembly-plugin
3.6.0
-
- org.apache.maven.plugins
- maven-release-plugin
-
org.apache.maven.plugins
maven-scm-plugin
@@ -838,14 +821,10 @@
org.apache.maven.plugins
maven-surefire-plugin
- false
- ${redirectTestOutputToFile}
+ false
+ ${redirectTestOutputToFile}
-
- org.apache.maven.plugins
- maven-antrun-plugin
-
org.apache.maven.plugins
maven-dependency-plugin
@@ -866,7 +845,7 @@
org.codehaus.mojo
build-helper-maven-plugin
- 3.0.0
+ 3.6.0
net.nicoulaj.maven.plugins
@@ -918,8 +897,8 @@
maven-remote-resources-plugin
- process-resource-bundles
- none
+ process-resource-bundles
+ none
@@ -932,7 +911,7 @@
org.cyclonedx
cyclonedx-maven-plugin
2.7.9
-
+
@@ -951,21 +930,23 @@
- org.apache.maven.plugins
- maven-antrun-plugin
+ org.codehaus.mojo
+ build-helper-maven-plugin
+
+ parse-version
+
+ parse-version
+
+
set-hostname-property
validate
- run
+ hostname
- true
-
-
-
-
+ host.name
@@ -1103,48 +1084,17 @@
- org.apache.maven.plugins
- maven-release-plugin
- false
-
-
- clean verify -DskipTests antrun:run@replace-cclient-files-during-release scm:add@add-cclient-files-during-release scm:checkin@commit-cclient-files-during-release
- clean verify -DskipTests antrun:run@replace-cclient-files-during-release scm:add@add-cclient-files-during-release scm:checkin@commit-cclient-files-during-release
- false
- true
- true
- release-@{project.version}
-
-
-
- org.apache.maven.plugins
- maven-scm-plugin
- false
-
-
- add-cclient-files-during-release
- none
-
- add
-
-
- false
- zookeeper-client/zookeeper-client-c/CMakeLists.txt,zookeeper-client/zookeeper-client-c/configure.ac,zookeeper-client/zookeeper-client-c/include/zookeeper_version.h
-
-
-
- commit-cclient-files-during-release
- none
-
-
- checkin
-
-
- false
- Prepared ${project.version}
-
-
-
+ org.apache.maven.plugins
+ maven-release-plugin
+ false
+
+ clean verify -DskipTests
+ clean verify -DskipTests
+ false
+ true
+ true
+ release-@{project.version}
+
org.apache.maven.plugins
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 @@
ZooKeeper c client
+ This file is GENERATED. Developers should edit the template in src/main/c-filtered/
-
+
org.codehaus.mojo
exec-maven-plugin
@@ -69,7 +70,7 @@
${project.basedir}/configure
${project.basedir}/../..
- ANT
+ EXECMAVENPLUGIN
--with-openssl=${c-client-openssl}
@@ -79,64 +80,63 @@
+
+ build-c-client
+ compile
+
+ exec
+
+
+ ${project.build.directory}/c
+ make
+
+ clean
+ install
+
+
+ ${env.LD_LIBRARY_PATH}${path.separator}/usr/lib
+ ${env.PATH}${path.separator}${basedir}
+ EXECMAVENPLUGIN
+ ${basedir}/../../zookeeper-server/target
+ ${basedir}/../..
+
+
+
org.apache.maven.plugins
- maven-antrun-plugin
+ maven-resources-plugin
- generate-sources
+ mkdir-target-c
generate-sources
-
-
-
-
-
- run
+ copy-resources
-
-
- build-c-client
- compile
-
-
-
-
-
-
-
-
-
-
+ ${project.build.directory}/c
+
-
- run
-
- replace-cclient-files-during-release
- none
+ prepare-filtered-c-source
- run
+ copy-resources
+ generate-sources
-
-
-
- -SNAPSHOT
-
-
-
- -SNAPSHOT
-
-
-
- -SNAPSHOT
-
-
+ ./
+ false
+
+ @
+
+
+
+ src/main/c-filtered
+ true
+
+
@@ -162,29 +162,31 @@
- org.apache.maven.plugins
- maven-antrun-plugin
+ org.codehaus.mojo
+ exec-maven-plugin
test-cppunit
test
+
+ exec
+
+ ${project.build.directory}/c
+ make
+
+ check
+
${skipTests}
-
-
-
-
-
-
-
-
-
-
+
+ ${env.LD_LIBRARY_PATH}${path.separator}/usr/lib
+ ${env.PATH}${path.separator}${basedir}
+ EXECMAVENPLUGIN
+ ${basedir}/../../zookeeper-server/target
+ ${basedir}/../..
+
-
- run
-
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 @@
provided
- io.dropwizard.metrics
- metrics-core
- provided
+ io.dropwizard.metrics
+ metrics-core
+ provided
org.apache.kerby
@@ -211,12 +211,6 @@
UTC
-
- parse-version
-
- parse-version
-
-
generate-sources
@@ -281,7 +275,7 @@
${surefire-forkcount}
false
- -Xmx512m -Dtest.junit.threads=${surefire-forkcount} -Dzookeeper.junit.threadid=${surefire.forkNumber} -javaagent:${org.jmockit:jmockit:jar}
+ -Xmx512m -Dtest.junit.threads=${surefire-forkcount} -Dzookeeper.junit.threadid=${surefire.forkNumber} -javaagent:${settings.localRepository}/org/jmockit/jmockit/${jmockit.version}/jmockit-${jmockit.version}.jar
${project.basedir}
${project.build.directory}/surefire
@@ -346,7 +340,7 @@
-
+