This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository processor. See https://gitlab.nuiton.org/nuiton/processor.git commit 8826b419456b900792dd02b7354f5ae5ac0d105b Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon May 4 17:24:58 2020 +0200 Fix releasable build [skip ci] --- .../org/nuiton/processor/ant/ProcessorTask.java | 16 ++++++------ .../java/org/nuiton/processor/LogsProcessor.java | 2 +- .../nuiton/processor/OptimisationProcessor.java | 2 +- .../main/java/org/nuiton/processor/Processor.java | 2 +- .../java/org/nuiton/processor/ProcessorReader.java | 2 +- .../java/org/nuiton/processor/ProcessorUtil.java | 6 ++--- .../java/org/nuiton/processor/ProcessorWriter.java | 2 +- .../processor/filters/ActiveLogsCodeFilter.java | 2 +- .../nuiton/processor/filters/DefaultFilter.java | 2 +- .../java/org/nuiton/processor/filters/Filter.java | 2 +- .../filters/GeneratorTemplatesFilter.java | 10 +++----- .../filters/GeneratorTemplatesFilterBody.java | 4 ++- .../filters/GeneratorTemplatesFilterIn.java | 6 ++--- .../org/nuiton/processor/filters/LogsFilter.java | 2 +- .../nuiton/processor/filters/NoActionFilter.java | 2 +- .../processor/filters/OptimisationFilter.java | 2 +- .../processor/filters/RemoveLogsCodeFilter.java | 2 +- pom.xml | 30 ++++++++++------------ .../src/license/THIRD-PARTY.properties | 21 --------------- .../nuiton/processor/plugin/ProcessorPlugin.java | 20 +++++++-------- src/site/site.xml | 7 +++-- 21 files changed, 60 insertions(+), 84 deletions(-) diff --git a/ant-processor-task/src/main/java/org/nuiton/processor/ant/ProcessorTask.java b/ant-processor-task/src/main/java/org/nuiton/processor/ant/ProcessorTask.java index 5375dce..3b7457e 100644 --- a/ant-processor-task/src/main/java/org/nuiton/processor/ant/ProcessorTask.java +++ b/ant-processor-task/src/main/java/org/nuiton/processor/ant/ProcessorTask.java @@ -35,23 +35,23 @@ import java.io.IOException; /** * Tache ant pour lutinprocessor. - * <p/> + * * To use this task, put this code in ant build file: * <pre> - * <taskdef name="processor" classname="org.nuiton.processor.ant.ProcessorTask" - * classpath="lib/lutinprocessor.jar" /> + * <taskdef name="processor" classname="org.nuiton.processor.ant.ProcessorTask" + * classpath="lib/lutinprocessor.jar" /> * </pre> - * <p/> + * * and use it with: * <pre> - * <processor srcdir="${src}" destdir="${targetgen}" filters="org.nuiton.processor.filters.GeneratorTemplatesFilter" /> + * <processor srcdir="${src}" destdir="${targetgen}" filters="org.nuiton.processor.filters.GeneratorTemplatesFilter" /> * </pre> * Created: 14 janv. 2004 * - * @author Benjamin Poussin <poussin@codelutin.com> Copyright Code Lutin + * @author Benjamin Poussin <poussin@codelutin.com> Copyright Code Lutin * @version $Revision$ - * <p/> - * Mise a jour: $Date$ par : + * + * Mise a jour: $Date$ par : */ public class ProcessorTask extends MatchingTask { // ProcessorTask diff --git a/nuiton-processor/src/main/java/org/nuiton/processor/LogsProcessor.java b/nuiton-processor/src/main/java/org/nuiton/processor/LogsProcessor.java index 730c2e7..58a9d8b 100644 --- a/nuiton-processor/src/main/java/org/nuiton/processor/LogsProcessor.java +++ b/nuiton-processor/src/main/java/org/nuiton/processor/LogsProcessor.java @@ -26,7 +26,7 @@ * * Created: Wed Jan 14 2004 * -* @author <poussin@codelutin.com> +* @author <poussin@codelutin.com> * Copyright Code Lutin * @version $Revision$ * diff --git a/nuiton-processor/src/main/java/org/nuiton/processor/OptimisationProcessor.java b/nuiton-processor/src/main/java/org/nuiton/processor/OptimisationProcessor.java index 2695407..e766566 100644 --- a/nuiton-processor/src/main/java/org/nuiton/processor/OptimisationProcessor.java +++ b/nuiton-processor/src/main/java/org/nuiton/processor/OptimisationProcessor.java @@ -26,7 +26,7 @@ * * Created: Wed Sep 4 2002 * -* @author <poussin@codelutin.com> +* @author <poussin@codelutin.com> * Copyright Code Lutin * @version $Revision$ * diff --git a/nuiton-processor/src/main/java/org/nuiton/processor/Processor.java b/nuiton-processor/src/main/java/org/nuiton/processor/Processor.java index c2e0eda..3a6be3b 100644 --- a/nuiton-processor/src/main/java/org/nuiton/processor/Processor.java +++ b/nuiton-processor/src/main/java/org/nuiton/processor/Processor.java @@ -26,7 +26,7 @@ * * Created: Wed Jan 14 2004 * - * @author <poussin@codelutin.com> + * @author <poussin@codelutin.com> * Copyright Code Lutin * @version $Revision$ * diff --git a/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorReader.java b/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorReader.java index 97d2191..a78b959 100644 --- a/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorReader.java +++ b/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorReader.java @@ -26,7 +26,7 @@ * * Created: Wed Jan 14 2004 * - * @author <poussin@codelutin.com> + * @author <poussin@codelutin.com> * Copyright Code Lutin * @version $Revision$ * diff --git a/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorUtil.java b/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorUtil.java index 8957da5..3650697 100644 --- a/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorUtil.java +++ b/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorUtil.java @@ -39,7 +39,7 @@ import java.io.OutputStreamWriter; /** * Utilities methods. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.0.0.0 */ public class ProcessorUtil { @@ -246,7 +246,7 @@ public class ProcessorUtil { /** * To extract all content inside the header and footer. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.1 */ public static class FragmentExtractor extends DefaultFilter { @@ -297,7 +297,7 @@ public class ProcessorUtil { /** * To remove all content inside the header and footer. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.1 */ public static class FragmentRemover extends DefaultFilter { diff --git a/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorWriter.java b/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorWriter.java index e6186d2..d062d3a 100644 --- a/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorWriter.java +++ b/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorWriter.java @@ -26,7 +26,7 @@ * * Created: Wed Jan 14 2004 * - * @author <poussin@codelutin.com> + * @author <poussin@codelutin.com> * Copyright Code Lutin * @version $Revision$ * diff --git a/nuiton-processor/src/main/java/org/nuiton/processor/filters/ActiveLogsCodeFilter.java b/nuiton-processor/src/main/java/org/nuiton/processor/filters/ActiveLogsCodeFilter.java index 4cde016..4f75519 100644 --- a/nuiton-processor/src/main/java/org/nuiton/processor/filters/ActiveLogsCodeFilter.java +++ b/nuiton-processor/src/main/java/org/nuiton/processor/filters/ActiveLogsCodeFilter.java @@ -26,7 +26,7 @@ * * Created: Wed Jan 14 2004 * -* @author <poussin@codelutin.com> +* @author <poussin@codelutin.com> * Copyright Code Lutin * @version $Revision$ * diff --git a/nuiton-processor/src/main/java/org/nuiton/processor/filters/DefaultFilter.java b/nuiton-processor/src/main/java/org/nuiton/processor/filters/DefaultFilter.java index 6dd2c07..78a1c13 100644 --- a/nuiton-processor/src/main/java/org/nuiton/processor/filters/DefaultFilter.java +++ b/nuiton-processor/src/main/java/org/nuiton/processor/filters/DefaultFilter.java @@ -25,7 +25,7 @@ * * Created: Wed Sep 4 2002 * - * @author <poussin@codelutin.com>Copyright Code Lutin + * @author <poussin@codelutin.com>Copyright Code Lutin * * @version $Revision$ * diff --git a/nuiton-processor/src/main/java/org/nuiton/processor/filters/Filter.java b/nuiton-processor/src/main/java/org/nuiton/processor/filters/Filter.java index 0ed775d..e74d6d0 100644 --- a/nuiton-processor/src/main/java/org/nuiton/processor/filters/Filter.java +++ b/nuiton-processor/src/main/java/org/nuiton/processor/filters/Filter.java @@ -26,7 +26,7 @@ * * Created: Wed Jan 14 2004 * - * @author <poussin@codelutin.com> + * @author <poussin@codelutin.com> * Copyright Code Lutin * @version $Revision$ * diff --git a/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilter.java b/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilter.java index 4eff6a0..e10a558 100644 --- a/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilter.java +++ b/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilter.java @@ -33,16 +33,12 @@ * Mise a jour: $Date$ * par : */ -/** - * MultilinesLitteralsFilter.java - */ - package org.nuiton.processor.filters; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -/* +/** * Classe principale du filtre de génération. Ce filtre recherche tout ce qu'il * y a entre les tag /*{ et }*/ a l'interieur de ces tags un autre filtre * ({@link org.nuiton.processor.filters.GeneratorTemplatesFilterIn}) est @@ -58,14 +54,16 @@ import org.apache.commons.logging.LogFactory; * </ul> * Vous pouvez modifier le comportement du processor en mettant des options * Une option est incluse dans le tag et est de la forme - * /*{generator option: <optionName> = valeur}*/ + * /*{generator option: <optionName> = valeur}*/ * les options existantes sont: + * <ul> * <li>passEmptyLine: boolean; cette option permet de supprimer la première * et la dernière ligne si elles sont videx</li> * <li>writeParentheses: boolean, default: true : cette option permet d'ajouter les * parentheses autour du resultat (par defaut ces parentheses correspondent a celles * de l'appel a la methode output.write)</li> * <li>wtriteString: String, default: output.write</li> + * </ul> */ public class GeneratorTemplatesFilter extends DefaultFilter { diff --git a/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilterBody.java b/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilterBody.java index 8a4313f..ee04688 100644 --- a/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilterBody.java +++ b/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilterBody.java @@ -58,14 +58,16 @@ import org.apache.commons.logging.LogFactory; * </ul> * Vous pouvez modifier le comportement du processor en mettant des options * Une option est incluse dans le tag et est de la forme - * /*[generator option: <optionName> = valeur]*/ + * /*[generator option: <optionName> = valeur]*/ * les options existantes sont: + * <ul> * <li>passEmptyLine: boolean; cette option permet de supprimer la première * et la dernière ligne si elles sont videx</li> * <li>writeParentheses: boolean, default: false : cette option permet d'ajouter les * parentheses autour du resultat (par defaut ces parentheses correspondent a celles * de l'appel a la methode output.write)</li> * <li>wtriteString: String, default: +</li> + * </ul> */ public class GeneratorTemplatesFilterBody extends GeneratorTemplatesFilter { diff --git a/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilterIn.java b/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilterIn.java index 37bc6e5..c03753e 100644 --- a/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilterIn.java +++ b/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilterIn.java @@ -26,7 +26,7 @@ * * Created: 14 janv. 2004 * - * @author Benjamin Poussin <poussin@codelutin.com> + * @author Benjamin Poussin <poussin@codelutin.com> * Copyright Code Lutin * @version $Revision$ * @@ -39,8 +39,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; /** - * Le tag *) n'est substitué que s'il est a l'extérieur du tag <%=...%>ou - * <%...%> + * Le tag *) n'est substitué que s'il est a l'extérieur du tag <%=...%>ou + * <%...%> */ public class GeneratorTemplatesFilterIn extends DefaultFilter { // GeneratorTemplatesFilterIn diff --git a/nuiton-processor/src/main/java/org/nuiton/processor/filters/LogsFilter.java b/nuiton-processor/src/main/java/org/nuiton/processor/filters/LogsFilter.java index d22221c..e89ff2a 100644 --- a/nuiton-processor/src/main/java/org/nuiton/processor/filters/LogsFilter.java +++ b/nuiton-processor/src/main/java/org/nuiton/processor/filters/LogsFilter.java @@ -26,7 +26,7 @@ * * Created: Wed Jan 14 2004 * -* @author <poussin@codelutin.com> +* @author <poussin@codelutin.com> * Copyright Code Lutin * @version $Revision$ * diff --git a/nuiton-processor/src/main/java/org/nuiton/processor/filters/NoActionFilter.java b/nuiton-processor/src/main/java/org/nuiton/processor/filters/NoActionFilter.java index 4038781..43e429b 100644 --- a/nuiton-processor/src/main/java/org/nuiton/processor/filters/NoActionFilter.java +++ b/nuiton-processor/src/main/java/org/nuiton/processor/filters/NoActionFilter.java @@ -26,7 +26,7 @@ * * Created: Wed Jan 14 2004 * - * @author <poussin@codelutin.com> + * @author <poussin@codelutin.com> * Copyright Code Lutin * @version $Revision$ * diff --git a/nuiton-processor/src/main/java/org/nuiton/processor/filters/OptimisationFilter.java b/nuiton-processor/src/main/java/org/nuiton/processor/filters/OptimisationFilter.java index 68e3f5f..d9eb669 100644 --- a/nuiton-processor/src/main/java/org/nuiton/processor/filters/OptimisationFilter.java +++ b/nuiton-processor/src/main/java/org/nuiton/processor/filters/OptimisationFilter.java @@ -26,7 +26,7 @@ * * Created: Wed Sep 4 2002 * -* @author <poussin@codelutin.com> +* @author <poussin@codelutin.com> * Copyright Code Lutin * @version $Revision$ * diff --git a/nuiton-processor/src/main/java/org/nuiton/processor/filters/RemoveLogsCodeFilter.java b/nuiton-processor/src/main/java/org/nuiton/processor/filters/RemoveLogsCodeFilter.java index bea12a4..a0fbcdb 100644 --- a/nuiton-processor/src/main/java/org/nuiton/processor/filters/RemoveLogsCodeFilter.java +++ b/nuiton-processor/src/main/java/org/nuiton/processor/filters/RemoveLogsCodeFilter.java @@ -26,7 +26,7 @@ * * Created: Wed Jan 14 2004 * -* @author <poussin@codelutin.com> +* @author <poussin@codelutin.com> * Copyright Code Lutin * @version $Revision$ * diff --git a/pom.xml b/pom.xml index aa86097..4949903 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuitonpom</artifactId> - <version>11-SNAPSHOT</version> + <version>11.8-SNAPSHOT</version> </parent> <artifactId>processor</artifactId> @@ -51,10 +51,11 @@ <role>developer</role> </roles> </developer> + </developers> - <developer> + <contributors> + <contributor> <name>Tony Chemit</name> - <id>tchemit</id> <email>chemit@codelutin.com</email> <organization>CodeLutin</organization> <organizationUrl>http://codelutin.com</organizationUrl> @@ -62,9 +63,9 @@ <roles> <role>developer</role> </roles> - </developer> + </contributor> - </developers> + </contributors> <modules> <module>nuiton-processor</module> @@ -79,20 +80,17 @@ </scm> <properties> - - <!-- redmine project Id --> - <projectId>processor</projectId> + <gitlabProjectName>processor</gitlabProjectName> <!-- locales for site generation --> <locales>fr</locales> - <mavenVersion>3.0</mavenVersion> - <antVersion>1.8.3</antVersion> + <mavenVersion>3.3.9</mavenVersion> + <antVersion>1.10.7</antVersion> - <ciViewId>processor</ciViewId> - <javaVersion>1.6</javaVersion> - <signatureArtifactId>java16</signatureArtifactId> - <signatureVersion>1.1</signatureVersion> + <javaVersion>1.8</javaVersion> + <signatureArtifactId>java18</signatureArtifactId> + <signatureVersion>1.0</signatureVersion> </properties> <dependencyManagement> @@ -133,7 +131,7 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> - <version>3.0.8</version> + <version>3.3.0</version> </dependency> <dependency> @@ -190,7 +188,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.11</version> + <version>4.13</version> <scope>test</scope> </dependency> diff --git a/processor-maven-plugin/src/license/THIRD-PARTY.properties b/processor-maven-plugin/src/license/THIRD-PARTY.properties deleted file mode 100644 index d564e49..0000000 --- a/processor-maven-plugin/src/license/THIRD-PARTY.properties +++ /dev/null @@ -1,21 +0,0 @@ -# Generated by org.codehaus.mojo.license.AddThirdPartyMojo -#------------------------------------------------------------------------------- -# Already used licenses in project : -# - BSD License -# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -# - Common Public License Version 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 -# - Public Domain -# - The Apache Software License, Version 2.0 -# - http://classworlds.codehaus.org/license.html -#------------------------------------------------------------------------------- -# Please fill the missing licenses for dependencies : -# -# -#Thu Aug 18 07:25:51 CEST 2011 -classworlds--classworlds--1.1-alpha-2=http\://classworlds.codehaus.org/license.html -org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1=The Apache Software License, Version 2.0 diff --git a/processor-maven-plugin/src/main/java/org/nuiton/processor/plugin/ProcessorPlugin.java b/processor-maven-plugin/src/main/java/org/nuiton/processor/plugin/ProcessorPlugin.java index 57f22f4..38df7fb 100644 --- a/processor-maven-plugin/src/main/java/org/nuiton/processor/plugin/ProcessorPlugin.java +++ b/processor-maven-plugin/src/main/java/org/nuiton/processor/plugin/ProcessorPlugin.java @@ -44,11 +44,11 @@ import java.util.Map.Entry; /** * Maven2 plugin for Nuiton Processor. - * <p/> + * * Created: 14 avril 2006 * - * @author jruchaud <ruchaud@codelutin.com> - * @author tchemit <chemit@codelutin.com> + * @author jruchaud <ruchaud@codelutin.com> + * @author tchemit <chemit@codelutin.com> */ @Mojo(name = "process", requiresProject = true) public class ProcessorPlugin extends AbstractPlugin implements PluginWithEncoding { @@ -79,11 +79,11 @@ public class ProcessorPlugin extends AbstractPlugin implements PluginWithEncodin /** * Fichiers à inclure. - * <p/> + * * Il s'agit des expressions séparées par des virgules. - * <p/> + * * Exemple : - * <p/> + * * *.java,*.xml * * @since 0.10 @@ -93,11 +93,11 @@ public class ProcessorPlugin extends AbstractPlugin implements PluginWithEncodin /** * Fichiers à exclure. - * <p/> + * * Il s'agit des expressions spérarées par des virgules. - * <p/> + * * Exemple : - * <p/> + * * *.java,*.xml * * @since 0.10 @@ -132,7 +132,7 @@ public class ProcessorPlugin extends AbstractPlugin implements PluginWithEncodin /** * Encoding used to read and writes files. - * <p/> + * * <b>Note:</b> If nothing is filled here, we will use the system * property {@code file.encoding}. * diff --git a/src/site/site.xml b/src/site/site.xml index f993a78..517478b 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -44,20 +44,19 @@ </links> <breadcrumbs> - <item name="${project.name}" href="${project.url}/index.html"/> - <item name="${project.version}" href="${project.url}/v/${siteDeployClassifier}/index.html"/> + <item name="${project.name}" href="${this.url}/index.html"/> </breadcrumbs> <menu ref="modules"/> <menu ref="reports"/> - <footer> + <footer><![CDATA[ <div id='mavenProjectProperties' locale='fr' projectId='${project.projectId}' version='${project.siteDeployClassifier}' sourcesType='${project.siteSourcesType}'/> - </footer> + ]]></footer> </body> </project> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.