branch develop updated (30ca083 -> 5d10cd3)
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 30ca083 Create a default maven site (Fixes #3821) new 2dad8b9 Update jetty plugin to 9.3.6.v20151106 (Fixes #3822) new 2c08963 Update guava to 19.0 (Fixes #3823) new 981cc0c Update junit to 4.12 (Fixes #3824) new 55c2abf Update shiro to 1.2.4 (Fixes #3825) new d181c9e Update tika to 1.11 (Fixes #3827) new 163f7d7 Update jgit to 4.1.1.201511131810-r (Fixes #3828) new 9e555b7 Update nuiton-utils to 3.0-rc-10 (Fixes #3829) new 7c5df95 Update svnkit to 1.8.11 (Fixes #3830) new 93ce03f Update codemirror to 5.8 (Fixes #3831) new 5d10cd3 Update struts to 2.3.24.1 (See #3831) The 10 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 5d10cd3ee966ead64c72e7ce5f23d96c18af8a92 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 22 11:29:17 2015 +0100 Update struts to 2.3.24.1 (See #3831) commit 93ce03fe9065cb0008c1ec96d399cb076ec100de Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 22 11:26:50 2015 +0100 Update codemirror to 5.8 (Fixes #3831) commit 7c5df950b17ea2e47e0fbff17940594123dd87d4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 22 11:25:58 2015 +0100 Update svnkit to 1.8.11 (Fixes #3830) commit 9e555b70ca7d7716e1290ac27c7e27d323a18311 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 22 11:25:22 2015 +0100 Update nuiton-utils to 3.0-rc-10 (Fixes #3829) commit 163f7d743eaff2ddbc64bc01f10df4ca40a4e851 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 22 11:23:47 2015 +0100 Update jgit to 4.1.1.201511131810-r (Fixes #3828) commit d181c9e52420ead63edf80d95265ce201fd4ec4e Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 22 11:22:51 2015 +0100 Update tika to 1.11 (Fixes #3827) commit 55c2abf4dd84c2adce307ec3f9641190df013bdd Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 22 11:22:10 2015 +0100 Update shiro to 1.2.4 (Fixes #3825) commit 981cc0cdba6d9d1e3d4f5911b4c32b10ad2f14f5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 22 11:21:35 2015 +0100 Update junit to 4.12 (Fixes #3824) commit 2c089634cb6294af155b709497bbfc85f8f45c1f Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 22 11:21:07 2015 +0100 Update guava to 19.0 (Fixes #3823) commit 2dad8b90a4cb79c0ee2dc19c53aeb5bf5ae12e51 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 22 11:20:44 2015 +0100 Update jetty plugin to 9.3.6.v20151106 (Fixes #3822) Summary of changes: pom.xml | 21 ++++++++++----------- .../org/nuiton/scmwebeditor/git/GitConnection.java | 6 ++++-- .../org/nuiton/scmwebeditor/git/GitProvider.java | 6 ++++-- 3 files changed, 18 insertions(+), 15 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 2dad8b90a4cb79c0ee2dc19c53aeb5bf5ae12e51 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 22 11:20:44 2015 +0100 Update jetty plugin to 9.3.6.v20151106 (Fixes #3822) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 61df88a..26a8b8a 100644 --- a/pom.xml +++ b/pom.xml @@ -363,7 +363,7 @@ <plugin> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <version>9.2.4.v20141103</version> + <version>9.3.6.v20151106</version> <configuration> <webAppConfig> <contextPath>/${project.artifactId}</contextPath> -- 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 2c089634cb6294af155b709497bbfc85f8f45c1f Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 22 11:21:07 2015 +0100 Update guava to 19.0 (Fixes #3823) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 26a8b8a..19f88dc 100644 --- a/pom.xml +++ b/pom.xml @@ -189,7 +189,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>18.0</version> + <version>19.0</version> </dependency> <dependency> -- 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 981cc0cdba6d9d1e3d4f5911b4c32b10ad2f14f5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 22 11:21:35 2015 +0100 Update junit to 4.12 (Fixes #3824) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 19f88dc..d65e6bf 100644 --- a/pom.xml +++ b/pom.xml @@ -170,7 +170,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.11</version> + <version>4.12</version> <scope>test</scope> </dependency> -- 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 55c2abf4dd84c2adce307ec3f9641190df013bdd Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 22 11:22:10 2015 +0100 Update shiro to 1.2.4 (Fixes #3825) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d65e6bf..3627fef 100644 --- a/pom.xml +++ b/pom.xml @@ -266,7 +266,7 @@ <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-core</artifactId> - <version>1.2.3</version> + <version>1.2.4</version> </dependency> <dependency> -- 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 d181c9e52420ead63edf80d95265ce201fd4ec4e Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 22 11:22:51 2015 +0100 Update tika to 1.11 (Fixes #3827) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3627fef..3598857 100644 --- a/pom.xml +++ b/pom.xml @@ -272,7 +272,7 @@ <dependency> <groupId>org.apache.tika</groupId> <artifactId>tika-core</artifactId> - <version>1.6</version> + <version>1.11</version> </dependency> <dependency> -- 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 163f7d743eaff2ddbc64bc01f10df4ca40a4e851 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 22 11:23:47 2015 +0100 Update jgit to 4.1.1.201511131810-r (Fixes #3828) --- pom.xml | 2 +- .../src/main/java/org/nuiton/scmwebeditor/git/GitConnection.java | 6 ++++-- swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitProvider.java | 6 ++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 3598857..fced205 100644 --- a/pom.xml +++ b/pom.xml @@ -195,7 +195,7 @@ <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit</artifactId> - <version>3.7.0.201502260915-r</version> + <version>4.1.1.201511131810-r</version> </dependency> <dependency> diff --git a/swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitConnection.java b/swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitConnection.java index 60ec870..f5ca173 100644 --- a/swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitConnection.java +++ b/swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitConnection.java @@ -975,9 +975,11 @@ public class GitConnection implements ScmConnection { logMessage = "Can not push : someone else is updating the HEAD or the branch"; } else if (e instanceof WrongRepositoryStateException) { logMessage = "Can not push : the repository is not in the right state"; - } else if (e instanceof RejectCommitException) { - logMessage = "Can not push : commit rejected"; } + //TC-2015-12-22 does not exist any longer +// else if (e instanceof RejectCommitException) { +// logMessage = "Can not push : commit rejected"; +// } if (log.isErrorEnabled()) { log.error(logMessage, e); diff --git a/swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitProvider.java b/swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitProvider.java index 950cf29..e17ea42 100644 --- a/swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitProvider.java +++ b/swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitProvider.java @@ -166,9 +166,11 @@ public class GitProvider implements ScmProvider { logMessage = "Can not push : someone else is updating the HEAD or the branch"; } else if (e instanceof WrongRepositoryStateException) { logMessage = "Can not push : the repository is not in the right state"; - } else if (e instanceof RejectCommitException) { - logMessage = "Can not push : commit rejected"; } + //TC-2015-12-22 does not exist any longer +// else if (e instanceof RejectCommitException) { +// logMessage = "Can not push : commit rejected"; +// } if (log.isErrorEnabled()) { log.error(logMessage, e); -- 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 9e555b70ca7d7716e1290ac27c7e27d323a18311 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 22 11:25:22 2015 +0100 Update nuiton-utils to 3.0-rc-10 (Fixes #3829) --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index fced205..aa35780 100644 --- a/pom.xml +++ b/pom.xml @@ -98,7 +98,6 @@ <struts2Version>2.3.16.3</struts2Version> <struts2jqueryVersion>3.7.1</struts2jqueryVersion> <nuitonI18nVersion>3.3</nuitonI18nVersion> - <nuitonUtilsVersion>3.0-rc-8</nuitonUtilsVersion> <nuitonWebVersion>1.17</nuitonWebVersion> <i18n.bundles>fr_FR,en_GB</i18n.bundles> @@ -214,7 +213,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>${nuitonUtilsVersion}</version> + <version>3.0-rc-10</version> <scope>compile</scope> </dependency> -- 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 7c5df950b17ea2e47e0fbff17940594123dd87d4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 22 11:25:58 2015 +0100 Update svnkit to 1.8.11 (Fixes #3830) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index aa35780..9c0a85d 100644 --- a/pom.xml +++ b/pom.xml @@ -207,7 +207,7 @@ <dependency> <groupId>org.tmatesoft.svnkit</groupId> <artifactId>svnkit</artifactId> - <version>1.8.5</version> + <version>1.8.11</version> </dependency> <dependency> -- 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 93ce03fe9065cb0008c1ec96d399cb076ec100de Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 22 11:26:50 2015 +0100 Update codemirror to 5.8 (Fixes #3831) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9c0a85d..b922245 100644 --- a/pom.xml +++ b/pom.xml @@ -233,7 +233,7 @@ <dependency> <groupId>org.webjars</groupId> <artifactId>codemirror</artifactId> - <version>5.1</version> + <version>5.8</version> </dependency> <dependency> -- 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 5d10cd3ee966ead64c72e7ce5f23d96c18af8a92 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 22 11:29:17 2015 +0100 Update struts to 2.3.24.1 (See #3831) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b922245..7bc16c1 100644 --- a/pom.xml +++ b/pom.xml @@ -95,7 +95,7 @@ <locales>fr,en</locales> <siteSourcesType>rst</siteSourcesType> - <struts2Version>2.3.16.3</struts2Version> + <struts2Version>2.3.24.1</struts2Version> <struts2jqueryVersion>3.7.1</struts2jqueryVersion> <nuitonI18nVersion>3.3</nuitonI18nVersion> <nuitonWebVersion>1.17</nuitonWebVersion> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm