branch develop updated (08a4b74 -> 312f1b6)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository nuiton-config. See https://gitlab.nuiton.org/nuiton/nuiton-config.git from 08a4b74 Add Jacoco to get project coverage new 312f1b6 Fix releasable build [skip ci] The 1 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 312f1b6e31ea65f3f64967c95e1c468a3c0f2a96 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon May 4 17:17:01 2020 +0200 Fix releasable build [skip ci] Summary of changes: .../nuiton/config/example/NuitonConfigTest.java | 22 ++++++++++++++++++++++ nuiton-config-maven-plugin/pom.xml | 5 +++++ .../src/license/THIRD-PARTY.properties | 9 ++++----- .../config/plugin/io/ConfigModelIOIniImpl.java | 3 ++- .../config/plugin/io/ConfigModelIOTomlImpl.java | 3 ++- .../config/plugin/io/ConfigModelIOYamlImpl.java | 3 ++- .../java/org/nuiton/config/ApplicationConfig.java | 7 ++++--- pom.xml | 16 ++++++---------- src/site/site_fr.xml | 14 +++----------- 9 files changed, 50 insertions(+), 32 deletions(-) -- 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-config. See https://gitlab.nuiton.org/nuiton/nuiton-config.git commit 312f1b6e31ea65f3f64967c95e1c468a3c0f2a96 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon May 4 17:17:01 2020 +0200 Fix releasable build [skip ci] --- .../nuiton/config/example/NuitonConfigTest.java | 22 ++++++++++++++++++++++ nuiton-config-maven-plugin/pom.xml | 5 +++++ .../src/license/THIRD-PARTY.properties | 9 ++++----- .../config/plugin/io/ConfigModelIOIniImpl.java | 3 ++- .../config/plugin/io/ConfigModelIOTomlImpl.java | 3 ++- .../config/plugin/io/ConfigModelIOYamlImpl.java | 3 ++- .../java/org/nuiton/config/ApplicationConfig.java | 7 ++++--- pom.xml | 16 ++++++---------- src/site/site_fr.xml | 14 +++----------- 9 files changed, 50 insertions(+), 32 deletions(-) diff --git a/nuiton-config-example/src/test/java/org/nuiton/config/example/NuitonConfigTest.java b/nuiton-config-example/src/test/java/org/nuiton/config/example/NuitonConfigTest.java index 9e1742c..ef2393c 100644 --- a/nuiton-config-example/src/test/java/org/nuiton/config/example/NuitonConfigTest.java +++ b/nuiton-config-example/src/test/java/org/nuiton/config/example/NuitonConfigTest.java @@ -1,5 +1,27 @@ package org.nuiton.config.example; +/*- + * #%L + * Nuiton Config :: Example + * %% + * Copyright (C) 2016 - 2020 Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import org.junit.Assert; import org.junit.Test; import org.nuiton.config.io.ApplicationConfigReadFormat; diff --git a/nuiton-config-maven-plugin/pom.xml b/nuiton-config-maven-plugin/pom.xml index 8ce713b..63b2553 100644 --- a/nuiton-config-maven-plugin/pom.xml +++ b/nuiton-config-maven-plugin/pom.xml @@ -151,6 +151,11 @@ <artifactId>plexus-i18n</artifactId> </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-annotations</artifactId> + </dependency> + <!-- doxia --> <dependency> diff --git a/nuiton-config-maven-plugin/src/license/THIRD-PARTY.properties b/nuiton-config-maven-plugin/src/license/THIRD-PARTY.properties index 5aadd5d..9c0ab18 100644 --- a/nuiton-config-maven-plugin/src/license/THIRD-PARTY.properties +++ b/nuiton-config-maven-plugin/src/license/THIRD-PARTY.properties @@ -1,7 +1,7 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - Apache License +# - Apache 2.0 # - Apache Software License, Version 1.1 # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 @@ -22,9 +22,8 @@ # Please fill the missing licenses for dependencies : # # -#Thu Feb 09 10:23:52 CET 2017 -antlr--antlr--2.7.2=BSD License +#Mon May 04 13:53:20 CEST 2020 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 +antlr--antlr--2.7.2=BSD License oro--oro--2.0.8=The Apache Software License, Version 2.0 +org.codehaus.plexus--plexus-i18n--1.0-beta-10=The Apache Software License, Version 2.0 diff --git a/nuiton-config-maven-plugin/src/main/java/org/nuiton/config/plugin/io/ConfigModelIOIniImpl.java b/nuiton-config-maven-plugin/src/main/java/org/nuiton/config/plugin/io/ConfigModelIOIniImpl.java index 02bfd3d..db549df 100644 --- a/nuiton-config-maven-plugin/src/main/java/org/nuiton/config/plugin/io/ConfigModelIOIniImpl.java +++ b/nuiton-config-maven-plugin/src/main/java/org/nuiton/config/plugin/io/ConfigModelIOIniImpl.java @@ -27,6 +27,7 @@ import com.google.common.io.Files; import org.apache.commons.configuration2.INIConfiguration; import org.apache.commons.configuration2.SubnodeConfiguration; import org.apache.commons.lang3.StringUtils; +import org.codehaus.plexus.component.annotations.Component; import org.nuiton.config.plugin.model.ActionModel; import org.nuiton.config.plugin.model.ConfigModel; import org.nuiton.config.plugin.model.OptionModel; @@ -44,9 +45,9 @@ import java.util.LinkedList; * Created on 02/10/16. * * @author Tony Chemit - dev@tchemit.fr - * @plexus.component role="org.nuiton.config.plugin.io.ConfigModelIO" role-hint="ini" * @since 3.0 */ +@Component(role = ConfigModelIO.class, hint = "ini") public class ConfigModelIOIniImpl implements ConfigModelIO { private static final String DESCRIPTION = "description"; diff --git a/nuiton-config-maven-plugin/src/main/java/org/nuiton/config/plugin/io/ConfigModelIOTomlImpl.java b/nuiton-config-maven-plugin/src/main/java/org/nuiton/config/plugin/io/ConfigModelIOTomlImpl.java index 714c9d4..bde45e0 100644 --- a/nuiton-config-maven-plugin/src/main/java/org/nuiton/config/plugin/io/ConfigModelIOTomlImpl.java +++ b/nuiton-config-maven-plugin/src/main/java/org/nuiton/config/plugin/io/ConfigModelIOTomlImpl.java @@ -25,6 +25,7 @@ package org.nuiton.config.plugin.io; import com.google.common.io.Files; import com.moandjiezana.toml.Toml; import com.moandjiezana.toml.TomlWriter; +import org.codehaus.plexus.component.annotations.Component; import org.nuiton.config.plugin.model.ConfigModel; import org.nuiton.config.plugin.model.OptionModel; @@ -39,9 +40,9 @@ import java.nio.file.Path; * Created on 02/10/16. * * @author Tony Chemit - dev@tchemit.fr - * @plexus.component role="org.nuiton.config.plugin.io.ConfigModelIO" role-hint="toml" * @since 3.0 */ +@Component(role = ConfigModelIO.class, hint = "toml") public class ConfigModelIOTomlImpl implements ConfigModelIO { @Override diff --git a/nuiton-config-maven-plugin/src/main/java/org/nuiton/config/plugin/io/ConfigModelIOYamlImpl.java b/nuiton-config-maven-plugin/src/main/java/org/nuiton/config/plugin/io/ConfigModelIOYamlImpl.java index 62529d0..590937a 100644 --- a/nuiton-config-maven-plugin/src/main/java/org/nuiton/config/plugin/io/ConfigModelIOYamlImpl.java +++ b/nuiton-config-maven-plugin/src/main/java/org/nuiton/config/plugin/io/ConfigModelIOYamlImpl.java @@ -25,6 +25,7 @@ package org.nuiton.config.plugin.io; import com.esotericsoftware.yamlbeans.YamlConfig; import com.esotericsoftware.yamlbeans.YamlReader; import com.esotericsoftware.yamlbeans.YamlWriter; +import org.codehaus.plexus.component.annotations.Component; import org.nuiton.config.plugin.model.ActionModel; import org.nuiton.config.plugin.model.ConfigModel; import org.nuiton.config.plugin.model.OptionModel; @@ -41,9 +42,9 @@ import java.nio.file.Path; * Created on 01/10/16. * * @author Tony Chemit - dev@tchemit.fr - * @plexus.component role="org.nuiton.config.plugin.io.ConfigModelIO" role-hint="yaml" * @since 3.0 */ +@Component(role = ConfigModelIO.class, hint = "yaml") public class ConfigModelIOYamlImpl implements ConfigModelIO { @Override diff --git a/nuiton-config/src/main/java/org/nuiton/config/ApplicationConfig.java b/nuiton-config/src/main/java/org/nuiton/config/ApplicationConfig.java index f95efc3..cbacd08 100644 --- a/nuiton-config/src/main/java/org/nuiton/config/ApplicationConfig.java +++ b/nuiton-config/src/main/java/org/nuiton/config/ApplicationConfig.java @@ -76,7 +76,8 @@ import java.util.Set; /** * Application configuration. - * <h3>A finir...</h3> + * + * <h2>A finir...</h2> * <ul> * <li>Ajout d'annotations sur les méthodes * pour preciser plus de chose pour les options (pattern, min/max, alias, @@ -283,7 +284,7 @@ import java.util.Set; * <h3>Les substitutions de variable</h3> * <p> * {@link ApplicationConfig} supporte les substituions de variables de la forme - * <tt>${xxx}</tt> où {@code xxx} est une autre variable de la configuration. + * {@code ${xxx}} où {@code xxx} est une autre variable de la configuration. * </p> * <p> * Exemple (dans un fichier de configuration): @@ -292,7 +293,7 @@ import java.util.Set; * lastname = Doe * fullname = ${firstname} ${lastname} * </pre> - * <tt>getOption("fullname")</tt> retournera <tt>"John Doe"</tt>. + * {@code getOption("fullname")} retournera {@code "John Doe"}. * * @author Benjamin Poussin - poussin@codelutin.com * @author Tony Chemit - dev@tchemit.fr diff --git a/pom.xml b/pom.xml index d815bd7..43bd8c3 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuitonpom</artifactId> - <version>10.5</version> + <version>11.8-SNAPSHOT</version> </parent> <artifactId>nuiton-config-project</artifactId> @@ -82,13 +82,7 @@ <properties> - <!-- redmine project Id --> - <!--FIXME issues no longer on redmine--> - <redmine.skipGenerateChanges>true</redmine.skipGenerateChanges> - <!-- FIXME true because issues are no longer on redmine but on gitlab--> - <skipPostRelease>true</skipPostRelease> - <projectId>nuiton-config</projectId> - <ciViewId>nuiton-config</ciViewId> + <gitlabProjectName>nuiton-config</gitlabProjectName> <javaVersion>1.8</javaVersion> <signatureArtifactId>java18</signatureArtifactId> @@ -138,7 +132,7 @@ <dependency> <groupId>org.nuiton.eugene</groupId> <artifactId>eugene</artifactId> - <version>3.0-alpha-10</version> + <version>3.0-rc-1-SNAPSHOT</version> <scope>compile</scope> </dependency> @@ -293,6 +287,8 @@ </exclusions> </dependency> + stereotypes-report + <!-- doxia --> @@ -340,7 +336,7 @@ <plugin> <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> - <version>0.8.4</version> + <version>0.8.5</version> <executions> <execution> <id>default-prepare-agent</id> diff --git a/src/site/site_fr.xml b/src/site/site_fr.xml index 9b9a348..6dc5eea 100644 --- a/src/site/site_fr.xml +++ b/src/site/site_fr.xml @@ -22,9 +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.8.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"> + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd"> <bannerLeft> <name>${project.name}</name> @@ -45,8 +45,7 @@ </links> <breadcrumbs> - <item name="${project.name}" href="${project.url}/index.html"/> - <item name="${project.version}" href="${project.url}/v/${project.siteDeployClassifier}/index.html"/> + <item name="${project.name}" href="${this.url}/index.html"/> </breadcrumbs> <menu name="Utilisateur"> @@ -63,12 +62,5 @@ <menu ref="reports"/> - <footer> - <div id='mavenProjectProperties' locale='fr' - projectId='${project.projectId}' - version='${project.siteDeployClassifier}' - sourcesType='${project.siteSourcesType}'/> - </footer> - </body> </project> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm