This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-config. See https://gitlab.nuiton.org/nuiton/nuiton-config.git commit f0491912b71585cc8d4ac086d98cd88512815b9e Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Sep 30 12:50:00 2016 +0200 Optimize dependencies and third parties + use collections4 --- nuiton-config-maven-plugin/pom.xml | 10 ++++++++ .../src/license/THIRD-PARTY.properties | 13 +++------- .../org/nuiton/config/plugin/ReportRenderer.java | 2 +- nuiton-config/nuiton-config (1).iml | 30 ---------------------- nuiton-config/src/license/THIRD-PARTY.properties | 19 ++++++++++++++ pom.xml | 6 +++++ 6 files changed, 39 insertions(+), 41 deletions(-) diff --git a/nuiton-config-maven-plugin/pom.xml b/nuiton-config-maven-plugin/pom.xml index ceb7d09..da0c3c5 100644 --- a/nuiton-config-maven-plugin/pom.xml +++ b/nuiton-config-maven-plugin/pom.xml @@ -66,6 +66,11 @@ </dependency> <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + + <dependency> <groupId>com.tunnelvisionlabs</groupId> <artifactId>antlr4-runtime</artifactId> </dependency> @@ -80,6 +85,11 @@ </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + </dependency> + + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> diff --git a/nuiton-config-maven-plugin/src/license/THIRD-PARTY.properties b/nuiton-config-maven-plugin/src/license/THIRD-PARTY.properties index fc3ffd2..2dc733f 100644 --- a/nuiton-config-maven-plugin/src/license/THIRD-PARTY.properties +++ b/nuiton-config-maven-plugin/src/license/THIRD-PARTY.properties @@ -2,11 +2,10 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - Apache License -# - Apache License Version 2.0 # - Apache Software License, Version 1.1 +# - BSD 3-Clause "New" or "Revised" License (BSD-3-Clause) # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -# - Eclipse Public License 1.0 # - Eclipse Public License, Version 1.0 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) v 3.0 @@ -14,24 +13,18 @@ # - Lesser General Public License (LPGL) v 2.1 # - MIT License # - Mozilla Public License Version 1.0 -# - New BSD License # - Public Domain # - The Apache Software License, Version 2.0 -# - The GNU General Public License -# - The SAX License -# - The W3C License -# - http://classworlds.codehaus.org/license.html +# - The BSD License # - http://jaxen.codehaus.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Sun Aug 09 09:53:01 CEST 2015 +#Fri Sep 30 12:43:31 CEST 2016 antlr--antlr--2.7.2=BSD License -classworlds--classworlds--1.1-alpha-2=http\://classworlds.codehaus.org/license.html commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.1=BSD License -org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1=The Apache Software License, Version 2.0 org.codehaus.plexus--plexus-i18n--1.0-beta-10=The Apache Software License, Version 2.0 org.codehaus.plexus--plexus-velocity--1.1.7=The Apache Software License, Version 2.0 oro--oro--2.0.8=The Apache Software License, Version 2.0 diff --git a/nuiton-config-maven-plugin/src/main/java/org/nuiton/config/plugin/ReportRenderer.java b/nuiton-config-maven-plugin/src/main/java/org/nuiton/config/plugin/ReportRenderer.java index 023f39c..c114d2c 100644 --- a/nuiton-config-maven-plugin/src/main/java/org/nuiton/config/plugin/ReportRenderer.java +++ b/nuiton-config-maven-plugin/src/main/java/org/nuiton/config/plugin/ReportRenderer.java @@ -22,7 +22,7 @@ package org.nuiton.config.plugin; * #L% */ -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.maven.doxia.sink.Sink; import org.apache.maven.doxia.sink.SinkEventAttributeSet; import org.apache.maven.doxia.sink.SinkEventAttributes; diff --git a/nuiton-config/nuiton-config (1).iml b/nuiton-config/nuiton-config (1).iml deleted file mode 100644 index 92c6a89..0000000 --- a/nuiton-config/nuiton-config (1).iml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false"> - <output url="file://$MODULE_DIR$/target/classes" /> - <output-test url="file://$MODULE_DIR$/target/test-classes" /> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> - <excludeFolder url="file://$MODULE_DIR$/target" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" name="Maven: org.nuiton:nuiton-converter:1.0" level="project" /> - <orderEntry type="library" name="Maven: org.nuiton:nuiton-version:1.0-rc-2" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:guava:19.0" level="project" /> - <orderEntry type="library" name="Maven: org.nuiton:nuiton-utils:3.0-rc-12" level="project" /> - <orderEntry type="library" name="Maven: commons-primitives:commons-primitives:1.0" level="project" /> - <orderEntry type="library" name="Maven: org.nuiton.i18n:nuiton-i18n:3.3" level="project" /> - <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" /> - <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.1" level="project" /> - <orderEntry type="library" name="Maven: commons-io:commons-io:2.5" level="project" /> - <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" /> - <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: log4j:log4j:1.2.17" level="project" /> - </component> -</module> \ No newline at end of file diff --git a/nuiton-config/src/license/THIRD-PARTY.properties b/nuiton-config/src/license/THIRD-PARTY.properties new file mode 100644 index 0000000..c8ce18b --- /dev/null +++ b/nuiton-config/src/license/THIRD-PARTY.properties @@ -0,0 +1,19 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Eclipse Public License 1.0 +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - New BSD License +# - The Apache Software License, Version 2.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Fri Sep 30 12:43:17 CEST 2016 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 diff --git a/pom.xml b/pom.xml index 82ea73d..396878f 100644 --- a/pom.xml +++ b/pom.xml @@ -97,6 +97,12 @@ </dependency> <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + <version>3.6.2</version> + </dependency> + + <dependency> <groupId>org.nuiton.eugene</groupId> <artifactId>eugene</artifactId> <version>${eugeneVersion}</version> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.