branch develop updated (0a656c8 -> c45585b)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository nuiton-maven-report-plugin. See https://gitlab.nuiton.org/nuiton/nuiton-maven-report-plugin.git from 0a656c8 Make javadoc compatible with java 8 (Fixes #3959) new e6bb618 Updates nuitonpom to 10.1 (Fixes #3958) new 86c0d3e Update and fix documentation and fix also licenses headers (fixes #3978) new 2b9100c Updates plexus-utils to 3.0.24 (Fixes #3977) new d5a0547 updates maven-reporting-impl to 2.4 (Fixes #3979) new c45585b Can stay on java 6 for the moment The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit c45585b1d5826a7f239b65636f2feda1812811b1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Jul 11 18:21:22 2016 +0200 Can stay on java 6 for the moment commit d5a054737c57b9387f642221d4bd1c4cf73362d4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Jul 11 18:18:54 2016 +0200 updates maven-reporting-impl to 2.4 (Fixes #3979) commit 2b9100cb98e6c2972c8a9edf87554fd3c350e8b4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Jul 11 18:12:22 2016 +0200 Updates plexus-utils to 3.0.24 (Fixes #3977) commit 86c0d3edb8a5959dd0e06b03c51a685db558e6ea Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Jul 11 18:07:32 2016 +0200 Update and fix documentation and fix also licenses headers (fixes #3978) commit e6bb618d08eccc3c857f50ba59fba33f3cf7f62f Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Jul 11 14:53:44 2016 +0200 Updates nuitonpom to 10.1 (Fixes #3958) Summary of changes: README.md | 1 + pom.xml | 19 +++----- .../config/AbstractApplicationConfigReport.java | 6 +-- .../config/AggregateApplicationConfigReport.java | 6 +-- .../org/nuiton/config/ApplicationConfigReport.java | 6 +-- .../config/ApplicationConfigReportRenderer.java | 6 +-- src/main/resources/config-report.properties | 7 +-- src/main/resources/config-report_en.properties | 7 +-- src/main/resources/config-report_fr.properties | 7 +-- src/site/apt/{index.apt => index.apt.vm} | 17 +++---- src/site/apt/usage.apt.vm | 21 ++++----- src/site/apt/versions.apt | 6 +-- src/site/site_fr.xml | 53 ++++------------------ 13 files changed, 48 insertions(+), 114 deletions(-) rename src/site/apt/{index.apt => index.apt.vm} (80%) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-maven-report-plugin. See https://gitlab.nuiton.org/nuiton/nuiton-maven-report-plugin.git commit e6bb618d08eccc3c857f50ba59fba33f3cf7f62f Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Jul 11 14:53:44 2016 +0200 Updates nuitonpom to 10.1 (Fixes #3958) --- pom.xml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 74aaa8c..49dfa95 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuitonpom</artifactId> - <version>10</version> + <version>10.1</version> </parent> <artifactId>nuiton-maven-report-plugin</artifactId> @@ -22,7 +22,7 @@ <developer> <name>Tony Chemit</name> <id>tchemit</id> - <email>chemit at codelutin dot com</email> + <email>chemit@codelutin.com</email> <organization>CodeLutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> <timezone>Europe/Paris</timezone> @@ -45,12 +45,6 @@ </url> <tag>HEAD</tag> </scm> - <distributionManagement> - <site> - <id>doc.${platform}</id> - <url>${our.site.repository}/${projectId}</url> - </site> - </distributionManagement> <prerequisites> <maven>3.0.5</maven> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-maven-report-plugin. See https://gitlab.nuiton.org/nuiton/nuiton-maven-report-plugin.git commit 86c0d3edb8a5959dd0e06b03c51a685db558e6ea Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Jul 11 18:07:32 2016 +0200 Update and fix documentation and fix also licenses headers (fixes #3978) --- README.md | 1 + pom.xml | 1 + .../config/AbstractApplicationConfigReport.java | 6 +-- .../config/AggregateApplicationConfigReport.java | 6 +-- .../org/nuiton/config/ApplicationConfigReport.java | 6 +-- .../config/ApplicationConfigReportRenderer.java | 6 +-- src/main/resources/config-report.properties | 7 +-- src/main/resources/config-report_en.properties | 7 +-- src/main/resources/config-report_fr.properties | 7 +-- src/site/apt/{index.apt => index.apt.vm} | 17 +++---- src/site/apt/usage.apt.vm | 21 ++++----- src/site/apt/versions.apt | 6 +-- src/site/site_fr.xml | 53 ++++------------------ 13 files changed, 42 insertions(+), 102 deletions(-) diff --git a/README.md b/README.md index e69de29..30404ce 100644 --- a/README.md +++ b/README.md @@ -0,0 +1 @@ +TODO \ No newline at end of file diff --git a/pom.xml b/pom.xml index 49dfa95..a67de10 100644 --- a/pom.xml +++ b/pom.xml @@ -64,6 +64,7 @@ <!-- Documentation is in apt format --> <siteSourcesType>apt</siteSourcesType> + <locales>fr</locales> <!-- extra files to include in release --> <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> diff --git a/src/main/java/org/nuiton/config/AbstractApplicationConfigReport.java b/src/main/java/org/nuiton/config/AbstractApplicationConfigReport.java index e7e05f1..438cc83 100644 --- a/src/main/java/org/nuiton/config/AbstractApplicationConfigReport.java +++ b/src/main/java/org/nuiton/config/AbstractApplicationConfigReport.java @@ -2,11 +2,9 @@ package org.nuiton.config; /* * #%L - * Nuiton Utils :: Maven Report Plugin - * $Id$ - * $HeadURL$ + * Maven Report Plugin * %% - * Copyright (C) 2012 - 2013 CodeLutin + * Copyright (C) 2012 - 2016 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as diff --git a/src/main/java/org/nuiton/config/AggregateApplicationConfigReport.java b/src/main/java/org/nuiton/config/AggregateApplicationConfigReport.java index 490e421..b10e81d 100644 --- a/src/main/java/org/nuiton/config/AggregateApplicationConfigReport.java +++ b/src/main/java/org/nuiton/config/AggregateApplicationConfigReport.java @@ -2,11 +2,9 @@ package org.nuiton.config; /* * #%L - * Nuiton Utils :: Maven Report Plugin - * $Id$ - * $HeadURL$ + * Nuiton Maven Report Plugin * %% - * Copyright (C) 2012 - 2013 CodeLutin + * Copyright (C) 2012 - 2016 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as diff --git a/src/main/java/org/nuiton/config/ApplicationConfigReport.java b/src/main/java/org/nuiton/config/ApplicationConfigReport.java index 39391f0..19b814e 100644 --- a/src/main/java/org/nuiton/config/ApplicationConfigReport.java +++ b/src/main/java/org/nuiton/config/ApplicationConfigReport.java @@ -2,11 +2,9 @@ package org.nuiton.config; /* * #%L - * Nuiton Utils :: Maven Report Plugin - * $Id$ - * $HeadURL$ + * Nuiton Maven Report Plugin * %% - * Copyright (C) 2012 - 2013 CodeLutin + * Copyright (C) 2012 - 2016 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as diff --git a/src/main/java/org/nuiton/config/ApplicationConfigReportRenderer.java b/src/main/java/org/nuiton/config/ApplicationConfigReportRenderer.java index 7d876f3..d0f9707 100644 --- a/src/main/java/org/nuiton/config/ApplicationConfigReportRenderer.java +++ b/src/main/java/org/nuiton/config/ApplicationConfigReportRenderer.java @@ -2,11 +2,9 @@ package org.nuiton.config; /* * #%L - * Nuiton Utils :: Maven Report Plugin - * $Id$ - * $HeadURL$ + * Nuiton Maven Report Plugin * %% - * Copyright (C) 2012 - 2013 CodeLutin + * Copyright (C) 2012 - 2016 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as diff --git a/src/main/resources/config-report.properties b/src/main/resources/config-report.properties index b007f8b..6d2e875 100644 --- a/src/main/resources/config-report.properties +++ b/src/main/resources/config-report.properties @@ -1,11 +1,8 @@ ### # #%L -# Nuiton Utils :: Nuiton Maven Report Plugin -# -# $Id$ -# $HeadURL$ +# Nuiton Maven Report Plugin # %% -# Copyright (C) 2012 CodeLutin +# Copyright (C) 2012 - 2016 CodeLutin, Tony Chemit # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as diff --git a/src/main/resources/config-report_en.properties b/src/main/resources/config-report_en.properties index 4954ef1..c18ff4f 100644 --- a/src/main/resources/config-report_en.properties +++ b/src/main/resources/config-report_en.properties @@ -1,11 +1,8 @@ ### # #%L -# Nuiton Utils :: Nuiton Maven Report Plugin -# -# $Id$ -# $HeadURL$ +# Nuiton Maven Report Plugin # %% -# Copyright (C) 2012 CodeLutin +# Copyright (C) 2012 - 2016 CodeLutin, Tony Chemit # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as diff --git a/src/main/resources/config-report_fr.properties b/src/main/resources/config-report_fr.properties index b105e6f..facaf4c 100644 --- a/src/main/resources/config-report_fr.properties +++ b/src/main/resources/config-report_fr.properties @@ -1,11 +1,8 @@ ### # #%L -# Nuiton Utils :: Nuiton Maven Report Plugin -# -# $Id$ -# $HeadURL$ +# Nuiton Maven Report Plugin # %% -# Copyright (C) 2012 CodeLutin +# Copyright (C) 2012 - 2016 CodeLutin, Tony Chemit # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt.vm similarity index 80% rename from src/site/apt/index.apt rename to src/site/apt/index.apt.vm index b179f93..12ca0c8 100644 --- a/src/site/apt/index.apt +++ b/src/site/apt/index.apt.vm @@ -1,11 +1,8 @@ ~~~ ~~ #%L -~~ Nuiton Utils :: Nuiton Maven Report Plugin -~~ -~~ $Id$ -~~ $HeadURL$ +~~ Nuiton Maven Report Plugin ~~ %% -~~ Copyright (C) 2012 CodeLutin, Tony Chemit +~~ Copyright (C) 2012-2016 CodeLutin, Tony Chemit ~~ %% ~~ This program is free software: you can redistribute it and/or modify ~~ it under the terms of the GNU Lesser General Public License as @@ -23,7 +20,7 @@ ~~ #L% ~~~ ------ - Nuiton-utils-maven-report-plugin + Nuiton maven reports plugin ------ ------ 2012-05-01 @@ -39,18 +36,18 @@ Note Voici quelques liens sur le nouveau projet: - * {{{http://svn.nuiton.org/nuiton-maven-report-plugin}svn}} + * {{{https://gitlab.nuiton.org/nuiton/nuiton-maven-report-plugin}scm}} - * {{{http://forge.nuiton.org/projects/nuiton-maven-report-plugin}forge}} + * {{{https://forge.nuiton.org/projects/nuiton-maven-report-plugin}forge}} - * {{{http://doc.nuiton.org/nuiton-maven-report-plugin}site}} + * {{{http://nuiton-maven-report-plugin.nuiton.org}site}} [] Il faut alors utiliser cet artefact (<org.nuiton:nuiton-maven-report-plugin>). La dernière version stable dans nuiton-utils est la 2.7; vous pouvez dès à - présent utiliser la version 3.0. + présent utiliser la version ${project.version}. Pour plus de détails sur les changements importants entre chaque version, vous pouvez consulter les {{{./versions.html}Notes de versions}}. diff --git a/src/site/apt/usage.apt.vm b/src/site/apt/usage.apt.vm index 3295c1e..e5b8fe3 100644 --- a/src/site/apt/usage.apt.vm +++ b/src/site/apt/usage.apt.vm @@ -1,11 +1,8 @@ ~~~ ~~ #%L -~~ Nuiton Utils :: Nuiton Maven Report Plugin -~~ -~~ $Id$ -~~ $HeadURL$ +~~ Nuiton Maven Report Plugin ~~ %% -~~ Copyright (C) 2012 CodeLutin, Tony Chemit +~~ Copyright (C) 2013-2016 CodeLutin, Tony Chemit ~~ %% ~~ This program is free software: you can redistribute it and/or modify ~~ it under the terms of the GNU Lesser General Public License as @@ -45,7 +42,7 @@ Utilisation <reportSets> <reportSet> <reports> - <report>application-config-report</report> + <report>config-report</report> </reports> </reportSet> </reportSets> @@ -67,12 +64,12 @@ Utilisation <plugins> <plugin> <groupId>org.nuiton</groupId> - <artifactId>nuiton-util-maven-report-plugin</artifactId> + <artifactId>nuiton-maven-report-plugin</artifactId> <version>${project.version}</version> <reportSets> <reportSet> <reports> - <report>application-config-report</report> + <report>config-report</report> </reports> </reportSet> </reportSets> @@ -84,10 +81,10 @@ Utilisation </reporting> ------------------------------------------------------------------------------- -* Générer un rapport pour l'utilisation d'ApplicationConfig en mode aggregate +* Générer un rapport pour l'utilisation d'ApplicationConfig en mode aggrégé. Pour une application multi-module, il peut-être intéressant de générer le - rapport au niveau du super-pom du projet. Pour cela on utilise un + rapport au niveau du pom parent du projet. Pour cela on utilise un report <aggregate> comme dans l'example suivant : ------------------------------------------------------------------------------- @@ -95,12 +92,12 @@ Utilisation <plugins> <plugin> <groupId>org.nuiton</groupId> - <artifactId>nuiton-util-maven-report-plugin</artifactId> + <artifactId>nuiton-maven-report-plugin</artifactId> <version>${project.version}</version> <reportSets> <reportSet> <reports> - <report>aggregate-application-config-report</report> + <report>aggregate-config-report</report> </reports> </reportSet> </reportSets> diff --git a/src/site/apt/versions.apt b/src/site/apt/versions.apt index f7a0149..354a784 100644 --- a/src/site/apt/versions.apt +++ b/src/site/apt/versions.apt @@ -1,10 +1,8 @@ ~~~ ~~ #%L -~~ Nuiton Config -~~ $Id$ -~~ $HeadURL$ +~~ Nuiton Maven Report Plugin ~~ %% -~~ Copyright (C) 2013 CodeLutin +~~ Copyright (C) 2013 - 2016 CodeLutin, Tony Chemit ~~ %% ~~ This program is free software: you can redistribute it and/or modify ~~ it under the terms of the GNU Lesser General Public License as diff --git a/src/site/site_fr.xml b/src/site/site_fr.xml index 0186bf5..c06e5d4 100644 --- a/src/site/site_fr.xml +++ b/src/site/site_fr.xml @@ -1,12 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - Nuiton Utils - - $Id$ - $HeadURL$ + Nuiton Maven Report Plugin %% - Copyright (C) 2004 - 2010 CodeLutin + Copyright (C) 2012 - 2016 CodeLutin, Tony Chemit %% 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,25 +22,9 @@ --> -<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.4.0" +<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.6.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> - - <skin> - <groupId>org.apache.maven.skins</groupId> - <artifactId>maven-fluido-skin</artifactId> - <version>${fluidoSkinVersion}</version> - </skin> - - <custom> - <fluidoSkin> - <topBarEnabled>false</topBarEnabled> - <googleSearch/> - <sideBarEnabled>true</sideBarEnabled> - <searchEnabled>true</searchEnabled> - <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> - </fluidoSkin> - </custom> + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.6.0 http://maven.apache.org/xsd/decoration-1.6.0.xsd"> <bannerLeft> <name>${project.name}</name> @@ -55,36 +36,18 @@ <href>http://www.codelutin.com</href> </bannerRight> - <publishDate position="right" /> - <version position="right" /> - - <poweredBy> - - <logo href="http://maven.apache.org" name="Maven" - img="${mavenpomSiteCommonResourcesUrl}/images/logos/maven-feather.png"/> - - </poweredBy> <body> - <head> - <script type="text/javascript" - src="${mavenpomSiteCommonResourcesUrl}/js/mavenpom-site.js"> - </script> - - <link rel="stylesheet" type="text/css" - href="${mavenpomSiteCommonResourcesUrl}/css/mavenpom-site.css"/> - </head> - <links> - <item name="Nuiton.org" href="https://nuiton.org"/> + <item name="Nuiton" href="https://forge.nuiton.org"/> <item name="Code Lutin" href="http://www.codelutin.com"/> <item name="Libre entreprise" href="http://www.libre-entreprise.org"/> </links> <breadcrumbs> - <item name="${project.name}" - href="${project.url}/index.html"/> + <item name="${project.name}" href="${project.url}/index.html"/> + <item name="${project.version}" href="${project.url}/${siteDeployClassifier}/index.html"/> </breadcrumbs> <menu name="Utilisateur"> @@ -100,7 +63,7 @@ projectId='${project.projectId}' version='${project.siteDeployClassifier}' sourcesType='${project.siteSourcesType}' - scmwebeditor_vmFiles=',usage,'/> + scmwebeditor_vmFiles=',index,usage,'/> </footer> </body> </project> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-maven-report-plugin. See https://gitlab.nuiton.org/nuiton/nuiton-maven-report-plugin.git commit 2b9100cb98e6c2972c8a9edf87554fd3c350e8b4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Jul 11 18:12:22 2016 +0200 Updates plexus-utils to 3.0.24 (Fixes #3977) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a67de10..a26e620 100644 --- a/pom.xml +++ b/pom.xml @@ -203,7 +203,7 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> - <version>3.0.22</version> + <version>3.0.24</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>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-maven-report-plugin. See https://gitlab.nuiton.org/nuiton/nuiton-maven-report-plugin.git commit d5a054737c57b9387f642221d4bd1c4cf73362d4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Jul 11 18:18:54 2016 +0200 updates maven-reporting-impl to 2.4 (Fixes #3979) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a26e620..535bcc0 100644 --- a/pom.xml +++ b/pom.xml @@ -179,7 +179,7 @@ <dependency> <groupId>org.apache.maven.reporting</groupId> <artifactId>maven-reporting-impl</artifactId> - <version>2.2</version> + <version>2.4</version> <exclusions> <exclusion> <groupId>org.apache.maven</groupId> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-maven-report-plugin. See https://gitlab.nuiton.org/nuiton/nuiton-maven-report-plugin.git commit c45585b1d5826a7f239b65636f2feda1812811b1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Jul 11 18:21:22 2016 +0200 Can stay on java 6 for the moment --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 535bcc0..2a2e4a4 100644 --- a/pom.xml +++ b/pom.xml @@ -55,8 +55,8 @@ <projectId>nuiton-maven-report-plugin</projectId> <ciViewId>nuiton-maven-report-plugin</ciViewId> - <javaVersion>1.7</javaVersion> - <signatureArtifactId>java17</signatureArtifactId> + <javaVersion>1.6</javaVersion> + <signatureArtifactId>java16</signatureArtifactId> <signatureVersion>1.0</signatureVersion> <doxiaVersion>1.5</doxiaVersion> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm