branch develop updated (5b8218e -> 3971eba)
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 5b8218e [jgitflow-maven-plugin]updating poms for 0.8-SNAPSHOT development new 711b3a6 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 430664d [jgitflow-maven-plugin]updating poms for 0.7 branch with snapshot versions new ef4704b [jgitflow-maven-plugin]updating poms for branch'release/0.7' with non-snapshot versions new 05b2a27 [jgitflow-maven-plugin]merging 'release/0.7' into 'master' new 701bcba [jgitflow-maven-plugin]merging 'master' into 'develop' new 3971eba [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 3971eba75e93efda8909ef497dea5ece91826dd2 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 11 19:33:41 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 701bcba68ca3eca9b6ef2138302457c4a8d2f8e3 Merge: 711b3a6 05b2a27 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 11 19:33:41 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 711b3a6d1d483d23e7dde4f24d24909390abb597 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 11 19:33:41 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 05b2a273b3ee62e6f1b6a000201fcaa2bbf015a1 Merge: 2b01ea1 ef4704b Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 11 19:33:38 2016 +0100 [jgitflow-maven-plugin]merging 'release/0.7' into 'master' commit ef4704bb787ffecfedc2d68fb4d8d783af9b5ea6 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 11 19:32:09 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/0.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 scmwebeditor. See http://git.nuiton.org/scmwebeditor.git commit ef4704bb787ffecfedc2d68fb4d8d783af9b5ea6 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 11 19:32:09 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/0.7' 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 c597674..358a711 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>org.nuiton</groupId> <artifactId>scmwebeditor</artifactId> - <version>0.7-SNAPSHOT</version> + <version>0.7</version> <packaging>pom</packaging> <name>ScmWebEditor</name> diff --git a/swe-git/pom.xml b/swe-git/pom.xml index 98b5c9e..6ba2fe3 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.7-SNAPSHOT</version> + <version>0.7</version> </parent> <artifactId>scmwebeditor-git</artifactId> diff --git a/swe-scm-api/pom.xml b/swe-scm-api/pom.xml index 297a5e8..00ec723 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.7-SNAPSHOT</version> + <version>0.7</version> </parent> <artifactId>scmwebeditor-scm-api</artifactId> diff --git a/swe-svn/pom.xml b/swe-svn/pom.xml index 375f20f..2cfef18 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.7-SNAPSHOT</version> + <version>0.7</version> </parent> <artifactId>scmwebeditor-svn</artifactId> diff --git a/swe-ui-web/pom.xml b/swe-ui-web/pom.xml index f75c848..5845c40 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.7-SNAPSHOT</version> + <version>0.7</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 05b2a273b3ee62e6f1b6a000201fcaa2bbf015a1 Merge: 2b01ea1 ef4704b Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 11 19:33:38 2016 +0100 [jgitflow-maven-plugin]merging 'release/0.7' into 'master' pom.xml | 50 ++-------------------- swe-git/pom.xml | 2 +- swe-scm-api/pom.xml | 2 +- swe-svn/pom.xml | 2 +- swe-ui-web/pom.xml | 5 +-- .../webapp/WEB-INF/content/badFileRedirect.jsp | 2 +- .../src/main/webapp/WEB-INF/content/badRstFile.jsp | 2 +- .../main/webapp/WEB-INF/content/badUseRedirect.jsp | 2 +- .../src/main/webapp/WEB-INF/content/error.jsp | 2 +- .../src/main/webapp/WEB-INF/content/fileModify.jsp | 2 +- .../webapp/WEB-INF/content/fileNotEditable.jsp | 2 +- .../main/webapp/WEB-INF/content/imageViewer.jsp | 2 +- .../src/main/webapp/WEB-INF/content/logout.jsp | 2 +- .../webapp/WEB-INF/content/modificationViewer.jsp | 26 +++++------ .../main/webapp/WEB-INF/content/outConnection.jsp | 2 +- .../webapp/WEB-INF/content/privateScmRedirect.jsp | 2 +- .../src/main/webapp/WEB-INF/content/redirect.jsp | 2 +- 17 files changed, 31 insertions(+), 78 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 711b3a6d1d483d23e7dde4f24d24909390abb597 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 11 19:33:41 2016 +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 6304f9f..358a711 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>org.nuiton</groupId> <artifactId>scmwebeditor</artifactId> - <version>0.8-SNAPSHOT</version> + <version>0.7</version> <packaging>pom</packaging> <name>ScmWebEditor</name> diff --git a/swe-git/pom.xml b/swe-git/pom.xml index c3fc466..6ba2fe3 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.8-SNAPSHOT</version> + <version>0.7</version> </parent> <artifactId>scmwebeditor-git</artifactId> diff --git a/swe-scm-api/pom.xml b/swe-scm-api/pom.xml index e87646e..00ec723 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.8-SNAPSHOT</version> + <version>0.7</version> </parent> <artifactId>scmwebeditor-scm-api</artifactId> diff --git a/swe-svn/pom.xml b/swe-svn/pom.xml index 21a8558..2cfef18 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.8-SNAPSHOT</version> + <version>0.7</version> </parent> <artifactId>scmwebeditor-svn</artifactId> diff --git a/swe-ui-web/pom.xml b/swe-ui-web/pom.xml index 8cecb0e..5845c40 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.8-SNAPSHOT</version> + <version>0.7</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 701bcba68ca3eca9b6ef2138302457c4a8d2f8e3 Merge: 711b3a6 05b2a27 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 11 19:33:41 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 scmwebeditor. See http://git.nuiton.org/scmwebeditor.git commit 3971eba75e93efda8909ef497dea5ece91826dd2 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 11 19:33:41 2016 +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 358a711..6304f9f 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>org.nuiton</groupId> <artifactId>scmwebeditor</artifactId> - <version>0.7</version> + <version>0.8-SNAPSHOT</version> <packaging>pom</packaging> <name>ScmWebEditor</name> diff --git a/swe-git/pom.xml b/swe-git/pom.xml index 6ba2fe3..c3fc466 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.7</version> + <version>0.8-SNAPSHOT</version> </parent> <artifactId>scmwebeditor-git</artifactId> diff --git a/swe-scm-api/pom.xml b/swe-scm-api/pom.xml index 00ec723..e87646e 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.7</version> + <version>0.8-SNAPSHOT</version> </parent> <artifactId>scmwebeditor-scm-api</artifactId> diff --git a/swe-svn/pom.xml b/swe-svn/pom.xml index 2cfef18..21a8558 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.7</version> + <version>0.8-SNAPSHOT</version> </parent> <artifactId>scmwebeditor-svn</artifactId> diff --git a/swe-ui-web/pom.xml b/swe-ui-web/pom.xml index 5845c40..8cecb0e 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.7</version> + <version>0.8-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