Merge tag 'release-3.9.3' into local/zookeeper-3.9.3.x

ZooKeeper 3.9.3 release.

Author: andreasmattes

.github/workflows/ci.yaml

@@ -86,3 +86,10 @@ jobs:
         name: failsafe-reports-${{ matrix.profile.name }}
         path: ./**/target/failsafe-reports/
         if-no-files-found: ignore
+    - name: Upload cppunit test logs
+      if: ${{ failure() }}
+      uses: actions/upload-artifact@v3
+      with:
+        name: cppunit-logs-${{ matrix.profile.name }}
+        path: ./zookeeper-client/zookeeper-client-c/target/c/TEST-*.txt
+        if-no-files-found: ignore

.gitignore

@@ -69,8 +69,6 @@ tags
 obj
 zookeeper-server/src/main/resources/lib/ant-eclipse-*
 zookeeper-server/src/main/resources/lib/ivy-*
-zookeeper-server/src/main/java/org/apache/zookeeper/version/Info.java
-zookeeper-server/src/main/java/org/apache/zookeeper/version/VersionInfoMain.java
 zookeeper-client/zookeeper-client-c/Makefile.in
 zookeeper-client/zookeeper-client-c/aclocal.m4
 zookeeper-client/zookeeper-client-c/autom4te.cache/

NOTICE.txt

@@ -1,5 +1,5 @@
 Apache ZooKeeper
-Copyright 2009-2023 The Apache Software Foundation
+Copyright 2009-2024 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

owaspSuppressions.xml

@@ -18,6 +18,11 @@
 -->
 
 <suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.2.xsd">
+   <suppress>
+      <!-- ZooKeeper is not affected, because HttpURI is not used in our code.
+           see: ZOOKEEPER-4876 -->
+      <cve>CVE-2024-6763</cve>
+   </suppress>
    <suppress>
       <!-- ZOOKEEPER-3217 -->
       <cve>CVE-2018-8088</cve>
@@ -72,5 +77,4 @@
            in json-java which we don't use in ZooKeeper -->
       <cve>CVE-2022-45688</cve>
    </suppress>
-
 </suppressions>

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.2</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-2</tag>
   </scm>
   <issueManagement>
     <system>JIRA</system>
@@ -539,14 +539,14 @@
   </profiles>
 
   <properties>
-    <upstream.version>3.9.2</upstream.version>
-    <zookeeper-server.tesb.version>3.9.2.jetty12.1</zookeeper-server.tesb.version>
+    <upstream.version>3.9.3</upstream.version>
+    <zookeeper-server.tesb.version>3.9.3.jetty12.1</zookeeper-server.tesb.version>
     <jetty.tesb.version>12.0.15</jetty.tesb.version>
 
     <!-- maven properties -->
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
-    <project.build.outputTimestamp>1707770925</project.build.outputTimestamp>
+    <project.build.outputTimestamp>1729206981</project.build.outputTimestamp>
     <dependency.locations.enabled>false</dependency.locations.enabled>
     <surefire.version>2.22.1</surefire.version>
 
@@ -563,8 +563,8 @@
     <mockito.version>4.9.0</mockito.version>
     <hamcrest.version>2.2</hamcrest.version>
     <commons-cli.version>1.5.0</commons-cli.version>
-    <netty.version>4.1.115.Final</netty.version>
-    <jetty.version>9.4.53.v20231009</jetty.version>
+    <netty.version>4.1.113.Final</netty.version>
+    <jetty.version>9.4.56.v20240826</jetty.version>
     <jackson.version>2.15.2</jackson.version>
     <jline.version>2.14.6</jline.version>
     <snappy.version>1.1.10.5</snappy.version>
@@ -575,7 +575,7 @@
     <spotbugsannotations.version>4.0.2</spotbugsannotations.version>
     <checkstyle.version>8.39</checkstyle.version>
     <enforcer.version>3.0.0-M3</enforcer.version>
-    <commons-io.version>2.11.0</commons-io.version>
+    <commons-io.version>2.17.0</commons-io.version>
     <burningwave.mockdns.version>0.25.4</burningwave.mockdns.version>
     <clover-maven-plugin.version>4.4.1</clover-maven-plugin.version>
     <sonar-maven-plugin.version>3.7.0.1746</sonar-maven-plugin.version>

zookeeper-assembly/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.zookeeper</groupId>
     <artifactId>parent</artifactId>
-    <version>3.9.2</version>
+    <version>3.9.3</version>
   </parent>
 
   <artifactId>zookeeper-assembly</artifactId>
@@ -103,6 +103,10 @@
       <groupId>jline</groupId>
       <artifactId>jline</artifactId>
     </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+    </dependency>
     <dependency>
        <groupId>io.dropwizard.metrics</groupId>
        <artifactId>metrics-core</artifactId>

zookeeper-client/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.zookeeper</groupId>
     <artifactId>parent</artifactId>
-    <version>3.9.2</version>
+    <version>3.9.3</version>
   </parent>
 
   <artifactId>zookeeper-client</artifactId>

zookeeper-client/zookeeper-client-c/CMakeLists.txt

@@ -16,7 +16,7 @@
 
 cmake_minimum_required(VERSION 3.5)
 
-project(zookeeper VERSION 3.9.2)
+project(zookeeper VERSION 3.9.3)
 set(email [email protected])
 set(description "zookeeper C client")
 

zookeeper-client/zookeeper-client-c/configure.ac

@@ -3,7 +3,7 @@
 
 AC_PREREQ(2.59)
 
-AC_INIT([zookeeper C client],3.9.2,[[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

zookeeper-client/zookeeper-client-c/include/zookeeper_version.h

@@ -22,7 +22,7 @@
 extern "C" {
 #endif
 
-#define ZOO_VERSION "3.9.2"
+#define ZOO_VERSION "3.9.3"
 
 #ifdef __cplusplus
 }