From ea8cf661aeb7f9f55c52e0f38e09a173104f5925 Mon Sep 17 00:00:00 2001
From: Keerthy Muralidharan <murkeert@amazon.com>
Date: Wed, 13 May 2020 15:42:51 -0700
Subject: [PATCH 1/2] proto-buf upgrade

---
 amazon-kinesis-client-multilang/pom.xml | 2 +-
 amazon-kinesis-client/pom.xml           | 4 ++--
 pom.xml                                 | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/amazon-kinesis-client-multilang/pom.xml b/amazon-kinesis-client-multilang/pom.xml
index ede57468..a327e089 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.11-SNAPSHOT</version>
+    <version>2.2.12</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/amazon-kinesis-client/pom.xml b/amazon-kinesis-client/pom.xml
index e55f6abb..17ead7ea 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.11-SNAPSHOT</version>
+    <version>2.2.12</version>
   </parent>
 
   <artifactId>amazon-kinesis-client</artifactId>
@@ -82,7 +82,7 @@
     <dependency>
       <groupId>com.google.protobuf</groupId>
       <artifactId>protobuf-java</artifactId>
-      <version>2.6.1</version>
+      <version>3.11.4</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
diff --git a/pom.xml b/pom.xml
index efe719d2..f9d61d66 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.11-SNAPSHOT</version>
+  <version>2.2.12</version>
   <description>The Amazon Kinesis Client Library for Java enables Java developers to easily consume and process data
     from Amazon Kinesis.
   </description>

From b195cfe4cff700c85667ce161782a8f17dcdcb95 Mon Sep 17 00:00:00 2001
From: Keerthy Muralidharan <murkeert@amazon.com>
Date: Thu, 14 May 2020 13:26:15 -0700
Subject: [PATCH 2/2] reverting version

---
 amazon-kinesis-client-multilang/pom.xml | 2 +-
 amazon-kinesis-client/pom.xml           | 2 +-
 pom.xml                                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/amazon-kinesis-client-multilang/pom.xml b/amazon-kinesis-client-multilang/pom.xml
index a327e089..ede57468 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.12</version>
+    <version>2.2.11-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/amazon-kinesis-client/pom.xml b/amazon-kinesis-client/pom.xml
index 17ead7ea..48926afd 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.12</version>
+    <version>2.2.11-SNAPSHOT</version>
   </parent>
 
   <artifactId>amazon-kinesis-client</artifactId>
diff --git a/pom.xml b/pom.xml
index f9d61d66..efe719d2 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.12</version>
+  <version>2.2.11-SNAPSHOT</version>
   <description>The Amazon Kinesis Client Library for Java enables Java developers to easily consume and process data
     from Amazon Kinesis.
   </description>