From a05e22f7820c0b088001ddc9816ab452b80a5539 Mon Sep 17 00:00:00 2001
From: Justin Pfifer <pfifer@amazon.com>
Date: Mon, 12 Nov 2018 08:54:04 -0800
Subject: [PATCH] Release 2.0.5 of the Amazon Kinesis Client for Java (#465)

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0abb1b29..b22ef573 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+### Release 2.0.5 (November 12, 2018)
+[Milestone #26](https://github.com/awslabs/amazon-kinesis-client/milestone/26?closed=1)
+* Fixed a deadlock condition that could occur when using the polling model.  
+  When using the `PollingConfig` and a slower record processor it was possible to hit a deadlock in the retrieval of records. 
+  * [PR #462](https://github.com/awslabs/amazon-kinesis-client/pull/462)
+  * [Issue #448](https://github.com/awslabs/amazon-kinesis-client/issues/448)
+* Adjusted `RetrievalConfig`, and `FanOutConfig` to use accessors instead of direct member access.  
+  * [PR #453](https://github.com/awslabs/amazon-kinesis-client/pull/453)
+
+
 ### Release 2.0.4 (October 18, 2018)
 [Milestone #25](https://github.com/awslabs/amazon-kinesis-client/milestone/25)
 * Added method to retrieve leases from the LeaseCoordinator and LeaseTaker.
diff --git a/README.md b/README.md
index 57469fdd..a1523497 100644
--- a/README.md
+++ b/README.md
@@ -61,20 +61,14 @@ The recommended way to use the KCL for Java is to consume it from Maven.
 
 ## Release Notes
 
-### Latest Release (2.0.4 - October 18, 2018)
-[Milestone #25](https://github.com/awslabs/amazon-kinesis-client/milestone/25)
-* Added method to retrieve leases from the LeaseCoordinator and LeaseTaker.
-  * [PR #428](https://github.com/awslabs/amazon-kinesis-client/pull/428)
-* Fixed a race condition shutting down the Scheduler before it has completed initialization.
-  * [PR #439](https://github.com/awslabs/amazon-kinesis-client/pull/439)
-  * [Issue #427](https://github.com/awslabs/amazon-kinesis-client/issues/427)
-* Added `HierarchicalShardSyncer` which replaces the static `ShardSyncer`.  
-  `HierarchicalShardSyncer` removes the contention between multiple instances of the Scheduler when running under a single JVM.
-  * [PR #395](https://github.com/awslabs/amazon-kinesis-client/pull/395)
-  * [Issue #415](https://github.com/awslabs/amazon-kinesis-client/issues/415)
-* Added `TaskExecutionListener` which allows monitoring of tasks being executed by the `ShardConsumer`.  
-  The listener is invoked before and after a task is executed by the `ShardConsumer`.
-  * [PR #417](https://github.com/awslabs/amazon-kinesis-client/pull/417)
+### Latest Release (2.0.5 - November 12, 2018)
+[Milestone #26](https://github.com/awslabs/amazon-kinesis-client/milestone/26?closed=1)
+* Fixed a deadlock condition that could occur when using the polling model.  
+  It was possible to hit a deadlock in the retrieval of records When using the `PollingConfig` and a slow running record processor.
+  * [PR #462](https://github.com/awslabs/amazon-kinesis-client/pull/462)
+  * [Issue #448](https://github.com/awslabs/amazon-kinesis-client/issues/448)
+* Adjusted `RetrievalConfig`, and `FanOutConfig` to use accessors instead of direct member access.  
+  * [PR #453](https://github.com/awslabs/amazon-kinesis-client/pull/453)
 
 ### For remaining release notes check **[CHANGELOG.md][changelog-md]**.
 
diff --git a/amazon-kinesis-client-multilang/pom.xml b/amazon-kinesis-client-multilang/pom.xml
index f4151c9e..8897a8b6 100644
--- a/amazon-kinesis-client-multilang/pom.xml
+++ b/amazon-kinesis-client-multilang/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>amazon-kinesis-client-pom</artifactId>
     <groupId>software.amazon.kinesis</groupId>
-    <version>2.0.5-SNAPSHOT</version>
+    <version>2.0.5</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/amazon-kinesis-client/pom.xml b/amazon-kinesis-client/pom.xml
index f3a668bc..1b791739 100644
--- a/amazon-kinesis-client/pom.xml
+++ b/amazon-kinesis-client/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>software.amazon.kinesis</groupId>
     <artifactId>amazon-kinesis-client-pom</artifactId>
-    <version>2.0.5-SNAPSHOT</version>
+    <version>2.0.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 9a5996ec..2f45c5b6 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.0.4";
+    public static final String KINESIS_CLIENT_LIB_USER_AGENT_VERSION = "2.0.5";
 
     /**
      * Client used to make calls to Kinesis for records retrieval
diff --git a/pom.xml b/pom.xml
index 23c6cda8..7c5cdc7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
   <artifactId>amazon-kinesis-client-pom</artifactId>
   <packaging>pom</packaging>
   <name>Amazon Kinesis Client Library</name>
-  <version>2.0.5-SNAPSHOT</version>
+  <version>2.0.5</version>
   <description>The Amazon Kinesis Client Library for Java enables Java developers to easily consume and process data
     from Amazon Kinesis.
   </description>