branch develop updated (c8c9f5b -> f5a9515)
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 c8c9f5b Pour générer la description de la configuration, ne pas passer par des conversion d'options (Fixes #4099) new 4504ffc [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds fb49e2c Update doc adds cd12f21 [jgitflow-maven-plugin]updating poms for 3.1.1 branch with snapshot versions new a36a4b2 [jgitflow-maven-plugin]updating poms for branch'release/3.1.1' with non-snapshot versions new f2b5ac8 [jgitflow-maven-plugin]merging 'release/3.1.1' into 'master' new bc456e8 [jgitflow-maven-plugin]merging 'master' into 'develop' new f5a9515 [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 f5a95151a4212a79d24f9e1469e4d1319674262a Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 19 11:57:07 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit bc456e8113301857757ed2d21bf90ad44c3d715e Merge: 4504ffc f2b5ac8 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 19 11:57:07 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 4504ffc398a982e2651109aa857687dc734ddf1a Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 19 11:57:06 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit f2b5ac803ac51bb3f3b0ef0b93c37b88ba273733 Merge: fb49e2c a36a4b2 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 19 11:57:06 2016 +0100 [jgitflow-maven-plugin]merging 'release/3.1.1' into 'master' commit a36a4b21a98536064a8fba2c7904057eaa6940b7 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 19 11:56:13 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/3.1.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 a36a4b21a98536064a8fba2c7904057eaa6940b7 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 19 11:56:13 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/3.1.1' with non-snapshot versions --- 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 78343ca..7141510 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.1-SNAPSHOT</version> + <version>3.1.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 5fa819a..79dffb7 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.1-SNAPSHOT</version> + <version>3.1.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 0fcdda8..32ea812 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.1-SNAPSHOT</version> + <version>3.1.1</version> </parent> <artifactId>nuiton-config-maven-plugin</artifactId> diff --git a/nuiton-config/pom.xml b/nuiton-config/pom.xml index b0ac737..39f2e47 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.1-SNAPSHOT</version> + <version>3.1.1</version> </parent> <artifactId>nuiton-config</artifactId> diff --git a/pom.xml b/pom.xml index 1165f69..1432e80 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ </parent> <artifactId>nuiton-config-project</artifactId> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.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 f2b5ac803ac51bb3f3b0ef0b93c37b88ba273733 Merge: fb49e2c a36a4b2 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 19 11:57:06 2016 +0100 [jgitflow-maven-plugin]merging 'release/3.1.1' into 'master' nuiton-config-example/pom.xml | 2 +- nuiton-config-io-ini/pom.xml | 2 +- nuiton-config-maven-plugin/pom.xml | 2 +- .../nuiton/config/plugin/templates/ApplicationConfigTransformer.java | 2 +- nuiton-config/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 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 4504ffc398a982e2651109aa857687dc734ddf1a Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 19 11:57:06 2016 +0100 [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..7141510 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.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..79dffb7 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.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..32ea812 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.1</version> </parent> <artifactId>nuiton-config-maven-plugin</artifactId> diff --git a/nuiton-config/pom.xml b/nuiton-config/pom.xml index a760e51..39f2e47 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.1</version> </parent> <artifactId>nuiton-config</artifactId> diff --git a/pom.xml b/pom.xml index 4400928..1432e80 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.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 bc456e8113301857757ed2d21bf90ad44c3d715e Merge: 4504ffc f2b5ac8 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 19 11:57:07 2016 +0100 [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 f5a95151a4212a79d24f9e1469e4d1319674262a Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 19 11:57:07 2016 +0100 [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 7141510..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.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 79dffb7..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.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 32ea812..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.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 39f2e47..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.1</version> + <version>3.2-SNAPSHOT</version> </parent> <artifactId>nuiton-config</artifactId> diff --git a/pom.xml b/pom.xml index 1432e80..4400928 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ </parent> <artifactId>nuiton-config-project</artifactId> - <version>3.1.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