From 4ac4e5abf2dd724cb4f0b5952eb7540836239c87 Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Thu, 28 Nov 2013 16:56:52 +0100
Subject: [PATCH] commons collection upgrade to 4.0

---
 pom.xml                                                     | 6 +++---
 .../com/commafeed/backend/feeds/FeedRefreshUpdater.java     | 2 +-
 src/main/java/com/commafeed/backend/opml/OPMLImporter.java  | 2 +-
 .../java/com/commafeed/backend/rome/RSSRDF10Parser.java     | 2 +-
 .../commafeed/frontend/pages/NextUnreadRedirectPage.java    | 2 +-
 .../com/commafeed/frontend/rest/resources/CategoryREST.java | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index ce697063..20012b32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -238,9 +238,9 @@
 			<version>1.8</version>
 		</dependency>
 		<dependency>
-			<groupId>commons-collections</groupId>
-			<artifactId>commons-collections</artifactId>
-			<version>3.2.1</version>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-collections4</artifactId>
+			<version>4.0</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-io</groupId>
diff --git a/src/main/java/com/commafeed/backend/feeds/FeedRefreshUpdater.java b/src/main/java/com/commafeed/backend/feeds/FeedRefreshUpdater.java
index a809d2b5..c6664a1c 100644
--- a/src/main/java/com/commafeed/backend/feeds/FeedRefreshUpdater.java
+++ b/src/main/java/com/commafeed/backend/feeds/FeedRefreshUpdater.java
@@ -15,7 +15,7 @@ import javax.inject.Inject;
 import lombok.extern.slf4j.Slf4j;
 
 import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
 
diff --git a/src/main/java/com/commafeed/backend/opml/OPMLImporter.java b/src/main/java/com/commafeed/backend/opml/OPMLImporter.java
index dffa7780..7e5b5a7d 100644
--- a/src/main/java/com/commafeed/backend/opml/OPMLImporter.java
+++ b/src/main/java/com/commafeed/backend/opml/OPMLImporter.java
@@ -11,7 +11,7 @@ import javax.inject.Inject;
 
 import lombok.extern.slf4j.Slf4j;
 
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 
 import com.commafeed.backend.cache.CacheService;
diff --git a/src/main/java/com/commafeed/backend/rome/RSSRDF10Parser.java b/src/main/java/com/commafeed/backend/rome/RSSRDF10Parser.java
index 45995237..8a38848e 100644
--- a/src/main/java/com/commafeed/backend/rome/RSSRDF10Parser.java
+++ b/src/main/java/com/commafeed/backend/rome/RSSRDF10Parser.java
@@ -2,7 +2,7 @@ package com.commafeed.backend.rome;
 
 import java.util.List;
 
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.jdom.Document;
 import org.jdom.Element;
 import org.jdom.Namespace;
diff --git a/src/main/java/com/commafeed/frontend/pages/NextUnreadRedirectPage.java b/src/main/java/com/commafeed/frontend/pages/NextUnreadRedirectPage.java
index 571413ba..fcc5ccfc 100755
--- a/src/main/java/com/commafeed/frontend/pages/NextUnreadRedirectPage.java
+++ b/src/main/java/com/commafeed/frontend/pages/NextUnreadRedirectPage.java
@@ -4,7 +4,7 @@ import java.util.List;
 
 import javax.inject.Inject;
 
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.request.flow.RedirectToUrlException;
diff --git a/src/main/java/com/commafeed/frontend/rest/resources/CategoryREST.java b/src/main/java/com/commafeed/frontend/rest/resources/CategoryREST.java
index 20644a5f..8abc89ff 100644
--- a/src/main/java/com/commafeed/frontend/rest/resources/CategoryREST.java
+++ b/src/main/java/com/commafeed/frontend/rest/resources/CategoryREST.java
@@ -21,9 +21,9 @@ import javax.ws.rs.core.Response.Status;
 
 import lombok.extern.slf4j.Slf4j;
 
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.ObjectUtils;
 
 import com.commafeed.backend.cache.CacheService;
 import com.commafeed.backend.dao.FeedCategoryDAO;