chore(dependencies): Reverting Spring Boot 2.2 upgrade (#735)

Revert "chore(dependencies): Upgrade Spring Boot to 2.2.1 (#702)" This reverts commit a8d0c89
spinnaker · Jan 7, 2020 · e275415 · e275415
1 parent 6e6f748
commit e275415
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/echo-pubsub-core/src/main/java/com/netflix/spinnaker/echo/pubsub/PubsubMessageHandler.java b/echo-pubsub-core/src/main/java/com/netflix/spinnaker/echo/pubsub/PubsubMessageHandler.java
@@ -31,7 +31,6 @@
 import java.util.zip.CRC32;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
-import redis.clients.jedis.params.SetParams;
 
 /** Shared cache of received and handled pubsub messages to synchronize clients. */
 @Slf4j
@@ -42,6 +41,8 @@ public class PubsubMessageHandler {
   private final Registry registry;
   private final List<EventCreator> eventCreators;
 
+  private static final String SET_IF_NOT_EXIST = "NX";
+  private static final String SET_EXPIRE_TIME_SECONDS = "EX";
   private static final String SUCCESS = "OK";
 
   @Service
@@ -130,7 +131,11 @@ private Boolean acquireMessageLock(
         redisClientDelegate.withCommandsClient(
             c -> {
               return c.set(
-                  messageKey, identifier, SetParams.setParams().nx().ex(ackDeadlineSeconds));
+                  messageKey,
+                  identifier,
+                  SET_IF_NOT_EXIST,
+                  SET_EXPIRE_TIME_SECONDS,
+                  ackDeadlineSeconds);
             });
     return SUCCESS.equals(response);
   }

diff --git a/...src/test/groovy/com/netflix/spinnaker/echo/pubsub/redis/EmbeddedRedisConfiguration.groovy b/...src/test/groovy/com/netflix/spinnaker/echo/pubsub/redis/EmbeddedRedisConfiguration.groovy
@@ -20,7 +20,7 @@ import com.netflix.spinnaker.kork.jedis.EmbeddedRedis
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import redis.clients.jedis.Jedis
-import redis.clients.jedis.util.Pool
+import redis.clients.util.Pool
 
 @Configuration
 class EmbeddedRedisConfiguration {

diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 #Tue Dec 17 19:07:11 UTC 2019
-fiatVersion=1.11.0
+fiatVersion=1.12.0
 enablePublishing=false
+korkVersion=7.4.0
 spinnakerGradleVersion=7.0.1
-korkVersion=7.3.0
 org.gradle.parallel=true