From 8e830ba3c88d2f24c5f149c786eaf8c5e1c7aa80 Mon Sep 17 00:00:00 2001
From: Abhishek Yadav Akkem <aakkem@amazon.com>
Date: Mon, 1 May 2023 14:30:08 -0700
Subject: [PATCH] Preparing for release 0.15.7

---
 CHANGELOG.md                                               | 7 ++++++-
 README.md                                                  | 5 +++++
 aws/kinesis/core/kinesis_producer.cc                       | 2 +-
 java/amazon-kinesis-producer-sample/pom.xml                | 2 +-
 java/amazon-kinesis-producer/pom.xml                       | 2 +-
 .../producer/GlueSchemaRegistrySerializerInstance.java     | 2 +-
 6 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fc619820..59469cd0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,12 @@
 ## Changelog
+## 0.15.7
+* [#498](https://github.com/awslabs/amazon-kinesis-producer/pull/498) Fix some memory leak cases in legacy code
+  * Upgrade SDK version to avoid s2n_cleanup related memory leak
+  * Fix resource cleanup on KPL end to avoid memory leak
+  
 ### 0.15.6
 * [#490](https://github.com/awslabs/amazon-kinesis-producer/pull/490) Updating aws cpp sdk version
-* 
+
 ### 0.15.5
 * [#482](https://github.com/awslabs/amazon-kinesis-producer/pull/482)  Remove the stream arn parameter when the next token is present
 
diff --git a/README.md b/README.md
index 58b5a143..1a973a6e 100644
--- a/README.md
+++ b/README.md
@@ -65,6 +65,11 @@ If you have further questions [please open a GitHub Issue](https://github.com/aw
 This is a restatement of the [notice published](https://docs.aws.amazon.com/streams/latest/dev/kinesis-kpl-upgrades.html) in the [Amazon Kinesis Data Streams Developer Guide][kinesis-developer-guide]
 
 ## Release Notes
+## 0.15.7
+* [#498](https://github.com/awslabs/amazon-kinesis-producer/pull/498) Fix some memory leak cases in legacy code
+  * Upgrade SDK version to avoid s2n_cleanup related memory leak 
+  * Fix resource cleanup on KPL end to avoid memory leak
+
 ## 0.15.6
 * [#490](https://github.com/awslabs/amazon-kinesis-producer/pull/490) Updating aws cpp sdk version
 
diff --git a/aws/kinesis/core/kinesis_producer.cc b/aws/kinesis/core/kinesis_producer.cc
index 1a870380..3ac7e3e6 100644
--- a/aws/kinesis/core/kinesis_producer.cc
+++ b/aws/kinesis/core/kinesis_producer.cc
@@ -45,7 +45,7 @@ struct EndpointConfiguration {
           sts_endpoint_(sts_endpoint) {}
 };
 
-const constexpr char* kVersion = "0.15.6N";
+const constexpr char* kVersion = "0.15.7N";
 const std::unordered_map< std::string, EndpointConfiguration > kRegionEndpointOverride = {
   { "cn-north-1", { "kinesis.cn-north-1.amazonaws.com.cn", "monitoring.cn-north-1.amazonaws.com.cn" } },
   { "cn-northwest-1", { "kinesis.cn-northwest-1.amazonaws.com.cn", "monitoring.cn-northwest-1.amazonaws.com.cn" } }
diff --git a/java/amazon-kinesis-producer-sample/pom.xml b/java/amazon-kinesis-producer-sample/pom.xml
index 824d1c58..329bc2fc 100644
--- a/java/amazon-kinesis-producer-sample/pom.xml
+++ b/java/amazon-kinesis-producer-sample/pom.xml
@@ -56,7 +56,7 @@
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>amazon-kinesis-producer</artifactId>
-            <version>0.15.6</version>
+            <version>0.15.7</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
diff --git a/java/amazon-kinesis-producer/pom.xml b/java/amazon-kinesis-producer/pom.xml
index 778869e0..7ee1b7dd 100644
--- a/java/amazon-kinesis-producer/pom.xml
+++ b/java/amazon-kinesis-producer/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.amazonaws</groupId>
     <artifactId>amazon-kinesis-producer</artifactId>
-    <version>0.15.6</version>
+    <version>0.15.7</version>
     <name>Amazon Kinesis Producer Library</name>
 
     <scm>
diff --git a/java/amazon-kinesis-producer/src/main/java/com/amazonaws/services/kinesis/producer/GlueSchemaRegistrySerializerInstance.java b/java/amazon-kinesis-producer/src/main/java/com/amazonaws/services/kinesis/producer/GlueSchemaRegistrySerializerInstance.java
index 74f5c751..1ef4ec2c 100644
--- a/java/amazon-kinesis-producer/src/main/java/com/amazonaws/services/kinesis/producer/GlueSchemaRegistrySerializerInstance.java
+++ b/java/amazon-kinesis-producer/src/main/java/com/amazonaws/services/kinesis/producer/GlueSchemaRegistrySerializerInstance.java
@@ -11,7 +11,7 @@
 public final class GlueSchemaRegistrySerializerInstance {
 
     private volatile GlueSchemaRegistrySerializer instance = null;
-    private static final String USER_AGENT_APP_NAME = "kpl-0.15.6";
+    private static final String USER_AGENT_APP_NAME = "kpl-0.15.7";
 
     /**
      * Instantiate GlueSchemaRegistrySerializer using the KinesisProducerConfiguration.