Skip to content

Commit

Permalink
Prepared 3.9.4-SNAPSHOT
Browse files Browse the repository at this point in the history
  • Loading branch information
anmolnar committed Oct 1, 2024
1 parent 903f7d6 commit 69250e9
Show file tree
Hide file tree
Showing 25 changed files with 222 additions and 26 deletions.
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<artifactId>parent</artifactId>
<packaging>pom</packaging>
<!-- to change version: mvn -B release:update-versions -DdevelopmentVersion=3.6.0-SNAPSHOT -->
<version>3.9.3</version>
<version>3.9.4-SNAPSHOT</version>
<name>Apache ZooKeeper</name>
<description>
ZooKeeper is a centralized service for maintaining configuration information, naming,
Expand Down Expand Up @@ -71,7 +71,7 @@
<connection>scm:git:https://gitbox.apache.org/repos/asf/zookeeper.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/zookeeper.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf/zookeeper.git</url>
<tag>release-3.9.3-0</tag>
<tag>release-3.9.2-0</tag>
</scm>
<issueManagement>
<system>JIRA</system>
Expand Down Expand Up @@ -542,7 +542,7 @@
<!-- maven properties -->
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<project.build.outputTimestamp>1727814518</project.build.outputTimestamp>
<project.build.outputTimestamp>1727814585</project.build.outputTimestamp>
<dependency.locations.enabled>false</dependency.locations.enabled>
<surefire.version>2.22.1</surefire.version>

Expand Down
2 changes: 1 addition & 1 deletion zookeeper-assembly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>parent</artifactId>
<version>3.9.3</version>
<version>3.9.4-SNAPSHOT</version>
</parent>

<artifactId>zookeeper-assembly</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion zookeeper-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>parent</artifactId>
<version>3.9.3</version>
<version>3.9.4-SNAPSHOT</version>
</parent>

<artifactId>zookeeper-client</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion zookeeper-client/zookeeper-client-c/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

cmake_minimum_required(VERSION 3.5)

project(zookeeper VERSION 3.9.3)
project(zookeeper VERSION 3.9.4)
set(email user@zookeeper.apache.org)
set(description "zookeeper C client")

Expand Down
2 changes: 1 addition & 1 deletion zookeeper-client/zookeeper-client-c/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

AC_PREREQ(2.59)

AC_INIT([zookeeper C client],3.9.3,[user@zookeeper.apache.org],[zookeeper])
AC_INIT([zookeeper C client],3.9.4,[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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
extern "C" {
#endif

#define ZOO_VERSION "3.9.3"
#define ZOO_VERSION "3.9.4"

#ifdef __cplusplus
}
Expand Down
2 changes: 1 addition & 1 deletion zookeeper-client/zookeeper-client-c/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-client</artifactId>
<version>3.9.3</version>
<version>3.9.4-SNAPSHOT</version>
</parent>

<artifactId>zookeeper-client-c</artifactId>
Expand Down
196 changes: 196 additions & 0 deletions zookeeper-client/zookeeper-client-c/pom.xml.releaseBackup
Original file line number Diff line number Diff line change
@@ -0,0 +1,196 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<!--
/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-->
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-client</artifactId>
<version>3.9.3-SNAPSHOT</version>
</parent>

<artifactId>zookeeper-client-c</artifactId>
<packaging>pom</packaging>
<name>Apache ZooKeeper - Client - C</name>
<description>ZooKeeper c client</description>

<properties>
<c-test-coverage-arg> </c-test-coverage-arg>
</properties>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<executions>
<execution>
<id>autoreconf</id>
<phase>process-sources</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<workingDirectory>${project.basedir}</workingDirectory>
<executable>autoreconf</executable>
<environmentVariables>
<ACLOCAL>aclocal -I /usr/share/aclocal</ACLOCAL>
</environmentVariables>
<arguments>
<argument>-if</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>configure</id>
<phase>process-sources</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<workingDirectory>${project.build.directory}/c</workingDirectory>
<executable>${project.basedir}/configure</executable>
<environmentVariables>
<base_dir>${project.basedir}/../..</base_dir>
<CALLER>ANT</CALLER>
</environmentVariables>
<arguments>
<argument>--with-openssl=${c-client-openssl}</argument>
<argument>--with-sasl=${c-client-sasl}</argument>
<argument>--prefix=${project.build.directory}/c</argument>
<argument>${c-test-coverage-arg}</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>generate-sources</id>
<phase>generate-sources</phase>
<configuration>
<target>
<mkdir dir="target/c" />
</target>
</configuration>
<goals>
<goal>run</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>
</configuration>
<goals>
<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>
</build>
<profiles>
<profile>
<id>c-test-coverage</id>
<properties>
<c-test-coverage-arg>--enable-gcov</c-test-coverage-arg>
</properties>
</profile>
<profile>
<!-- can be skipped by deactivating the profile with -P!cppunit (may need to escape or quote exclamation on command-line) -->
<id>cppunit</id>
<activation>
<property>
<!-- can also be skipped by -DskipCppUnit or with -DskipTests (see below) -->
<name>!skipCppUnit</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>test-cppunit</id>
<phase>test</phase>
<configuration>
<!-- 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>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
2 changes: 1 addition & 1 deletion zookeeper-compatibility-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>parent</artifactId>
<version>3.9.3</version>
<version>3.9.4-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
<modelVersion>4.0.0</modelVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-compatibility-tests</artifactId>
<version>3.9.3</version>
<version>3.9.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion zookeeper-contrib/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>parent</artifactId>
<version>3.9.3</version>
<version>3.9.4-SNAPSHOT</version>
</parent>

<artifactId>zookeeper-contrib</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion zookeeper-contrib/zookeeper-contrib-fatjar/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-contrib</artifactId>
<version>3.9.3</version>
<version>3.9.4-SNAPSHOT</version>
</parent>

<groupId>org.apache.zookeeper</groupId>
Expand Down
2 changes: 1 addition & 1 deletion zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-contrib</artifactId>
<version>3.9.3</version>
<version>3.9.4-SNAPSHOT</version>
</parent>

<artifactId>zookeeper-contrib-loggraph</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion zookeeper-contrib/zookeeper-contrib-rest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-contrib</artifactId>
<version>3.9.3</version>
<version>3.9.4-SNAPSHOT</version>
</parent>

<artifactId>zookeeper-contrib-rest</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-contrib</artifactId>
<version>3.9.3</version>
<version>3.9.4-SNAPSHOT</version>
</parent>

<artifactId>zookeeper-contrib-zooinspector</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion zookeeper-docs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>parent</artifactId>
<version>3.9.3</version>
<version>3.9.4-SNAPSHOT</version>
</parent>

<artifactId>zookeeper-docs</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion zookeeper-it/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>parent</artifactId>
<version>3.9.3</version>
<version>3.9.4-SNAPSHOT</version>
</parent>

<artifactId>zookeeper-it</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion zookeeper-jute/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>parent</artifactId>
<version>3.9.3</version>
<version>3.9.4-SNAPSHOT</version>
</parent>

<artifactId>zookeeper-jute</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion zookeeper-metrics-providers/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>parent</artifactId>
<version>3.9.3</version>
<version>3.9.4-SNAPSHOT</version>
</parent>

<artifactId>zookeeper-metrics-providers</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-metrics-providers</artifactId>
<version>3.9.3</version>
<version>3.9.4-SNAPSHOT</version>
</parent>

<artifactId>zookeeper-prometheus-metrics</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion zookeeper-recipes/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>parent</artifactId>
<version>3.9.3</version>
<version>3.9.4-SNAPSHOT</version>
</parent>

<artifactId>zookeeper-recipes</artifactId>
Expand Down
Loading

0 comments on commit 69250e9

Please sign in to comment.