[wicket] 04/05: WICKET-6904 Make Apache Wicket fully supporting Java9+ module system

[mg...@apache.org]

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 d74e4660cc546d845f62f1aba778e6a554373b10
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Sun Jul 18 23:48:48 2021 +0300

    WICKET-6904 Make Apache Wicket fully supporting Java9+ module system
    
    Fix JPMS requires to use the jakarta.** modules
---
 wicket-bean-validation/src/main/java/module-info.java               | 2 +-
 wicket-cdi/src/main/java/module-info.java                           | 6 +++---
 wicket-cdi/src/test/java/org/apache/wicket/cdi/CdiWicketTester.java | 2 +-
 wicket-cdi/src/test/java/org/apache/wicket/cdi/ContextManager.java  | 4 +---
 .../wicket-native-websocket-javax/src/main/java/module-info.java    | 2 +-
 wicket-spring/src/main/java/module-info.java                        | 2 +-
 6 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/wicket-bean-validation/src/main/java/module-info.java b/wicket-bean-validation/src/main/java/module-info.java
index ce46fc1..bf3ec4b 100644
--- a/wicket-bean-validation/src/main/java/module-info.java
+++ b/wicket-bean-validation/src/main/java/module-info.java
@@ -18,7 +18,7 @@
 module org.apache.wicket.bean.validation {
     requires org.apache.wicket.util;
     requires org.apache.wicket.core;
-    requires java.validation;
+    requires jakarta.validation;
 
     exports org.apache.wicket.bean.validation;
 }
diff --git a/wicket-cdi/src/main/java/module-info.java b/wicket-cdi/src/main/java/module-info.java
index 3db04a1..481f4cf 100644
--- a/wicket-cdi/src/main/java/module-info.java
+++ b/wicket-cdi/src/main/java/module-info.java
@@ -16,10 +16,10 @@
  */
 
 module org.apache.wicket.cdi {
-    requires java.annotation;
+    requires jakarta.annotation;
     requires java.naming;
-    requires jakarta.enterprise.cdi.api;
-    requires jakarta.inject.api;
+    requires jakarta.cdi;
+    requires jakarta.inject;
     requires org.apache.wicket.util;
     requires org.apache.wicket.request;
     requires org.apache.wicket.core;
diff --git a/wicket-cdi/src/test/java/org/apache/wicket/cdi/CdiWicketTester.java b/wicket-cdi/src/test/java/org/apache/wicket/cdi/CdiWicketTester.java
index 8b08474..e4a4bc4 100644
--- a/wicket-cdi/src/test/java/org/apache/wicket/cdi/CdiWicketTester.java
+++ b/wicket-cdi/src/test/java/org/apache/wicket/cdi/CdiWicketTester.java
@@ -22,7 +22,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 import jakarta.inject.Inject;
 
 import org.apache.wicket.Page;
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 2a6948f..6a3729e 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
@@ -16,7 +16,7 @@
  */
 package org.apache.wicket.cdi;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.inject.spi.BeanManager;
 import jakarta.inject.Inject;
@@ -26,8 +26,6 @@ import jakarta.servlet.http.HttpSession;
 import org.jboss.weld.bean.builtin.BeanManagerProxy;
 import org.jboss.weld.module.web.servlet.HttpContextLifecycle;
 import org.jboss.weld.servlet.spi.helpers.AcceptingHttpContextActivationFilter;
-import org.jglue.cdiunit.internal.CdiUnitInitialListenerImpl;
-import org.jglue.cdiunit.internal.servlet.LifecycleAwareRequest;
 
 /**
  * @author jsarman
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 a710d7c..0ba939e 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
@@ -21,7 +21,7 @@ module org.apache.wicket.websocket.javax {
     requires org.apache.wicket.core;
     requires org.apache.wicket.websocket.core;
     requires jakarta.servlet;
-    requires jakarta.websocket.api;
+    requires jakarta.websocket;
     requires org.slf4j;
 
     exports org.apache.wicket.protocol.ws.javax;
diff --git a/wicket-spring/src/main/java/module-info.java b/wicket-spring/src/main/java/module-info.java
index 8c33925..ba868af 100644
--- a/wicket-spring/src/main/java/module-info.java
+++ b/wicket-spring/src/main/java/module-info.java
@@ -19,7 +19,7 @@ module org.apache.wicket.spring {
     requires org.apache.wicket.util;
     requires org.apache.wicket.core;
     requires org.apache.wicket.ioc;
-    requires javax.inject;
+    requires jakarta.inject;
     requires jakarta.servlet;
     requires spring.beans;
     requires spring.context;