branch develop updated (0d7e05e -> 598da4c)
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 0d7e05e [jgitflow-maven-plugin]updating poms for 0.7-SNAPSHOT development new c27892d [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds daf42bc [jgitflow-maven-plugin]updating poms for 0.6 branch with snapshot versions new 3909cde [jgitflow-maven-plugin]updating poms for branch'release/0.6' with non-snapshot versions new 2b01ea1 [jgitflow-maven-plugin]merging 'release/0.6' into 'master' new c1f9fb8 [jgitflow-maven-plugin]merging 'master' into 'develop' new 598da4c [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 598da4c426a03082a9b2846d0cee518a76d18978 Author: Maven Release <maven-release@codelutin.com> Date: Tue Dec 22 12:26:41 2015 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit c1f9fb8fd7046089ae51d7b08c0f2a973ac16f17 Merge: c27892d 2b01ea1 Author: Maven Release <maven-release@codelutin.com> Date: Tue Dec 22 12:26:41 2015 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit c27892dd2af4eafd6fb8e879cfb2dfc970e89208 Author: Maven Release <maven-release@codelutin.com> Date: Tue Dec 22 12:26:41 2015 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 2b01ea12f5b66e137580827f54bf73f4aa7ee315 Merge: 9c3d6b8 3909cde Author: Maven Release <maven-release@codelutin.com> Date: Tue Dec 22 12:26:39 2015 +0100 [jgitflow-maven-plugin]merging 'release/0.6' into 'master' commit 3909cde9b751c60285a55bdb360995388919b4f2 Author: Maven Release <maven-release@codelutin.com> Date: Tue Dec 22 12:25:39 2015 +0100 [jgitflow-maven-plugin]updating poms for branch'release/0.6' 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 3909cde9b751c60285a55bdb360995388919b4f2 Author: Maven Release <maven-release@codelutin.com> Date: Tue Dec 22 12:25:39 2015 +0100 [jgitflow-maven-plugin]updating poms for branch'release/0.6' 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 7bc16c1..4c10cbc 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.6</version> <packaging>pom</packaging> <name>ScmWebEditor</name> diff --git a/swe-git/pom.xml b/swe-git/pom.xml index 42aab4a..4482c6d 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.6</version> </parent> <artifactId>scmwebeditor-git</artifactId> diff --git a/swe-scm-api/pom.xml b/swe-scm-api/pom.xml index 43fca6a..eebad8b 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.6</version> </parent> <artifactId>scmwebeditor-scm-api</artifactId> diff --git a/swe-svn/pom.xml b/swe-svn/pom.xml index 542d2e1..80fa313 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.6</version> </parent> <artifactId>scmwebeditor-svn</artifactId> diff --git a/swe-ui-web/pom.xml b/swe-ui-web/pom.xml index 9598dd6..29df56e 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.6</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 2b01ea12f5b66e137580827f54bf73f4aa7ee315 Merge: 9c3d6b8 3909cde Author: Maven Release <maven-release@codelutin.com> Date: Tue Dec 22 12:26:39 2015 +0100 [jgitflow-maven-plugin]merging 'release/0.6' into 'master' pom.xml | 40 ++++---- .../src/site => src/site/en}/resources/example.jpg | Bin {swe-ui-web/src => src}/site/en/rst/index.rst | 0 {swe-ui-web/src => src}/site/en/rst/install.rst | 0 {swe-ui-web/src => src}/site/en/rst/tutoriel.rst | 0 {swe-ui-web/src => src}/site/en/rst/user.rst | 0 .../src/site/en => src/site}/resources/example.jpg | Bin .../src => src}/site/resources/maquette-01.png | Bin .../src => src}/site/resources/maquette-01.xcf | Bin .../src => src}/site/resources/maquette-02.png | Bin .../src => src}/site/resources/maquette-02.xcf | Bin {swe-ui-web/src => src}/site/rst/index.rst | 0 {swe-ui-web/src => src}/site/rst/install.rst | 0 {swe-ui-web/src => src}/site/rst/tutoriel.rst | 0 {swe-ui-web/src => src}/site/rst/user.rst | 0 {swe-git/src => src}/site/site_en.xml | 30 +++--- {swe-svn/src => src}/site/site_fr.xml | 22 +++-- swe-git/pom.xml | 36 +------- .../org/nuiton/scmwebeditor/git/GitConnection.java | 6 +- .../org/nuiton/scmwebeditor/git/GitProvider.java | 6 +- swe-git/src/site/en/resources/example.jpg | Bin 117905 -> 0 bytes swe-git/src/site/en/rst/index.rst | 26 ------ swe-git/src/site/en/rst/install.rst | 28 ------ swe-git/src/site/en/rst/tutoriel.rst | 28 ------ swe-git/src/site/en/rst/user.rst | 31 ------- swe-git/src/site/resources/example.jpg | Bin 117905 -> 0 bytes swe-git/src/site/resources/maquette-01.png | Bin 145897 -> 0 bytes swe-git/src/site/resources/maquette-01.xcf | Bin 617655 -> 0 bytes swe-git/src/site/resources/maquette-02.png | Bin 266671 -> 0 bytes swe-git/src/site/resources/maquette-02.xcf | Bin 1427504 -> 0 bytes swe-git/src/site/rst/index.rst | 26 ------ swe-git/src/site/rst/install.rst | 28 ------ swe-git/src/site/rst/tutoriel.rst | 26 ------ swe-git/src/site/rst/user.rst | 31 ------- swe-git/src/site/site_fr.xml | 81 ---------------- swe-scm-api/pom.xml | 40 +------- swe-scm-api/src/site/en/resources/example.jpg | Bin 117905 -> 0 bytes swe-scm-api/src/site/en/rst/index.rst | 26 ------ swe-scm-api/src/site/en/rst/install.rst | 28 ------ swe-scm-api/src/site/en/rst/tutoriel.rst | 28 ------ swe-scm-api/src/site/en/rst/user.rst | 31 ------- swe-scm-api/src/site/resources/example.jpg | Bin 117905 -> 0 bytes swe-scm-api/src/site/resources/maquette-01.png | Bin 145897 -> 0 bytes swe-scm-api/src/site/resources/maquette-01.xcf | Bin 617655 -> 0 bytes swe-scm-api/src/site/resources/maquette-02.png | Bin 266671 -> 0 bytes swe-scm-api/src/site/resources/maquette-02.xcf | Bin 1427504 -> 0 bytes swe-scm-api/src/site/rst/index.rst | 26 ------ swe-scm-api/src/site/rst/install.rst | 28 ------ swe-scm-api/src/site/rst/tutoriel.rst | 26 ------ swe-scm-api/src/site/rst/user.rst | 31 ------- swe-scm-api/src/site/site_en.xml | 81 ---------------- swe-scm-api/src/site/site_fr.xml | 81 ---------------- swe-svn/pom.xml | 36 +------- swe-svn/src/site/en/resources/example.jpg | Bin 117905 -> 0 bytes swe-svn/src/site/en/rst/index.rst | 26 ------ swe-svn/src/site/en/rst/install.rst | 28 ------ swe-svn/src/site/en/rst/tutoriel.rst | 28 ------ swe-svn/src/site/en/rst/user.rst | 31 ------- swe-svn/src/site/resources/example.jpg | Bin 117905 -> 0 bytes swe-svn/src/site/resources/maquette-01.png | Bin 145897 -> 0 bytes swe-svn/src/site/resources/maquette-01.xcf | Bin 617655 -> 0 bytes swe-svn/src/site/resources/maquette-02.png | Bin 266671 -> 0 bytes swe-svn/src/site/resources/maquette-02.xcf | Bin 1427504 -> 0 bytes swe-svn/src/site/rst/index.rst | 26 ------ swe-svn/src/site/rst/install.rst | 28 ------ swe-svn/src/site/rst/tutoriel.rst | 26 ------ swe-svn/src/site/rst/user.rst | 31 ------- swe-svn/src/site/site_en.xml | 81 ---------------- swe-ui-web/pom.xml | 102 ++++++++++----------- swe-ui-web/src/site/site_en.xml | 81 ---------------- swe-ui-web/src/site/site_fr.xml | 81 ---------------- 71 files changed, 112 insertions(+), 1364 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 c27892dd2af4eafd6fb8e879cfb2dfc970e89208 Author: Maven Release <maven-release@codelutin.com> Date: Tue Dec 22 12:26:41 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 3445a25..4c10cbc 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.6</version> <packaging>pom</packaging> <name>ScmWebEditor</name> diff --git a/swe-git/pom.xml b/swe-git/pom.xml index 98b5c9e..4482c6d 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.6</version> </parent> <artifactId>scmwebeditor-git</artifactId> diff --git a/swe-scm-api/pom.xml b/swe-scm-api/pom.xml index 297a5e8..eebad8b 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.6</version> </parent> <artifactId>scmwebeditor-scm-api</artifactId> diff --git a/swe-svn/pom.xml b/swe-svn/pom.xml index 375f20f..80fa313 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.6</version> </parent> <artifactId>scmwebeditor-svn</artifactId> diff --git a/swe-ui-web/pom.xml b/swe-ui-web/pom.xml index 1f3ec79..29df56e 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.6</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 c1f9fb8fd7046089ae51d7b08c0f2a973ac16f17 Merge: c27892d 2b01ea1 Author: Maven Release <maven-release@codelutin.com> Date: Tue Dec 22 12:26:41 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 598da4c426a03082a9b2846d0cee518a76d18978 Author: Maven Release <maven-release@codelutin.com> Date: Tue Dec 22 12:26:41 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 4c10cbc..3445a25 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>org.nuiton</groupId> <artifactId>scmwebeditor</artifactId> - <version>0.6</version> + <version>0.7-SNAPSHOT</version> <packaging>pom</packaging> <name>ScmWebEditor</name> diff --git a/swe-git/pom.xml b/swe-git/pom.xml index 4482c6d..98b5c9e 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</version> + <version>0.7-SNAPSHOT</version> </parent> <artifactId>scmwebeditor-git</artifactId> diff --git a/swe-scm-api/pom.xml b/swe-scm-api/pom.xml index eebad8b..297a5e8 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</version> + <version>0.7-SNAPSHOT</version> </parent> <artifactId>scmwebeditor-scm-api</artifactId> diff --git a/swe-svn/pom.xml b/swe-svn/pom.xml index 80fa313..375f20f 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</version> + <version>0.7-SNAPSHOT</version> </parent> <artifactId>scmwebeditor-svn</artifactId> diff --git a/swe-ui-web/pom.xml b/swe-ui-web/pom.xml index 29df56e..1f3ec79 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</version> + <version>0.7-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