diff --git a/openbis-common/build.gradle b/openbis-common/build.gradle index 755c037d0037b2876de5ee15040bb6362c7d2505..d3cb643812b5efc393853f4313b221af290e5243 100644 --- a/openbis-common/build.gradle +++ b/openbis-common/build.gradle @@ -15,5 +15,5 @@ dependencies { 'truezip:truezip:+' testCompile project(path: ':common', configuration: 'tests'), - 'eclipse:jetty-servlet:+' + 'eclipse:jetty-servlet:9.2+' } \ No newline at end of file diff --git a/openbis/build.gradle b/openbis/build.gradle index 2b8524d4dd0191707ac234f912cba42fee530bcf..b2ad1d95bfef79734dbc5af98fa9bb0380e39871 100644 --- a/openbis/build.gradle +++ b/openbis/build.gradle @@ -19,7 +19,7 @@ dependencies { 'lucene:lucene-queryparser:4.10.3', 'lucene:lucene-analyzers-common:4.10.3', 'hibernate:hibernate-search-orm:5.0.1.Final', - 'eclipse:jetty-deploy:+', + 'eclipse:jetty-deploy:9.2+', 'google:gwt-debug-panel:1.0', 'javax:servlet-api:+', 'google:gwt-user:+', diff --git a/openbis/dist/server/install.sh b/openbis/dist/server/install.sh index 79eeef891f1d5e0f87201183f0fbd2519d303451..b23f9859e9c66ec141fee67994b15bf4f308247c 100755 --- a/openbis/dist/server/install.sh +++ b/openbis/dist/server/install.sh @@ -57,7 +57,7 @@ if [ "$1" ]; then shift fi -jetty_with_version="jetty-distribution-`cat $installation_folder/jetty-version.txt`" +jetty_with_version="jetty-`cat $installation_folder/jetty-version.txt`" jetty_folder="${server_folder}/jetty-dist" base_folder="${server_folder}/jetty" diff --git a/openbis_standard_technologies/build.gradle b/openbis_standard_technologies/build.gradle index ac365fb949527298c0c9609ee5e6356c6cee0f20..6894e6c34db9221822e4ccce3aba95e3b7bfabaa 100644 --- a/openbis_standard_technologies/build.gradle +++ b/openbis_standard_technologies/build.gradle @@ -28,7 +28,7 @@ configurations.create('datastore_server') configurations.create('javadoc_sources') configurations.create('javadoc_compilation') -def jettyVersion = '9.3.0.v20150612' +def jettyVersion = '9.2.10' dependencies { compile project(':screening'), @@ -36,8 +36,8 @@ dependencies { providedCompile 'google:gwt-user:2.4' - providedRuntime "eclipse:jetty-util:${jettyVersion}", - "eclipse:jetty-deploy:${jettyVersion}" + providedRuntime "eclipse:jetty-util:${jettyVersion}.v20150310", + "eclipse:jetty-deploy:${jettyVersion}.v20150310" gwt 'reveregroup:gwt-image-loader:1.1.4', 'google:gwt-dev:+'