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/04 10:37:29 UTC
[wicket] branch master updated: WICKET-6994 Make the servlet API a runtime provided dependency when using JPMS.
This is an automated email from the ASF dual-hosted git repository.
adelbene pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git
The following commit(s) were added to refs/heads/master by this push:
new e7ab67bcf7 WICKET-6994 Make the servlet API a runtime provided dependency when using JPMS.
e7ab67bcf7 is described below
commit e7ab67bcf739ad9da9e79cab6c6305962fc5a14b
Author: Andrea Del Bene <ad...@apache.org>
AuthorDate: Mon Jul 4 12:36:35 2022 +0200
WICKET-6994 Make the servlet API a runtime provided dependency when using JPMS.
---
wicket-core/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 +-
10 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/wicket-core/src/main/java/module-info.java b/wicket-core/src/main/java/module-info.java
index bc35039cfb..3ab3c7f0ed 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.fileupload2;
requires org.slf4j;
- requires jakarta.servlet;
+ requires static jakarta.servlet;
requires org.danekja.jdk.serializable.functional;
requires com.github.openjson;
requires org.junit.jupiter.api;
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 e151e0e702..1edd3d46d5 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 jakarta.servlet;
+ requires static jakarta.servlet;
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 54479d7a81..df6b337eca 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 jakarta.servlet;
+ requires static jakarta.servlet;
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 b449c72eb2..1f2a6879da 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 jakarta.servlet;
+ requires static jakarta.servlet;
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 18de40e2ba..294ea13ea4 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 jakarta.servlet;
+ requires static jakarta.servlet;
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 0ba939e17b..0f62b0b2e2 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 jakarta.servlet;
+ requires static jakarta.servlet;
requires jakarta.websocket;
requires org.slf4j;
diff --git a/wicket-request/src/main/java/module-info.java b/wicket-request/src/main/java/module-info.java
index f06fcbb0dc..9ea32b08f6 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 jakarta.servlet;
+ requires static jakarta.servlet;
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 ba868aff90..89c5c38ca0 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 jakarta.inject;
- requires jakarta.servlet;
+ requires static jakarta.servlet;
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 8cea9d1a86..5439b109b9 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.fileupload2;
requires org.slf4j;
- requires jakarta.servlet;
+ requires static jakarta.servlet;
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 7f3717b52f..ad8eb7ea2a 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 jakarta.servlet;
+ requires static jakarta.servlet;
requires org.apache.wicket.util;
requires org.apache.wicket.core;
requires org.slf4j;