Upgrade to Java 8 (fixes #304)

Waffle · Jan 28, 2017 · 5436cd6 · 5436cd6
1 parent c955578
commit 5436cd6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/Source/JNA/pom.xml b/Source/JNA/pom.xml
@@ -202,6 +202,8 @@
                     <configuration>
                         <!-- Slightly faster builds, see https://issues.apache.org/jira/browse/MCOMPILER-209 -->
                         <useIncrementalCompilation>false</useIncrementalCompilation>
+                        <source>1.8</source>
+                        <target>1.8</target>
                     </configuration>
                 </plugin>
                 <plugin>

diff --git a/Source/JNA/waffle-jna/pom.xml b/Source/JNA/waffle-jna/pom.xml
@@ -37,6 +37,7 @@
     </scm>
 
     <properties>
+        <caffeine.version>2.3.5</caffeine.version>
         <guava.version>20.0</guava.version>
         <jna.version>4.3.0</jna.version>
         <servlet.version>3.1.0</servlet.version>
@@ -81,5 +82,10 @@
             <artifactId>guava</artifactId>
             <version>${guava.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.github.ben-manes.caffeine</groupId>
+            <artifactId>caffeine</artifactId>
+            <version>${caffeine.version}</version>
+        </dependency>
     </dependencies>
 </project>
diff --git a/Source/JNA/waffle-jna/src/main/java/waffle/windows/auth/impl/WindowsAuthProviderImpl.java b/Source/JNA/waffle-jna/src/main/java/waffle/windows/auth/impl/WindowsAuthProviderImpl.java
@@ -17,8 +17,8 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
 import com.sun.jna.platform.win32.Advapi32;
 import com.sun.jna.platform.win32.Kernel32;
 import com.sun.jna.platform.win32.Netapi32Util;
@@ -89,7 +89,7 @@ public WindowsAuthProviderImpl() {
      *            Timeout for security contexts in seconds.
      */
     public WindowsAuthProviderImpl(final int continueContextsTimeout) {
-        this.continueContexts = CacheBuilder.newBuilder().expireAfterWrite(continueContextsTimeout, TimeUnit.SECONDS)
+        this.continueContexts = Caffeine.newBuilder().expireAfterWrite(continueContextsTimeout, TimeUnit.SECONDS)
                 .build();
     }