Merge branch 'master' of sissource.ethz.ch:sispub/openbis

openbis/resource/eclipse/openBIS dev server.launch

@@ -10,7 +10,7 @@
 <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
 <listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot; javaProject=&quot;openbis&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/ivy-repository/eclipse/jetty-runner/9.4.9.v20180320/jetty-runner-9.4.9.v20180320.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/ivy-repository/eclipse/jetty-runner/9.4.14.v20181114/jetty-runner-9.4.14.v20181114.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
 </listAttribute>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.jetty.runner.Runner"/>

openbis_standard_technologies/build.gradle

@@ -59,7 +59,7 @@ configurations.create('datastore_server')
 configurations.create('javadoc_sources')
 configurations.create('javadoc_compilation')
 
-def jettyVersion = '9.4.9'
+def jettyVersion = '9.4.14'
 
 dependencies {
 	compile project(':screening'),
@@ -67,13 +67,13 @@ dependencies {
 	
 	providedCompile 'google:gwt-user:2.4'
 					
-	providedRuntime "eclipse:jetty-deploy:${jettyVersion}.v20180320@jar",
-                    "eclipse:jetty-xml:${jettyVersion}.v20180320@jar",
-                    "eclipse:jetty-webapp:${jettyVersion}.v20180320@jar",
-                    "eclipse:jetty-servlet:${jettyVersion}.v20180320@jar",
-                    "eclipse:jetty-security:${jettyVersion}.v20180320@jar",
-                    "eclipse:jetty-server:${jettyVersion}.v20180320@jar",
-                    "eclipse:jetty-continuation:${jettyVersion}.v20180320@jar"
+	providedRuntime "eclipse:jetty-deploy:${jettyVersion}.v20181114@jar",
+                    "eclipse:jetty-xml:${jettyVersion}.v20181114@jar",
+                    "eclipse:jetty-webapp:${jettyVersion}.v20181114@jar",
+                    "eclipse:jetty-servlet:${jettyVersion}.v20181114@jar",
+                    "eclipse:jetty-security:${jettyVersion}.v20181114@jar",
+                    "eclipse:jetty-server:${jettyVersion}.v20181114@jar",
+                    "eclipse:jetty-continuation:${jettyVersion}.v20181114@jar"
 		
 	gwt 'reveregroup:gwt-image-loader:1.1.4',
                 'google:gwt-dev:+'