diff --git a/bundles/org.eclipse.rap.http.jetty/META-INF/MANIFEST.MF b/bundles/org.eclipse.rap.http.jetty/META-INF/MANIFEST.MF index 32707df914..9d9be9fcda 100644 --- a/bundles/org.eclipse.rap.http.jetty/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.rap.http.jetty/META-INF/MANIFEST.MF @@ -8,15 +8,15 @@ Bundle-Version: 4.8.0.qualifier Bundle-Activator: org.eclipse.rap.http.jetty.internal.Activator Import-Package: jakarta.servlet;version="[5.0.0,7.0.0)", jakarta.servlet.http;version="[5.0.0,7.0.0)", - org.eclipse.jetty.ee10.servlet;version="[12.0.1,13.0.0)", - org.eclipse.jetty.http;version="[12.0.1,13.0.0)", - org.eclipse.jetty.server;version="[12.0.1,13.0.0)", - org.eclipse.jetty.server.handler;version="[12.0.1,13.0.0)", - org.eclipse.jetty.session;version="[12.0.1,13.0.0)", - org.eclipse.jetty.util;version="[12.0.1,13.0.0)", - org.eclipse.jetty.util.component;version="[12.0.1,13.0.0)", - org.eclipse.jetty.util.ssl;version="[12.0.1,13.0.0)", - org.eclipse.jetty.util.thread;version="[12.0.1,13.0.0)", + org.eclipse.jetty.ee11.servlet;version="[12.1.0,13.0.0)", + org.eclipse.jetty.http;version="[12.1.0,13.0.0)", + org.eclipse.jetty.server;version="[12.1.0,13.0.0)", + org.eclipse.jetty.server.handler;version="[12.1.0,13.0.0)", + org.eclipse.jetty.session;version="[12.1.0,13.0.0)", + org.eclipse.jetty.util;version="[12.1.0,13.0.0)", + org.eclipse.jetty.util.component;version="[12.1.0,13.0.0)", + org.eclipse.jetty.util.ssl;version="[12.1.0,13.0.0)", + org.eclipse.jetty.util.thread;version="[12.1.0,13.0.0)", org.eclipse.rap.http.servlet;version="[4.8.0,5.0.0)", org.osgi.framework;version="1.3.0", org.osgi.framework.startlevel;version="1.0.0", diff --git a/bundles/org.eclipse.rap.http.jetty/src/org/eclipse/rap/http/jetty/internal/HttpServerManager.java b/bundles/org.eclipse.rap.http.jetty/src/org/eclipse/rap/http/jetty/internal/HttpServerManager.java index 4dcbe06a9c..138daca715 100644 --- a/bundles/org.eclipse.rap.http.jetty/src/org/eclipse/rap/http/jetty/internal/HttpServerManager.java +++ b/bundles/org.eclipse.rap.http.jetty/src/org/eclipse/rap/http/jetty/internal/HttpServerManager.java @@ -23,7 +23,7 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.*; -import org.eclipse.jetty.ee10.servlet.*; +import org.eclipse.jetty.ee11.servlet.*; import org.eclipse.jetty.http.UriCompliance; import org.eclipse.jetty.server.*; import org.eclipse.jetty.session.DefaultSessionIdManager; diff --git a/examples/org.eclipse.rap.demo.controls/launch/RAP Controls Demo.launch b/examples/org.eclipse.rap.demo.controls/launch/RAP Controls Demo.launch index 9578497e47..a3fbcaca4b 100644 --- a/examples/org.eclipse.rap.demo.controls/launch/RAP Controls Demo.launch +++ b/examples/org.eclipse.rap.demo.controls/launch/RAP Controls Demo.launch @@ -65,7 +65,7 @@ - + diff --git a/examples/org.eclipse.rap.demo/launch/RAP Workbench Demo (Business).launch b/examples/org.eclipse.rap.demo/launch/RAP Workbench Demo (Business).launch index 1f278b6152..4c92f29bcc 100644 --- a/examples/org.eclipse.rap.demo/launch/RAP Workbench Demo (Business).launch +++ b/examples/org.eclipse.rap.demo/launch/RAP Workbench Demo (Business).launch @@ -58,7 +58,7 @@ - + diff --git a/examples/org.eclipse.rap.demo/launch/RAP Workbench Demo (Fancy).launch b/examples/org.eclipse.rap.demo/launch/RAP Workbench Demo (Fancy).launch index 0a3eb2ce6f..bfefb21569 100644 --- a/examples/org.eclipse.rap.demo/launch/RAP Workbench Demo (Fancy).launch +++ b/examples/org.eclipse.rap.demo/launch/RAP Workbench Demo (Fancy).launch @@ -58,7 +58,7 @@ - + diff --git a/examples/org.eclipse.rap.demo/launch/RAP Workbench Demo (OSGi).launch b/examples/org.eclipse.rap.demo/launch/RAP Workbench Demo (OSGi).launch index f8e289a948..8ead8b0e89 100644 --- a/examples/org.eclipse.rap.demo/launch/RAP Workbench Demo (OSGi).launch +++ b/examples/org.eclipse.rap.demo/launch/RAP Workbench Demo (OSGi).launch @@ -42,7 +42,7 @@ - + diff --git a/examples/org.eclipse.rap.demo/launch/RAP Workbench Demo.launch b/examples/org.eclipse.rap.demo/launch/RAP Workbench Demo.launch index 228bc38b5e..7e8ad863c0 100644 --- a/examples/org.eclipse.rap.demo/launch/RAP Workbench Demo.launch +++ b/examples/org.eclipse.rap.demo/launch/RAP Workbench Demo.launch @@ -58,7 +58,7 @@ - + diff --git a/examples/org.eclipse.rap.e4.demo/launch/RAP e4 Demo.launch b/examples/org.eclipse.rap.e4.demo/launch/RAP e4 Demo.launch index af25cb4eb1..5a10ba5830 100644 --- a/examples/org.eclipse.rap.e4.demo/launch/RAP e4 Demo.launch +++ b/examples/org.eclipse.rap.e4.demo/launch/RAP e4 Demo.launch @@ -84,7 +84,7 @@ - + diff --git a/examples/org.eclipse.rap.examples/launch/RAP Examples Demo.launch b/examples/org.eclipse.rap.examples/launch/RAP Examples Demo.launch index f0de2e20e5..236d51aba6 100644 --- a/examples/org.eclipse.rap.examples/launch/RAP Examples Demo.launch +++ b/examples/org.eclipse.rap.examples/launch/RAP Examples Demo.launch @@ -64,7 +64,7 @@ - + diff --git a/tests/org.eclipse.rap.rwt.jstest/RWT Client Tests.launch b/tests/org.eclipse.rap.rwt.jstest/RWT Client Tests.launch index 0b0681485e..5cf60238db 100644 --- a/tests/org.eclipse.rap.rwt.jstest/RWT Client Tests.launch +++ b/tests/org.eclipse.rap.rwt.jstest/RWT Client Tests.launch @@ -33,7 +33,7 @@ - +