You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ad...@apache.org on 2022/07/01 10:30:13 UTC
[wicket] branch wicket-9.x updated: Make the servlet API a runtime provided dependency when using JPMS. (#528)
This is an automated email from the ASF dual-hosted git repository.
adelbene pushed a commit to branch wicket-9.x
in repository https://gitbox.apache.org/repos/asf/wicket.git
The following commit(s) were added to refs/heads/wicket-9.x by this push:
new 345c2cf758 Make the servlet API a runtime provided dependency when using JPMS. (#528)
345c2cf758 is described below
commit 345c2cf7589cfb1b11e51a0d25b91e87e3b2819c
Author: Andreas Svanberg <an...@mensa.se>
AuthorDate: Fri Jul 1 12:30:07 2022 +0200
Make the servlet API a runtime provided dependency when using JPMS. (#528)
Symmetrical with how it works when using just Maven to build.
When building a custom runtime for a Wicket application a servlet container will have to be required which will pull in the dependency.
---
wicket-core/src/main/java/module-info.java | 2 +-
.../wicket-http2/wicket-http2-core/src/main/java/module-info.java | 2 +-
.../wicket-http2/wicket-http2-jetty/src/main/java/module-info.java | 2 +-
.../wicket-http2/wicket-http2-servlet4/src/main/java/module-info.java | 2 +-
.../wicket-http2/wicket-http2-tomcat/src/main/java/module-info.java | 2 +-
.../wicket-http2/wicket-http2-undertow/src/main/java/module-info.java | 2 +-
wicket-experimental/wicket-metrics/src/main/java/module-info.java | 2 +-
wicket-extensions/src/main/java/module-info.java | 2 +-
wicket-guice/src/main/java/module-info.java | 2 +-
.../wicket-native-websocket-core/src/main/java/module-info.java | 2 +-
.../wicket-native-websocket-javax/src/main/java/module-info.java | 2 +-
wicket-request/src/main/java/module-info.java | 2 +-
wicket-spring/src/main/java/module-info.java | 2 +-
wicket-util/src/main/java/module-info.java | 2 +-
wicket-velocity/src/main/java/module-info.java | 2 +-
15 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/wicket-core/src/main/java/module-info.java b/wicket-core/src/main/java/module-info.java
index 9e5acbea46..de5f4bb89f 100644
--- a/wicket-core/src/main/java/module-info.java
+++ b/wicket-core/src/main/java/module-info.java
@@ -25,7 +25,7 @@ module org.apache.wicket.core {
requires org.apache.commons.collections4;
requires commons.fileupload;
requires org.slf4j;
- requires javax.servlet.api;
+ requires static javax.servlet.api;
requires org.danekja.jdk.serializable.functional;
requires com.github.openjson;
requires org.junit.jupiter.api;
diff --git a/wicket-experimental/wicket-http2/wicket-http2-core/src/main/java/module-info.java b/wicket-experimental/wicket-http2/wicket-http2-core/src/main/java/module-info.java
index b18f0df9fe..41175dba38 100644
--- a/wicket-experimental/wicket-http2/wicket-http2-core/src/main/java/module-info.java
+++ b/wicket-experimental/wicket-http2/wicket-http2-core/src/main/java/module-info.java
@@ -20,7 +20,7 @@ module org.apache.wicket.http2.core {
requires org.apache.wicket.request;
requires org.apache.wicket.core;
requires org.slf4j;
- requires javax.servlet.api;
+ requires static javax.servlet.api;
exports org.apache.wicket.http2;
exports org.apache.wicket.http2.markup.head;
diff --git a/wicket-experimental/wicket-http2/wicket-http2-jetty/src/main/java/module-info.java b/wicket-experimental/wicket-http2/wicket-http2-jetty/src/main/java/module-info.java
index 5bb2da0bb9..99991f8012 100644
--- a/wicket-experimental/wicket-http2/wicket-http2-jetty/src/main/java/module-info.java
+++ b/wicket-experimental/wicket-http2/wicket-http2-jetty/src/main/java/module-info.java
@@ -20,7 +20,7 @@ module org.apache.wicket.http2.jetty {
requires org.apache.wicket.core;
requires org.apache.wicket.http2.core;
requires org.slf4j;
- requires javax.servlet.api;
+ requires static javax.servlet.api;
requires org.eclipse.jetty.server;
exports org.apache.wicket.http2.markup.head.jetty;
diff --git a/wicket-experimental/wicket-http2/wicket-http2-servlet4/src/main/java/module-info.java b/wicket-experimental/wicket-http2/wicket-http2-servlet4/src/main/java/module-info.java
index bb6963d7e7..fe1fbaf1b8 100644
--- a/wicket-experimental/wicket-http2/wicket-http2-servlet4/src/main/java/module-info.java
+++ b/wicket-experimental/wicket-http2/wicket-http2-servlet4/src/main/java/module-info.java
@@ -20,7 +20,7 @@ module org.apache.wicket.http2.servlet4 {
requires org.apache.wicket.core;
requires org.apache.wicket.http2.core;
requires org.slf4j;
- requires javax.servlet.api;
+ requires static javax.servlet.api;
exports org.apache.wicket.http2.markup.head.servlet4;
}
diff --git a/wicket-experimental/wicket-http2/wicket-http2-tomcat/src/main/java/module-info.java b/wicket-experimental/wicket-http2/wicket-http2-tomcat/src/main/java/module-info.java
index 42b4b71670..261271e94f 100644
--- a/wicket-experimental/wicket-http2/wicket-http2-tomcat/src/main/java/module-info.java
+++ b/wicket-experimental/wicket-http2/wicket-http2-tomcat/src/main/java/module-info.java
@@ -20,7 +20,7 @@ module org.apache.wicket.http2.tomcat {
requires org.apache.wicket.core;
requires org.apache.wicket.http2.core;
requires org.slf4j;
- requires javax.servlet.api;
+ requires static javax.servlet.api;
requires tomcat.catalina;
exports org.apache.wicket.http2.markup.head.tomcat;
diff --git a/wicket-experimental/wicket-http2/wicket-http2-undertow/src/main/java/module-info.java b/wicket-experimental/wicket-http2/wicket-http2-undertow/src/main/java/module-info.java
index 1eacbdb9ed..38e0dc2837 100644
--- a/wicket-experimental/wicket-http2/wicket-http2-undertow/src/main/java/module-info.java
+++ b/wicket-experimental/wicket-http2/wicket-http2-undertow/src/main/java/module-info.java
@@ -20,7 +20,7 @@ module org.apache.wicket.http2.undertow {
requires org.apache.wicket.core;
requires org.apache.wicket.http2.core;
requires org.slf4j;
- requires javax.servlet.api;
+ requires static javax.servlet.api;
requires undertow.servlet;
exports org.apache.wicket.http2.markup.head.undertow;
diff --git a/wicket-experimental/wicket-metrics/src/main/java/module-info.java b/wicket-experimental/wicket-metrics/src/main/java/module-info.java
index 2706ccb546..5030acadeb 100644
--- a/wicket-experimental/wicket-metrics/src/main/java/module-info.java
+++ b/wicket-experimental/wicket-metrics/src/main/java/module-info.java
@@ -20,7 +20,7 @@ module org.apache.wicket.metrics {
requires org.aspectj.runtime;
requires com.codahale.metrics;
requires com.codahale.metrics.jmx;
- requires javax.servlet.api;
+ requires static javax.servlet.api;
exports org.apache.wicket.metrics;
exports org.apache.wicket.metrics.aspects;
diff --git a/wicket-extensions/src/main/java/module-info.java b/wicket-extensions/src/main/java/module-info.java
index 2edde990f0..6764cf1d44 100644
--- a/wicket-extensions/src/main/java/module-info.java
+++ b/wicket-extensions/src/main/java/module-info.java
@@ -17,7 +17,7 @@
module org.apache.wicket.extensions {
requires java.desktop;
- requires javax.servlet.api;
+ requires static javax.servlet.api;
requires org.slf4j;
requires com.fasterxml.jackson.databind;
requires com.github.openjson;
diff --git a/wicket-guice/src/main/java/module-info.java b/wicket-guice/src/main/java/module-info.java
index 926d1e624f..00c5eba640 100644
--- a/wicket-guice/src/main/java/module-info.java
+++ b/wicket-guice/src/main/java/module-info.java
@@ -16,7 +16,7 @@
*/
module org.apache.wicket.guice {
- requires javax.servlet.api;
+ requires static javax.servlet.api;
requires org.apache.wicket.util;
requires org.apache.wicket.core;
requires org.apache.wicket.ioc;
diff --git a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/module-info.java b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/module-info.java
index 756e180c6c..48678893dd 100644
--- a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/module-info.java
+++ b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/module-info.java
@@ -19,7 +19,7 @@ module org.apache.wicket.websocket.core {
requires org.apache.wicket.util;
requires org.apache.wicket.request;
requires org.apache.wicket.core;
- requires javax.servlet.api;
+ requires static javax.servlet.api;
requires org.slf4j;
exports org.apache.wicket.protocol.ws;
diff --git a/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/module-info.java b/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/module-info.java
index 7c985adaca..6ffc452145 100644
--- a/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/module-info.java
+++ b/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/module-info.java
@@ -20,7 +20,7 @@ module org.apache.wicket.websocket.javax {
requires org.apache.wicket.request;
requires org.apache.wicket.core;
requires org.apache.wicket.websocket.core;
- requires javax.servlet.api;
+ requires static javax.servlet.api;
requires jakarta.websocket.api;
requires org.slf4j;
diff --git a/wicket-request/src/main/java/module-info.java b/wicket-request/src/main/java/module-info.java
index cc2fe4ec28..02d57d8816 100644
--- a/wicket-request/src/main/java/module-info.java
+++ b/wicket-request/src/main/java/module-info.java
@@ -19,7 +19,7 @@ module org.apache.wicket.request {
requires java.sql;
requires org.apache.wicket.util;
requires org.slf4j;
- requires javax.servlet.api;
+ requires static javax.servlet.api;
exports org.apache.wicket.request;
exports org.apache.wicket.request.flow;
diff --git a/wicket-spring/src/main/java/module-info.java b/wicket-spring/src/main/java/module-info.java
index 71feeb7aeb..6f624bad9d 100644
--- a/wicket-spring/src/main/java/module-info.java
+++ b/wicket-spring/src/main/java/module-info.java
@@ -20,7 +20,7 @@ module org.apache.wicket.spring {
requires org.apache.wicket.core;
requires org.apache.wicket.ioc;
requires javax.inject;
- requires javax.servlet.api;
+ requires static javax.servlet.api;
requires spring.beans;
requires spring.context;
requires spring.core;
diff --git a/wicket-util/src/main/java/module-info.java b/wicket-util/src/main/java/module-info.java
index 0e4275f24a..0d0fb4a7d5 100644
--- a/wicket-util/src/main/java/module-info.java
+++ b/wicket-util/src/main/java/module-info.java
@@ -25,7 +25,7 @@ module org.apache.wicket.util {
requires org.apache.commons.collections4;
requires commons.fileupload;
requires org.slf4j;
- requires javax.servlet.api;
+ requires static javax.servlet.api;
requires org.junit.jupiter.api;
exports org.apache.wicket.util;
diff --git a/wicket-velocity/src/main/java/module-info.java b/wicket-velocity/src/main/java/module-info.java
index 5ec61a0539..5a21759577 100644
--- a/wicket-velocity/src/main/java/module-info.java
+++ b/wicket-velocity/src/main/java/module-info.java
@@ -16,7 +16,7 @@
*/
module org.apache.wicket.velocity {
- requires javax.servlet.api;
+ requires static javax.servlet.api;
requires org.apache.wicket.util;
requires org.apache.wicket.core;
requires org.slf4j;