From 89a90e34e2633b6966cb4433c16b21c303cd056c Mon Sep 17 00:00:00 2001
From: kcl-release-automation-bot
 <139302800+kcl-release-automation-bot@users.noreply.github.com>
Date: Wed, 1 May 2024 17:48:25 -0700
Subject: [PATCH] Preparation for v2.6.0 (#1323)

---
 CHANGELOG.md                                           | 10 ++++++++++
 README.md                                              |  2 +-
 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, 15 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c8d42844d..0273992e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,16 @@
 For **1.x** release notes, please see [v1.x/CHANGELOG.md](https://github.com/awslabs/amazon-kinesis-client/blob/v1.x/CHANGELOG.md)
 
 ---
+### Release 2.6.0 (2024-05-01)
+* [#1317](https://github.com/awslabs/amazon-kinesis-client/pull/1317) Add enablePriorityLeaseAssignment config
+* [#1320](https://github.com/awslabs/amazon-kinesis-client/pull/1320) Update lease taker to get unassigned leases
+* [#1318](https://github.com/awslabs/amazon-kinesis-client/pull/1318) Internally construct and use stream ARNs for all streams in multi-stream mode
+* [#1291](https://github.com/awslabs/amazon-kinesis-client/pull/1291) Update RetrievalFactory implementations to utilize the StreamIdentifier field of StreamConfig
+* [#1308](https://github.com/awslabs/amazon-kinesis-client/pull/1308) Move shutdownComplete call to ShardConsumer
+* [#1313](https://github.com/awslabs/amazon-kinesis-client/pull/1313) Add additional integration tests for multi-stream and cross account access
+* [#1273](https://github.com/awslabs/amazon-kinesis-client/pull/1273) Optimize currentStreamConfigMap by cleaning up lingering streams
+* [#1302](https://github.com/awslabs/amazon-kinesis-client/pull/1302) Fix gracefulShutdown behavior in Scheduler
+
 ### Release 2.5.8 (2024-03-27)
 * [#1278](https://github.com/awslabs/amazon-kinesis-client/pull/1278) Upgrade awssdk.version from 2.25.3 to 2.25.11 
 * [#1279](https://github.com/awslabs/amazon-kinesis-client/pull/1279) Upgrade org.apache.maven.plugins:maven-gpg-plugin from 3.1.0 to 3.2.1 
diff --git a/README.md b/README.md
index 80aa7f1c5..6737c4b1f 100644
--- a/README.md
+++ b/README.md
@@ -63,7 +63,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.5.8</version>
+      <version>2.6.0</version>
   </dependency>
   ```
 
diff --git a/amazon-kinesis-client-multilang/pom.xml b/amazon-kinesis-client-multilang/pom.xml
index 7c6354f64..734303714 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.6.0-SNAPSHOT</version>
+    <version>2.6.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/amazon-kinesis-client/pom.xml b/amazon-kinesis-client/pom.xml
index 0a77cf2b0..dc94fb04c 100644
--- a/amazon-kinesis-client/pom.xml
+++ b/amazon-kinesis-client/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>software.amazon.kinesis</groupId>
     <artifactId>amazon-kinesis-client-pom</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>2.6.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 47a5bbcde..fc8dc130c 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
@@ -49,7 +49,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.6.0-SNAPSHOT";
+    public static final String KINESIS_CLIENT_LIB_USER_AGENT_VERSION = "2.6.0";
 
     /**
      * Client used to make calls to Kinesis for records retrieval
diff --git a/pom.xml b/pom.xml
index b9fddf742..3a31f47ab 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.6.0-SNAPSHOT</version>
+  <version>2.6.0</version>
   <description>The Amazon Kinesis Client Library for Java enables Java developers to easily consume and process data
     from Amazon Kinesis.
   </description>