branch develop updated (0440229 -> fce102b)
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 0440229 [jgitflow-maven-plugin]updating poms for 3.2-SNAPSHOT development new 17f1f36 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 40a906f [jgitflow-maven-plugin]updating poms for 3.1 branch with snapshot versions new a15eb8d [jgitflow-maven-plugin]updating poms for branch'release/3.1' with non-snapshot versions new 790e9d7 [jgitflow-maven-plugin]merging 'release/3.1' into 'master' new d06214b [jgitflow-maven-plugin]merging 'master' into 'develop' new fce102b [jgitflow-maven-plugin]Updating develop poms back to pre merge state 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 fce102bf8e7dc81b942307891e89858718c799c2 Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 7 19:07:25 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit d06214b3a23c38ed638bcd10176298fb028ffbe1 Merge: 17f1f36 790e9d7 Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 7 19:07:25 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 17f1f3649567db05ecf69081e3754ced4a557804 Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 7 19:07:25 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 790e9d70375896d4d8f28951cc12acf5019839d8 Merge: d66860b a15eb8d Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 7 19:07:24 2016 +0200 [jgitflow-maven-plugin]merging 'release/3.1' into 'master' commit a15eb8d6940433486cc3ae7ae892f5934f106c14 Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 7 19:05:11 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/3.1' with non-snapshot versions Summary of changes: -- 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 790e9d70375896d4d8f28951cc12acf5019839d8 Merge: d66860b a15eb8d Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 7 19:07:24 2016 +0200 [jgitflow-maven-plugin]merging 'release/3.1' into 'master' nuiton-config-example/pom.xml | 7 +- .../src/license/THIRD-PARTY.properties | 17 -- .../src/main/config/NuitonConfigExample.ini | 36 ++++ .../nuiton/config/example/NuitonConfigExample.java | 15 +- nuiton-config-example/src/site/apt/index.apt.vm | 4 +- nuiton-config-io-ini/LICENSE.txt | 165 ++++++++++++++++++ nuiton-config-io-ini/README.md | 0 nuiton-config-io-ini/pom.xml | 42 +++++ .../config/io/ini/ApplicationConfigIOIni.java | 141 ++++++++++++++++ .../org.nuiton.config.io.ApplicationConfigIO | 1 + .../config/io/ini/ApplicationConfigIOIniTest.java | 115 +++++++++++++ .../src/test/resources/NuitonConfigExample.ini | 5 + nuiton-config-maven-plugin/pom.xml | 7 +- .../src/license/THIRD-PARTY.properties | 7 +- .../nuiton/config/plugin/ConfigMojoSupport.java | 6 +- .../org/nuiton/config/plugin/GenerateMojo.java | 26 +++ .../nuiton/config/plugin/ReportMojoSupport.java | 19 +-- .../org/nuiton/config/plugin/ReportRenderer.java | 178 +++----------------- .../config/plugin/io/ConfigModelIOIniImpl.java | 186 +++++++++++++++++++++ .../templates/ApplicationConfigTransformer.java | 140 ++++++++++++++-- .../ApplicationConfigTransformerConfig.java | 2 + .../src/main/resources/config-report.properties | 4 + .../src/main/resources/config-report_fr.properties | 5 + .../config/plugin/io/ConfigModelIOIniImplTest.java | 78 +++++++++ .../src/test/resources/NuitonConfigExample.ini | 29 ++++ nuiton-config/pom.xml | 4 +- nuiton-config/src/license/THIRD-PARTY.properties | 19 --- .../java/org/nuiton/config/ApplicationConfig.java | 146 +++++++++------- .../org/nuiton/config/ApplicationConfigInit.java | 19 ++- .../org/nuiton/config/SubApplicationConfig.java | 4 + .../org/nuiton/config/io/ApplicationConfigIO.java | 32 ++-- .../config/io/ApplicationConfigIOHelper.java | 73 ++++++++ .../config/io/ApplicationConfigReadFormat.java | 34 +--- .../ApplicationConfigReadPropertiesException.java | 34 ++-- .../ApplicationConfigWritePropertiesException.java | 34 ++-- .../properties/ApplicationConfigIOProperties.java | 74 ++++++++ .../org.nuiton.config.io.ApplicationConfigIO | 1 + nuiton-config/src/site/apt/index.apt | 56 ++++--- .../ApplicationConfigIOPropertiesTest.java | 118 +++++++++++++ .../test/resources/NuitonConfigExample.properties | 25 +++ pom.xml | 15 +- src/site/apt/usage.apt.vm | 61 ++++++- 42 files changed, 1549 insertions(+), 435 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 17f1f3649567db05ecf69081e3754ced4a557804 Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 7 19:07:25 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- 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 a77d2b7..565a71f 100644 --- a/nuiton-config-example/pom.xml +++ b/nuiton-config-example/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-config-project</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.1</version> </parent> <artifactId>nuiton-config-example</artifactId> diff --git a/nuiton-config-io-ini/pom.xml b/nuiton-config-io-ini/pom.xml index 7872227..f81eda2 100644 --- a/nuiton-config-io-ini/pom.xml +++ b/nuiton-config-io-ini/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-config-project</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.1</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 ba2bcd6..f8bb3a6 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.2-SNAPSHOT</version> + <version>3.1</version> </parent> <artifactId>nuiton-config-maven-plugin</artifactId> diff --git a/nuiton-config/pom.xml b/nuiton-config/pom.xml index a760e51..d4843c6 100644 --- a/nuiton-config/pom.xml +++ b/nuiton-config/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-config-project</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.1</version> </parent> <artifactId>nuiton-config</artifactId> diff --git a/pom.xml b/pom.xml index 4400928..53a8d96 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ </parent> <artifactId>nuiton-config-project</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.1</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 develop in repository nuiton-config. See https://gitlab.nuiton.org/nuiton/nuiton-config.git commit d06214b3a23c38ed638bcd10176298fb028ffbe1 Merge: 17f1f36 790e9d7 Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 7 19:07:25 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' -- 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 fce102bf8e7dc81b942307891e89858718c799c2 Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 7 19:07:25 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- 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 565a71f..a77d2b7 100644 --- a/nuiton-config-example/pom.xml +++ b/nuiton-config-example/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-config-project</artifactId> - <version>3.1</version> + <version>3.2-SNAPSHOT</version> </parent> <artifactId>nuiton-config-example</artifactId> diff --git a/nuiton-config-io-ini/pom.xml b/nuiton-config-io-ini/pom.xml index f81eda2..7872227 100644 --- a/nuiton-config-io-ini/pom.xml +++ b/nuiton-config-io-ini/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-config-project</artifactId> - <version>3.1</version> + <version>3.2-SNAPSHOT</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 f8bb3a6..ba2bcd6 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.1</version> + <version>3.2-SNAPSHOT</version> </parent> <artifactId>nuiton-config-maven-plugin</artifactId> diff --git a/nuiton-config/pom.xml b/nuiton-config/pom.xml index d4843c6..a760e51 100644 --- a/nuiton-config/pom.xml +++ b/nuiton-config/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-config-project</artifactId> - <version>3.1</version> + <version>3.2-SNAPSHOT</version> </parent> <artifactId>nuiton-config</artifactId> diff --git a/pom.xml b/pom.xml index 53a8d96..4400928 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ </parent> <artifactId>nuiton-config-project</artifactId> - <version>3.1</version> + <version>3.2-SNAPSHOT</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>.
participants (1)
-
nuiton.org scm