Skip to content

Commit e29e13a

Browse files
solomaxsolomax
committed
Jetty is updated to the most recent version
1 parent b1478c8 commit e29e13a

108 files changed

Lines changed: 608 additions & 652 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎async-tasks-parent/async-tasks-demo/pom.xml‎

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -38,22 +38,19 @@
3838
</excludes>
3939
</resource>
4040
</resources>
41-
<plugins>
42-
<!-- Jetty configuration -->
43-
<plugin>
44-
<groupId>org.eclipse.jetty</groupId>
45-
<artifactId>jetty-maven-plugin</artifactId>
46-
<configuration>
47-
<connectors>
48-
<connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
49-
<port>8080</port>
50-
<maxIdleTime>3600000</maxIdleTime>
51-
</connector>
52-
</connectors>
53-
<scanIntervalSeconds>0</scanIntervalSeconds>
54-
<reload>manual</reload>
55-
</configuration>
56-
</plugin>
57-
</plugins>
41+
<plugins>
42+
<!-- Jetty configuration -->
43+
<plugin>
44+
<groupId>org.eclipse.jetty.ee10</groupId>
45+
<artifactId>jetty-ee10-maven-plugin</artifactId>
46+
<configuration>
47+
<httpConnector>
48+
<port>8080</port>
49+
<idleTimeout>3600000</idleTimeout>
50+
</httpConnector>
51+
<scan>0</scan>
52+
</configuration>
53+
</plugin>
54+
</plugins>
5855
</build>
5956
</project>

‎autocomplete-tagit-parent/autocomplete-tagit-examples/pom.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@
4444
<artifactId>junit-jupiter-engine</artifactId>
4545
</dependency>
4646

47-
<!-- JETTY DEPENDENCIES FOR TESTING -->
47+
<!-- JETTY DEPENDENCIES FOR TESTING -->
4848
<dependency>
4949
<groupId>org.eclipse.jetty</groupId>
5050
<artifactId>jetty-server</artifactId>
5151
</dependency>
5252
<dependency>
53-
<groupId>org.eclipse.jetty</groupId>
54-
<artifactId>jetty-webapp</artifactId>
53+
<groupId>org.eclipse.jetty.ee10</groupId>
54+
<artifactId>jetty-ee10-webapp</artifactId>
5555
</dependency>
5656
<dependency>
5757
<groupId>org.eclipse.jetty</groupId>
@@ -62,15 +62,15 @@
6262
<artifactId>wicket-native-websocket-javax</artifactId>
6363
</dependency>
6464
<dependency>
65-
<groupId>org.eclipse.jetty.websocket</groupId>
66-
<artifactId>websocket-jakarta-server</artifactId>
65+
<groupId>org.eclipse.jetty.ee10.websocket</groupId>
66+
<artifactId>jetty-ee10-websocket-jakarta-server</artifactId>
6767
</dependency>
6868
</dependencies>
6969
<build>
7070
<plugins>
7171
<plugin>
72-
<groupId>org.eclipse.jetty</groupId>
73-
<artifactId>jetty-maven-plugin</artifactId>
72+
<groupId>org.eclipse.jetty.ee10</groupId>
73+
<artifactId>jetty-ee10-maven-plugin</artifactId>
7474
</plugin>
7575
</plugins>
7676
</build>

‎autocomplete-tagit-parent/autocomplete-tagit-examples/src/test/java/org/wicketstuff/tagit/example/Start.java‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,18 @@
2828
import org.eclipse.jetty.server.Server;
2929
import org.eclipse.jetty.server.ServerConnector;
3030
import org.eclipse.jetty.server.SslConnectionFactory;
31-
import org.eclipse.jetty.server.session.DefaultSessionCache;
32-
import org.eclipse.jetty.server.session.FileSessionDataStore;
33-
import org.eclipse.jetty.servlet.ServletContextHandler;
31+
import org.eclipse.jetty.session.DefaultSessionCache;
32+
import org.eclipse.jetty.session.FileSessionDataStore;
33+
import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
3434
import org.eclipse.jetty.util.resource.Resource;
35+
import org.eclipse.jetty.util.resource.ResourceFactory;
3536
import org.eclipse.jetty.util.ssl.SslContextFactory;
36-
import org.eclipse.jetty.webapp.WebAppContext;
37-
import org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer;
37+
import org.eclipse.jetty.ee10.webapp.WebAppContext;
38+
import org.eclipse.jetty.ee10.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer;
3839

3940

4041
import java.time.Duration;
4142

42-
import org.eclipse.jetty.server.Server;
43-
import org.eclipse.jetty.server.ServerConnector;
44-
import org.eclipse.jetty.util.resource.Resource;
45-
import org.eclipse.jetty.util.ssl.SslContextFactory;
46-
import org.eclipse.jetty.webapp.WebAppContext;
47-
4843
public class Start
4944
{
5045

@@ -64,7 +59,7 @@ public static void main(final String[] args) throws Exception
6459

6560
server.addConnector(http);
6661

67-
Resource keystore = Resource.newClassPathResource("/keystore");
62+
Resource keystore = ResourceFactory.root().newClassLoaderResource("/keystore");
6863
if (keystore != null && keystore.exists())
6964
{
7065
// if a keystore for a SSL certificate is available, start a SSL

‎closure-compiler/pom.xml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,14 @@
3939
<artifactId>jul-to-slf4j</artifactId>
4040
</dependency>
4141

42+
<!-- JETTY DEPENDENCIES FOR TESTING -->
4243
<dependency>
4344
<groupId>org.eclipse.jetty</groupId>
4445
<artifactId>jetty-server</artifactId>
4546
</dependency>
4647
<dependency>
47-
<groupId>org.eclipse.jetty</groupId>
48-
<artifactId>jetty-webapp</artifactId>
48+
<groupId>org.eclipse.jetty.ee10</groupId>
49+
<artifactId>jetty-ee10-webapp</artifactId>
4950
</dependency>
5051
<dependency>
5152
<groupId>org.eclipse.jetty</groupId>
@@ -56,8 +57,8 @@
5657
<artifactId>wicket-native-websocket-javax</artifactId>
5758
</dependency>
5859
<dependency>
59-
<groupId>org.eclipse.jetty.websocket</groupId>
60-
<artifactId>websocket-jakarta-server</artifactId>
60+
<groupId>org.eclipse.jetty.ee10.websocket</groupId>
61+
<artifactId>jetty-ee10-websocket-jakarta-server</artifactId>
6162
</dependency>
6263
</dependencies>
6364
</project>

‎closure-compiler/src/test/java/org/wicketstuff/closurecompiler/testapp/Start.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import org.eclipse.jetty.server.HttpConnectionFactory;
55
import org.eclipse.jetty.server.Server;
66
import org.eclipse.jetty.server.ServerConnector;
7-
import org.eclipse.jetty.webapp.WebAppContext;
7+
import org.eclipse.jetty.ee10.webapp.WebAppContext;
88

99
public class Start
1010
{

‎dashboard-parent/dashboard-examples/pom.xml‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,12 @@
2424
<build>
2525
<plugins>
2626
<plugin>
27-
<groupId>org.eclipse.jetty</groupId>
28-
<artifactId>jetty-maven-plugin</artifactId>
27+
<groupId>org.eclipse.jetty.ee10</groupId>
28+
<artifactId>jetty-ee10-maven-plugin</artifactId>
2929
<configuration>
3030
<systemProperties>
31-
<systemProperty>
32-
<name>jetty.port</name>
33-
<value>8081</value>
34-
</systemProperty>
35-
<systemProperty>
36-
<name>maven.project.build.directory.test-classes</name>
37-
<value>${project.build.directory}/test-classes</value>
38-
</systemProperty>
31+
<jetty.http.port>8081</jetty.http.port>
32+
<maven.project.build.directory.test-classes>${project.build.directory}/test-classes</maven.project.build.directory.test-classes>
3933
</systemProperties>
4034
</configuration>
4135
</plugin>
@@ -102,14 +96,14 @@
10296
<artifactId>junit-jupiter-engine</artifactId>
10397
</dependency>
10498

105-
<!-- JETTY DEPENDENCIES FOR TESTING -->
99+
<!-- JETTY DEPENDENCIES FOR TESTING -->
106100
<dependency>
107101
<groupId>org.eclipse.jetty</groupId>
108102
<artifactId>jetty-server</artifactId>
109103
</dependency>
110104
<dependency>
111-
<groupId>org.eclipse.jetty</groupId>
112-
<artifactId>jetty-webapp</artifactId>
105+
<groupId>org.eclipse.jetty.ee10</groupId>
106+
<artifactId>jetty-ee10-webapp</artifactId>
113107
</dependency>
114108
<dependency>
115109
<groupId>org.eclipse.jetty</groupId>
@@ -120,8 +114,8 @@
120114
<artifactId>wicket-native-websocket-javax</artifactId>
121115
</dependency>
122116
<dependency>
123-
<groupId>org.eclipse.jetty.websocket</groupId>
124-
<artifactId>websocket-jakarta-server</artifactId>
117+
<groupId>org.eclipse.jetty.ee10.websocket</groupId>
118+
<artifactId>jetty-ee10-websocket-jakarta-server</artifactId>
125119
</dependency>
126120
</dependencies>
127121
</project>

‎dashboard-parent/dashboard-examples/src/test/java/org/wicketstuff/dashboard/examples/Start.java‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,17 @@
2424
import org.eclipse.jetty.server.Server;
2525
import org.eclipse.jetty.server.ServerConnector;
2626
import org.eclipse.jetty.server.SslConnectionFactory;
27-
import org.eclipse.jetty.server.session.DefaultSessionCache;
28-
import org.eclipse.jetty.server.session.FileSessionDataStore;
29-
import org.eclipse.jetty.servlet.ServletContextHandler;
27+
import org.eclipse.jetty.session.DefaultSessionCache;
28+
import org.eclipse.jetty.session.FileSessionDataStore;
29+
import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
3030
import org.eclipse.jetty.util.resource.Resource;
31+
import org.eclipse.jetty.util.resource.ResourceFactory;
3132
import org.eclipse.jetty.util.ssl.SslContextFactory;
32-
import org.eclipse.jetty.webapp.WebAppContext;
33-
import org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer;
34-
33+
import org.eclipse.jetty.ee10.webapp.WebAppContext;
34+
import org.eclipse.jetty.ee10.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer;
3535

3636
import java.time.Duration;
3737

38-
import org.eclipse.jetty.server.Server;
39-
import org.eclipse.jetty.server.ServerConnector;
40-
import org.eclipse.jetty.util.resource.Resource;
41-
import org.eclipse.jetty.util.ssl.SslContextFactory;
42-
import org.eclipse.jetty.webapp.WebAppContext;
43-
4438
/**
4539
* @author Decebal Suiu
4640
*/
@@ -62,7 +56,7 @@ public static void main(String[] args) throws Exception {
6256

6357
server.addConnector(http);
6458

65-
Resource keystore = Resource.newClassPathResource("/keystore");
59+
Resource keystore = ResourceFactory.root().newClassLoaderResource("/keystore");
6660
if (keystore != null && keystore.exists()) {
6761
// if a keystore for a SSL certificate is available, start a SSL
6862
// connector on port 8443.

‎datastores-parent/datastore-tests/pom.xml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,15 @@
5151
<scope>compile</scope>
5252
<optional>false</optional>
5353
</dependency>
54+
<!-- JETTY DEPENDENCIES FOR TESTING -->
5455
<dependency>
5556
<groupId>org.eclipse.jetty</groupId>
5657
<artifactId>jetty-server</artifactId>
5758
<scope>compile</scope>
5859
</dependency>
5960
<dependency>
60-
<groupId>org.eclipse.jetty</groupId>
61-
<artifactId>jetty-webapp</artifactId>
61+
<groupId>org.eclipse.jetty.ee10</groupId>
62+
<artifactId>jetty-ee10-webapp</artifactId>
6263
<scope>compile</scope>
6364
</dependency>
6465
<dependency>
@@ -72,8 +73,8 @@
7273
<scope>compile</scope>
7374
</dependency>
7475
<dependency>
75-
<groupId>org.eclipse.jetty.websocket</groupId>
76-
<artifactId>websocket-jakarta-server</artifactId>
76+
<groupId>org.eclipse.jetty.ee10.websocket</groupId>
77+
<artifactId>jetty-ee10-websocket-jakarta-server</artifactId>
7778
<scope>compile</scope>
7879
</dependency>
7980
<dependency>

‎datastores-parent/datastore-tests/src/main/java/org/wicketstuff/datastores/common/app/Start.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.eclipse.jetty.server.HttpConnectionFactory;
2121
import org.eclipse.jetty.server.Server;
2222
import org.eclipse.jetty.server.ServerConnector;
23-
import org.eclipse.jetty.webapp.WebAppContext;
23+
import org.eclipse.jetty.ee10.webapp.WebAppContext;
2424

2525
public class Start {
2626
public static void main(String[] args) {

‎datastores-parent/pom.xml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,14 @@
4242
<artifactId>junit-jupiter-engine</artifactId>
4343
</dependency>
4444

45+
<!-- JETTY DEPENDENCIES FOR TESTING -->
4546
<dependency>
4647
<groupId>org.eclipse.jetty</groupId>
4748
<artifactId>jetty-server</artifactId>
4849
</dependency>
4950
<dependency>
50-
<groupId>org.eclipse.jetty</groupId>
51-
<artifactId>jetty-webapp</artifactId>
51+
<groupId>org.eclipse.jetty.ee10</groupId>
52+
<artifactId>jetty-ee10-webapp</artifactId>
5253
</dependency>
5354
<dependency>
5455
<groupId>org.eclipse.jetty</groupId>
@@ -59,8 +60,8 @@
5960
<artifactId>wicket-native-websocket-javax</artifactId>
6061
</dependency>
6162
<dependency>
62-
<groupId>org.eclipse.jetty.websocket</groupId>
63-
<artifactId>websocket-jakarta-server</artifactId>
63+
<groupId>org.eclipse.jetty.ee10.websocket</groupId>
64+
<artifactId>jetty-ee10-websocket-jakarta-server</artifactId>
6465
</dependency>
6566
<dependency>
6667
<groupId>jakarta.servlet</groupId>

0 commit comments

Comments
 (0)