This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository izi-eval. See http://git.codelutin.com/izi-eval.git commit 44584eebfcfc9bf5536578ad232917dc91d383fa Author: Eric Chatellier <chatellier@codelutin.com> Date: Tue Jan 5 16:40:09 2016 +0100 refs #7860: Update commons-collections4 --- masc-api/pom.xml | 4 ++-- masc-api/src/main/java/fr/inra/masc/io/writer/DexiXmlWriter.java | 6 +++--- masc-api/src/main/java/fr/inra/masc/io/writer/ThresholdsWriter.java | 4 ++-- masc-api/src/main/java/fr/inra/masc/services/ThresholdService.java | 4 ++-- .../src/main/java/fr/inra/masc/synoptic/CriteriaGraphBuilder.java | 4 ++-- masc-api/src/main/java/fr/inra/masc/synoptic/LegendItem.java | 4 ++-- masc-api/src/main/java/fr/inra/masc/synoptic/SynopticModel.java | 4 ++-- masc-api/src/main/java/fr/inra/masc/utils/MascUtil.java | 4 ++-- masc-ui/pom.xml | 4 ++-- masc-ui/src/main/java/fr/inra/masc/ui/MascMainUIHandler.java | 4 ++-- masc-ui/src/main/java/fr/inra/masc/ui/MascUIHelper.java | 4 ++-- .../editor/criteria/editor/ComputableCriteriaEditorHandler.java | 4 ++-- .../ui/content/editor/factorValue/MascFactorValueEditorFactory.java | 4 ++-- .../masc/ui/content/editor/threshold/ThresholdEditorHandler.java | 4 ++-- .../inra/masc/ui/content/editor/threshold/ThresholdTableModel.java | 4 ++-- .../main/java/fr/inra/masc/ui/tree/criteria/CriteriaTreeHelper.java | 4 ++-- pom.xml | 6 +++--- 17 files changed, 36 insertions(+), 36 deletions(-) diff --git a/masc-api/pom.xml b/masc-api/pom.xml index af91f45..ca8b5d4 100644 --- a/masc-api/pom.xml +++ b/masc-api/pom.xml @@ -54,8 +54,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/masc-api/src/main/java/fr/inra/masc/io/writer/DexiXmlWriter.java b/masc-api/src/main/java/fr/inra/masc/io/writer/DexiXmlWriter.java index d9d056f..98acaae 100644 --- a/masc-api/src/main/java/fr/inra/masc/io/writer/DexiXmlWriter.java +++ b/masc-api/src/main/java/fr/inra/masc/io/writer/DexiXmlWriter.java @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 Inra, Codelutin + * Copyright (C) 2011 - 2016 Inra, Codelutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -28,8 +28,8 @@ import java.io.IOException; import java.util.Collection; import java.util.Map; -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.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/masc-api/src/main/java/fr/inra/masc/io/writer/ThresholdsWriter.java b/masc-api/src/main/java/fr/inra/masc/io/writer/ThresholdsWriter.java index 4f742cf..fd2c2d5 100644 --- a/masc-api/src/main/java/fr/inra/masc/io/writer/ThresholdsWriter.java +++ b/masc-api/src/main/java/fr/inra/masc/io/writer/ThresholdsWriter.java @@ -5,7 +5,7 @@ package fr.inra.masc.io.writer; * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 - 2012 Inra, Codelutin, Tony chemit + * Copyright (C) 2011 - 2016 Inra, Codelutin, Tony chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -32,7 +32,7 @@ import java.io.BufferedWriter; import java.io.File; import java.io.IOException; import java.util.List; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; diff --git a/masc-api/src/main/java/fr/inra/masc/services/ThresholdService.java b/masc-api/src/main/java/fr/inra/masc/services/ThresholdService.java index af9e69d..c362050 100644 --- a/masc-api/src/main/java/fr/inra/masc/services/ThresholdService.java +++ b/masc-api/src/main/java/fr/inra/masc/services/ThresholdService.java @@ -6,7 +6,7 @@ package fr.inra.masc.services; * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 - 2012 Inra, Codelutin, Tony Chemit + * Copyright (C) 2011 - 2016 Inra, Codelutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -36,7 +36,7 @@ import fr.inra.masc.model.EditableCriteria; import fr.inra.masc.model.MascModel; import fr.inra.masc.model.ThresholdValue; import fr.inra.masc.model.ThresholdValueImpl; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/masc-api/src/main/java/fr/inra/masc/synoptic/CriteriaGraphBuilder.java b/masc-api/src/main/java/fr/inra/masc/synoptic/CriteriaGraphBuilder.java index fce0d54..cc880bd 100644 --- a/masc-api/src/main/java/fr/inra/masc/synoptic/CriteriaGraphBuilder.java +++ b/masc-api/src/main/java/fr/inra/masc/synoptic/CriteriaGraphBuilder.java @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 - 2014 Inra, Codelutin, Tony chemit + * Copyright (C) 2011 - 2016 Inra, Codelutin, Tony chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -31,7 +31,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/masc-api/src/main/java/fr/inra/masc/synoptic/LegendItem.java b/masc-api/src/main/java/fr/inra/masc/synoptic/LegendItem.java index f716919..ea66c53 100644 --- a/masc-api/src/main/java/fr/inra/masc/synoptic/LegendItem.java +++ b/masc-api/src/main/java/fr/inra/masc/synoptic/LegendItem.java @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 - 2012 Inra, Codelutin, Tony Chemit + * Copyright (C) 2011 - 2016 Inra, Codelutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -25,7 +25,7 @@ package fr.inra.masc.synoptic; import com.google.common.collect.Lists; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.jdesktop.beans.AbstractSerializableBean; import java.awt.Color; diff --git a/masc-api/src/main/java/fr/inra/masc/synoptic/SynopticModel.java b/masc-api/src/main/java/fr/inra/masc/synoptic/SynopticModel.java index 7410f20..fcf3cdc 100644 --- a/masc-api/src/main/java/fr/inra/masc/synoptic/SynopticModel.java +++ b/masc-api/src/main/java/fr/inra/masc/synoptic/SynopticModel.java @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 - 2012 Inra, Codelutin, Tony Chemit + * Copyright (C) 2011 - 2016 Inra, Codelutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -26,7 +26,7 @@ package fr.inra.masc.synoptic; import fr.inra.masc.model.Option; import java.awt.Color; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.jdesktop.beans.AbstractSerializableBean; import java.beans.PropertyChangeEvent; diff --git a/masc-api/src/main/java/fr/inra/masc/utils/MascUtil.java b/masc-api/src/main/java/fr/inra/masc/utils/MascUtil.java index 380479c..e0f3457 100644 --- a/masc-api/src/main/java/fr/inra/masc/utils/MascUtil.java +++ b/masc-api/src/main/java/fr/inra/masc/utils/MascUtil.java @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 - 2012 Inra, Codelutin + * Copyright (C) 2011 - 2016 Inra, Codelutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -37,7 +37,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; diff --git a/masc-ui/pom.xml b/masc-ui/pom.xml index 3dec08a..be5e3fd 100644 --- a/masc-ui/pom.xml +++ b/masc-ui/pom.xml @@ -138,8 +138,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/masc-ui/src/main/java/fr/inra/masc/ui/MascMainUIHandler.java b/masc-ui/src/main/java/fr/inra/masc/ui/MascMainUIHandler.java index e315e83..61db077 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/MascMainUIHandler.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/MascMainUIHandler.java @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 Inra, Codelutin, Tony Chemit + * Copyright (C) 2011 - 2016 Inra, Codelutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -51,7 +51,7 @@ import jaxx.runtime.swing.help.JAXXHelpBroker; import jaxx.runtime.swing.help.JAXXHelpUIHandler; import jaxx.runtime.swing.log.JAXXLog4jUI; -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/masc-ui/src/main/java/fr/inra/masc/ui/MascUIHelper.java b/masc-ui/src/main/java/fr/inra/masc/ui/MascUIHelper.java index 9908b66..401d4ab 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/MascUIHelper.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/MascUIHelper.java @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 - 2012 Inra, Codelutin, Tony Chemit + * Copyright (C) 2011 - 2016 Inra, Codelutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -41,7 +41,7 @@ import jaxx.runtime.swing.JAXXWidgetUtil; import jaxx.runtime.swing.help.JAXXHelpBroker; import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; import jaxx.runtime.swing.renderer.DecoratorProviderListCellRenderer; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.SystemUtils; import org.jdesktop.swingx.JXErrorPane; import org.jdesktop.swingx.JXLabel; diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/criteria/editor/ComputableCriteriaEditorHandler.java b/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/criteria/editor/ComputableCriteriaEditorHandler.java index f4193ba..88c3b16 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/criteria/editor/ComputableCriteriaEditorHandler.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/criteria/editor/ComputableCriteriaEditorHandler.java @@ -6,7 +6,7 @@ package fr.inra.masc.ui.content.editor.criteria.editor; * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 - 2013 Inra, Codelutin, Tony Chemit + * Copyright (C) 2011 - 2016 Inra, Codelutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -39,7 +39,7 @@ import javax.swing.tree.TreePath; import jaxx.runtime.swing.Table; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/factorValue/MascFactorValueEditorFactory.java b/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/factorValue/MascFactorValueEditorFactory.java index 85b95fc..be8ca37 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/factorValue/MascFactorValueEditorFactory.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/factorValue/MascFactorValueEditorFactory.java @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 - 2012 Inra, Codelutin + * Copyright (C) 2011 - 2016 Inra, Codelutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -44,7 +44,7 @@ import javax.swing.JFormattedTextField; import javax.swing.JList; import javax.swing.JTextField; import javax.swing.ListCellRenderer; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.jdesktop.swingx.renderer.DefaultListRenderer; /** @author sletellier <letellier@codelutin.com> */ diff --git a/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/threshold/ThresholdEditorHandler.java b/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/threshold/ThresholdEditorHandler.java index 8e02e22..c4eafbe 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/threshold/ThresholdEditorHandler.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/threshold/ThresholdEditorHandler.java @@ -5,7 +5,7 @@ package fr.inra.masc.ui.content.editor.threshold; * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 - 2012 Inra, Codelutin + * Copyright (C) 2011 - 2016 Inra, Codelutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -44,7 +44,7 @@ import javax.swing.table.TableCellRenderer; import jaxx.runtime.swing.editor.FileEditor; import jaxx.runtime.swing.renderer.DecoratorProviderTableCellRenderer; -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/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/threshold/ThresholdTableModel.java b/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/threshold/ThresholdTableModel.java index 82b7f07..b24b22c 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/threshold/ThresholdTableModel.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/content/editor/threshold/ThresholdTableModel.java @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 - 2012 Inra, Codelutin, Tony Chemit + * Copyright (C) 2011 - 2016 Inra, Codelutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -34,7 +34,7 @@ import fr.inra.masc.model.ScaleValue; import fr.inra.masc.model.ThresholdValue; import fr.inra.masc.model.ThresholdValueImpl; import fr.inra.masc.ui.MascUIHelper; -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/masc-ui/src/main/java/fr/inra/masc/ui/tree/criteria/CriteriaTreeHelper.java b/masc-ui/src/main/java/fr/inra/masc/ui/tree/criteria/CriteriaTreeHelper.java index 3616555..d77cd87 100644 --- a/masc-ui/src/main/java/fr/inra/masc/ui/tree/criteria/CriteriaTreeHelper.java +++ b/masc-ui/src/main/java/fr/inra/masc/ui/tree/criteria/CriteriaTreeHelper.java @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 - 2012 Inra, Codelutin, Tony Chemit + * Copyright (C) 2011 - 2016 Inra, Codelutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -31,7 +31,7 @@ import fr.inra.masc.MascUIModel; import fr.inra.masc.model.Criteria; import jaxx.runtime.swing.nav.tree.NavTreeHelper; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/pom.xml b/pom.xml index 9003ddb..e09852a 100644 --- a/pom.xml +++ b/pom.xml @@ -246,9 +246,9 @@ </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.1</version> </dependency> <dependency> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.