Preparing for release 3.5.8
diff --git a/NOTICE.txt b/NOTICE.txt
index ff3661d..4c4f8b2 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,5 +1,5 @@
 Apache ZooKeeper
-Copyright 2009-2019 The Apache Software Foundation
+Copyright 2009-2020 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/build.xml b/build.xml
index af1514a..800c6e2 100644
--- a/build.xml
+++ b/build.xml
@@ -77,10 +77,10 @@
     
     <property name="version-major" value="3" />
     <property name="version-minor" value="5" />
-    <property name="version-patch" value="6" />
+    <property name="version-patch" value="8" />
     <property name="version-base" value="${version-major}.${version-minor}.${version-patch}" />
     <property name="version-suffix" value="SNAPSHOT" />
-    <property name="version" value="${version-base}-${version-suffix}" />
+    <property name="version" value="${version-base}" />
 
     <property name="final.name" value="${name}-${version}"/>
     <property name="revision.dir" value="${basedir}/.revision" />
diff --git a/pom.xml b/pom.xml
index 1250baa..b5a98ae 100755
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
   <groupId>org.apache.zookeeper</groupId>
   <artifactId>parent</artifactId>
   <packaging>pom</packaging>
-  <version>3.5.8-SNAPSHOT</version>
+  <version>3.5.8</version>
   <name>Apache ZooKeeper</name>
   <description>
     ZooKeeper is a centralized service for maintaining configuration information, naming,
diff --git a/zookeeper-assembly/pom.xml b/zookeeper-assembly/pom.xml
index 8284b54..c4680a2 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.5.8-SNAPSHOT</version>
+    <version>3.5.8</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/zookeeper-client/pom.xml b/zookeeper-client/pom.xml
index 432a41b..bcc8d9e 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.5.8-SNAPSHOT</version>
+    <version>3.5.8</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/zookeeper-client/zookeeper-client-c/pom.xml b/zookeeper-client/zookeeper-client-c/pom.xml
index 23d4f9b..93b1a45 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.5.8-SNAPSHOT</version>
+    <version>3.5.8</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/zookeeper-contrib/pom.xml b/zookeeper-contrib/pom.xml
index 466a777..1a80ae6 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.5.8-SNAPSHOT</version>
+    <version>3.5.8</version>
   </parent>
 
   <artifactId>zookeeper-contrib</artifactId>
diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml b/zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml
index 1d7d773..3c909af 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.5.8-SNAPSHOT</version>
+    <version>3.5.8</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 4bf495f..b5c225b 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.5.8-SNAPSHOT</version>
+    <version>3.5.8</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 ea2ef8a..6c716f9 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.5.8-SNAPSHOT</version>
+    <version>3.5.8</version>
   </parent>
 
   <artifactId>zookeeper-contrib-zooinspector</artifactId>
diff --git a/zookeeper-docs/pom.xml b/zookeeper-docs/pom.xml
index 093d153..fcd7f69 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.5.8-SNAPSHOT</version>
+        <version>3.5.8</version>
         <relativePath>..</relativePath>
     </parent>
 
diff --git a/zookeeper-docs/src/main/resources/markdown/releasenotes.md b/zookeeper-docs/src/main/resources/markdown/releasenotes.md
index d3ca0dc..787ffe2 100644
--- a/zookeeper-docs/src/main/resources/markdown/releasenotes.md
+++ b/zookeeper-docs/src/main/resources/markdown/releasenotes.md
@@ -14,6 +14,42 @@
 limitations under the License.
 //-->
 
+# Release Notes - ZooKeeper - Version 3.5.8
+
+## Bug
+
+* [ZOOKEEPER-1677](https://issues.apache.org/jira/browse/ZOOKEEPER-1677) - Misuse of INET_ADDRSTRLEN
+* [ZOOKEEPER-2164](https://issues.apache.org/jira/browse/ZOOKEEPER-2164) - Fast leader election keeps failing
+* [ZOOKEEPER-2307](https://issues.apache.org/jira/browse/ZOOKEEPER-2307) - ZooKeeper not starting because acceptedEpoch is less than the currentEpoch
+* [ZOOKEEPER-2490](https://issues.apache.org/jira/browse/ZOOKEEPER-2490) - Infinitely connect on windows
+* [ZOOKEEPER-3215](https://issues.apache.org/jira/browse/ZOOKEEPER-3215) - Handle Java 9/11 additions of covariant return types to java.nio.ByteBuffer methods
+* [ZOOKEEPER-3726](https://issues.apache.org/jira/browse/ZOOKEEPER-3726) - Invalid ipv6 address comparison in C client
+* [ZOOKEEPER-3737](https://issues.apache.org/jira/browse/ZOOKEEPER-3737) - Unable to eliminate log4j1 transitive dependency
+* [ZOOKEEPER-3739](https://issues.apache.org/jira/browse/ZOOKEEPER-3739) - Remove use of com.sun.nio.file.SensitivityWatchEventModifier
+* [ZOOKEEPER-3756](https://issues.apache.org/jira/browse/ZOOKEEPER-3756) - Members failing to rejoin quorum
+* [ZOOKEEPER-3760](https://issues.apache.org/jira/browse/ZOOKEEPER-3760) - Remove a useless throwing CliException
+* [ZOOKEEPER-3769](https://issues.apache.org/jira/browse/ZOOKEEPER-3769) - Fast leader election does not end if leader is taken down
+* [ZOOKEEPER-3780](https://issues.apache.org/jira/browse/ZOOKEEPER-3780) - Restore Version.getRevision() to be backward compatible
+                
+## Improvement
+
+* [ZOOKEEPER-2779](https://issues.apache.org/jira/browse/ZOOKEEPER-2779) - Add option to not set ACL for reconfig node
+* [ZOOKEEPER-3355](https://issues.apache.org/jira/browse/ZOOKEEPER-3355) - Remove tbd From Docs
+* [ZOOKEEPER-3357](https://issues.apache.org/jira/browse/ZOOKEEPER-3357) - Remove Dead Link from ZooKeeper Programmer's Guide
+* [ZOOKEEPER-3678](https://issues.apache.org/jira/browse/ZOOKEEPER-3678) - Remove Redundant GroupID from Maven POMs
+* [ZOOKEEPER-3679](https://issues.apache.org/jira/browse/ZOOKEEPER-3679) - Upgrade maven-compiler-plugin For ZooKeeper-jute
+* [ZOOKEEPER-3723](https://issues.apache.org/jira/browse/ZOOKEEPER-3723) - Zookeeper Client should not fail with ZSYSTEMERROR if DNS does not resolve one of the servers in the zk ensemble. 
+* [ZOOKEEPER-3727](https://issues.apache.org/jira/browse/ZOOKEEPER-3727) - Fix 3.5 source tarball to represent the git repository
+* [ZOOKEEPER-3785](https://issues.apache.org/jira/browse/ZOOKEEPER-3785) - Make sources buildable with JDK14
+            
+## Task
+
+* [ZOOKEEPER-3734](https://issues.apache.org/jira/browse/ZOOKEEPER-3734) - Upgrade jackson-databind to address CVE-2020-8840
+* [ZOOKEEPER-3751](https://issues.apache.org/jira/browse/ZOOKEEPER-3751) - Upgrade jackson-databind to 2.10 from 2.9
+* [ZOOKEEPER-3794](https://issues.apache.org/jira/browse/ZOOKEEPER-3794) - Upgrade netty to address CVE-2020-11612
+* [ZOOKEEPER-3817](https://issues.apache.org/jira/browse/ZOOKEEPER-3817) - Owasp failing due to CVE-2020-9488
+
+
 # Release Notes - ZooKeeper - Version 3.5.7
 
 ## Bug
diff --git a/zookeeper-jute/pom.xml b/zookeeper-jute/pom.xml
index 7dc7295..ef6d329 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.5.8-SNAPSHOT</version>
+    <version>3.5.8</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/zookeeper-recipes/pom.xml b/zookeeper-recipes/pom.xml
index cc8effd..5e2b3b1 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.5.8-SNAPSHOT</version>
+    <version>3.5.8</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 960d7f6..9271239 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.5.8-SNAPSHOT</version>
+    <version>3.5.8</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 3853848..4761653 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.5.8-SNAPSHOT</version>
+    <version>3.5.8</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 ee91b76..de97842 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.5.8-SNAPSHOT</version>
+    <version>3.5.8</version>
   </parent>
 
   <artifactId>zookeeper-recipes-queue</artifactId>
diff --git a/zookeeper-server/pom.xml b/zookeeper-server/pom.xml
index dfef418..9eba941 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.5.8-SNAPSHOT</version>
+    <version>3.5.8</version>
     <relativePath>..</relativePath>
   </parent>