From c8f82836b1cfcf84d456fde01f968ed69996c1c5 Mon Sep 17 00:00:00 2001
From: Cory-Bradshaw <44377622+Cory-Bradshaw@users.noreply.github.com>
Date: Mon, 8 Apr 2019 11:20:08 -0700
Subject: [PATCH] Preparation for v2.2.0 (#536)

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62e970bf..78719f06 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,11 @@
 # Changelog
+### Release 2.2.0 (April 8, 2019)
+[Milestone#31](https://github.com/awslabs/amazon-kinesis-client/milestone/31)
+* Updated License to [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0)
+  * [PR#523](https://github.com/awslabs/amazon-kinesis-client/pull/523)
+* Introducing configuration for suppressing logs from ReadTimeoutExceptions caused while calling SubscribeToShard.  
+Suppression can be configured by setting `LifecycleConfig#readTimeoutsToIgnoreBeforeWarning(Count)`.
+  * [PR#528](https://github.com/awslabs/amazon-kinesis-client/issues/528)
 
 ### Release 2.1.3 (March 18, 2019)
 [Milestone#30](https://github.com/awslabs/amazon-kinesis-client/milestone/30)
diff --git a/README.md b/README.md
index 03c26c70..4da531ae 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ The recommended way to use the KCL for Java is to consume it from Maven.
   <dependency>
       <groupId>software.amazon.kinesis</groupId>
       <artifactId>amazon-kinesis-client</artifactId>
-      <version>2.1.2</version>
+      <version>2.2.0</version>
   </dependency>
   ```
 
@@ -60,22 +60,13 @@ The recommended way to use the KCL for Java is to consume it from Maven.
 
 ## Release Notes
 
-### Latest Release (2.1.3 - March 18, 2019)
-[Milestone#30](https://github.com/awslabs/amazon-kinesis-client/milestone/30)
-* Added a message to recommend using `KinesisClientUtil` when an acquire timeout occurs in the `FanOutRecordsPublisher`.
-  * [PR#514](https://github.com/awslabs/amazon-kinesis-client/pull/514)
-* Added a sleep between retries while waiting for a newly created stream consumer to become active.
-  * [PR#506](https://github.com/awslabs/amazon-kinesis-client/issues/506)
-* Added timeouts on all futures returned from the DynamoDB and Kinesis clients.  
-  The timeouts can be configured by setting `LeaseManagementConfig#requestTimeout(Duration)` for DynamoDB, and `PollingConfig#kinesisRequestTimeout(Duration)` for Kinesis.
-  * [PR#518](https://github.com/awslabs/amazon-kinesis-client/pull/518)
-* Upgraded to SDK version 2.5.10.
-  * [PR#518](https://github.com/awslabs/amazon-kinesis-client/pull/518)
-* Artifacts for the Amazon Kinesis Client for Java are now signed by a new GPG key:
-  ```
-  pub   4096R/86368934 2019-02-14 [expires: 2020-02-14]
-  uid                  Amazon Kinesis Tools <amazon-kinesis-tools@amazon.com>
-  ```
+### Latest Release (2.2.0 - April 8, 2019)
+[Milestone#31](https://github.com/awslabs/amazon-kinesis-client/milestone/31)
+* Updated License to [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0)
+  * [PR#523](https://github.com/awslabs/amazon-kinesis-client/pull/523)
+* Introducing configuration for suppressing logs from ReadTimeoutExceptions caused while calling SubscribeToShard.  
+Suppression can be configured by setting `LifecycleConfig#readTimeoutsToIgnoreBeforeWarning(Count)`.
+  * [PR#528](https://github.com/awslabs/amazon-kinesis-client/issues/528)
 
 
 ### 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 fa218195..7efdf77f 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.1.4-SNAPSHOT</version>
+    <version>2.2.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/amazon-kinesis-client/pom.xml b/amazon-kinesis-client/pom.xml
index f5e7a2be..db1daae4 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.1.4-SNAPSHOT</version>
+    <version>2.2.0</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 94eb7665..50cc197d 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.1.4";
+    public static final String KINESIS_CLIENT_LIB_USER_AGENT_VERSION = "2.2.0";
 
     /**
      * Client used to make calls to Kinesis for records retrieval
diff --git a/pom.xml b/pom.xml
index 7e27a245..d6db1381 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.1.4-SNAPSHOT</version>
+  <version>2.2.0</version>
   <description>The Amazon Kinesis Client Library for Java enables Java developers to easily consume and process data
     from Amazon Kinesis.
   </description>