This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia-2.x. See https://gitlab.nuiton.org/nuiton/topia-2.x.git commit 3000ad5ba1e7fcf97872fc8c7d05beec2017df16 Author: Eric Chatellier <chatellier@codelutin.com> Date: Tue Jan 3 13:59:48 2017 +0100 refs #3902: Update guava --- pom.xml | 2 +- .../src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 4c56080..203cf99 100644 --- a/pom.xml +++ b/pom.xml @@ -304,7 +304,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>19.0</version> + <version>20.0</version> </dependency> <!-- Commons libs --> diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java index 578462f..748e481 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2014 CodeLutin + * Copyright (C) 2004 - 2017 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -37,7 +37,6 @@ package org.nuiton.topia.persistence; import com.google.common.base.Preconditions; -import com.google.common.collect.Iterators; import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -57,6 +56,7 @@ import org.nuiton.util.PagerBeanUtil; import java.io.Serializable; import java.lang.reflect.InvocationTargetException; import java.security.Permission; +import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -878,7 +878,7 @@ public class TopiaDAOImpl<E extends TopiaEntity> implements } // empty iterator (will be changed at first next call) - data = Iterators.emptyIterator(); + data = Collections.emptyIterator(); } @Override -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.