From bb8fa6cd894ccd8b85161ae236f669a1228ca313 Mon Sep 17 00:00:00 2001
From: ychunxue <52723802+ychunxue@users.noreply.github.com>
Date: Wed, 23 Oct 2019 15:54:23 -0700
Subject: [PATCH] KCL Release 2.2.5 (#635)

* Revalidate if current shard is closed before shutting down the ShardConsumer

* KCL 2.2.5 release

* KCL 2.2.5 release

* Fixing bad merge

* Update the KINESIS_CLIENT_LIB_USER_AGENT_VERSION
---
 CHANGELOG.md                                              | 8 ++++++++
 README.md                                                 | 7 +++++++
 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, 19 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2266cf2d..70bc7998 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,14 @@
 # Changelog
 
 
+### Release 2.2.5 (October 23, 2019)
+
+[Milestone#40](https://github.com/awslabs/amazon-kinesis-client/milestone/40)
+* Updating Sonatype to dedicated AWS endpoint.
+  * [PR#619](https://github.com/awslabs/amazon-kinesis-client/pull/619)
+* Introducing a validation step to verify if ShardEnd is reached, to prevent shard consumer stuck scenarios in the event of malformed response from service.
+  * [PR#624](https://github.com/awslabs/amazon-kinesis-client/pull/624)
+
 ### Release 2.2.4 (September 23, 2019)
 
 [Milestone#39](https://github.com/awslabs/amazon-kinesis-client/milestone/39)
diff --git a/README.md b/README.md
index 8742e23c..a1ac9f19 100644
--- a/README.md
+++ b/README.md
@@ -60,6 +60,13 @@ The recommended way to use the KCL for Java is to consume it from Maven.
 
 ## Release Notes
 
+### Latest Release (2.2.5 - October 23, 2019)
+[Milestone#40](https://github.com/awslabs/amazon-kinesis-client/milestone/40)
+* Updating Sonatype to dedicated AWS endpoint.
+  * [PR#619](https://github.com/awslabs/amazon-kinesis-client/pull/619)
+* Introducing a validation step to verify if ShardEnd is reached, to prevent shard consumer stuck scenarios in the event of malformed response from service.
+  * [PR#624](https://github.com/awslabs/amazon-kinesis-client/pull/624)
+
 ### Latest Release (2.2.4 - September 23, 2019)
 [Milestone#39](https://github.com/awslabs/amazon-kinesis-client/milestone/39)
 * Making FanoutRecordsPublisher test cases resilient to delayed thread operations
diff --git a/amazon-kinesis-client-multilang/pom.xml b/amazon-kinesis-client-multilang/pom.xml
index 2494e2e2..ea42b543 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.2.4</version>
+    <version>2.2.5</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/amazon-kinesis-client/pom.xml b/amazon-kinesis-client/pom.xml
index 2170b07b..e404725c 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.2.4</version>
+    <version>2.2.5</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 1c1c2de2..d83e8399 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
@@ -34,7 +34,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.2.4";
+    public static final String KINESIS_CLIENT_LIB_USER_AGENT_VERSION = "2.2.5";
 
     /**
      * Client used to make calls to Kinesis for records retrieval
diff --git a/pom.xml b/pom.xml
index b847f18a..7aa44eda 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.2.4</version>
+  <version>2.2.5</version>
   <description>The Amazon Kinesis Client Library for Java enables Java developers to easily consume and process data
     from Amazon Kinesis.
   </description>