branch master updated (ed40d63 -> b93b284)
This is an automated email from the git hooks/post-receive script. New change to branch master in repository nuiton-config. See https://gitlab.nuiton.org/nuiton/nuiton-config.git from ed40d63 [jgitflow-maven-plugin]merging 'release/3.4' into 'master' adds 298c240 [jgitflow-maven-plugin]updating poms for 3.5-SNAPSHOT development adds 29cd8eb [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds cb913e2 [jgitflow-maven-plugin]merging 'master' into 'develop' adds dab2b7a [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 7322236 - Update Guava to 27.0.1 to fix CVE-2018-10237 --> Update to java 8 - Update Nuiton-utils to 3.0 - Update commons-lang3 to 3.8.1 - Update commons-collections4 to 4.2 - Update commons-io to 2.6 - Update commons-configuration2 to 2.4 - Update plexus-utils to 3.1.1 - Update maven-plugin-annotations to 3.6.0 - Update doxia to 1.8 and doxia-site-renderer to 1.8.1 - Update maven to 3.6.0 - Update i18n to 3.7 adds a7de0a6 Setup .gitlab-ci.yml adds 9f1131f Use variables for Sonar build adds d8b3b74 #49 Add unit test to proove issue adds 717400c #49 Use an enum which is not in the same src module adds f720f79 fix generated enum option adds 7c5f37c Merge branch 'feature/fix_generated_enum_option' into 'develop' adds b7b5b38 Update libs : Guava 28.1 ; commons-lang3 3.9 ; commons-collections4 4.4 ; commons-beanutils 1.9.4 ; commons-configuration2 2.6 ; yamlbeans 1.13 adds ba7210f Update maven related dependencies adds 08a4b74 Add Jacoco to get project coverage adds 312f1b6 Fix releasable build [skip ci] adds 9bb79a2 Update libs adds e0b8941 Update ci and libs adds 5548ada Fix config adds c8d5f7f Fix config adds 61d293f Pages only on master new 37a62f4 [gitflow-maven-plugin]Update versions for release new b93b284 Merge branch 'release/3.5' 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 b93b284b22454f76454f26af52ce127487fa8a6c Merge: ed40d63 37a62f4 Author: Éric <chatellier@codelutin.com> Date: Mon Aug 24 20:08:37 2020 +0200 Merge branch 'release/3.5' commit 37a62f40b34c4611d7d0ba06ab5f8285dbbd8c8f Author: Éric <chatellier@codelutin.com> Date: Mon Aug 24 20:07:29 2020 +0200 [gitflow-maven-plugin]Update versions for release Summary of changes: .gitlab-ci.yml | 51 ++++++++++++++ nuiton-config-example/pom.xml | 7 +- .../src/main/config/NuitonConfigExample.ini | 8 ++- .../nuiton/config/example/NuitonConfigTest.java} | 36 ++++------ nuiton-config-io-ini/pom.xml | 2 +- nuiton-config-maven-plugin/pom.xml | 7 +- .../src/license/THIRD-PARTY.properties | 9 +-- .../config/plugin/io/ConfigModelIOIniImpl.java | 3 +- .../config/plugin/io/ConfigModelIOTomlImpl.java | 3 +- .../config/plugin/io/ConfigModelIOYamlImpl.java | 3 +- .../templates/ApplicationConfigTransformer.java | 14 +++- nuiton-config/pom.xml | 2 +- .../java/org/nuiton/config/ApplicationConfig.java | 7 +- pom.xml | 82 ++++++++++++++-------- src/site/site_fr.xml | 14 +--- 15 files changed, 164 insertions(+), 84 deletions(-) create mode 100644 .gitlab-ci.yml copy nuiton-config-example/src/{main/java/org/nuiton/config/example/NuitonConfigExample.java => test/java/org/nuiton/config/example/NuitonConfigTest.java} (58%) -- 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 master in repository nuiton-config. See https://gitlab.nuiton.org/nuiton/nuiton-config.git commit 37a62f40b34c4611d7d0ba06ab5f8285dbbd8c8f Author: Éric <chatellier@codelutin.com> Date: Mon Aug 24 20:07:29 2020 +0200 [gitflow-maven-plugin]Update versions for release --- nuiton-config-example/pom.xml | 2 +- nuiton-config-io-ini/pom.xml | 2 +- nuiton-config-maven-plugin/pom.xml | 2 +- nuiton-config/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nuiton-config-example/pom.xml b/nuiton-config-example/pom.xml index 26be193..dd91b25 100644 --- a/nuiton-config-example/pom.xml +++ b/nuiton-config-example/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-config-project</artifactId> - <version>3.5-SNAPSHOT</version> + <version>3.5</version> </parent> <artifactId>nuiton-config-example</artifactId> diff --git a/nuiton-config-io-ini/pom.xml b/nuiton-config-io-ini/pom.xml index dfc751d..52658e4 100644 --- a/nuiton-config-io-ini/pom.xml +++ b/nuiton-config-io-ini/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-config-project</artifactId> - <version>3.5-SNAPSHOT</version> + <version>3.5</version> </parent> <artifactId>nuiton-config-io-ini</artifactId> diff --git a/nuiton-config-maven-plugin/pom.xml b/nuiton-config-maven-plugin/pom.xml index 63b2553..f0093ae 100644 --- a/nuiton-config-maven-plugin/pom.xml +++ b/nuiton-config-maven-plugin/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-config-project</artifactId> - <version>3.5-SNAPSHOT</version> + <version>3.5</version> </parent> <artifactId>nuiton-config-maven-plugin</artifactId> diff --git a/nuiton-config/pom.xml b/nuiton-config/pom.xml index 51e947d..deaa0e1 100644 --- a/nuiton-config/pom.xml +++ b/nuiton-config/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-config-project</artifactId> - <version>3.5-SNAPSHOT</version> + <version>3.5</version> </parent> <artifactId>nuiton-config</artifactId> diff --git a/pom.xml b/pom.xml index f5e5ecb..30cb0a3 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ </parent> <artifactId>nuiton-config-project</artifactId> - <version>3.5-SNAPSHOT</version> + <version>3.5</version> <packaging>pom</packaging> <name>Nuiton Config</name> -- 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 master in repository nuiton-config. See https://gitlab.nuiton.org/nuiton/nuiton-config.git commit b93b284b22454f76454f26af52ce127487fa8a6c Merge: ed40d63 37a62f4 Author: Éric <chatellier@codelutin.com> Date: Mon Aug 24 20:08:37 2020 +0200 Merge branch 'release/3.5' .gitlab-ci.yml | 51 ++++++++++++++ nuiton-config-example/pom.xml | 7 +- .../src/main/config/NuitonConfigExample.ini | 8 ++- .../nuiton/config/example/NuitonConfigTest.java | 41 +++++++++++ nuiton-config-io-ini/pom.xml | 2 +- nuiton-config-maven-plugin/pom.xml | 7 +- .../src/license/THIRD-PARTY.properties | 9 +-- .../config/plugin/io/ConfigModelIOIniImpl.java | 3 +- .../config/plugin/io/ConfigModelIOTomlImpl.java | 3 +- .../config/plugin/io/ConfigModelIOYamlImpl.java | 3 +- .../templates/ApplicationConfigTransformer.java | 14 +++- nuiton-config/pom.xml | 2 +- .../java/org/nuiton/config/ApplicationConfig.java | 7 +- pom.xml | 82 ++++++++++++++-------- src/site/site_fr.xml | 14 +--- 15 files changed, 193 insertions(+), 60 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm