Skip to content

bump to Jakarta EE 11, requires Jetty 12.1 #405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
haubi wants to merge 1 commit into
base: main
Choose a base branch
from
Open

bump to Jakarta EE 11, requires Jetty 12.1 #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions bundles/org.eclipse.rap.http.jetty/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion ...org.eclipse.rap.http.jetty/src/org/eclipse/rap/http/jetty/internal/HttpServerManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion examples/org.eclipse.rap.demo.controls/launch/RAP Controls Demo.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<setEntry value="org.eclipse.equinox.preferences@default:default"/>
<setEntry value="org.eclipse.equinox.registry@default:default"/>
<setEntry value="org.eclipse.help@default:default"/>
<setEntry value="org.eclipse.jetty.ee10.servlet@default:default"/>
<setEntry value="org.eclipse.jetty.ee11.servlet@default:default"/>
<setEntry value="org.eclipse.jetty.http@default:default"/>
<setEntry value="org.eclipse.jetty.io@default:default"/>
<setEntry value="org.eclipse.jetty.security@default:default"/>
Expand Down
2 changes: 1 addition & 1 deletion examples/org.eclipse.rap.demo/launch/RAP Workbench Demo (Business).launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<setEntry value="org.eclipse.equinox.preferences@default:default"/>
<setEntry value="org.eclipse.equinox.registry@default:default"/>
<setEntry value="org.eclipse.help@default:default"/>
<setEntry value="org.eclipse.jetty.ee10.servlet@default:default"/>
<setEntry value="org.eclipse.jetty.ee11.servlet@default:default"/>
<setEntry value="org.eclipse.jetty.http@default:default"/>
<setEntry value="org.eclipse.jetty.io@default:default"/>
<setEntry value="org.eclipse.jetty.security@default:default"/>
Expand Down
2 changes: 1 addition & 1 deletion examples/org.eclipse.rap.demo/launch/RAP Workbench Demo (Fancy).launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<setEntry value="org.eclipse.equinox.preferences@default:default"/>
<setEntry value="org.eclipse.equinox.registry@default:default"/>
<setEntry value="org.eclipse.help@default:default"/>
<setEntry value="org.eclipse.jetty.ee10.servlet@default:default"/>
<setEntry value="org.eclipse.jetty.ee11.servlet@default:default"/>
<setEntry value="org.eclipse.jetty.http@default:default"/>
<setEntry value="org.eclipse.jetty.io@default:default"/>
<setEntry value="org.eclipse.jetty.security@default:default"/>
Expand Down
2 changes: 1 addition & 1 deletion examples/org.eclipse.rap.demo/launch/RAP Workbench Demo (OSGi).launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<setEntry value="org.eclipse.equinox.preferences@default:default"/>
<setEntry value="org.eclipse.equinox.registry@default:default"/>
<setEntry value="org.eclipse.help@default:default"/>
<setEntry value="org.eclipse.jetty.ee10.servlet@default:default"/>
<setEntry value="org.eclipse.jetty.ee11.servlet@default:default"/>
<setEntry value="org.eclipse.jetty.http@default:default"/>
<setEntry value="org.eclipse.jetty.io@default:default"/>
<setEntry value="org.eclipse.jetty.security@default:default"/>
Expand Down
2 changes: 1 addition & 1 deletion examples/org.eclipse.rap.demo/launch/RAP Workbench Demo.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<setEntry value="org.eclipse.equinox.preferences@default:default"/>
<setEntry value="org.eclipse.equinox.registry@default:default"/>
<setEntry value="org.eclipse.help@default:default"/>
<setEntry value="org.eclipse.jetty.ee10.servlet@default:default"/>
<setEntry value="org.eclipse.jetty.ee11.servlet@default:default"/>
<setEntry value="org.eclipse.jetty.http@default:default"/>
<setEntry value="org.eclipse.jetty.io@default:default"/>
<setEntry value="org.eclipse.jetty.security@default:default"/>
Expand Down
2 changes: 1 addition & 1 deletion examples/org.eclipse.rap.e4.demo/launch/RAP e4 Demo.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
<setEntry value="org.eclipse.equinox.event@default:default"/>
<setEntry value="org.eclipse.equinox.preferences@default:default"/>
<setEntry value="org.eclipse.equinox.registry@default:default"/>
<setEntry value="org.eclipse.jetty.ee10.servlet@default:default"/>
<setEntry value="org.eclipse.jetty.ee11.servlet@default:default"/>
<setEntry value="org.eclipse.jetty.http@default:default"/>
<setEntry value="org.eclipse.jetty.io@default:default"/>
<setEntry value="org.eclipse.jetty.logging@default:default"/>
Expand Down
2 changes: 1 addition & 1 deletion examples/org.eclipse.rap.examples/launch/RAP Examples Demo.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<setEntry value="org.eclipse.equinox.console@default:default"/>
<setEntry value="org.eclipse.equinox.preferences@default:default"/>
<setEntry value="org.eclipse.equinox.registry@default:default"/>
<setEntry value="org.eclipse.jetty.ee10.servlet@default:default"/>
<setEntry value="org.eclipse.jetty.ee11.servlet@default:default"/>
<setEntry value="org.eclipse.jetty.http@default:default"/>
<setEntry value="org.eclipse.jetty.io@default:default"/>
<setEntry value="org.eclipse.jetty.security@default:default"/>
Expand Down
2 changes: 1 addition & 1 deletion tests/org.eclipse.rap.rwt.jstest/RWT Client Tests.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<setEntry value="org.apache.felix.scr@1:true"/>
<setEntry value="org.eclipse.equinox.common@2:true"/>
<setEntry value="org.eclipse.equinox.console@default:default"/>
<setEntry value="org.eclipse.jetty.ee10.servlet@default:default"/>
<setEntry value="org.eclipse.jetty.ee11.servlet@default:default"/>
<setEntry value="org.eclipse.jetty.http@default:default"/>
<setEntry value="org.eclipse.jetty.io@default:default"/>
<setEntry value="org.eclipse.jetty.logging@default:default"/>
Expand Down