From 35107a61882661a49c9b71de4372e7b7cb743c72 Mon Sep 17 00:00:00 2001
From: Avinash Ravilla <ravillaa@amazon.com>
Date: Fri, 9 Jul 2021 13:25:39 -0700
Subject: [PATCH] Preparing for release 2.3.6

---
 CHANGELOG.md                                           | 10 +++++++++-
 README.md                                              | 10 +++++++++-
 amazon-kinesis-client-multilang/pom.xml                |  2 +-
 amazon-kinesis-client/pom.xml                          |  2 +-
 .../amazon/kinesis/retrieval/RetrievalConfig.java      |  2 +-
 pom.xml                                                |  2 +-
 6 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e2a981196..5afb09c68 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,14 @@
 # Changelog
 
-### Latest Release 2.3.5 (June 14, 2021)
+### Latest Release 2.3.6 (July 9, 2021)
+[Milestone#62](https://github.com/awslabs/amazon-kinesis-client/milestone/62)
+* [#836](https://github.com/awslabs/amazon-kinesis-client/pull/836) Upgraded AWS SDK version to 2.16.98
+* [#835](https://github.com/awslabs/amazon-kinesis-client/pull/835) Upgraded Glue Schema Registry version to 1.1.1
+* [#828](https://github.com/awslabs/amazon-kinesis-client/pull/828) Modified wildcard imports to individual imports.
+* [#817](https://github.com/awslabs/amazon-kinesis-client/pull/817) Updated the Worker shutdown logic to make sure that the `LeaseCleanupManager` also terminates all the threads that it has started.
+* [#794](https://github.com/awslabs/amazon-kinesis-client/pull/794) Silence warning when there are no stale streams to delete.
+
+### Release 2.3.5 (June 14, 2021)
 [Milestone#59](https://github.com/awslabs/amazon-kinesis-client/milestone/59)
 * [#824](https://github.com/awslabs/amazon-kinesis-client/pull/824) Upgraded dependencies
   * logback-classic version to 1.2.3
diff --git a/README.md b/README.md
index 3f621b0d5..93870b8b7 100644
--- a/README.md
+++ b/README.md
@@ -66,7 +66,15 @@ The recommended way to use the KCL for Java is to consume it from Maven.
 
 ## Release Notes
 
-### Latest Release 2.3.5 (June 14, 2021)
+### Latest Release 2.3.6 (July 9, 2021)
+[Milestone#62](https://github.com/awslabs/amazon-kinesis-client/milestone/62)
+* [#836](https://github.com/awslabs/amazon-kinesis-client/pull/836) Upgraded AWS SDK version to 2.16.98
+* [#835](https://github.com/awslabs/amazon-kinesis-client/pull/835) Upgraded Glue Schema Registry version to 1.1.1
+* [#828](https://github.com/awslabs/amazon-kinesis-client/pull/828) Modified wildcard imports to individual imports.
+* [#817](https://github.com/awslabs/amazon-kinesis-client/pull/817) Updated the Worker shutdown logic to make sure that the `LeaseCleanupManager` also terminates all the threads that it has started.
+* [#794](https://github.com/awslabs/amazon-kinesis-client/pull/794) Silence warning when there are no stale streams to delete.
+
+### Release 2.3.5 (June 14, 2021)
 [Milestone#59](https://github.com/awslabs/amazon-kinesis-client/milestone/59)
 * [#824](https://github.com/awslabs/amazon-kinesis-client/pull/824) Upgraded dependencies
 	* logback-classic version to 1.2.3
diff --git a/amazon-kinesis-client-multilang/pom.xml b/amazon-kinesis-client-multilang/pom.xml
index 091be02ef..748f81e1b 100644
--- a/amazon-kinesis-client-multilang/pom.xml
+++ b/amazon-kinesis-client-multilang/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>amazon-kinesis-client-pom</artifactId>
     <groupId>software.amazon.kinesis</groupId>
-    <version>2.3.5</version>
+    <version>2.3.6</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/amazon-kinesis-client/pom.xml b/amazon-kinesis-client/pom.xml
index e6ce52a11..5b9808038 100644
--- a/amazon-kinesis-client/pom.xml
+++ b/amazon-kinesis-client/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>software.amazon.kinesis</groupId>
     <artifactId>amazon-kinesis-client-pom</artifactId>
-    <version>2.3.5</version>
+    <version>2.3.6</version>
   </parent>
 
   <artifactId>amazon-kinesis-client</artifactId>
diff --git a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/retrieval/RetrievalConfig.java b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/retrieval/RetrievalConfig.java
index 6c48e0032..049252c87 100644
--- a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/retrieval/RetrievalConfig.java
+++ b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/retrieval/RetrievalConfig.java
@@ -46,7 +46,7 @@ public class RetrievalConfig {
      */
     public static final String KINESIS_CLIENT_LIB_USER_AGENT = "amazon-kinesis-client-library-java";
 
-    public static final String KINESIS_CLIENT_LIB_USER_AGENT_VERSION = "2.3.5";
+    public static final String KINESIS_CLIENT_LIB_USER_AGENT_VERSION = "2.3.6";
 
     /**
      * Client used to make calls to Kinesis for records retrieval
diff --git a/pom.xml b/pom.xml
index 5c22d6359..5f1817c72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
   <artifactId>amazon-kinesis-client-pom</artifactId>
   <packaging>pom</packaging>
   <name>Amazon Kinesis Client Library</name>
-  <version>2.3.5</version>
+  <version>2.3.6</version>
   <description>The Amazon Kinesis Client Library for Java enables Java developers to easily consume and process data
     from Amazon Kinesis.
   </description>