This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit 840bfb7745afdf165abbb97aef4b3d4268d7047a Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Fri Nov 13 20:48:52 2015 +0100 Update commons-collections4 --- pollen-persistence/pom.xml | 4 ++-- .../org/chorem/pollen/business/persistence/PollAccountDAOImpl.java | 2 +- pollen-services/pom.xml | 4 ++-- .../src/main/java/org/chorem/pollen/PollenUserSecurityContext.java | 2 +- .../pollen/entities/migration/PollenMigrationCallbackV1_5.java | 4 ++-- .../src/main/java/org/chorem/pollen/services/impl/EmailService.java | 2 +- pollen-ui-struts2/pom.xml | 4 ++-- .../main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java | 2 +- .../main/java/org/chorem/pollen/ui/actions/io/GenerateChart.java | 2 +- .../main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java | 2 +- .../chorem/pollen/ui/actions/poll/form/AbstractDisplayChoice.java | 2 +- .../org/chorem/pollen/ui/actions/poll/form/AbstractPollForm.java | 4 ++-- pollen-votecounting-coombs/pom.xml | 4 ++-- .../org/chorem/pollen/votecounting/CoombsVoteCountingStrategy.java | 2 +- pollen-votecounting-instant-runoff/pom.xml | 4 ++-- .../pollen/votecounting/InstantRunoffVoteCountingStrategy.java | 2 +- pom.xml | 6 +++--- 17 files changed, 26 insertions(+), 26 deletions(-) diff --git a/pollen-persistence/pom.xml b/pollen-persistence/pom.xml index 973a489..eacf3e9 100644 --- a/pollen-persistence/pom.xml +++ b/pollen-persistence/pom.xml @@ -36,8 +36,8 @@ <artifactId>commons-logging</artifactId> </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> </dependency> <dependency> <groupId>commons-io</groupId> diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java b/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java index 013e458..53db2df 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java @@ -24,7 +24,7 @@ package org.chorem.pollen.business.persistence; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/pollen-services/pom.xml b/pollen-services/pom.xml index ddaa308..d231676 100644 --- a/pollen-services/pom.xml +++ b/pollen-services/pom.xml @@ -43,8 +43,8 @@ <artifactId>commons-logging</artifactId> </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> </dependency> <dependency> <groupId>commons-io</groupId> diff --git a/pollen-services/src/main/java/org/chorem/pollen/PollenUserSecurityContext.java b/pollen-services/src/main/java/org/chorem/pollen/PollenUserSecurityContext.java index 9f19305..231b4cb 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/PollenUserSecurityContext.java +++ b/pollen-services/src/main/java/org/chorem/pollen/PollenUserSecurityContext.java @@ -24,7 +24,7 @@ package org.chorem.pollen; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.chorem.pollen.bean.PollUri; import org.chorem.pollen.bean.PollUrl; import org.chorem.pollen.business.persistence.Poll; diff --git a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_5.java b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_5.java index a5e3c9b..c54750d 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_5.java +++ b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_5.java @@ -27,7 +27,7 @@ import com.google.common.base.Function; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; import com.opensymphony.xwork2.ActionContext; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.pollen.PollenApplicationContext; @@ -268,4 +268,4 @@ public class PollenMigrationCallbackV1_5 extends TopiaMigrationCallbackByClassNG } }; -} \ No newline at end of file +} diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java b/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java index 5580935..de4ed88 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java @@ -24,7 +24,7 @@ package org.chorem.pollen.services.impl; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/pollen-ui-struts2/pom.xml b/pollen-ui-struts2/pom.xml index bb8d05b..c2403c8 100644 --- a/pollen-ui-struts2/pom.xml +++ b/pollen-ui-struts2/pom.xml @@ -135,8 +135,8 @@ </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> </dependency> <dependency> diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java index 77165f9..81e20ce 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java @@ -27,7 +27,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.inject.Inject; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.struts2.interceptor.ParameterAware; import org.apache.struts2.interceptor.ServletRequestAware; import org.chorem.pollen.PollenApplicationContext; diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GenerateChart.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GenerateChart.java index 55f05e8..55726f3 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GenerateChart.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GenerateChart.java @@ -22,7 +22,7 @@ */ package org.chorem.pollen.ui.actions.io; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.pollen.ui.actions.PollenActionSupport; diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java index de38af6..210cd54 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java @@ -25,7 +25,7 @@ package org.chorem.pollen.ui.actions.poll; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.opensymphony.xwork2.inject.Inject; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractDisplayChoice.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractDisplayChoice.java index 4c71f43..0511edb 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractDisplayChoice.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractDisplayChoice.java @@ -22,7 +22,7 @@ */ package org.chorem.pollen.ui.actions.poll.form; -import org.apache.commons.collections.MapUtils; +import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.chorem.pollen.business.persistence.Choice; import org.chorem.pollen.ui.actions.PollenActionSupport; diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractPollForm.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractPollForm.java index 047df92..a246260 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractPollForm.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractPollForm.java @@ -31,8 +31,8 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.opensymphony.xwork2.Preparable; import com.opensymphony.xwork2.interceptor.annotations.InputConfig; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.collections.MapUtils; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.MapUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; diff --git a/pollen-votecounting-coombs/pom.xml b/pollen-votecounting-coombs/pom.xml index dbf84f9..d3437f0 100644 --- a/pollen-votecounting-coombs/pom.xml +++ b/pollen-votecounting-coombs/pom.xml @@ -23,8 +23,8 @@ </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> </dependency> <dependency> diff --git a/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCountingStrategy.java b/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCountingStrategy.java index bb9c313..241329d 100644 --- a/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCountingStrategy.java +++ b/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCountingStrategy.java @@ -25,7 +25,7 @@ package org.chorem.pollen.votecounting; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.chorem.pollen.votecounting.model.ChoiceScore; import org.chorem.pollen.votecounting.model.VoteCountingResult; import org.chorem.pollen.votecounting.model.Voter; diff --git a/pollen-votecounting-instant-runoff/pom.xml b/pollen-votecounting-instant-runoff/pom.xml index 35a176e..8ab00a1 100644 --- a/pollen-votecounting-instant-runoff/pom.xml +++ b/pollen-votecounting-instant-runoff/pom.xml @@ -28,8 +28,8 @@ </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> </dependency> <dependency> diff --git a/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCountingStrategy.java b/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCountingStrategy.java index 04fe999..d57d4f5 100644 --- a/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCountingStrategy.java +++ b/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCountingStrategy.java @@ -24,7 +24,7 @@ package org.chorem.pollen.votecounting; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.chorem.pollen.votecounting.model.ChoiceScore; import org.chorem.pollen.votecounting.model.VoteCountingResult; import org.chorem.pollen.votecounting.model.Voter; diff --git a/pom.xml b/pom.xml index f386644..64e59d3 100644 --- a/pom.xml +++ b/pom.xml @@ -226,9 +226,9 @@ <!-- Commons --> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2</version> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + <version>4.0</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.