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 f58b550b8a5e4d58a1ce56a9404cf2dbf3e2678d Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Sep 30 15:50:32 2016 +0200 Update librairies (Fixes #4048) --- nuiton-config-example/pom.xml | 4 ---- nuiton-config-maven-plugin/pom.xml | 4 ++-- .../src/license/THIRD-PARTY.properties | 4 +--- .../org/nuiton/config/plugin/ReportRenderer.java | 2 +- pom.xml | 20 ++++++-------------- 5 files changed, 10 insertions(+), 24 deletions(-) diff --git a/nuiton-config-example/pom.xml b/nuiton-config-example/pom.xml index b26c4b3..a307b73 100644 --- a/nuiton-config-example/pom.xml +++ b/nuiton-config-example/pom.xml @@ -16,10 +16,6 @@ <properties> - <javaVersion>1.8</javaVersion> - <signatureArtifactId>java18</signatureArtifactId> - <signatureVersion>1.0</signatureVersion> - <!-- Post Release configuration --> <skipPostRelease>false</skipPostRelease> diff --git a/nuiton-config-maven-plugin/pom.xml b/nuiton-config-maven-plugin/pom.xml index bd60990..8158c6e 100644 --- a/nuiton-config-maven-plugin/pom.xml +++ b/nuiton-config-maven-plugin/pom.xml @@ -66,10 +66,10 @@ <groupId>com.tunnelvisionlabs</groupId> <artifactId>antlr4-runtime</artifactId> </dependency> - <dependency> + <!--dependency> <groupId>com.tunnelvisionlabs</groupId> <artifactId>antlr4-annotations</artifactId> - </dependency> + </dependency--> <dependency> <groupId>org.apache.commons</groupId> diff --git a/nuiton-config-maven-plugin/src/license/THIRD-PARTY.properties b/nuiton-config-maven-plugin/src/license/THIRD-PARTY.properties index 2dc733f..bee1086 100644 --- a/nuiton-config-maven-plugin/src/license/THIRD-PARTY.properties +++ b/nuiton-config-maven-plugin/src/license/THIRD-PARTY.properties @@ -3,7 +3,6 @@ # Already used licenses in project : # - Apache License # - 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, Version 1.0 @@ -21,10 +20,9 @@ # Please fill the missing licenses for dependencies : # # -#Fri Sep 30 12:43:31 CEST 2016 +#Fri Sep 30 15:38:10 CEST 2016 antlr--antlr--2.7.2=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.1=BSD License 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 c114d2c..9ddae92 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 @@ -24,8 +24,8 @@ package org.nuiton.config.plugin; 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; +import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet; import org.apache.maven.reporting.AbstractMavenReportRenderer; import org.codehaus.plexus.i18n.I18N; import org.codehaus.plexus.util.StringUtils; diff --git a/pom.xml b/pom.xml index 5aba643..d971623 100644 --- a/pom.xml +++ b/pom.xml @@ -67,10 +67,8 @@ <signatureArtifactId>java17</signatureArtifactId> <signatureVersion>1.0</signatureVersion> - <antlr4Version>4.5</antlr4Version> <mavenVersion>3.3.9</mavenVersion> - <eugeneVersion>3.0-SNAPSHOT</eugeneVersion> - <doxiaVersion>1.5</doxiaVersion> + <doxiaVersion>1.7</doxiaVersion> <!-- Documentation is in apt format --> <siteSourcesType>apt</siteSourcesType> @@ -94,7 +92,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>3.0-rc-12</version> + <version>3.0-rc-15</version> </dependency> <dependency> @@ -106,7 +104,7 @@ <dependency> <groupId>org.nuiton.eugene</groupId> <artifactId>eugene</artifactId> - <version>${eugeneVersion}</version> + <version>3.0-alpha-7</version> <scope>compile</scope> </dependency> @@ -149,7 +147,7 @@ <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> - <version>1.9.2</version> + <version>1.9.3</version> </dependency> <dependency> @@ -166,16 +164,10 @@ <scope>provided</scope> </dependency> - <!-- see http://stackoverflow.com/a/32918434/2038100 --> <dependency> <groupId>com.tunnelvisionlabs</groupId> <artifactId>antlr4-runtime</artifactId> - <version>${antlr4Version}</version> - </dependency> - <dependency> - <groupId>com.tunnelvisionlabs</groupId> - <artifactId>antlr4-annotations</artifactId> - <version>${antlr4Version}</version> + <version>4.5.3</version> </dependency> <dependency> @@ -273,7 +265,7 @@ <dependency> <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-site-renderer</artifactId> - <version>1.4</version> + <version>1.7.1</version> <exclusions> <exclusion> <groupId>org.codehaus.plexus</groupId> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.