branch develop updated (298c240 -> dab2b7a)
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 298c240 [jgitflow-maven-plugin]updating poms for 3.5-SNAPSHOT development new 29cd8eb [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 419021f Fix release ... adds 81c6d71 [jgitflow-maven-plugin]updating poms for branch'release/3.4' with non-snapshot versions adds ebca137 Fix release ... new ed40d63 [jgitflow-maven-plugin]merging 'release/3.4' into 'master' new cb913e2 [jgitflow-maven-plugin]merging 'master' into 'develop' new dab2b7a [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 4 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 dab2b7affc93f4c92dbecb9af1546ba478a6ee33 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 31 16:35:30 2018 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit cb913e2fdb51efe2143012e6dc5265e1de592e91 Merge: 29cd8eb ed40d63 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 31 16:35:30 2018 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 29cd8ebaa954242aeb2129d068146e826573e887 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 31 16:35:30 2018 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit ed40d634b97506fc554595733b4b51b308d26713 Merge: e29cc70 ebca137 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 31 16:35:29 2018 +0100 [jgitflow-maven-plugin]merging 'release/3.4' into 'master' Summary of changes: nuiton-config-example/pom.xml | 2 +- nuiton-config/pom.xml | 3 +++ pom.xml | 4 ++++ 3 files changed, 8 insertions(+), 1 deletion(-) -- 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 ed40d634b97506fc554595733b4b51b308d26713 Merge: e29cc70 ebca137 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 31 16:35:29 2018 +0100 [jgitflow-maven-plugin]merging 'release/3.4' into 'master' nuiton-config-example/pom.xml | 4 +- nuiton-config-io-ini/pom.xml | 2 +- nuiton-config-maven-plugin/pom.xml | 2 +- nuiton-config/pom.xml | 5 ++- .../java/org/nuiton/config/ApplicationConfig.java | 46 ++++++++++++++-------- pom.xml | 6 ++- 6 files changed, 43 insertions(+), 22 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 29cd8ebaa954242aeb2129d068146e826573e887 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 31 16:35:30 2018 +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 202bfb7..3d231b0 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.4</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..83c4922 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.4</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 8ce713b..299eba8 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.4</version> </parent> <artifactId>nuiton-config-maven-plugin</artifactId> diff --git a/nuiton-config/pom.xml b/nuiton-config/pom.xml index 925804b..f151947 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.4</version> </parent> <artifactId>nuiton-config</artifactId> diff --git a/pom.xml b/pom.xml index 66a0e57..1717360 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ </parent> <artifactId>nuiton-config-project</artifactId> - <version>3.5-SNAPSHOT</version> + <version>3.4</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 cb913e2fdb51efe2143012e6dc5265e1de592e91 Merge: 29cd8eb ed40d63 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 31 16:35:30 2018 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' nuiton-config-example/pom.xml | 2 +- nuiton-config/pom.xml | 3 +++ pom.xml | 4 ++++ 3 files changed, 8 insertions(+), 1 deletion(-) -- 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 dab2b7affc93f4c92dbecb9af1546ba478a6ee33 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 31 16:35:30 2018 +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 6a6b1c9..a4834a7 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.4</version> + <version>3.5-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 83c4922..dfc751d 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.4</version> + <version>3.5-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 299eba8..8ce713b 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.4</version> + <version>3.5-SNAPSHOT</version> </parent> <artifactId>nuiton-config-maven-plugin</artifactId> diff --git a/nuiton-config/pom.xml b/nuiton-config/pom.xml index c398f92..51e947d 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.4</version> + <version>3.5-SNAPSHOT</version> </parent> <artifactId>nuiton-config</artifactId> diff --git a/pom.xml b/pom.xml index d83ac6d..22b74e5 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ </parent> <artifactId>nuiton-config-project</artifactId> - <version>3.4</version> + <version>3.5-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