This is an automated email from the ASF dual-hosted git repository. mgrigorov pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/wicket.git
commit 336d5b78d350d2e63dfb8c9f845855fb6e6de00f Author: Martin Tzvetanov Grigorov <[email protected]> AuthorDate: Sun Jul 18 23:47:22 2021 +0300 WICKET-6904 Make Apache Wicket fully supporting Java9+ module system Move the javax.servlet.** stubs to wicket-util and export them. This is a temporary hack until the dependencies upgrade to Jakarta EE APIs (Spring, commons-fileupload, CDI Unit, ...) --- .../src/test/java/org/apache/wicket/core/util/ExceptionTestBase.java | 2 +- .../src/main/java/javax/servlet/ServletContext.java | 0 .../src/main/java/javax/servlet/http/HttpServletRequest.java | 0 .../src/main/java/javax/servlet/http/HttpSession.java | 0 wicket-util/src/main/java/module-info.java | 4 ++++ 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/wicket-core/src/test/java/org/apache/wicket/core/util/ExceptionTestBase.java b/wicket-core/src/test/java/org/apache/wicket/core/util/ExceptionTestBase.java index d07375e..2f703c0 100644 --- a/wicket-core/src/test/java/org/apache/wicket/core/util/ExceptionTestBase.java +++ b/wicket-core/src/test/java/org/apache/wicket/core/util/ExceptionTestBase.java @@ -27,7 +27,7 @@ import org.junit.jupiter.api.Test; /** * Base class for testing exceptions in order to make sure that they achieve 100% test coverage. - * Assumes that exceptions implement all of the four standard consturctors. + * Assumes that exceptions implement all of the four standard constructors. * * @author Chris Turner */ diff --git a/wicket-core/src/main/java/javax/servlet/ServletContext.java b/wicket-util/src/main/java/javax/servlet/ServletContext.java similarity index 100% rename from wicket-core/src/main/java/javax/servlet/ServletContext.java rename to wicket-util/src/main/java/javax/servlet/ServletContext.java diff --git a/wicket-core/src/main/java/javax/servlet/http/HttpServletRequest.java b/wicket-util/src/main/java/javax/servlet/http/HttpServletRequest.java similarity index 100% rename from wicket-core/src/main/java/javax/servlet/http/HttpServletRequest.java rename to wicket-util/src/main/java/javax/servlet/http/HttpServletRequest.java diff --git a/wicket-core/src/main/java/javax/servlet/http/HttpSession.java b/wicket-util/src/main/java/javax/servlet/http/HttpSession.java similarity index 100% rename from wicket-core/src/main/java/javax/servlet/http/HttpSession.java rename to wicket-util/src/main/java/javax/servlet/http/HttpSession.java diff --git a/wicket-util/src/main/java/module-info.java b/wicket-util/src/main/java/module-info.java index da20fa4..e6729ec 100644 --- a/wicket-util/src/main/java/module-info.java +++ b/wicket-util/src/main/java/module-info.java @@ -53,4 +53,8 @@ module org.apache.wicket.util { exports org.apache.wicket.util.visit; exports org.apache.wicket.util.watch; exports org.apache.wicket.util.xml; + + // temporary hack until CDI-Unit, commons-fileupload and Spring provide Jakarta EE based releases + exports javax.servlet; + exports javax.servlet.http; }
