This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia-2.x. See http://git.nuiton.org/topia-2.x.git commit d1166fcd784bd7746531b3a41834c681145a5b28 Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Mar 2 11:10:48 2016 +0100 refs #3902: Update commons-collections4, remove commons-collection3 --- pom.xml | 8 +------- topia-persistence/pom.xml | 5 ----- .../src/main/java/org/nuiton/topia/TopiaContextFactory.java | 9 ++++----- .../main/java/org/nuiton/topia/event/TopiaTransactionEvent.java | 6 +++--- .../main/java/org/nuiton/topia/framework/TopiaFiresSupport.java | 6 +++--- .../src/main/java/org/nuiton/topia/framework/TopiaQuery.java | 4 ++-- .../java/org/nuiton/topia/generator/BinderHelperTransformer.java | 2 +- .../java/org/nuiton/topia/generator/EntityDAOTransformer.java | 2 +- .../main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java | 2 +- .../java/org/nuiton/topia/persistence/csv/TopiaCsvCommons.java | 4 ++-- .../nuiton/topia/persistence/csv/out/ExportEntityVisitor.java | 4 ++-- .../java/org/nuiton/topia/persistence/pager/TopiaPagerBean.java | 2 +- topia-service-replication/pom.xml | 7 +------ .../org/nuiton/topia/replication/model/ReplicationModel.java | 4 ++-- .../java/org/nuiton/topia/replication/operation/Duplicate.java | 4 ++-- topia-service-security/pom.xml | 5 ----- .../java/org/nuiton/topia/security/TopiaSecurityServiceImpl.java | 9 +++++---- .../org/nuiton/topia/security/util/TopiaSecurityCaching.java | 6 +++--- 18 files changed, 34 insertions(+), 55 deletions(-) diff --git a/pom.xml b/pom.xml index c035abd..77f1b07 100644 --- a/pom.xml +++ b/pom.xml @@ -314,7 +314,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId> - <version>4.0</version> + <version>4.1</version> </dependency> <dependency> @@ -324,12 +324,6 @@ </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2.1</version> - </dependency> - - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <version>1.1.3</version> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index 87fbe38..e841c95 100644 --- a/topia-persistence/pom.xml +++ b/topia-persistence/pom.xml @@ -77,11 +77,6 @@ </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> - - <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> </dependency> diff --git a/topia-persistence/src/main/java/org/nuiton/topia/TopiaContextFactory.java b/topia-persistence/src/main/java/org/nuiton/topia/TopiaContextFactory.java index b871dd3..b41fc73 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/TopiaContextFactory.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/TopiaContextFactory.java @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2014 CodeLutin + * Copyright (C) 2004 - 2016 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 @@ -24,8 +24,8 @@ package org.nuiton.topia; -import org.apache.commons.collections.map.AbstractReferenceMap; -import org.apache.commons.collections.map.ReferenceMap; +import org.apache.commons.collections4.map.AbstractReferenceMap.ReferenceStrength; +import org.apache.commons.collections4.map.ReferenceMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.cfg.Environment; @@ -56,8 +56,7 @@ public class TopiaContextFactory { /** Cache contenant tous les contexts deja créé. */ protected static Map<Properties, TopiaContext> contextCache = - new ReferenceMap(AbstractReferenceMap.HARD, - AbstractReferenceMap.SOFT); + new ReferenceMap(ReferenceStrength.HARD, ReferenceStrength.SOFT); public final static String CONFIG_DEFAULT_SCHEMA = Environment.DEFAULT_SCHEMA; diff --git a/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaTransactionEvent.java b/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaTransactionEvent.java index 8878620..bd2dce7 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaTransactionEvent.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaTransactionEvent.java @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2014 CodeLutin + * Copyright (C) 2004 - 2016 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 @@ -24,12 +24,12 @@ package org.nuiton.topia.event; -import org.apache.commons.collections.map.IdentityMap; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.framework.EntityState; import org.nuiton.topia.persistence.TopiaEntity; import java.util.EventObject; +import java.util.IdentityHashMap; import java.util.Map; import java.util.Set; @@ -44,7 +44,7 @@ public class TopiaTransactionEvent extends EventObject { private static final long serialVersionUID = 1L; - private Map<TopiaEntity, EntityState> entities = new IdentityMap(); + private Map<TopiaEntity, EntityState> entities = new IdentityHashMap<>(); public TopiaTransactionEvent(TopiaContext source) { super(source); diff --git a/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java b/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java index 6e50c43..5a48863 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2014 CodeLutin + * Copyright (C) 2004 - 2016 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 @@ -29,12 +29,12 @@ import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.beans.VetoableChangeSupport; import java.util.HashSet; +import java.util.IdentityHashMap; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.collections.map.IdentityMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.Session; @@ -91,7 +91,7 @@ public class TopiaFiresSupport { /** used to collect entity modification during transaction */ protected Map<TopiaEntity, EntityState> transactionEntities = - new IdentityMap(); + new IdentityHashMap<>(); protected Set<PropertyChangeListener> propertyChangeListeners = new HashSet<PropertyChangeListener>(); diff --git a/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java b/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java index 5c7a4a6..fa781c6 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2014 CodeLutin + * Copyright (C) 2004 - 2016 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 @@ -25,7 +25,7 @@ package org.nuiton.topia.framework; import org.apache.commons.beanutils.PropertyUtils; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.StringUtils; diff --git a/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java b/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java index faea5a7..1f4db13 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java @@ -24,7 +24,7 @@ package org.nuiton.topia.generator; -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/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java b/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java index 7a90f60..b1098fe 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java @@ -26,7 +26,7 @@ package org.nuiton.topia.generator; /*{generator option: parentheses = false}*/ /*{generator option: writeString = +}*/ -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/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java b/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java index 88f3f91..856fed6 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java @@ -24,7 +24,7 @@ package org.nuiton.topia.generator; -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/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/TopiaCsvCommons.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/TopiaCsvCommons.java index 751f481..5ba80fe 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/TopiaCsvCommons.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/TopiaCsvCommons.java @@ -5,7 +5,7 @@ package org.nuiton.topia.persistence.csv; * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2014 CodeLutin + * Copyright (C) 2004 - 2016 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 @@ -24,7 +24,7 @@ package org.nuiton.topia.persistence.csv; */ 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.nuiton.decorator.Decorator; import org.nuiton.topia.TopiaRuntimeException; diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/ExportEntityVisitor.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/ExportEntityVisitor.java index 4c37202..eda8cd9 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/ExportEntityVisitor.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/ExportEntityVisitor.java @@ -5,7 +5,7 @@ package org.nuiton.topia.persistence.csv.out; * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2014 CodeLutin + * Copyright (C) 2004 - 2016 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 @@ -24,7 +24,7 @@ package org.nuiton.topia.persistence.csv.out; */ import com.google.common.base.Preconditions; -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.nuiton.topia.TopiaException; diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/TopiaPagerBean.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/TopiaPagerBean.java index f38f3fa..c90ba12 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/TopiaPagerBean.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/TopiaPagerBean.java @@ -24,7 +24,7 @@ package org.nuiton.topia.persistence.pager; * #L% */ -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.nuiton.util.PagerBean; import java.util.List; diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index 4d99705..7a8e77c 100644 --- a/topia-service-replication/pom.xml +++ b/topia-service-replication/pom.xml @@ -6,7 +6,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2004 - 2010 CodeLutin + Copyright (C) 2004 - 2016 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 @@ -63,11 +63,6 @@ </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> - - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> diff --git a/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationModel.java b/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationModel.java index e4e7a34..57c4f60 100644 --- a/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationModel.java +++ b/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationModel.java @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2014 CodeLutin + * Copyright (C) 2004 - 2016 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 @@ -24,7 +24,7 @@ package org.nuiton.topia.replication.model; -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.nuiton.topia.TopiaException; diff --git a/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/Duplicate.java b/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/Duplicate.java index a1367e6..45aec3f 100644 --- a/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/Duplicate.java +++ b/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/Duplicate.java @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2014 CodeLutin + * Copyright (C) 2004 - 2016 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 @@ -24,7 +24,7 @@ package org.nuiton.topia.replication.operation; -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.nuiton.topia.TopiaException; diff --git a/topia-service-security/pom.xml b/topia-service-security/pom.xml index 6aaab0d..f5eb051 100644 --- a/topia-service-security/pom.xml +++ b/topia-service-security/pom.xml @@ -81,11 +81,6 @@ </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> - - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> diff --git a/topia-service-security/src/main/java/org/nuiton/topia/security/TopiaSecurityServiceImpl.java b/topia-service-security/src/main/java/org/nuiton/topia/security/TopiaSecurityServiceImpl.java index 077e401..9c05e6e 100644 --- a/topia-service-security/src/main/java/org/nuiton/topia/security/TopiaSecurityServiceImpl.java +++ b/topia-service-security/src/main/java/org/nuiton/topia/security/TopiaSecurityServiceImpl.java @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2014 CodeLutin + * Copyright (C) 2004 - 2016 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 @@ -24,7 +24,8 @@ package org.nuiton.topia.security; -import org.apache.commons.collections.map.ReferenceMap; +import org.apache.commons.collections4.map.ReferenceMap; +import org.apache.commons.collections4.map.AbstractReferenceMap.ReferenceStrength; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; @@ -111,10 +112,10 @@ public class TopiaSecurityServiceImpl implements TopiaSecurityService, transient private TopiaSecurityCaching entitiesLoadingCache = new TopiaSecurityCaching(2); transient private Map<String, Permission> authorizationsCache = - Collections.synchronizedMap(new ReferenceMap(ReferenceMap.SOFT, ReferenceMap.SOFT)); + Collections.synchronizedMap(new ReferenceMap(ReferenceStrength.SOFT, ReferenceStrength.SOFT)); transient private Map<String, Set<Permission>> permissionsCache = - Collections.synchronizedMap(new ReferenceMap(ReferenceMap.SOFT, ReferenceMap.SOFT)); + Collections.synchronizedMap(new ReferenceMap(ReferenceStrength.SOFT, ReferenceStrength.SOFT)); /** * Constructeur. Initialise la sécurité à partir du contexte passer en diff --git a/topia-service-security/src/main/java/org/nuiton/topia/security/util/TopiaSecurityCaching.java b/topia-service-security/src/main/java/org/nuiton/topia/security/util/TopiaSecurityCaching.java index caf9e58..bd544cd 100644 --- a/topia-service-security/src/main/java/org/nuiton/topia/security/util/TopiaSecurityCaching.java +++ b/topia-service-security/src/main/java/org/nuiton/topia/security/util/TopiaSecurityCaching.java @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2014 CodeLutin + * Copyright (C) 2004 - 2016 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 @@ -24,12 +24,12 @@ package org.nuiton.topia.security.util; -import static org.apache.commons.collections.map.AbstractReferenceMap.SOFT; +import static org.apache.commons.collections4.map.AbstractReferenceMap.ReferenceStrength.SOFT; import java.util.Collections; import java.util.Map; -import org.apache.commons.collections.map.ReferenceMap; +import org.apache.commons.collections4.map.ReferenceMap; /** * La classe permet d'avoir un ensemble de clés pour identifier de manière unique une valeur. -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.