This is an automated email from the ASF dual-hosted git repository. andor pushed a commit to branch branch-3.9 in repository https://gitbox.apache.org/repos/asf/zookeeper.git
commit a10c832f716be3a6ad58b3b8da60b17339b0573d Author: Andor Molnar <[email protected]> AuthorDate: Tue Oct 8 14:18:49 2024 -0500 Revert "Prepared 3.9.4-SNAPSHOT" This reverts commit 69250e956503457de54d6191fed69a0406c94334. --- pom.xml | 6 +- zookeeper-assembly/pom.xml | 2 +- zookeeper-client/pom.xml | 2 +- zookeeper-client/zookeeper-client-c/CMakeLists.txt | 2 +- zookeeper-client/zookeeper-client-c/configure.ac | 2 +- .../zookeeper-client-c/include/zookeeper_version.h | 2 +- zookeeper-client/zookeeper-client-c/pom.xml | 2 +- .../zookeeper-client-c/pom.xml.releaseBackup | 196 --------------------- zookeeper-compatibility-tests/pom.xml | 2 +- .../zookeeper-compatibility-tests-curator/pom.xml | 2 +- zookeeper-contrib/pom.xml | 2 +- zookeeper-contrib/zookeeper-contrib-fatjar/pom.xml | 2 +- .../zookeeper-contrib-loggraph/pom.xml | 2 +- zookeeper-contrib/zookeeper-contrib-rest/pom.xml | 2 +- .../zookeeper-contrib-zooinspector/pom.xml | 2 +- zookeeper-docs/pom.xml | 2 +- zookeeper-it/pom.xml | 2 +- zookeeper-jute/pom.xml | 2 +- zookeeper-metrics-providers/pom.xml | 2 +- .../zookeeper-prometheus-metrics/pom.xml | 2 +- zookeeper-recipes/pom.xml | 2 +- .../zookeeper-recipes-election/pom.xml | 2 +- zookeeper-recipes/zookeeper-recipes-lock/pom.xml | 2 +- zookeeper-recipes/zookeeper-recipes-queue/pom.xml | 2 +- zookeeper-server/pom.xml | 2 +- 25 files changed, 26 insertions(+), 222 deletions(-) diff --git a/pom.xml b/pom.xml index 12fb3ecc3..6def9f6db 100644 --- a/pom.xml +++ b/pom.xml @@ -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.4-SNAPSHOT</version> + <version>3.9.3</version> <name>Apache ZooKeeper</name> <description> ZooKeeper is a centralized service for maintaining configuration information, naming, @@ -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.2-0</tag> + <tag>release-3.9.3-0</tag> </scm> <issueManagement> <system>JIRA</system> @@ -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>1727814585</project.build.outputTimestamp> + <project.build.outputTimestamp>1727814518</project.build.outputTimestamp> <dependency.locations.enabled>false</dependency.locations.enabled> <surefire.version>2.22.1</surefire.version> diff --git a/zookeeper-assembly/pom.xml b/zookeeper-assembly/pom.xml index 86ab1fa64..f8e4ce6d7 100755 --- a/zookeeper-assembly/pom.xml +++ b/zookeeper-assembly/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.zookeeper</groupId> <artifactId>parent</artifactId> - <version>3.9.4-SNAPSHOT</version> + <version>3.9.3</version> </parent> <artifactId>zookeeper-assembly</artifactId> diff --git a/zookeeper-client/pom.xml b/zookeeper-client/pom.xml index 8a9336868..b5d353f56 100755 --- a/zookeeper-client/pom.xml +++ b/zookeeper-client/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.zookeeper</groupId> <artifactId>parent</artifactId> - <version>3.9.4-SNAPSHOT</version> + <version>3.9.3</version> </parent> <artifactId>zookeeper-client</artifactId> diff --git a/zookeeper-client/zookeeper-client-c/CMakeLists.txt b/zookeeper-client/zookeeper-client-c/CMakeLists.txt index 38c01454c..e1ea1d811 100644 --- a/zookeeper-client/zookeeper-client-c/CMakeLists.txt +++ b/zookeeper-client/zookeeper-client-c/CMakeLists.txt @@ -16,7 +16,7 @@ cmake_minimum_required(VERSION 3.5) -project(zookeeper VERSION 3.9.4) +project(zookeeper VERSION 3.9.3) set(email [email protected]) set(description "zookeeper C client") diff --git a/zookeeper-client/zookeeper-client-c/configure.ac b/zookeeper-client/zookeeper-client-c/configure.ac index 8b4dab6ff..9b4dedbe8 100644 --- a/zookeeper-client/zookeeper-client-c/configure.ac +++ b/zookeeper-client/zookeeper-client-c/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ(2.59) -AC_INIT([zookeeper C client],3.9.4,[[email protected]],[zookeeper]) +AC_INIT([zookeeper C client],3.9.3,[[email protected]],[zookeeper]) AC_CONFIG_SRCDIR([src/zookeeper.c]) # Save initial CFLAGS and CXXFLAGS values before AC_PROG_CC and AC_PROG_CXX diff --git a/zookeeper-client/zookeeper-client-c/include/zookeeper_version.h b/zookeeper-client/zookeeper-client-c/include/zookeeper_version.h index 80dacbcf4..cb415a507 100644 --- a/zookeeper-client/zookeeper-client-c/include/zookeeper_version.h +++ b/zookeeper-client/zookeeper-client-c/include/zookeeper_version.h @@ -22,7 +22,7 @@ extern "C" { #endif -#define ZOO_VERSION "3.9.4" +#define ZOO_VERSION "3.9.3" #ifdef __cplusplus } diff --git a/zookeeper-client/zookeeper-client-c/pom.xml b/zookeeper-client/zookeeper-client-c/pom.xml index fc464cb08..b5be295c6 100755 --- a/zookeeper-client/zookeeper-client-c/pom.xml +++ b/zookeeper-client/zookeeper-client-c/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper-client</artifactId> - <version>3.9.4-SNAPSHOT</version> + <version>3.9.3</version> </parent> <artifactId>zookeeper-client-c</artifactId> diff --git a/zookeeper-client/zookeeper-client-c/pom.xml.releaseBackup b/zookeeper-client/zookeeper-client-c/pom.xml.releaseBackup deleted file mode 100644 index a114041d4..000000000 --- a/zookeeper-client/zookeeper-client-c/pom.xml.releaseBackup +++ /dev/null @@ -1,196 +0,0 @@ -<?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},[[email protected]],[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> diff --git a/zookeeper-compatibility-tests/pom.xml b/zookeeper-compatibility-tests/pom.xml index 0ed264dce..cf18be4e8 100644 --- a/zookeeper-compatibility-tests/pom.xml +++ b/zookeeper-compatibility-tests/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.zookeeper</groupId> <artifactId>parent</artifactId> - <version>3.9.4-SNAPSHOT</version> + <version>3.9.3</version> </parent> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> diff --git a/zookeeper-compatibility-tests/zookeeper-compatibility-tests-curator/pom.xml b/zookeeper-compatibility-tests/zookeeper-compatibility-tests-curator/pom.xml index 333e69701..1d7850ee8 100644 --- a/zookeeper-compatibility-tests/zookeeper-compatibility-tests-curator/pom.xml +++ b/zookeeper-compatibility-tests/zookeeper-compatibility-tests-curator/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper-compatibility-tests</artifactId> - <version>3.9.4-SNAPSHOT</version> + <version>3.9.3</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/zookeeper-contrib/pom.xml b/zookeeper-contrib/pom.xml index 8f0a20048..2825bdc74 100755 --- a/zookeeper-contrib/pom.xml +++ b/zookeeper-contrib/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.zookeeper</groupId> <artifactId>parent</artifactId> - <version>3.9.4-SNAPSHOT</version> + <version>3.9.3</version> </parent> <artifactId>zookeeper-contrib</artifactId> diff --git a/zookeeper-contrib/zookeeper-contrib-fatjar/pom.xml b/zookeeper-contrib/zookeeper-contrib-fatjar/pom.xml index 84256f3a0..f9dbaa5d6 100755 --- a/zookeeper-contrib/zookeeper-contrib-fatjar/pom.xml +++ b/zookeeper-contrib/zookeeper-contrib-fatjar/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper-contrib</artifactId> - <version>3.9.4-SNAPSHOT</version> + <version>3.9.3</version> </parent> <groupId>org.apache.zookeeper</groupId> diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml b/zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml index 29a4d6297..26213484b 100755 --- a/zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml +++ b/zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper-contrib</artifactId> - <version>3.9.4-SNAPSHOT</version> + <version>3.9.3</version> </parent> <artifactId>zookeeper-contrib-loggraph</artifactId> diff --git a/zookeeper-contrib/zookeeper-contrib-rest/pom.xml b/zookeeper-contrib/zookeeper-contrib-rest/pom.xml index 6d2385185..b8b0b4676 100755 --- a/zookeeper-contrib/zookeeper-contrib-rest/pom.xml +++ b/zookeeper-contrib/zookeeper-contrib-rest/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper-contrib</artifactId> - <version>3.9.4-SNAPSHOT</version> + <version>3.9.3</version> </parent> <artifactId>zookeeper-contrib-rest</artifactId> diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml b/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml index 491f46b3c..823a31272 100755 --- a/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml +++ b/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper-contrib</artifactId> - <version>3.9.4-SNAPSHOT</version> + <version>3.9.3</version> </parent> <artifactId>zookeeper-contrib-zooinspector</artifactId> diff --git a/zookeeper-docs/pom.xml b/zookeeper-docs/pom.xml index c05155da4..df331e1c5 100644 --- a/zookeeper-docs/pom.xml +++ b/zookeeper-docs/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.zookeeper</groupId> <artifactId>parent</artifactId> - <version>3.9.4-SNAPSHOT</version> + <version>3.9.3</version> </parent> <artifactId>zookeeper-docs</artifactId> diff --git a/zookeeper-it/pom.xml b/zookeeper-it/pom.xml index 7ad5cb653..72e171a36 100755 --- a/zookeeper-it/pom.xml +++ b/zookeeper-it/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.zookeeper</groupId> <artifactId>parent</artifactId> - <version>3.9.4-SNAPSHOT</version> + <version>3.9.3</version> </parent> <artifactId>zookeeper-it</artifactId> diff --git a/zookeeper-jute/pom.xml b/zookeeper-jute/pom.xml index 0ca222b9d..ac3de753b 100755 --- a/zookeeper-jute/pom.xml +++ b/zookeeper-jute/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.zookeeper</groupId> <artifactId>parent</artifactId> - <version>3.9.4-SNAPSHOT</version> + <version>3.9.3</version> </parent> <artifactId>zookeeper-jute</artifactId> diff --git a/zookeeper-metrics-providers/pom.xml b/zookeeper-metrics-providers/pom.xml index decea7323..81f2233ba 100755 --- a/zookeeper-metrics-providers/pom.xml +++ b/zookeeper-metrics-providers/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.zookeeper</groupId> <artifactId>parent</artifactId> - <version>3.9.4-SNAPSHOT</version> + <version>3.9.3</version> </parent> <artifactId>zookeeper-metrics-providers</artifactId> diff --git a/zookeeper-metrics-providers/zookeeper-prometheus-metrics/pom.xml b/zookeeper-metrics-providers/zookeeper-prometheus-metrics/pom.xml index 5c74295bb..06d56cb2d 100755 --- a/zookeeper-metrics-providers/zookeeper-prometheus-metrics/pom.xml +++ b/zookeeper-metrics-providers/zookeeper-prometheus-metrics/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper-metrics-providers</artifactId> - <version>3.9.4-SNAPSHOT</version> + <version>3.9.3</version> </parent> <artifactId>zookeeper-prometheus-metrics</artifactId> diff --git a/zookeeper-recipes/pom.xml b/zookeeper-recipes/pom.xml index 33704a3a7..0a4c052ba 100755 --- a/zookeeper-recipes/pom.xml +++ b/zookeeper-recipes/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.zookeeper</groupId> <artifactId>parent</artifactId> - <version>3.9.4-SNAPSHOT</version> + <version>3.9.3</version> </parent> <artifactId>zookeeper-recipes</artifactId> diff --git a/zookeeper-recipes/zookeeper-recipes-election/pom.xml b/zookeeper-recipes/zookeeper-recipes-election/pom.xml index 72bd39385..adbdca5d3 100755 --- a/zookeeper-recipes/zookeeper-recipes-election/pom.xml +++ b/zookeeper-recipes/zookeeper-recipes-election/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper-recipes</artifactId> - <version>3.9.4-SNAPSHOT</version> + <version>3.9.3</version> </parent> <artifactId>zookeeper-recipes-election</artifactId> diff --git a/zookeeper-recipes/zookeeper-recipes-lock/pom.xml b/zookeeper-recipes/zookeeper-recipes-lock/pom.xml index 22b45a45e..69d0fc452 100755 --- a/zookeeper-recipes/zookeeper-recipes-lock/pom.xml +++ b/zookeeper-recipes/zookeeper-recipes-lock/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper-recipes</artifactId> - <version>3.9.4-SNAPSHOT</version> + <version>3.9.3</version> </parent> <artifactId>zookeeper-recipes-lock</artifactId> diff --git a/zookeeper-recipes/zookeeper-recipes-queue/pom.xml b/zookeeper-recipes/zookeeper-recipes-queue/pom.xml index eae644bbf..c4788f25e 100755 --- a/zookeeper-recipes/zookeeper-recipes-queue/pom.xml +++ b/zookeeper-recipes/zookeeper-recipes-queue/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper-recipes</artifactId> - <version>3.9.4-SNAPSHOT</version> + <version>3.9.3</version> </parent> <artifactId>zookeeper-recipes-queue</artifactId> diff --git a/zookeeper-server/pom.xml b/zookeeper-server/pom.xml index b1926777e..0e296de04 100755 --- a/zookeeper-server/pom.xml +++ b/zookeeper-server/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.zookeeper</groupId> <artifactId>parent</artifactId> - <version>3.9.4-SNAPSHOT</version> + <version>3.9.3</version> </parent> <artifactId>zookeeper</artifactId>
