branch develop updated (0c83630 -> 49a1151)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository scmwebeditor. See http://git.nuiton.org/scmwebeditor.git from 0c83630 Fixes #3781 (Better vm files format detection) Merge branch 'feature/3781' into develop new 49b062d [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds a51fea2 [jgitflow-maven-plugin]updating poms for 0.5.1 branch with snapshot versions new de4d46b [jgitflow-maven-plugin]updating poms for branch'release/0.5.1' with non-snapshot versions new 9c3d6b8 [jgitflow-maven-plugin]merging 'release/0.5.1' into 'master' new 6ac3965 [jgitflow-maven-plugin]merging 'master' into 'develop' new 49a1151 [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 49a1151fbf6bb97a4df9789e41dcb1b4b5b50f7f Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 3 21:44:58 2015 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 6ac3965e94334873602fdd5e3e8eadb3bb1ddb1b Merge: 49b062d 9c3d6b8 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 3 21:44:57 2015 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 49b062d89402ad78d3d72c8640f1f0109194298e Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 3 21:44:57 2015 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 9c3d6b8478ff6a934929321633efa2dc232ef2b3 Merge: 7d48983 de4d46b Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 3 21:44:56 2015 +0100 [jgitflow-maven-plugin]merging 'release/0.5.1' into 'master' commit de4d46b1acc6c04554968027b5f6f53af5756161 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 3 21:44:54 2015 +0100 [jgitflow-maven-plugin]updating poms for branch'release/0.5.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 scmwebeditor. See http://git.nuiton.org/scmwebeditor.git commit de4d46b1acc6c04554968027b5f6f53af5756161 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 3 21:44:54 2015 +0100 [jgitflow-maven-plugin]updating poms for branch'release/0.5.1' with non-snapshot versions --- pom.xml | 2 +- swe-git/pom.xml | 2 +- swe-scm-api/pom.xml | 2 +- swe-svn/pom.xml | 2 +- swe-ui-web/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 58c2719..97f66d2 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>org.nuiton</groupId> <artifactId>scmwebeditor</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.1</version> <packaging>pom</packaging> <name>ScmWebEditor</name> diff --git a/swe-git/pom.xml b/swe-git/pom.xml index f5152f9..47aab52 100644 --- a/swe-git/pom.xml +++ b/swe-git/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>scmwebeditor</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.1</version> </parent> <artifactId>scmwebeditor-git</artifactId> diff --git a/swe-scm-api/pom.xml b/swe-scm-api/pom.xml index f0d7d6e..fca56a3 100644 --- a/swe-scm-api/pom.xml +++ b/swe-scm-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>scmwebeditor</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.1</version> </parent> <artifactId>scmwebeditor-scm-api</artifactId> diff --git a/swe-svn/pom.xml b/swe-svn/pom.xml index 245f2c7..a402e0f 100644 --- a/swe-svn/pom.xml +++ b/swe-svn/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>scmwebeditor</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.1</version> </parent> <artifactId>scmwebeditor-svn</artifactId> diff --git a/swe-ui-web/pom.xml b/swe-ui-web/pom.xml index 9ee9eca..c15321d 100644 --- a/swe-ui-web/pom.xml +++ b/swe-ui-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>scmwebeditor</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.1</version> </parent> <artifactId>scmwebeditor-ui-web</artifactId> -- 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 scmwebeditor. See http://git.nuiton.org/scmwebeditor.git commit 9c3d6b8478ff6a934929321633efa2dc232ef2b3 Merge: 7d48983 de4d46b Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 3 21:44:56 2015 +0100 [jgitflow-maven-plugin]merging 'release/0.5.1' into 'master' pom.xml | 2 +- swe-git/pom.xml | 2 +- swe-scm-api/pom.xml | 2 +- swe-svn/pom.xml | 2 +- swe-ui-web/pom.xml | 2 +- .../org/nuiton/scmwebeditor/uiweb/actions/EditAction.java | 13 +++++++++++-- 6 files changed, 16 insertions(+), 7 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 scmwebeditor. See http://git.nuiton.org/scmwebeditor.git commit 49b062d89402ad78d3d72c8640f1f0109194298e Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 3 21:44:57 2015 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- pom.xml | 2 +- swe-git/pom.xml | 2 +- swe-scm-api/pom.xml | 2 +- swe-svn/pom.xml | 2 +- swe-ui-web/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index ed6952b..97f66d2 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>org.nuiton</groupId> <artifactId>scmwebeditor</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.5.1</version> <packaging>pom</packaging> <name>ScmWebEditor</name> diff --git a/swe-git/pom.xml b/swe-git/pom.xml index 8eb0d3d..47aab52 100644 --- a/swe-git/pom.xml +++ b/swe-git/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>scmwebeditor</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.5.1</version> </parent> <artifactId>scmwebeditor-git</artifactId> diff --git a/swe-scm-api/pom.xml b/swe-scm-api/pom.xml index 5be66aa..fca56a3 100644 --- a/swe-scm-api/pom.xml +++ b/swe-scm-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>scmwebeditor</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.5.1</version> </parent> <artifactId>scmwebeditor-scm-api</artifactId> diff --git a/swe-svn/pom.xml b/swe-svn/pom.xml index 379f7fb..a402e0f 100644 --- a/swe-svn/pom.xml +++ b/swe-svn/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>scmwebeditor</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.5.1</version> </parent> <artifactId>scmwebeditor-svn</artifactId> diff --git a/swe-ui-web/pom.xml b/swe-ui-web/pom.xml index 5e3315b..c15321d 100644 --- a/swe-ui-web/pom.xml +++ b/swe-ui-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>scmwebeditor</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.5.1</version> </parent> <artifactId>scmwebeditor-ui-web</artifactId> -- 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 scmwebeditor. See http://git.nuiton.org/scmwebeditor.git commit 6ac3965e94334873602fdd5e3e8eadb3bb1ddb1b Merge: 49b062d 9c3d6b8 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 3 21:44:57 2015 +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 scmwebeditor. See http://git.nuiton.org/scmwebeditor.git commit 49a1151fbf6bb97a4df9789e41dcb1b4b5b50f7f Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 3 21:44:58 2015 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- pom.xml | 2 +- swe-git/pom.xml | 2 +- swe-scm-api/pom.xml | 2 +- swe-svn/pom.xml | 2 +- swe-ui-web/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 97f66d2..ed6952b 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>org.nuiton</groupId> <artifactId>scmwebeditor</artifactId> - <version>0.5.1</version> + <version>0.6-SNAPSHOT</version> <packaging>pom</packaging> <name>ScmWebEditor</name> diff --git a/swe-git/pom.xml b/swe-git/pom.xml index 47aab52..8eb0d3d 100644 --- a/swe-git/pom.xml +++ b/swe-git/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>scmwebeditor</artifactId> - <version>0.5.1</version> + <version>0.6-SNAPSHOT</version> </parent> <artifactId>scmwebeditor-git</artifactId> diff --git a/swe-scm-api/pom.xml b/swe-scm-api/pom.xml index fca56a3..5be66aa 100644 --- a/swe-scm-api/pom.xml +++ b/swe-scm-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>scmwebeditor</artifactId> - <version>0.5.1</version> + <version>0.6-SNAPSHOT</version> </parent> <artifactId>scmwebeditor-scm-api</artifactId> diff --git a/swe-svn/pom.xml b/swe-svn/pom.xml index a402e0f..379f7fb 100644 --- a/swe-svn/pom.xml +++ b/swe-svn/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>scmwebeditor</artifactId> - <version>0.5.1</version> + <version>0.6-SNAPSHOT</version> </parent> <artifactId>scmwebeditor-svn</artifactId> diff --git a/swe-ui-web/pom.xml b/swe-ui-web/pom.xml index c15321d..5e3315b 100644 --- a/swe-ui-web/pom.xml +++ b/swe-ui-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>scmwebeditor</artifactId> - <version>0.5.1</version> + <version>0.6-SNAPSHOT</version> </parent> <artifactId>scmwebeditor-ui-web</artifactId> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm