Bug 572002, Bug 573461: Update to Jetty 10.0.4
Change-Id: I8ce4ddb46417a512b870a4354df1fa2e4a8d31eb
diff --git a/r/_assemblies/org.eclipse.statet.r-feature/feature.xml b/r/_assemblies/org.eclipse.statet.r-feature/feature.xml
index 7e44d60..e3fafe8 100644
--- a/r/_assemblies/org.eclipse.statet.r-feature/feature.xml
+++ b/r/_assemblies/org.eclipse.statet.r-feature/feature.xml
@@ -27,8 +27,8 @@
<import feature="org.eclipse.statet.rj.core" version="4.4.0" match="equivalent"/>
<import feature="org.eclipse.statet.rj.eclient" version="4.4.0" match="equivalent"/>
- <import plugin="org.eclipse.jetty.client" version="10.0.2" match="equivalent"/>
- <import plugin="org.eclipse.jetty.proxy" version="10.0.2" match="equivalent"/>
+ <import plugin="org.eclipse.jetty.client" version="10.0.4" match="equivalent"/>
+ <import plugin="org.eclipse.jetty.proxy" version="10.0.4" match="equivalent"/>
</requires>
<plugin
diff --git a/r/org.eclipse.statet.r.core/META-INF/MANIFEST.MF b/r/org.eclipse.statet.r.core/META-INF/MANIFEST.MF
index 186ca3e..3c2f939 100644
--- a/r/org.eclipse.statet.r.core/META-INF/MANIFEST.MF
+++ b/r/org.eclipse.statet.r.core/META-INF/MANIFEST.MF
@@ -25,8 +25,8 @@
org.eclipse.statet.rhelp.core;bundle-version="[4.4.0,4.5.0)",
org.eclipse.equinox.http.registry;bundle-version="1.1.0",
org.eclipse.equinox.http.jetty;bundle-version="3.7.0",
- org.eclipse.jetty.client;bundle-version="[10.0.2,10.1.0)",
- org.eclipse.jetty.proxy;bundle-version="[10.0.2,10.1.0)",
+ org.eclipse.jetty.client;bundle-version="[10.0.4,10.1.0)",
+ org.eclipse.jetty.proxy;bundle-version="[10.0.4,10.1.0)",
org.eclipse.core.variables;bundle-version="3.4.0"
Import-Package: com.ibm.icu.lang;version="67.1.0",
com.ibm.icu.text;version="67.1.0",
diff --git a/r/org.eclipse.statet.r.ui/META-INF/MANIFEST.MF b/r/org.eclipse.statet.r.ui/META-INF/MANIFEST.MF
index 41444b3..a0ea70f 100644
--- a/r/org.eclipse.statet.r.ui/META-INF/MANIFEST.MF
+++ b/r/org.eclipse.statet.r.ui/META-INF/MANIFEST.MF
@@ -44,8 +44,8 @@
javax.servlet;version="[4.0.0,5.0.0)",
javax.servlet.http;version="[4.0.0,5.0.0)",
org.eclipse.help,
- org.eclipse.jetty.servlet;version="[10.0.2,10.1.0)",
- org.eclipse.jetty.util;version="[10.0.2,10.1.0)",
+ org.eclipse.jetty.servlet;version="[10.0.4,10.1.0)",
+ org.eclipse.jetty.util;version="[10.0.4,10.1.0)",
org.eclipse.statet.ecommons.collections;version="4.4.0",
org.eclipse.statet.ecommons.commands.core;version="4.4.0",
org.eclipse.statet.ecommons.databinding,
diff --git a/rhelp/org.eclipse.statet.rhelp.core/META-INF/MANIFEST.MF b/rhelp/org.eclipse.statet.rhelp.core/META-INF/MANIFEST.MF
index 6c2fa11..2696f1d 100644
--- a/rhelp/org.eclipse.statet.rhelp.core/META-INF/MANIFEST.MF
+++ b/rhelp/org.eclipse.statet.rhelp.core/META-INF/MANIFEST.MF
@@ -13,11 +13,11 @@
org.apache.lucene.queryparser;bundle-version="[7.5.0,7.6.0)",
org.apache.lucene.highlighter;bundle-version="[7.5.0,7.6.0)",
org.eclipse.statet.rj.services.core;bundle-version="[4.4.0,4.5.0)",
- org.eclipse.jetty.util;bundle-version="[10.0.2,10.1.0)";resolution:=optional,
- org.eclipse.jetty.server;bundle-version="[10.0.2,10.1.0)";resolution:=optional,
- org.eclipse.jetty.client;bundle-version="[10.0.2,10.1.0)";resolution:=optional,
- org.eclipse.jetty.http;bundle-version="[10.0.2,10.1.0)";resolution:=optional,
- org.eclipse.jetty.proxy;bundle-version="[10.0.2,10.1.0)";resolution:=optional
+ org.eclipse.jetty.util;bundle-version="[10.0.4,10.1.0)";resolution:=optional,
+ org.eclipse.jetty.server;bundle-version="[10.0.4,10.1.0)";resolution:=optional,
+ org.eclipse.jetty.client;bundle-version="[10.0.4,10.1.0)";resolution:=optional,
+ org.eclipse.jetty.http;bundle-version="[10.0.4,10.1.0)";resolution:=optional,
+ org.eclipse.jetty.proxy;bundle-version="[10.0.4,10.1.0)";resolution:=optional
Import-Package: com.ibm.icu.text;version="67.1.0",
javax.servlet;version="[4.0.0,5.0.0)";resolution:=optional,
javax.servlet.http;version="[4.0.0,5.0.0)";resolution:=optional
