This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository eugene. See https://gitlab.nuiton.org/nuiton/eugene.git commit 493012d4f8c58be788514d33fc379d504513b408 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 9 13:22:16 2016 +0200 Replace commons-collections by commons-collections4 (fixes #4066) --- eugene-java-templates/pom.xml | 4 ++-- .../src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java | 2 +- .../main/java/org/nuiton/eugene/java/SimpleJavaBeanTransformer.java | 2 +- .../nuiton/eugene/java/SimpleJavaBeanWithNoInterfaceTransformer.java | 2 +- eugene-maven-plugin/pom.xml | 5 ----- .../java/org/nuiton/eugene/plugin/writer/BaseChainedFileWriter.java | 2 +- eugene/pom.xml | 4 ++-- eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java | 2 +- .../java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java | 2 +- .../models/extension/io/ModelExtensionFileParserPropertiesImpl.java | 4 ++-- .../eugene/models/extension/io/ModelExtensionWriterIniImpl.java | 2 +- .../models/extension/io/ModelExtensionWriterPropertiesImpl.java | 2 +- .../main/java/org/nuiton/eugene/writer/FileGrabberFromClassPath.java | 2 +- .../main/java/org/nuiton/eugene/writer/FileGrabberFromDirectory.java | 2 +- 14 files changed, 16 insertions(+), 21 deletions(-) diff --git a/eugene-java-templates/pom.xml b/eugene-java-templates/pom.xml index 631f67e..e28a49c 100644 --- a/eugene-java-templates/pom.xml +++ b/eugene-java-templates/pom.xml @@ -66,8 +66,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/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java b/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java index ff7e967..c47e3b7 100644 --- a/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java +++ b/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java @@ -21,7 +21,7 @@ */ package org.nuiton.eugene.java; -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.eugene.models.object.ObjectModelAttribute; diff --git a/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanTransformer.java b/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanTransformer.java index 0bc33b4..7bc676e 100644 --- a/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanTransformer.java +++ b/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanTransformer.java @@ -25,7 +25,7 @@ package org.nuiton.eugene.java; /*{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/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanWithNoInterfaceTransformer.java b/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanWithNoInterfaceTransformer.java index ca783ca..a143d3c 100644 --- a/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanWithNoInterfaceTransformer.java +++ b/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanWithNoInterfaceTransformer.java @@ -29,7 +29,7 @@ import com.google.common.base.Function; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; -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/eugene-maven-plugin/pom.xml b/eugene-maven-plugin/pom.xml index 637c9c9..935961b 100644 --- a/eugene-maven-plugin/pom.xml +++ b/eugene-maven-plugin/pom.xml @@ -102,11 +102,6 @@ </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> - - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId> </dependency> diff --git a/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/writer/BaseChainedFileWriter.java b/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/writer/BaseChainedFileWriter.java index ac1d9a8..adffc45 100644 --- a/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/writer/BaseChainedFileWriter.java +++ b/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/writer/BaseChainedFileWriter.java @@ -22,7 +22,7 @@ package org.nuiton.eugene.plugin.writer; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.maven.plugin.logging.Log; import org.apache.maven.plugin.logging.SystemStreamLog; import org.codehaus.plexus.util.FileUtils; diff --git a/eugene/pom.xml b/eugene/pom.xml index fad51e6..29036e0 100644 --- a/eugene/pom.xml +++ b/eugene/pom.xml @@ -87,8 +87,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/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java b/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java index cc46b1e..e17587a 100644 --- a/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java +++ b/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java @@ -24,7 +24,7 @@ package org.nuiton.eugene.java; import com.google.common.base.Joiner; 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/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java b/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java index baa3750..dd127c2 100644 --- a/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java +++ b/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java @@ -22,7 +22,7 @@ package org.nuiton.eugene.java; -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.eugene.EugeneCoreTagValues; diff --git a/eugene/src/main/java/org/nuiton/eugene/models/extension/io/ModelExtensionFileParserPropertiesImpl.java b/eugene/src/main/java/org/nuiton/eugene/models/extension/io/ModelExtensionFileParserPropertiesImpl.java index d91a502..7027af5 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/extension/io/ModelExtensionFileParserPropertiesImpl.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/extension/io/ModelExtensionFileParserPropertiesImpl.java @@ -22,7 +22,7 @@ package org.nuiton.eugene.models.extension.io; * #L% */ -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.eugene.models.extension.tagvalue.InvalidStereotypeSyntaxException; @@ -73,7 +73,7 @@ class ModelExtensionFileParserPropertiesImpl extends ModelExtensionFileParser { // get all the tagValues keys and sort them List<String> keys = new ArrayList<>(); - CollectionUtils.addAll(keys, prop.keys()); + CollectionUtils.addAll(keys, prop.stringPropertyNames()); Collections.sort(keys); boolean safe = true; diff --git a/eugene/src/main/java/org/nuiton/eugene/models/extension/io/ModelExtensionWriterIniImpl.java b/eugene/src/main/java/org/nuiton/eugene/models/extension/io/ModelExtensionWriterIniImpl.java index 8e6ef1e..5521e2d 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/extension/io/ModelExtensionWriterIniImpl.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/extension/io/ModelExtensionWriterIniImpl.java @@ -1,6 +1,6 @@ package org.nuiton.eugene.models.extension.io; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.SystemUtils; import org.nuiton.eugene.models.extension.model.ModelExtension; import org.nuiton.eugene.models.extension.model.ModelExtensionAttribute; diff --git a/eugene/src/main/java/org/nuiton/eugene/models/extension/io/ModelExtensionWriterPropertiesImpl.java b/eugene/src/main/java/org/nuiton/eugene/models/extension/io/ModelExtensionWriterPropertiesImpl.java index 5b9b138..2d35ad6 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/extension/io/ModelExtensionWriterPropertiesImpl.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/extension/io/ModelExtensionWriterPropertiesImpl.java @@ -1,7 +1,7 @@ package org.nuiton.eugene.models.extension.io; import com.google.common.base.Joiner; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.SystemUtils; import org.nuiton.eugene.models.extension.model.ModelExtension; import org.nuiton.eugene.models.extension.model.ModelExtensionAttribute; diff --git a/eugene/src/main/java/org/nuiton/eugene/writer/FileGrabberFromClassPath.java b/eugene/src/main/java/org/nuiton/eugene/writer/FileGrabberFromClassPath.java index 4b7a446..6db5f15 100644 --- a/eugene/src/main/java/org/nuiton/eugene/writer/FileGrabberFromClassPath.java +++ b/eugene/src/main/java/org/nuiton/eugene/writer/FileGrabberFromClassPath.java @@ -22,7 +22,7 @@ package org.nuiton.eugene.writer; * #L% */ -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/eugene/src/main/java/org/nuiton/eugene/writer/FileGrabberFromDirectory.java b/eugene/src/main/java/org/nuiton/eugene/writer/FileGrabberFromDirectory.java index dbfcf64..17aec59 100644 --- a/eugene/src/main/java/org/nuiton/eugene/writer/FileGrabberFromDirectory.java +++ b/eugene/src/main/java/org/nuiton/eugene/writer/FileGrabberFromDirectory.java @@ -22,7 +22,7 @@ package org.nuiton.eugene.writer; * #L% */ -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.codehaus.plexus.util.DirectoryScanner; -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.