branch develop updated (d8a9db9 -> 74f7452)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from d8a9db9 From scmwebeditor -- fdh new c731880 Fix embedded application fix dependencies #8840 new 74f7452 Merge branch 'develop' of gitlab.nuiton.org:codelutin/echobase into develop The 2 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 74f74521e723c60912f013787230ca4beaadb656 Merge: c731880 d8a9db9 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Fri Dec 2 16:03:00 2016 +0100 Merge branch 'develop' of gitlab.nuiton.org:codelutin/echobase into develop commit c7318805ae8d27736a605f23f783d8afaafeee3d Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Fri Dec 2 16:01:19 2016 +0100 Fix embedded application fix dependencies #8840 Summary of changes: echobase-ui/pom.xml | 5 +++-- pom.xml | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit c7318805ae8d27736a605f23f783d8afaafeee3d Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Fri Dec 2 16:01:19 2016 +0100 Fix embedded application fix dependencies #8840 --- echobase-ui/pom.xml | 5 +++-- pom.xml | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index 43f5469..c6c27ae 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -315,7 +315,7 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> - + <!-- logging dependencies --> <dependency> @@ -358,7 +358,7 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> - + </dependencies> <profiles> @@ -420,6 +420,7 @@ <plugin> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-jspc-maven-plugin</artifactId> + <version>${jettyPluginVersion}</version> <executions> <execution> <id>jspc</id> diff --git a/pom.xml b/pom.xml index 18daaaa..6109e47 100644 --- a/pom.xml +++ b/pom.xml @@ -130,7 +130,7 @@ <topiaVersion>3.1.1</topiaVersion> <nuitonUtilsVersion>3.0-rc-12</nuitonUtilsVersion> <nuitonI18nVersion>3.4.1</nuitonI18nVersion> - <nuitonWebVersion>1.17</nuitonWebVersion> + <nuitonWebVersion>1.18</nuitonWebVersion> <!--<struts2Version>2.3.20</struts2Version>--> <struts2Version>2.3.15.3</struts2Version> @@ -142,6 +142,8 @@ <postgresqlVersion>9.4.1208.jre7</postgresqlVersion> <slf4jVersion>1.7.21</slf4jVersion> <coserVersion>1.5.6</coserVersion> + <!-- /!\ http://bengreen.eu/fancyhtml/quickreference/jettyjsp9error.html --> + <jettyPluginVersion>9.1.6.v20160112</jettyPluginVersion> <reflectionsVersion>0.9.10</reflectionsVersion> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 74f74521e723c60912f013787230ca4beaadb656 Merge: c731880 d8a9db9 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Fri Dec 2 16:03:00 2016 +0100 Merge branch 'develop' of gitlab.nuiton.org:codelutin/echobase into develop echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- echobase-ui/pom.xml | 2 +- pom.xml | 2 +- src/site/rst/usage.rst.vm | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm