diff options
| author | Enrico Olivelli <eolivelli@apache.org> | 2019-12-04 12:47:52 +0100 |
|---|---|---|
| committer | Norbert Kalmar <nkalmar@apache.org> | 2019-12-04 12:47:52 +0100 |
| commit | 253673f30431344030509b974bd2f65d23c1cd6e (patch) | |
| tree | 54d9c107c1f04bfc7c5314f134de8c6d2d53db32 /zookeeper-client | |
| parent | b2a671e6a7b7f323a2a5659222429dfcc21e17cd (diff) | |
| download | zookeeper-253673f30431344030509b974bd2f65d23c1cd6e.tar.gz | |
ZOOKEEPER-3635: Use Docker and Maven Release Plugin to prepare ZooKeeper releases
- configure maven-release-plugin
- configure maven-scm-plugin
- use maven-antrun-plugin in order to alter C client files during release procedure
- update Apache Parent pom to 21
- use openjdk8 for building releases
Author: Enrico Olivelli <eolivelli@apache.org>
Author: Enrico Olivelli <eolivelli@gmail.com>
Author: Enrico Olivelli <enrico.olivelli@diennea.com>
Reviewers: Norbert Kalmar <nkalmar@apache.org>
Closes #1162 from eolivelli/fix/ZOOKEEPER-3635-new-release-proc
Diffstat (limited to 'zookeeper-client')
| -rw-r--r-- | zookeeper-client/zookeeper-client-c/include/zookeeper_version.h | 4 | ||||
| -rwxr-xr-x | zookeeper-client/zookeeper-client-c/pom.xml | 23 | ||||
| -rw-r--r-- | zookeeper-client/zookeeper-client-c/src/cli.c | 6 |
3 files changed, 26 insertions, 7 deletions
diff --git a/zookeeper-client/zookeeper-client-c/include/zookeeper_version.h b/zookeeper-client/zookeeper-client-c/include/zookeeper_version.h index 1633cab2a..63b6a5ca3 100644 --- a/zookeeper-client/zookeeper-client-c/include/zookeeper_version.h +++ b/zookeeper-client/zookeeper-client-c/include/zookeeper_version.h @@ -22,9 +22,7 @@ extern "C" { #endif -#define ZOO_MAJOR_VERSION 3 -#define ZOO_MINOR_VERSION 6 -#define ZOO_PATCH_VERSION 0 +#define ZOO_VERSION "3.6.0" #ifdef __cplusplus } diff --git a/zookeeper-client/zookeeper-client-c/pom.xml b/zookeeper-client/zookeeper-client-c/pom.xml index 44202296d..fb3b52f57 100755 --- a/zookeeper-client/zookeeper-client-c/pom.xml +++ b/zookeeper-client/zookeeper-client-c/pom.xml @@ -152,6 +152,29 @@ <goal>run</goal> </goals> </execution> + <execution> + <id>replace-cclient-files-during-release</id> + <phase>none</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target> + <replaceregexp file="include/zookeeper_version.h" match="project.*" replace="project(zookeeper VERSION ${project.version})" 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> + </configuration> + </execution> </executions> </plugin> </plugins> diff --git a/zookeeper-client/zookeeper-client-c/src/cli.c b/zookeeper-client/zookeeper-client-c/src/cli.c index e8151ec8c..4a9c76fbc 100644 --- a/zookeeper-client/zookeeper-client-c/src/cli.c +++ b/zookeeper-client/zookeeper-client-c/src/cli.c @@ -834,10 +834,8 @@ int main(int argc, char **argv) { " command 'verbose' later to activate debug logs in the cli shell)\n\n", argv[0]); fprintf(stderr, - "Version: ZooKeeper cli (c client) version %d.%d.%d\n", - ZOO_MAJOR_VERSION, - ZOO_MINOR_VERSION, - ZOO_PATCH_VERSION); + "Version: ZooKeeper cli (c client) version %s\n", + ZOO_VERSION); return 2; } |
