From 9f1475d708a7ce7ae6652388e5596faac0561f22 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 31 Mar 2015 11:22:11 +0200 Subject: [PATCH] Fix wrong import in Guava auto-config Remove the need for `commons-collections` See gh-2633 --- .../boot/autoconfigure/cache/GuavaCacheConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/GuavaCacheConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/GuavaCacheConfiguration.java index f14c5f193f..62cf7731fc 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/GuavaCacheConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/GuavaCacheConfiguration.java @@ -18,7 +18,6 @@ package org.springframework.boot.autoconfigure.cache; import java.util.List; -import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; @@ -27,6 +26,7 @@ import org.springframework.cache.guava.GuavaCacheManager; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import com.google.common.cache.CacheBuilder;