From 9345af5e39695d191b221473ce3a51b03dc09db3 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Tue, 2 May 2017 21:41:07 +0300
Subject: juick-www: drop Google's shit

---
 juick-server/build.gradle                                           | 2 +-
 .../main/java/com/juick/www/configuration/WwwAppConfiguration.java  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/juick-server/build.gradle b/juick-server/build.gradle
index 6e26cdf7..3febf08f 100644
--- a/juick-server/build.gradle
+++ b/juick-server/build.gradle
@@ -27,7 +27,7 @@ dependencies {
     compile "commons-io:commons-io:2.5"
     compile "commons-codec:commons-codec:1.10"
 
-    compile "com.google.guava:guava:21.0"
+    compile 'com.github.ben-manes.caffeine:caffeine:2.4.0'
 
     compile "org.springframework:spring-context:${rootProject.springFrameworkVersion}"
     compile "org.springframework:spring-jdbc:${rootProject.springFrameworkVersion}"
diff --git a/juick-www/src/main/java/com/juick/www/configuration/WwwAppConfiguration.java b/juick-www/src/main/java/com/juick/www/configuration/WwwAppConfiguration.java
index beb3f95f..2cf1faed 100644
--- a/juick-www/src/main/java/com/juick/www/configuration/WwwAppConfiguration.java
+++ b/juick-www/src/main/java/com/juick/www/configuration/WwwAppConfiguration.java
@@ -9,7 +9,7 @@ import com.juick.www.HelpService;
 import com.juick.www.controllers.PageTemplates;
 import com.juick.www.WebApp;
 import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.cache.guava.GuavaCacheManager;
+import org.springframework.cache.caffeine.CaffeineCacheManager;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
@@ -41,8 +41,8 @@ public class WwwAppConfiguration {
         return new PageTemplates();
     }
     @Bean
-    public GuavaCacheManager cacheManager() {
-        return new GuavaCacheManager("help");
+    public CaffeineCacheManager cacheManager() {
+        return new CaffeineCacheManager("help");
     }
 
     @Bean
-- 
cgit v1.2.3