From 589fda2e4796012e7663a136657b782958b8a4b5 Mon Sep 17 00:00:00 2001
From: Nikita Koksharov <mrniko@users.noreply.github.com>
Date: Thu, 26 Dec 2019 16:32:25 +0300
Subject: [PATCH 1/4] Update CHANGELOG.md

---
 CHANGELOG.md | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 57a08c99b..6e55e39e7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,27 @@ Redisson Releases History
 
 Сonsider __[Redisson PRO](https://redisson.pro)__ version for advanced features and support by SLA.
 
+### 26-Dec-2019 - 3.12.0 released
+
+Feature - `RExecutorService` task id injection  
+Feature - `submit()` methods with ttl parameter added to `RExecutorService`  
+Feature - `schedule()` methods with timeToLive parameter added to `RScheduledExecutorService`  
+Feature - `MyBatis` cache implementation added  
+Feature - added implementation of `doSuspend` and `doResume` methods of Spring Transaction Manager  
+Feature - `WorkerOptions.taskTimeout` setting added  
+Feature - `RSemaphore.addPermits` method added  
+Feature - ability to define `TaskFailureListener`, `TaskFinishedListener`, `TaskStartedListener` and `TaskSuccessListener` task listeners with WorkerOptions object  
+
+Improvement - Default workers amount of `RExecutorService` set to 1
+
+Fixed - CommandDecoder throws NPE  
+Fixed - ReplicatedConnectionManager triggers reactivation of slaves with ip address instead of hostname (thanks to @f-sander)  
+Fixed - Reactive/Rxjava2 transaction doesn't unlock lock on rollback or commit  
+Fixed - Spring Transaction Manager doesn't handle Redisson `TransactionException`  
+Fixed - `RBuckets.get` throws NPE for non-existed buckets (thanks to @d10n)  
+Fixed - `RPermitExpirableSemaphore` does not expire  
+Fixed - `RedissonCacheStatisticsAutoConfiguration` should be conditional on CacheMeterBinderProvider presence (thanks to @ehontoria)  
+
 ### 28-Nov-2019 - 3.11.6 released
 
 Feature - `RExecutorServiceAsync.cancelTaskAsync()` method added  

From 7b1b7f17a2fb8c7c426a487136b8bc8962f1d5e3 Mon Sep 17 00:00:00 2001
From: Nikita Koksharov <mrniko@users.noreply.github.com>
Date: Thu, 26 Dec 2019 16:33:20 +0300
Subject: [PATCH 2/4] Update README.md

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 8b849792f..735dc38dc 100644
--- a/README.md
+++ b/README.md
@@ -103,12 +103,12 @@ Used by
     <dependency>
        <groupId>org.redisson</groupId>
        <artifactId>redisson</artifactId>
-       <version>3.11.6</version>
+       <version>3.12.0</version>
     </dependency>  
 
 
 #### Gradle
-    compile 'org.redisson:redisson:3.11.6'  
+    compile 'org.redisson:redisson:3.12.0'  
 
 #### Java
 
@@ -166,8 +166,8 @@ Consider __[Redisson PRO](https://redisson.pro)__ version for advanced features
 
 ## Downloads
    
-[Redisson 3.11.6](https://repository.sonatype.org/service/local/artifact/maven/redirect?r=central-proxy&g=org.redisson&a=redisson&v=3.11.6&e=jar),
-[Redisson node 3.11.6](https://repository.sonatype.org/service/local/artifact/maven/redirect?r=central-proxy&g=org.redisson&a=redisson-all&v=3.11.6&e=jar)  
+[Redisson 3.12.0](https://repository.sonatype.org/service/local/artifact/maven/redirect?r=central-proxy&g=org.redisson&a=redisson&v=3.12.0&e=jar),
+[Redisson node 3.12.0](https://repository.sonatype.org/service/local/artifact/maven/redirect?r=central-proxy&g=org.redisson&a=redisson-all&v=3.12.0&e=jar)  
 
 ## FAQs
 

From 822cced537d0c8a41f2198a61266c52929677076 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 27 Dec 2019 18:15:16 +0000
Subject: [PATCH 3/4] Bump tomcat-embed-core from 8.5.40 to 8.5.50 in /redisson

Bumps tomcat-embed-core from 8.5.40 to 8.5.50.

Signed-off-by: dependabot[bot] <support@github.com>
---
 redisson/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/redisson/pom.xml b/redisson/pom.xml
index 76a4fbce9..e842af742 100644
--- a/redisson/pom.xml
+++ b/redisson/pom.xml
@@ -122,7 +122,7 @@
         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-core</artifactId>
-            <version>8.5.40</version>
+            <version>8.5.50</version>
             <scope>test</scope>
         </dependency>
         <dependency>

From 78c1382e1f16d800076eb06fb18c783ecd484432 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 27 Dec 2019 18:15:29 +0000
Subject: [PATCH 4/4] Bump tomcat-embed-core in
 /redisson-tomcat/redisson-tomcat-7

Bumps tomcat-embed-core from 7.0.94 to 7.0.99.

Signed-off-by: dependabot[bot] <support@github.com>
---
 redisson-tomcat/redisson-tomcat-7/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/redisson-tomcat/redisson-tomcat-7/pom.xml b/redisson-tomcat/redisson-tomcat-7/pom.xml
index 57b213c95..6ce48dbd0 100644
--- a/redisson-tomcat/redisson-tomcat-7/pom.xml
+++ b/redisson-tomcat/redisson-tomcat-7/pom.xml
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-core</artifactId>
-            <version>7.0.94</version>
+            <version>7.0.99</version>
             <scope>provided</scope>
         </dependency>
         <dependency>