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
The following commit(s) were added to refs/heads/master by this push:
new e3296fdb23 WICKET-6882 Migrate to Jakarta EE
e3296fdb23 is described below
commit e3296fdb2378899ae0a9a59472a0bae85f81d5fd
Author: Martin Tzvetanov Grigorov <[email protected]>
AuthorDate: Wed Jan 10 08:23:48 2024 +0200
WICKET-6882 Migrate to Jakarta EE
Remove temporary classes used for the migration from javax to jakarta
Signed-off-by: Martin Tzvetanov Grigorov <[email protected]>
---
.../java/org/apache/wicket/cdi/ContextManager.java | 6 +-
.../main/java/javax/servlet/ServletContext.java | 333 -----------------
.../javax/servlet/http/HttpServletRequest.java | 414 ---------------------
.../main/java/javax/servlet/http/HttpSession.java | 104 ------
wicket-util/src/main/java/module-info.java | 4 -
5 files changed, 3 insertions(+), 858 deletions(-)
diff --git a/wicket-cdi/src/test/java/org/apache/wicket/cdi/ContextManager.java
b/wicket-cdi/src/test/java/org/apache/wicket/cdi/ContextManager.java
index 6a3729e8bd..7017c963eb 100644
--- a/wicket-cdi/src/test/java/org/apache/wicket/cdi/ContextManager.java
+++ b/wicket-cdi/src/test/java/org/apache/wicket/cdi/ContextManager.java
@@ -74,12 +74,12 @@ public class ContextManager
// FIXME Wicket 10
currentRequest = null;// new LifecycleAwareRequest(new
CdiUnitInitialListenerImpl(), new
javax.servlet.http.HttpServletRequest(request));
- lifecycle.requestInitialized(new
javax.servlet.http.HttpServletRequest.Impl(currentRequest), null);
+ lifecycle.requestInitialized(currentRequest, null);
}
public void deactivateContexts()
{
- lifecycle.requestDestroyed(new
javax.servlet.http.HttpServletRequest.Impl(currentRequest));
+ lifecycle.requestDestroyed(currentRequest);
currentSession = currentRequest.getSession(false);
currentRequest = null;
}
@@ -93,7 +93,7 @@ public class ContextManager
if (currentSession != null)
{
- lifecycle.sessionDestroyed(new
javax.servlet.http.HttpSession.Impl(currentSession));
+ lifecycle.sessionDestroyed(currentSession);
currentSession = null;
}
}
diff --git a/wicket-util/src/main/java/javax/servlet/ServletContext.java
b/wicket-util/src/main/java/javax/servlet/ServletContext.java
deleted file mode 100644
index 9b855edaf1..0000000000
--- a/wicket-util/src/main/java/javax/servlet/ServletContext.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package javax.servlet;
-
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.EventListener;
-import java.util.Map;
-import java.util.Set;
-
-import jakarta.servlet.Filter;
-import jakarta.servlet.FilterRegistration;
-import jakarta.servlet.RequestDispatcher;
-import jakarta.servlet.Servlet;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.ServletRegistration;
-import jakarta.servlet.SessionCookieConfig;
-import jakarta.servlet.SessionTrackingMode;
-import jakarta.servlet.descriptor.JspConfigDescriptor;
-
-/**
- * A temporary class used until all dependencies provide releases based on
jakarta.** APIs
- */
-public interface ServletContext extends jakarta.servlet.ServletContext {
-
- class Impl implements ServletContext {
-
- private final jakarta.servlet.ServletContext delegate;
-
- public Impl(jakarta.servlet.ServletContext delegate)
- {
- this.delegate = delegate;
- }
-
- @Override
- public jakarta.servlet.ServletContext getDelegate() {
- return delegate;
- }
- }
-
- jakarta.servlet.ServletContext getDelegate();
-
- @Override
- default String getContextPath() {
- return getDelegate().getContextPath();
- }
-
- @Override
- default jakarta.servlet.ServletContext getContext(String uripath) {
- return getDelegate().getContext(uripath);
- }
-
- @Override
- default int getMajorVersion() {
- return getDelegate().getMajorVersion();
- }
-
- @Override
- default int getMinorVersion() {
- return getDelegate().getMinorVersion();
- }
-
- @Override
- default int getEffectiveMajorVersion() {
- return getDelegate().getEffectiveMajorVersion();
- }
-
- @Override
- default int getEffectiveMinorVersion() {
- return getDelegate().getEffectiveMinorVersion();
- }
-
- @Override
- default String getMimeType(String file) {
- return getDelegate().getMimeType(file);
- }
-
- @Override
- default Set<String> getResourcePaths(String path) {
- return getDelegate().getResourcePaths(path);
- }
-
- @Override
- default URL getResource(String path) throws MalformedURLException {
- return getDelegate().getResource(path);
- }
-
- @Override
- default InputStream getResourceAsStream(String path) {
- return getDelegate().getResourceAsStream(path);
- }
-
- @Override
- default RequestDispatcher getRequestDispatcher(String path) {
- return getDelegate().getRequestDispatcher(path);
- }
-
- @Override
- default RequestDispatcher getNamedDispatcher(String name) {
- return getDelegate().getNamedDispatcher(name);
- }
-
- @Override
- default void log(String msg) {
- getDelegate().log(msg);
- }
-
- @Override
- default void log(String message, Throwable throwable) {
- getDelegate().log(message, throwable);
- }
-
- @Override
- default String getRealPath(String path) {
- return getDelegate().getRealPath(path);
- }
-
- @Override
- default String getServerInfo() {
- return getDelegate().getServerInfo();
- }
-
- @Override
- default String getInitParameter(String name) {
- return getDelegate().getInitParameter(name);
- }
-
- @Override
- default Enumeration<String> getInitParameterNames() {
- return getDelegate().getInitParameterNames();
- }
-
- @Override
- default boolean setInitParameter(String name, String value) {
- return getDelegate().setInitParameter(name, value);
- }
-
- @Override
- default Object getAttribute(String name) {
- return getDelegate().getAttribute(name);
- }
-
- @Override
- default Enumeration<String> getAttributeNames() {
- return getDelegate().getAttributeNames();
- }
-
- @Override
- default void setAttribute(String name, Object object) {
- getDelegate().setAttribute(name, object);
- }
-
- @Override
- default void removeAttribute(String name) {
- getDelegate().removeAttribute(name);
- }
-
- @Override
- default String getServletContextName() {
- return getDelegate().getServletContextName();
- }
-
- @Override
- default ServletRegistration.Dynamic addServlet(String servletName, String
className) {
- return getDelegate().addServlet(servletName, className);
- }
-
- @Override
- default ServletRegistration.Dynamic addServlet(String servletName, Servlet
servlet) {
- return getDelegate().addServlet(servletName, servlet);
- }
-
- @Override
- default ServletRegistration.Dynamic addServlet(String servletName, Class<?
extends Servlet> servletClass) {
- return getDelegate().addServlet(servletName, servletClass);
- }
-
- @Override
- default ServletRegistration.Dynamic addJspFile(String servletName, String
jspFile) {
- return getDelegate().addJspFile(servletName, jspFile);
- }
-
- @Override
- default <T extends Servlet> T createServlet(Class<T> clazz) throws
ServletException {
- return getDelegate().createServlet(clazz);
- }
-
- @Override
- default ServletRegistration getServletRegistration(String servletName) {
- return getDelegate().getServletRegistration(servletName);
- }
-
- @Override
- default Map<String, ? extends ServletRegistration>
getServletRegistrations() {
- return getDelegate().getServletRegistrations();
- }
-
- @Override
- default FilterRegistration.Dynamic addFilter(String filterName, String
className) {
- return getDelegate().addFilter(filterName, className);
- }
-
- @Override
- default FilterRegistration.Dynamic addFilter(String filterName, Filter
filter) {
- return getDelegate().addFilter(filterName, filter);
- }
-
- @Override
- default FilterRegistration.Dynamic addFilter(String filterName, Class<?
extends Filter> filterClass) {
- return getDelegate().addFilter(filterName, filterClass);
- }
-
- @Override
- default <T extends Filter> T createFilter(Class<T> clazz) throws
ServletException {
- return getDelegate().createFilter(clazz);
- }
-
- @Override
- default FilterRegistration getFilterRegistration(String filterName) {
- return getDelegate().getFilterRegistration(filterName);
- }
-
- @Override
- default Map<String, ? extends FilterRegistration> getFilterRegistrations()
{
- return getDelegate().getFilterRegistrations();
- }
-
- @Override
- default SessionCookieConfig getSessionCookieConfig() {
- return getDelegate().getSessionCookieConfig();
- }
-
- @Override
- default void setSessionTrackingModes(Set<SessionTrackingMode>
sessionTrackingModes) {
- getDelegate().setSessionTrackingModes(sessionTrackingModes);
- }
-
- @Override
- default Set<SessionTrackingMode> getDefaultSessionTrackingModes() {
- return getDelegate().getDefaultSessionTrackingModes();
- }
-
- @Override
- default Set<SessionTrackingMode> getEffectiveSessionTrackingModes() {
- return getDelegate().getEffectiveSessionTrackingModes();
- }
-
- @Override
- default void addListener(String className) {
- getDelegate().addListener(className);
- }
-
- @Override
- default <T extends EventListener> void addListener(T t) {
- getDelegate().addListener(t);
- }
-
- @Override
- default void addListener(Class<? extends EventListener> listenerClass) {
- getDelegate().addListener(listenerClass);
- }
-
- @Override
- default <T extends EventListener> T createListener(Class<T> clazz) throws
ServletException {
- return getDelegate().createListener(clazz);
- }
-
- @Override
- default JspConfigDescriptor getJspConfigDescriptor() {
- return getDelegate().getJspConfigDescriptor();
- }
-
- @Override
- default ClassLoader getClassLoader() {
- return getDelegate().getClassLoader();
- }
-
- @Override
- default void declareRoles(String... roleNames) {
- getDelegate().declareRoles(roleNames);
- }
-
- @Override
- default String getVirtualServerName() {
- return getDelegate().getVirtualServerName();
- }
-
- @Override
- default int getSessionTimeout() {
- return getDelegate().getSessionTimeout();
- }
-
- @Override
- default void setSessionTimeout(int sessionTimeout) {
- getDelegate().setSessionTimeout(sessionTimeout);
- }
-
- @Override
- default String getRequestCharacterEncoding() {
- return getDelegate().getRequestCharacterEncoding();
- }
-
- @Override
- default void setRequestCharacterEncoding(String encoding) {
- getDelegate().setRequestCharacterEncoding(encoding);
- }
-
- @Override
- default String getResponseCharacterEncoding() {
- return getDelegate().getResponseCharacterEncoding();
- }
-
- @Override
- default void setResponseCharacterEncoding(String encoding) {
- getDelegate().setResponseCharacterEncoding(encoding);
- }
-}
diff --git
a/wicket-util/src/main/java/javax/servlet/http/HttpServletRequest.java
b/wicket-util/src/main/java/javax/servlet/http/HttpServletRequest.java
deleted file mode 100644
index c5155e62d6..0000000000
--- a/wicket-util/src/main/java/javax/servlet/http/HttpServletRequest.java
+++ /dev/null
@@ -1,414 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package javax.servlet.http;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.security.Principal;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.Locale;
-import java.util.Map;
-
-import jakarta.servlet.AsyncContext;
-import jakarta.servlet.DispatcherType;
-import jakarta.servlet.RequestDispatcher;
-import jakarta.servlet.ServletConnection;
-import jakarta.servlet.ServletContext;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.ServletInputStream;
-import jakarta.servlet.ServletRequest;
-import jakarta.servlet.ServletResponse;
-import jakarta.servlet.http.Cookie;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.servlet.http.HttpSession;
-import jakarta.servlet.http.HttpUpgradeHandler;
-import jakarta.servlet.http.Part;
-
-/**
- * A temporary class used until all dependencies provide releases based on
jakarta.** APIs
- */
-public interface HttpServletRequest extends
jakarta.servlet.http.HttpServletRequest {
-
- class Impl implements HttpServletRequest {
-
- private final jakarta.servlet.http.HttpServletRequest delegate;
-
- public Impl(jakarta.servlet.http.HttpServletRequest delegate)
- {
- this.delegate = delegate;
- }
-
- @Override
- public jakarta.servlet.http.HttpServletRequest getDelegate() {
- return delegate;
- }
-
- @Override
- public String getRequestId() {
- return delegate.getRequestId();
- }
-
- @Override
- public String getProtocolRequestId() {
- return delegate.getProtocolRequestId();
- }
-
- @Override
- public ServletConnection getServletConnection() {
- return delegate.getServletConnection();
- }
- }
-
- jakarta.servlet.http.HttpServletRequest getDelegate();
-
- @Override
- default String getAuthType() {
- return getDelegate().getAuthType();
- }
-
- @Override
- default Cookie[] getCookies() {
- return getDelegate().getCookies();
- }
-
- @Override
- default long getDateHeader(String name) {
- return getDelegate().getDateHeader(name);
- }
-
- @Override
- default String getHeader(String name) {
- return getDelegate().getHeader(name);
- }
-
- @Override
- default Enumeration<String> getHeaders(String name) {
- return getDelegate().getHeaders(name);
- }
-
- @Override
- default Enumeration<String> getHeaderNames() {
- return getDelegate().getHeaderNames();
- }
-
- @Override
- default int getIntHeader(String name) {
- return getDelegate().getIntHeader(name);
- }
-
- @Override
- default String getMethod() {
- return getDelegate().getMethod();
- }
-
- @Override
- default String getPathInfo() {
- return getDelegate().getPathInfo();
- }
-
- @Override
- default String getPathTranslated() {
- return getDelegate().getPathTranslated();
- }
-
- @Override
- default String getContextPath() {
- return getDelegate().getContextPath();
- }
-
- @Override
- default String getQueryString() {
- return getDelegate().getQueryString();
- }
-
- @Override
- default String getRemoteUser() {
- return getDelegate().getRemoteUser();
- }
-
- @Override
- default boolean isUserInRole(String role) {
- return getDelegate().isUserInRole(role);
- }
-
- @Override
- default Principal getUserPrincipal() {
- return getDelegate().getUserPrincipal();
- }
-
- @Override
- default String getRequestedSessionId() {
- return getDelegate().getRequestedSessionId();
- }
-
- @Override
- default String getRequestURI() {
- return getDelegate().getRequestURI();
- }
-
- @Override
- default StringBuffer getRequestURL() {
- return getDelegate().getRequestURL();
- }
-
- @Override
- default String getServletPath() {
- return getDelegate().getServletPath();
- }
-
- @Override
- default HttpSession getSession(boolean create) {
- return getDelegate().getSession(create);
- }
-
- @Override
- default HttpSession getSession() {
- return getDelegate().getSession();
- }
-
- @Override
- default String changeSessionId() {
- return getDelegate().changeSessionId();
- }
-
- @Override
- default boolean isRequestedSessionIdValid() {
- return getDelegate().isRequestedSessionIdValid();
- }
-
- @Override
- default boolean isRequestedSessionIdFromCookie() {
- return getDelegate().isRequestedSessionIdFromCookie();
- }
-
- @Override
- default boolean isRequestedSessionIdFromURL() {
- return getDelegate().isRequestedSessionIdFromURL();
- }
-
- @Override
- default boolean authenticate(HttpServletResponse response) throws
IOException, ServletException {
- return getDelegate().authenticate(response);
- }
-
- @Override
- default void login(String username, String password) throws
ServletException {
- getDelegate().login(username, password);
- }
-
- @Override
- default void logout() throws ServletException {
- getDelegate().logout();
- }
-
- @Override
- default Collection<Part> getParts() throws IOException, ServletException {
- return getDelegate().getParts();
- }
-
- @Override
- default Part getPart(String name) throws IOException, ServletException {
- return getDelegate().getPart(name);
- }
-
- @Override
- default <T extends HttpUpgradeHandler> T upgrade(Class<T> handlerClass)
throws IOException, ServletException {
- return getDelegate().upgrade(handlerClass);
- }
-
- @Override
- default Object getAttribute(String name) {
- return getDelegate().getAttribute(name);
- }
-
- @Override
- default Enumeration<String> getAttributeNames() {
- return getDelegate().getAttributeNames();
- }
-
- @Override
- default String getCharacterEncoding() {
- return getDelegate().getCharacterEncoding();
- }
-
- @Override
- default void setCharacterEncoding(String env) throws
UnsupportedEncodingException {
- getDelegate().setCharacterEncoding(env);
- }
-
- @Override
- default int getContentLength() {
- return getDelegate().getContentLength();
- }
-
- @Override
- default long getContentLengthLong() {
- return getDelegate().getContentLengthLong();
- }
-
- @Override
- default String getContentType() {
- return getDelegate().getContentType();
- }
-
- @Override
- default ServletInputStream getInputStream() throws IOException {
- return getDelegate().getInputStream();
- }
-
- @Override
- default String getParameter(String name) {
- return getDelegate().getParameter(name);
- }
-
- @Override
- default Enumeration<String> getParameterNames() {
- return getDelegate().getParameterNames();
- }
-
- @Override
- default String[] getParameterValues(String name) {
- return getDelegate().getParameterValues(name);
- }
-
- @Override
- default Map<String, String[]> getParameterMap() {
- return getDelegate().getParameterMap();
- }
-
- @Override
- default String getProtocol() {
- return getDelegate().getProtocol();
- }
-
- @Override
- default String getScheme() {
- return getDelegate().getScheme();
- }
-
- @Override
- default String getServerName() {
- return getDelegate().getScheme();
- }
-
- @Override
- default int getServerPort() {
- return getDelegate().getServerPort();
- }
-
- @Override
- default BufferedReader getReader() throws IOException {
- return getDelegate().getReader();
- }
-
- @Override
- default String getRemoteAddr() {
- return getDelegate().getRemoteAddr();
- }
-
- @Override
- default String getRemoteHost() {
- return getDelegate().getRemoteHost();
- }
-
- @Override
- default void setAttribute(String name, Object o) {
- getDelegate().setAttribute(name, o);
- }
-
- @Override
- default void removeAttribute(String name) {
- getDelegate().removeAttribute(name);
- }
-
- @Override
- default Locale getLocale() {
- return getDelegate().getLocale();
- }
-
- @Override
- default Enumeration<Locale> getLocales() {
- return getDelegate().getLocales();
- }
-
- @Override
- default boolean isSecure() {
- return getDelegate().isSecure();
- }
-
- @Override
- default RequestDispatcher getRequestDispatcher(String path) {
- return getDelegate().getRequestDispatcher(path);
- }
-
- @Override
- default int getRemotePort() {
- return getDelegate().getRemotePort();
- }
-
- @Override
- default String getLocalName() {
- return getDelegate().getLocalName();
- }
-
- @Override
- default String getLocalAddr() {
- return getDelegate().getLocalAddr();
- }
-
- @Override
- default int getLocalPort() {
- return getDelegate().getLocalPort();
- }
-
- @Override
- default ServletContext getServletContext() {
- return getDelegate().getServletContext();
- }
-
- @Override
- default AsyncContext startAsync() throws IllegalStateException {
- return getDelegate().startAsync();
- }
-
- @Override
- default AsyncContext startAsync(ServletRequest servletRequest,
ServletResponse servletResponse) throws IllegalStateException {
- return getDelegate().startAsync(servletRequest, servletResponse);
- }
-
- @Override
- default boolean isAsyncStarted() {
- return getDelegate().isAsyncStarted();
- }
-
- @Override
- default boolean isAsyncSupported() {
- return getDelegate().isAsyncSupported();
- }
-
- @Override
- default AsyncContext getAsyncContext() {
- return getDelegate().getAsyncContext();
- }
-
- @Override
- default DispatcherType getDispatcherType() {
- return getDelegate().getDispatcherType();
- }
-}
diff --git a/wicket-util/src/main/java/javax/servlet/http/HttpSession.java
b/wicket-util/src/main/java/javax/servlet/http/HttpSession.java
deleted file mode 100644
index b1be018af8..0000000000
--- a/wicket-util/src/main/java/javax/servlet/http/HttpSession.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package javax.servlet.http;
-
-import java.util.Enumeration;
-
-import jakarta.servlet.ServletContext;
-
-/**
- * A temporary class used until all dependencies provide releases based on
jakarta.** APIs
- */
-public interface HttpSession extends jakarta.servlet.http.HttpSession {
-
- class Impl implements javax.servlet.http.HttpSession {
-
- private final jakarta.servlet.http.HttpSession delegate;
-
- public Impl(jakarta.servlet.http.HttpSession delegate)
- {
- this.delegate = delegate;
- }
-
- @Override
- public jakarta.servlet.http.HttpSession getDelegate() {
- return delegate;
- }
- }
-
- jakarta.servlet.http.HttpSession getDelegate();
-
- @Override
- default long getCreationTime() {
- return getDelegate().getCreationTime();
- }
-
- @Override
- default String getId() {
- return getDelegate().getId();
- }
-
- @Override
- default long getLastAccessedTime() {
- return getDelegate().getLastAccessedTime();
- }
-
- @Override
- default ServletContext getServletContext() {
- return getDelegate().getServletContext();
- }
-
- @Override
- default void setMaxInactiveInterval(int interval) {
- getDelegate().setMaxInactiveInterval(interval);
- }
-
- @Override
- default int getMaxInactiveInterval() {
- return getDelegate().getMaxInactiveInterval();
- }
-
- @Override
- default Object getAttribute(String name) {
- return getDelegate().getAttribute(name);
- }
-
- @Override
- default Enumeration<String> getAttributeNames() {
- return getDelegate().getAttributeNames();
- }
-
- @Override
- default void setAttribute(String name, Object value) {
- getDelegate().setAttribute(name, value);
- }
-
- @Override
- default void removeAttribute(String name) {
- getDelegate().removeAttribute(name);
- }
-
- @Override
- default void invalidate() {
- getDelegate().invalidate();
- }
-
- @Override
- default boolean isNew() {
- return getDelegate().isNew();
- }
-}
diff --git a/wicket-util/src/main/java/module-info.java
b/wicket-util/src/main/java/module-info.java
index 6b2a4335b3..a61323893a 100644
--- a/wicket-util/src/main/java/module-info.java
+++ b/wicket-util/src/main/java/module-info.java
@@ -52,10 +52,6 @@ module org.apache.wicket.util {
exports org.apache.wicket.util.watch;
exports org.apache.wicket.util.xml;
- // temporary hack until Weld and CDI-Unit provide Jakarta EE based releases
- exports javax.servlet;
- exports javax.servlet.http;
-
//opening packages to allow resources access
opens org.apache.wicket.util.markup.xhtml;
opens org.apache.wicket.util.license;
