This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch WICKET-7199-10.x in repository https://gitbox.apache.org/repos/asf/wicket.git
commit dc765d5f6ffa736010fb6810b7eccc521edbf60a Author: Maxim Solodovnik <[email protected]> AuthorDate: Thu Sep 3 14:10:07 2026 +0700 [WICKET-7199] jetty is updated --- .../src/main/resources/archetype-resources/pom.xml | 33 ++++++++----------- pom.xml | 38 ++++++++++++++-------- testing/wicket-js-tests/pom.xml | 4 +-- .../testing/jstest/StartJavaScriptTests.java | 9 ++--- testing/wicket-threadtest/pom.xml | 8 ++--- .../wicket/protocol/http/WebApplicationTest.java | 2 +- wicket-examples/pom.xml | 16 ++++----- .../wicket/examples/JettyTestCaseDecorator.java | 11 +++---- .../org/apache/wicket/examples/StartExamples.java | 13 ++++---- .../requestlogger/JsonRequestLogger.java | 4 +-- wicket-migration/pom.xml | 4 +-- .../wicket-native-websocket-javax/pom.xml | 8 ++--- 12 files changed, 77 insertions(+), 73 deletions(-) diff --git a/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml b/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml index 68f96b348e..685f2815ff 100644 --- a/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml @@ -98,33 +98,29 @@ <scope>test</scope> <version>${jetty.version}</version> </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-webapp</artifactId> - <scope>test</scope> - <version>${jetty.version}</version> - </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-jmx</artifactId> <scope>test</scope> <version>${jetty.version}</version> </dependency> + <!-- + eeXX MUST be aligned with servlet version + https://jakarta.ee/specifications/servlet/ + --> <dependency> - <groupId>org.eclipse.jetty.websocket</groupId> - <artifactId>websocket-jakarta-server</artifactId> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-webapp</artifactId> <scope>test</scope> <version>${jetty.version}</version> </dependency> - - <!-- uncomment if WebSocket support is needed + <!-- comment if WebSocket support is needed --> <dependency> - <groupId>org.eclipse.jetty.websocket</groupId> - <artifactId>websocket-jakarta-server</artifactId> - <version>${jetty.version}</version> + <groupId>org.eclipse.jetty.ee10.websocket</groupId> + <artifactId>jetty-ee10-websocket-jakarta-server</artifactId> <scope>test</scope> + <version>${jetty.version}</version> </dependency> - --> </dependencies> <build> <resources> @@ -179,15 +175,12 @@ <version>@maven-war-plugin.version@</version> </plugin> <plugin> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-maven-plugin</artifactId> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-maven-plugin</artifactId> <version>${jetty.version}</version> <configuration> <systemProperties> - <systemProperty> - <name>maven.project.build.directory.test-classes</name> - <value>${project.build.directory}/test-classes</value> - </systemProperty> + <maven.project.build.directory.test-classes>${project.build.directory}/test-classes</maven.project.build.directory.test-classes> </systemProperties> <jettyXmls>${project.basedir}/src/test/jetty/jetty.xml,${project.basedir}/src/test/jetty/jetty-ssl.xml,${project.basedir}/src/test/jetty/jetty-http.xml,${project.basedir}/src/test/jetty/jetty-https.xml</jettyXmls> </configuration> diff --git a/pom.xml b/pom.xml index 8140c67a19..1ccf50201b 100644 --- a/pom.xml +++ b/pom.xml @@ -121,10 +121,10 @@ <module>wicket-native-websocket</module> <module>wicket-bean-validation</module> <module>wicket-user-guide</module> - <module>wicket-migration</module> + <module>wicket-migration</module> <module>wicket-tester</module> <module>wicket-extensions-tester</module> - </modules> + </modules> <properties> <!-- Encoding --> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -155,19 +155,19 @@ <el-impl.version>2.2.1-b05</el-impl.version> <error_prone_annotations.version>2.45.0</error_prone_annotations.version> <forbiddenapis.version>3.10</forbiddenapis.version> - <jacoco.version>0.8.14</jacoco.version> + <jacoco.version>0.8.15</jacoco.version> <jackson.version>2.14.3</jackson.version> <jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version> <jakarta.el.version>4.0.2</jakarta.el.version> <jakarta.el-api.version>5.0.1</jakarta.el-api.version> - <jakarta.enterprise.cdi-api.version>3.0.1</jakarta.enterprise.cdi-api.version> + <jakarta.enterprise.cdi-api.version>4.0.1</jakarta.enterprise.cdi-api.version> <jakarta.inject-api.version>2.0.1.MR</jakarta.inject-api.version> <jakarta.servlet.jsp-api.version>3.1.1</jakarta.servlet.jsp-api.version> <jakarta.validation-api.version>3.1.1</jakarta.validation-api.version> <jakarta.websocket-api.version>2.2.0</jakarta.websocket-api.version> <jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version> <jdk-serializable-functional.version>1.9.0</jdk-serializable-functional.version> - <jetty.version>11.0.24</jetty.version> + <jetty.version>12.1.12</jetty.version> <junit.version>5.13.4</junit.version> <jsr305.version>3.0.2</jsr305.version> <logback.version>1.2.7</logback.version> @@ -181,7 +181,7 @@ <slf4j.version>2.0.17</slf4j.version> <spring.version>6.2.12</spring.version> <wagon-ssh-external.version>3.5.3</wagon-ssh-external.version> - <weld.version>4.0.3.Final</weld.version> + <weld.version>5.1.7.Final</weld.version> <velocity-engine-core.version>2.4.1</velocity-engine-core.version> <!-- Maven plugins --> @@ -567,6 +567,12 @@ </exclusion> </exclusions> </dependency> + <!-- this one is reqired to patch extremely outdatet Xerces shipped with httpunit below --> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.12.2</version> + </dependency> <dependency> <groupId>io.github.cdi-unit</groupId> <artifactId>cdi-unit</artifactId> @@ -597,15 +603,19 @@ <version>${jetty.version}</version> <scope>test</scope> </dependency> + <!-- + eeXX MUST be aligned with servlet version + https://jakarta.ee/specifications/servlet/ + --> <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-webapp</artifactId> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-webapp</artifactId> <version>${jetty.version}</version> <scope>test</scope> </dependency> <dependency> - <groupId>org.eclipse.jetty.websocket</groupId> - <artifactId>websocket-jakarta-server</artifactId> + <groupId>org.eclipse.jetty.ee10.websocket</groupId> + <artifactId>jetty-ee10-websocket-jakarta-server</artifactId> <version>${jetty.version}</version> <scope>test</scope> </dependency> @@ -1160,12 +1170,12 @@ <version>${build-helper-maven-plugin.version}</version> </plugin> <plugin> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-maven-plugin</artifactId> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-maven-plugin</artifactId> <version>${jetty.version}</version> <configuration> - <scanIntervalSeconds>60</scanIntervalSeconds> - <webAppSourceDirectory>src/main/webapp</webAppSourceDirectory> + <scan>60</scan> + <baseResource>src/main/webapp</baseResource> </configuration> </plugin> <plugin> diff --git a/testing/wicket-js-tests/pom.xml b/testing/wicket-js-tests/pom.xml index 9c26a32524..e928ff4a3b 100644 --- a/testing/wicket-js-tests/pom.xml +++ b/testing/wicket-js-tests/pom.xml @@ -46,8 +46,8 @@ <artifactId>jetty-server</artifactId> </dependency> <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-webapp</artifactId> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-webapp</artifactId> </dependency> </dependencies> diff --git a/testing/wicket-js-tests/src/test/java/org/apache/wicket/testing/jstest/StartJavaScriptTests.java b/testing/wicket-js-tests/src/test/java/org/apache/wicket/testing/jstest/StartJavaScriptTests.java index 9088e44e9c..40d0b8a3cc 100644 --- a/testing/wicket-js-tests/src/test/java/org/apache/wicket/testing/jstest/StartJavaScriptTests.java +++ b/testing/wicket-js-tests/src/test/java/org/apache/wicket/testing/jstest/StartJavaScriptTests.java @@ -30,8 +30,9 @@ import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.server.SslConnectionFactory; import org.eclipse.jetty.util.resource.Resource; +import org.eclipse.jetty.util.resource.ResourceFactory; import org.eclipse.jetty.util.ssl.SslContextFactory; -import org.eclipse.jetty.webapp.WebAppContext; +import org.eclipse.jetty.ee10.webapp.WebAppContext; /** * Separate startup class for people that want to run the examples directly. Use parameter @@ -64,7 +65,7 @@ public class StartJavaScriptTests server.addConnector(http); - Resource keystore = Resource.newClassPathResource("/keystore"); + Resource keystore = ResourceFactory.root().newClassLoaderResource("/keystore"); if (keystore != null && keystore.exists()) { // if a keystore for a SSL certificate is available, start a SSL @@ -114,9 +115,9 @@ public class StartJavaScriptTests try { server.start(); - + browse(); - + server.join(); } catch (Exception e) diff --git a/testing/wicket-threadtest/pom.xml b/testing/wicket-threadtest/pom.xml index 198c1bc138..73ca6faacc 100644 --- a/testing/wicket-threadtest/pom.xml +++ b/testing/wicket-threadtest/pom.xml @@ -45,9 +45,9 @@ </exclusion> </exclusions> </dependency> - </dependencies> + </dependencies> </dependencyManagement> - + <dependencies> <dependency> <groupId>commons-httpclient</groupId> @@ -67,8 +67,8 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-webapp</artifactId> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-webapp</artifactId> <scope>compile</scope> </dependency> <dependency> diff --git a/wicket-core-tests/src/test/java/org/apache/wicket/protocol/http/WebApplicationTest.java b/wicket-core-tests/src/test/java/org/apache/wicket/protocol/http/WebApplicationTest.java index ca6c333de7..ae31653af3 100644 --- a/wicket-core-tests/src/test/java/org/apache/wicket/protocol/http/WebApplicationTest.java +++ b/wicket-core-tests/src/test/java/org/apache/wicket/protocol/http/WebApplicationTest.java @@ -149,7 +149,7 @@ class WebApplicationTest extends WicketTestCase }; // character encoding not set yet - request.setCharacterEncoding(null); + request.setCharacterEncoding((String)null); application.createWebRequest(request, "/"); diff --git a/wicket-examples/pom.xml b/wicket-examples/pom.xml index 221712dbdc..ccd4bd3c86 100644 --- a/wicket-examples/pom.xml +++ b/wicket-examples/pom.xml @@ -165,8 +165,8 @@ <scope>runtime</scope> </dependency> <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-webapp</artifactId> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-webapp</artifactId> <scope>runtime</scope> </dependency> <dependency> @@ -174,8 +174,8 @@ <artifactId>jetty-jmx</artifactId> </dependency> <dependency> - <groupId>org.eclipse.jetty.websocket</groupId> - <artifactId>websocket-jakarta-server</artifactId> + <groupId>org.eclipse.jetty.ee10.websocket</groupId> + <artifactId>jetty-ee10-websocket-jakarta-server</artifactId> </dependency> <dependency> <groupId>org.glassfish</groupId> @@ -237,8 +237,8 @@ <artifactId>maven-war-plugin</artifactId> </plugin> <plugin> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-maven-plugin</artifactId> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-maven-plugin</artifactId> </plugin> </plugins> <pluginManagement> @@ -266,8 +266,8 @@ </configuration> </plugin> <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-maven-plugin</artifactId> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-maven-plugin</artifactId> <version>${jetty.version}</version> <dependencies> <dependency> diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/JettyTestCaseDecorator.java b/wicket-examples/src/test/java/org/apache/wicket/examples/JettyTestCaseDecorator.java index 96ba0f8240..4e0d093788 100644 --- a/wicket-examples/src/test/java/org/apache/wicket/examples/JettyTestCaseDecorator.java +++ b/wicket-examples/src/test/java/org/apache/wicket/examples/JettyTestCaseDecorator.java @@ -20,7 +20,7 @@ import org.eclipse.jetty.server.HttpConfiguration; import org.eclipse.jetty.server.HttpConnectionFactory; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; -import org.eclipse.jetty.webapp.WebAppContext; +import org.eclipse.jetty.ee10.webapp.WebAppContext; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -28,7 +28,7 @@ import com.meterware.httpunit.HttpUnitOptions; /** * Test decorator that starts a jetty instance - * + * * @author ivaynberg */ public class JettyTestCaseDecorator @@ -59,17 +59,16 @@ public class JettyTestCaseDecorator server.addConnector(http); WebAppContext web = new WebAppContext(); - if (contextPath == null) - web.setContextPath("/wicket-examples"); - else - web.setContextPath(contextPath); + web.setContextPath(contextPath == null ? "/wicket-examples" : contextPath); if (webappLocation == null) { String basedir = System.getProperty("basedir"); String path = ""; if (basedir != null) + { path = basedir + "/"; + } path += "src/main/webapp"; web.setWar(path); diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/StartExamples.java b/wicket-examples/src/test/java/org/apache/wicket/examples/StartExamples.java index 1064e89e5f..8180911ea9 100644 --- a/wicket-examples/src/test/java/org/apache/wicket/examples/StartExamples.java +++ b/wicket-examples/src/test/java/org/apache/wicket/examples/StartExamples.java @@ -28,13 +28,14 @@ import org.eclipse.jetty.server.SecureRequestCustomizer; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.server.SslConnectionFactory; -import org.eclipse.jetty.server.session.DefaultSessionCache; -import org.eclipse.jetty.server.session.FileSessionDataStore; -import org.eclipse.jetty.servlet.ServletContextHandler; +import org.eclipse.jetty.session.DefaultSessionCache; +import org.eclipse.jetty.session.FileSessionDataStore; +import org.eclipse.jetty.ee10.servlet.ServletContextHandler; import org.eclipse.jetty.util.resource.Resource; +import org.eclipse.jetty.util.resource.ResourceFactory; import org.eclipse.jetty.util.ssl.SslContextFactory; -import org.eclipse.jetty.webapp.WebAppContext; -import org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer; +import org.eclipse.jetty.ee10.webapp.WebAppContext; +import org.eclipse.jetty.ee10.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer; /** * Separate startup class for people that want to run the examples directly. Use parameter @@ -64,7 +65,7 @@ public class StartExamples server.addConnector(http); - Resource keystore = Resource.newClassPathResource("/keystore"); + Resource keystore = ResourceFactory.root().newClassLoaderResource("/keystore"); if (keystore != null && keystore.exists()) { // if a keystore for a SSL certificate is available, start a SSL diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/requestlogger/JsonRequestLogger.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/requestlogger/JsonRequestLogger.java index 95a0aaa2f2..3597da55c3 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/requestlogger/JsonRequestLogger.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/requestlogger/JsonRequestLogger.java @@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory; /** * JsonRequestLogger uses Jackson to log requests in JSON-format. You will need jackson-mapper in * your classpath, ie. like: - * + * * <pre> * {@literal * <dependency> @@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory; * </dependency> * } * </pre> - * + * * @author Emond Papegaaij */ public class JsonRequestLogger extends AbstractRequestLogger diff --git a/wicket-migration/pom.xml b/wicket-migration/pom.xml index c201d4b670..cb7b7ee95d 100644 --- a/wicket-migration/pom.xml +++ b/wicket-migration/pom.xml @@ -59,7 +59,7 @@ <exclusion> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - </exclusion> + </exclusion> <exclusion> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> @@ -75,7 +75,7 @@ <exclusion> <groupId>com.fasterxml.jackson.module</groupId> <artifactId>jackson-module-parameter-names</artifactId> - </exclusion> + </exclusion> <exclusion> <groupId>com.google.errorprone</groupId> <artifactId>*</artifactId> diff --git a/wicket-native-websocket/wicket-native-websocket-javax/pom.xml b/wicket-native-websocket/wicket-native-websocket-javax/pom.xml index 1334ffd810..6e85a82511 100644 --- a/wicket-native-websocket/wicket-native-websocket-javax/pom.xml +++ b/wicket-native-websocket/wicket-native-websocket-javax/pom.xml @@ -60,12 +60,12 @@ <artifactId>jetty-server</artifactId> </dependency> <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-webapp</artifactId> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-webapp</artifactId> </dependency> <dependency> - <groupId>org.eclipse.jetty.websocket</groupId> - <artifactId>websocket-jakarta-server</artifactId> + <groupId>org.eclipse.jetty.ee10.websocket</groupId> + <artifactId>jetty-ee10-websocket-jakarta-server</artifactId> </dependency> </dependencies> </project>
