From 9a1b77345bd2a00b17b2db789879f7c88f94e33f Mon Sep 17 00:00:00 2001 From: Ben Manes Date: Sat, 18 Feb 2017 22:23:07 -0800 Subject: [PATCH] Prepare for release --- build.gradle | 4 ++-- .../test/java/com/google/common/cache/CacheBuilderTest.java | 3 ++- .../com/github/benmanes/caffeine/jcache/JCacheProfiler.java | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 9b4e33962d..f9ccf1d516 100644 --- a/build.gradle +++ b/build.gradle @@ -65,8 +65,8 @@ subprojects { group = 'com.github.ben-manes.caffeine' version.with { major = 2 // incompatible API changes - minor = 3 // backwards-compatible additions - patch = 6 // backwards-compatible bug fixes + minor = 4 // backwards-compatible additions + patch = 0 // backwards-compatible bug fixes releaseBuild = rootProject.hasProperty('release') } archivesBaseName = path[1..-1].replaceAll(':', '-').toLowerCase() diff --git a/guava/src/test/java/com/google/common/cache/CacheBuilderTest.java b/guava/src/test/java/com/google/common/cache/CacheBuilderTest.java index 13c8e76699..68cb3d0c0d 100644 --- a/guava/src/test/java/com/google/common/cache/CacheBuilderTest.java +++ b/guava/src/test/java/com/google/common/cache/CacheBuilderTest.java @@ -391,7 +391,7 @@ public void testRemovalNotification_clear() throws InterruptedException { * cache afterward). */ @GwtIncompatible("QueuingRemovalListener") - + @SuppressWarnings("FutureReturnValueIgnored") public void testRemovalNotification_clear_basher() throws InterruptedException { // If a clear() happens close to the end of computation, one of two things should happen: // - computation ends first: the removal listener is called, and the cache does not contain the @@ -468,6 +468,7 @@ public void testRemovalNotification_clear_basher() throws InterruptedException { * (removed because of size limits or expiration) trigger appropriate removal notifications. */ @GwtIncompatible("QueuingRemovalListener") + @SuppressWarnings("FutureReturnValueIgnored") // FIXME(ben): disabled due to TravisCI killing the process public void testRemovalNotification_get_basher() throws InterruptedException { int nTasks = 1000; diff --git a/jcache/src/test/java/com/github/benmanes/caffeine/jcache/JCacheProfiler.java b/jcache/src/test/java/com/github/benmanes/caffeine/jcache/JCacheProfiler.java index 4d30cf6e84..5be5396ff7 100644 --- a/jcache/src/test/java/com/github/benmanes/caffeine/jcache/JCacheProfiler.java +++ b/jcache/src/test/java/com/github/benmanes/caffeine/jcache/JCacheProfiler.java @@ -77,6 +77,7 @@ public void start() { } } + @SuppressWarnings("FutureReturnValueIgnored") private void scheduleStatusTask() { Stopwatch stopwatch = Stopwatch.createStarted(); Executors.newSingleThreadScheduledExecutor().scheduleWithFixedDelay(() -> {