From fcef9a264e84224c33ae9fd04154276bcbc4a370 Mon Sep 17 00:00:00 2001
From: anttil <anttil>
Date: Mon, 22 Jun 2015 06:00:44 +0000
Subject: [PATCH] SSDM-2068: Upgrade to Jetty 9.3. HTTP/2 not yet enabled.
SVN: 34222
---
openbis/dist/server/install.sh | 2 +-
openbis_standard_technologies/build.gradle | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/openbis/dist/server/install.sh b/openbis/dist/server/install.sh
index b23f9859e9c..79eeef891f1 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-`cat $installation_folder/jetty-version.txt`"
+jetty_with_version="jetty-distribution-`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 6894e6c34db..ac365fb9495 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.2.10'
+def jettyVersion = '9.3.0.v20150612'
dependencies {
compile project(':screening'),
@@ -36,8 +36,8 @@ dependencies {
providedCompile 'google:gwt-user:2.4'
- providedRuntime "eclipse:jetty-util:${jettyVersion}.v20150310",
- "eclipse:jetty-deploy:${jettyVersion}.v20150310"
+ providedRuntime "eclipse:jetty-util:${jettyVersion}",
+ "eclipse:jetty-deploy:${jettyVersion}"
gwt 'reveregroup:gwt-image-loader:1.1.4',
'google:gwt-dev:+'
--
GitLab