branch develop updated (4779b72 -> ec61775)
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 4779b72 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 7c2201c fixes 46: update libs new ec61775 fixes 45: La modification d'une option n'est pas prise en compte The 2 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 ec61775e9887f479e929833b0ee2a772d66585b8 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Aug 28 15:32:17 2017 +0200 fixes 45: La modification d'une option n'est pas prise en compte commit 7c2201c830d41e634c0f95f757829e1124200176 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Aug 28 15:31:51 2017 +0200 fixes 46: update libs Summary of changes: nuiton-config-example/pom.xml | 22 +++++++++++++++ nuiton-config-io-ini/pom.xml | 22 +++++++++++++++ nuiton-config/pom.xml | 22 +++++++++++++++ .../java/org/nuiton/config/ApplicationConfig.java | 4 +-- pom.xml | 33 ++++++++++++++++++---- 5 files changed, 95 insertions(+), 8 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 7c2201c830d41e634c0f95f757829e1124200176 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Aug 28 15:31:51 2017 +0200 fixes 46: update libs --- nuiton-config-example/pom.xml | 22 ++++++++++++++++++++++ nuiton-config-io-ini/pom.xml | 22 ++++++++++++++++++++++ nuiton-config/pom.xml | 22 ++++++++++++++++++++++ pom.xml | 33 +++++++++++++++++++++++++++------ 4 files changed, 93 insertions(+), 6 deletions(-) diff --git a/nuiton-config-example/pom.xml b/nuiton-config-example/pom.xml index b44ab61..03db5a0 100644 --- a/nuiton-config-example/pom.xml +++ b/nuiton-config-example/pom.xml @@ -1,4 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Nuiton Config :: Example + %% + Copyright (C) 2016 - 2017 CodeLutin + %% + 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% + --> + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> diff --git a/nuiton-config-io-ini/pom.xml b/nuiton-config-io-ini/pom.xml index fdfe060..3952a14 100644 --- a/nuiton-config-io-ini/pom.xml +++ b/nuiton-config-io-ini/pom.xml @@ -1,4 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Nuiton Config :: IO Ini + %% + Copyright (C) 2016 - 2017 CodeLutin + %% + 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% + --> + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> diff --git a/nuiton-config/pom.xml b/nuiton-config/pom.xml index 60e5498..258a57e 100644 --- a/nuiton-config/pom.xml +++ b/nuiton-config/pom.xml @@ -1,4 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Nuiton Config :: API + %% + Copyright (C) 2016 - 2017 CodeLutin + %% + 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% + --> + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> diff --git a/pom.xml b/pom.xml index 841ed62..aaa2f90 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,33 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Nuiton Config + %% + Copyright (C) 2016 - 2017 CodeLutin + %% + 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% + --> + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.nuiton</groupId> <artifactId>nuitonpom</artifactId> - <version>10.4</version> + <version>10.5</version> </parent> <artifactId>nuiton-config-project</artifactId> @@ -94,7 +116,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>3.0-rc-17</version> + <version>3.0-rc-18</version> <exclusions> <exclusion> <groupId>commons-primitives</groupId> @@ -131,7 +153,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.5</version> + <version>3.6</version> </dependency> <dependency> @@ -181,14 +203,13 @@ <dependency> <groupId>com.moandjiezana.toml</groupId> <artifactId>toml4j</artifactId> - <version>0.7.1</version> + <version>0.7.2</version> </dependency> <dependency> <groupId>com.esotericsoftware.yamlbeans</groupId> <artifactId>yamlbeans</artifactId> - <!--Ne pas utiliser la version 1.09 elle est buggée--> - <version>1.11</version> + <version>1.12</version> </dependency> <dependency> -- 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 ec61775e9887f479e929833b0ee2a772d66585b8 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Aug 28 15:32:17 2017 +0200 fixes 45: La modification d'une option n'est pas prise en compte --- nuiton-config/src/main/java/org/nuiton/config/ApplicationConfig.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 4d51803..5d5d47f 100644 --- a/nuiton-config/src/main/java/org/nuiton/config/ApplicationConfig.java +++ b/nuiton-config/src/main/java/org/nuiton/config/ApplicationConfig.java @@ -4,7 +4,7 @@ package org.nuiton.config; * #%L * Nuiton Config :: API * %% - * Copyright (C) 2016 Code Lutin, Tony Chemit + * Copyright (C) 2016 - 2017 Code Lutin, 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 @@ -1463,7 +1463,7 @@ public class ApplicationConfig { } else { // delete from props, or home, or system if not found in previous scope - remove(key, optionScope, ApplicationConfigScope.HOME, ApplicationConfigScope.SYSTEM); + remove(key, optionScope, ApplicationConfigScope.HOME, ApplicationConfigScope.SYSTEM, ApplicationConfigScope.CLASS_PATH); } } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm