branch develop updated (4ffe9c0 -> 8072111)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository i18n. See https://gitlab.nuiton.org/nuiton/i18n.git from 4ffe9c0 [jgitflow-maven-plugin]updating poms for 3.8-SNAPSHOT development new 697a7fa [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 0e95724 [jgitflow-maven-plugin]updating poms for branch'release/3.7' with non-snapshot versions new ea3f184 [jgitflow-maven-plugin]merging 'release/3.7' into 'master' new 067abf4 [jgitflow-maven-plugin]merging 'master' into 'develop' new 8072111 [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 807211176f40644141173155e676953d4774f7b5 Author: maven-release <maven-release@bihar.codelutin.com> Date: Tue May 15 13:42:15 2018 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 067abf498d18009e58020d5aaecce4aadfe6085f Merge: 697a7fa ea3f184 Author: maven-release <maven-release@bihar.codelutin.com> Date: Tue May 15 13:42:15 2018 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 697a7fa8a20ed2640ced165e1ebaa6d76095373e Author: maven-release <maven-release@bihar.codelutin.com> Date: Tue May 15 13:42:15 2018 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit ea3f184a85cf081d1b06165104437a739ea4c37a Merge: 6638114 0e95724 Author: maven-release <maven-release@bihar.codelutin.com> Date: Tue May 15 13:42:13 2018 +0200 [jgitflow-maven-plugin]merging 'release/3.7' into 'master' commit 0e957243b3fdbbe5d66908ce014e26e339cb9504 Author: maven-release <maven-release@bihar.codelutin.com> Date: Tue May 15 13:34:13 2018 +0200 [jgitflow-maven-plugin]updating poms for branch'release/3.7' 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 i18n. See https://gitlab.nuiton.org/nuiton/i18n.git commit 0e957243b3fdbbe5d66908ce014e26e339cb9504 Author: maven-release <maven-release@bihar.codelutin.com> Date: Tue May 15 13:34:13 2018 +0200 [jgitflow-maven-plugin]updating poms for branch'release/3.7' with non-snapshot versions --- i18n-maven-plugin/pom.xml | 2 +- nuiton-i18n/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/i18n-maven-plugin/pom.xml b/i18n-maven-plugin/pom.xml index b5dcb00..c95fa2e 100644 --- a/i18n-maven-plugin/pom.xml +++ b/i18n-maven-plugin/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>3.7-SNAPSHOT</version> + <version>3.7</version> </parent> <groupId>org.nuiton.i18n</groupId> diff --git a/nuiton-i18n/pom.xml b/nuiton-i18n/pom.xml index 906202e..c94e279 100644 --- a/nuiton-i18n/pom.xml +++ b/nuiton-i18n/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>3.7-SNAPSHOT</version> + <version>3.7</version> </parent> <groupId>org.nuiton.i18n</groupId> diff --git a/pom.xml b/pom.xml index 9322dd8..b602797 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ </parent> <artifactId>i18n</artifactId> - <version>3.7-SNAPSHOT</version> + <version>3.7</version> <packaging>pom</packaging> <name>I18n</name> <description>Nuiton i18n tools</description> -- 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 i18n. See https://gitlab.nuiton.org/nuiton/i18n.git commit ea3f184a85cf081d1b06165104437a739ea4c37a Merge: 6638114 0e95724 Author: maven-release <maven-release@bihar.codelutin.com> Date: Tue May 15 13:42:13 2018 +0200 [jgitflow-maven-plugin]merging 'release/3.7' into 'master' i18n-maven-plugin/pom.xml | 6 +- nuiton-i18n-editor/pom.xml | 2 +- nuiton-i18n/pom.xml | 13 +- .../java/org/nuiton/i18n/web/I18nTextProvider.java | 183 +++++++++++++++++++++ pom.xml | 51 +++++- 5 files changed, 242 insertions(+), 13 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 i18n. See https://gitlab.nuiton.org/nuiton/i18n.git commit 697a7fa8a20ed2640ced165e1ebaa6d76095373e Author: maven-release <maven-release@bihar.codelutin.com> Date: Tue May 15 13:42:15 2018 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- i18n-maven-plugin/pom.xml | 2 +- nuiton-i18n/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/i18n-maven-plugin/pom.xml b/i18n-maven-plugin/pom.xml index 4a99e63..c95fa2e 100644 --- a/i18n-maven-plugin/pom.xml +++ b/i18n-maven-plugin/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>3.8-SNAPSHOT</version> + <version>3.7</version> </parent> <groupId>org.nuiton.i18n</groupId> diff --git a/nuiton-i18n/pom.xml b/nuiton-i18n/pom.xml index 4e07993..c94e279 100644 --- a/nuiton-i18n/pom.xml +++ b/nuiton-i18n/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>3.8-SNAPSHOT</version> + <version>3.7</version> </parent> <groupId>org.nuiton.i18n</groupId> diff --git a/pom.xml b/pom.xml index b6582b0..b602797 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ </parent> <artifactId>i18n</artifactId> - <version>3.8-SNAPSHOT</version> + <version>3.7</version> <packaging>pom</packaging> <name>I18n</name> <description>Nuiton i18n tools</description> -- 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 i18n. See https://gitlab.nuiton.org/nuiton/i18n.git commit 067abf498d18009e58020d5aaecce4aadfe6085f Merge: 697a7fa ea3f184 Author: maven-release <maven-release@bihar.codelutin.com> Date: Tue May 15 13:42:15 2018 +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 i18n. See https://gitlab.nuiton.org/nuiton/i18n.git commit 807211176f40644141173155e676953d4774f7b5 Author: maven-release <maven-release@bihar.codelutin.com> Date: Tue May 15 13:42:15 2018 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- i18n-maven-plugin/pom.xml | 2 +- nuiton-i18n/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/i18n-maven-plugin/pom.xml b/i18n-maven-plugin/pom.xml index c95fa2e..4a99e63 100644 --- a/i18n-maven-plugin/pom.xml +++ b/i18n-maven-plugin/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>3.7</version> + <version>3.8-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> diff --git a/nuiton-i18n/pom.xml b/nuiton-i18n/pom.xml index c94e279..4e07993 100644 --- a/nuiton-i18n/pom.xml +++ b/nuiton-i18n/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>3.7</version> + <version>3.8-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> diff --git a/pom.xml b/pom.xml index b602797..b6582b0 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ </parent> <artifactId>i18n</artifactId> - <version>3.7</version> + <version>3.8-SNAPSHOT</version> <packaging>pom</packaging> <name>I18n</name> <description>Nuiton i18n tools</description> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm