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 582532b WICKET-6882 Migrate to Jakarta EE
582532b is described below
commit 582532b2b08fddc2c1cb8ed80e34d93e9c8fea7f
Author: Martin Tzvetanov Grigorov <[email protected]>
AuthorDate: Wed Apr 21 12:13:21 2021 +0300
WICKET-6882 Migrate to Jakarta EE
Migrate some more usages of javax.** with jakarta.**
Update Weld and Annotations API
---
pom.xml | 4 ++--
.../src/main/java/org/apache/wicket/cdi/AutoConversation.java | 2 +-
.../main/java/org/apache/wicket/cdi/AutoConversationManager.java | 5 ++---
.../src/main/java/org/apache/wicket/cdi/BeanManagerLookup.java | 4 ++--
.../src/main/java/org/apache/wicket/cdi/CdiConfiguration.java | 2 +-
.../java/org/apache/wicket/cdi/ConversationExpiryChecker.java | 4 ++--
.../main/java/org/apache/wicket/cdi/ConversationPropagation.java | 2 +-
.../main/java/org/apache/wicket/cdi/ConversationPropagator.java | 9 ++++-----
.../src/main/java/org/apache/wicket/cdi/DetachEventEmitter.java | 4 ++--
.../src/main/java/org/apache/wicket/cdi/NonContextual.java | 8 ++++----
.../src/test/java/org/apache/wicket/cdi/CdiWicketTester.java | 2 +-
.../src/test/java/org/apache/wicket/cdi/ContextManager.java | 6 +++---
.../java/org/apache/wicket/cdi/ConversationPropagatorTest.java | 4 ++--
.../src/test/java/org/apache/wicket/cdi/WicketCdiTestCase.java | 2 +-
.../test/java/org/apache/wicket/cdi/testapp/TestAppScope.java | 4 ++--
.../java/org/apache/wicket/cdi/testapp/TestCdiApplication.java | 2 +-
.../java/org/apache/wicket/cdi/testapp/TestConversationBean.java | 2 +-
.../java/org/apache/wicket/cdi/testapp/TestConversationPage.java | 4 ++--
.../org/apache/wicket/cdi/testapp/TestConversationalPage.java | 2 +-
.../org/apache/wicket/cdi/testapp/TestNonConversationalPage.java | 2 +-
.../src/test/java/org/apache/wicket/cdi/testapp/TestPage.java | 2 +-
.../test/java/org/apache/wicket/cdi/testapp/TestQualifier.java | 2 +-
22 files changed, 38 insertions(+), 40 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5166950..366dc60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,7 +146,7 @@
<forbiddenapis.version>3.1</forbiddenapis.version>
<jacoco.version>0.8.6</jacoco.version>
<jackson.version>2.10.5</jackson.version>
-
<jakarta.annotation-api.version>1.3.5</jakarta.annotation-api.version>
+
<jakarta.annotation-api.version>2.0.0-RC1</jakarta.annotation-api.version>
<jakarta.el.version>4.0.1</jakarta.el.version>
<jakarta.el-api.version>4.0.0</jakarta.el-api.version>
<jakarta.enterprise.cdi-api.version>3.0.0</jakarta.enterprise.cdi-api.version>
@@ -169,7 +169,7 @@
<slf4j.version>1.7.25</slf4j.version>
<spring.version>5.3.6</spring.version>
<wagon-ssh-external.version>3.4.3</wagon-ssh-external.version>
- <weld.version>3.1.7.Final</weld.version>
+ <weld.version>4.0.1.SP1</weld.version>
<velocity-engine-core.version>2.3</velocity-engine-core.version>
<!-- Maven plugins -->
diff --git
a/wicket-cdi/src/main/java/org/apache/wicket/cdi/AutoConversation.java
b/wicket-cdi/src/main/java/org/apache/wicket/cdi/AutoConversation.java
index 90f5e19..1c589be 100644
--- a/wicket-cdi/src/main/java/org/apache/wicket/cdi/AutoConversation.java
+++ b/wicket-cdi/src/main/java/org/apache/wicket/cdi/AutoConversation.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.cdi;
-import javax.enterprise.context.ConversationScoped;
+import jakarta.enterprise.context.ConversationScoped;
import org.apache.wicket.util.io.IClusterable;
diff --git
a/wicket-cdi/src/main/java/org/apache/wicket/cdi/AutoConversationManager.java
b/wicket-cdi/src/main/java/org/apache/wicket/cdi/AutoConversationManager.java
index 4aedb48..ed60208 100644
---
a/wicket-cdi/src/main/java/org/apache/wicket/cdi/AutoConversationManager.java
+++
b/wicket-cdi/src/main/java/org/apache/wicket/cdi/AutoConversationManager.java
@@ -16,14 +16,13 @@
*/
package org.apache.wicket.cdi;
-import javax.enterprise.context.Conversation;
-import javax.inject.Inject;
+import jakarta.enterprise.context.Conversation;
+import jakarta.inject.Inject;
import org.apache.wicket.Component;
import org.apache.wicket.Page;
import org.apache.wicket.application.IComponentOnBeforeRenderListener;
import org.apache.wicket.request.IRequestHandler;
-import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
import org.apache.wicket.util.visit.Visits;
diff --git
a/wicket-cdi/src/main/java/org/apache/wicket/cdi/BeanManagerLookup.java
b/wicket-cdi/src/main/java/org/apache/wicket/cdi/BeanManagerLookup.java
index f44e513..34287fb 100644
--- a/wicket-cdi/src/main/java/org/apache/wicket/cdi/BeanManagerLookup.java
+++ b/wicket-cdi/src/main/java/org/apache/wicket/cdi/BeanManagerLookup.java
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.cdi;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.CDI;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.CDI;
import javax.naming.InitialContext;
import javax.naming.NamingException;
diff --git
a/wicket-cdi/src/main/java/org/apache/wicket/cdi/CdiConfiguration.java
b/wicket-cdi/src/main/java/org/apache/wicket/cdi/CdiConfiguration.java
index 196af12..e3f9620 100644
--- a/wicket-cdi/src/main/java/org/apache/wicket/cdi/CdiConfiguration.java
+++ b/wicket-cdi/src/main/java/org/apache/wicket/cdi/CdiConfiguration.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.cdi;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeanManager;
import org.apache.wicket.Application;
import org.apache.wicket.MetaDataKey;
diff --git
a/wicket-cdi/src/main/java/org/apache/wicket/cdi/ConversationExpiryChecker.java
b/wicket-cdi/src/main/java/org/apache/wicket/cdi/ConversationExpiryChecker.java
index 3e2bc94..cd55227 100644
---
a/wicket-cdi/src/main/java/org/apache/wicket/cdi/ConversationExpiryChecker.java
+++
b/wicket-cdi/src/main/java/org/apache/wicket/cdi/ConversationExpiryChecker.java
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.cdi;
-import javax.enterprise.context.Conversation;
-import javax.inject.Inject;
+import jakarta.enterprise.context.Conversation;
+import jakarta.inject.Inject;
import org.apache.wicket.Component;
import org.apache.wicket.Page;
diff --git
a/wicket-cdi/src/main/java/org/apache/wicket/cdi/ConversationPropagation.java
b/wicket-cdi/src/main/java/org/apache/wicket/cdi/ConversationPropagation.java
index 3c1eb89..a5fe19f 100644
---
a/wicket-cdi/src/main/java/org/apache/wicket/cdi/ConversationPropagation.java
+++
b/wicket-cdi/src/main/java/org/apache/wicket/cdi/ConversationPropagation.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.cdi;
-import javax.enterprise.context.ConversationScoped;
+import jakarta.enterprise.context.ConversationScoped;
import org.apache.wicket.Page;
import org.apache.wicket.request.IRequestHandler;
diff --git
a/wicket-cdi/src/main/java/org/apache/wicket/cdi/ConversationPropagator.java
b/wicket-cdi/src/main/java/org/apache/wicket/cdi/ConversationPropagator.java
index c6fbd33..b28c6b5 100644
--- a/wicket-cdi/src/main/java/org/apache/wicket/cdi/ConversationPropagator.java
+++ b/wicket-cdi/src/main/java/org/apache/wicket/cdi/ConversationPropagator.java
@@ -16,10 +16,10 @@
*/
package org.apache.wicket.cdi;
-import javax.enterprise.context.ContextNotActiveException;
-import javax.enterprise.context.Conversation;
-import javax.enterprise.context.ConversationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ContextNotActiveException;
+import jakarta.enterprise.context.Conversation;
+import jakarta.enterprise.context.ConversationScoped;
+import jakarta.inject.Inject;
import org.apache.wicket.Application;
import org.apache.wicket.MetaDataKey;
@@ -28,7 +28,6 @@ import
org.apache.wicket.core.request.handler.BufferedResponseRequestHandler;
import org.apache.wicket.core.request.handler.IPageClassRequestHandler;
import org.apache.wicket.core.request.handler.IPageRequestHandler;
import org.apache.wicket.request.IRequestHandler;
-import org.apache.wicket.request.IRequestHandlerDelegate;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.cycle.IRequestCycleListener;
import org.apache.wicket.request.cycle.RequestCycle;
diff --git
a/wicket-cdi/src/main/java/org/apache/wicket/cdi/DetachEventEmitter.java
b/wicket-cdi/src/main/java/org/apache/wicket/cdi/DetachEventEmitter.java
index e983ca3..82358ce 100644
--- a/wicket-cdi/src/main/java/org/apache/wicket/cdi/DetachEventEmitter.java
+++ b/wicket-cdi/src/main/java/org/apache/wicket/cdi/DetachEventEmitter.java
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.cdi;
-import javax.enterprise.event.Event;
-import javax.inject.Inject;
+import jakarta.enterprise.event.Event;
+import jakarta.inject.Inject;
import org.apache.wicket.MetaDataKey;
import org.apache.wicket.request.IRequestHandler;
diff --git a/wicket-cdi/src/main/java/org/apache/wicket/cdi/NonContextual.java
b/wicket-cdi/src/main/java/org/apache/wicket/cdi/NonContextual.java
index b596f53..0ef313d 100644
--- a/wicket-cdi/src/main/java/org/apache/wicket/cdi/NonContextual.java
+++ b/wicket-cdi/src/main/java/org/apache/wicket/cdi/NonContextual.java
@@ -22,10 +22,10 @@ import java.util.WeakHashMap;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.InjectionTarget;
import org.apache.wicket.util.collections.ClassMetaCache;
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 0ce51f3..8b08474 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
@@ -23,7 +23,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.annotation.PreDestroy;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.wicket.Page;
import org.apache.wicket.core.request.handler.IPageRequestHandler;
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 41852c0..2a6948f 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
@@ -17,9 +17,9 @@
package org.apache.wicket.cdi;
import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.inject.Inject;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpSession;
diff --git
a/wicket-cdi/src/test/java/org/apache/wicket/cdi/ConversationPropagatorTest.java
b/wicket-cdi/src/test/java/org/apache/wicket/cdi/ConversationPropagatorTest.java
index 42c4c26..10033c0 100644
---
a/wicket-cdi/src/test/java/org/apache/wicket/cdi/ConversationPropagatorTest.java
+++
b/wicket-cdi/src/test/java/org/apache/wicket/cdi/ConversationPropagatorTest.java
@@ -18,8 +18,8 @@ package org.apache.wicket.cdi;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import javax.enterprise.context.Conversation;
-import javax.inject.Inject;
+import jakarta.enterprise.context.Conversation;
+import jakarta.inject.Inject;
import org.apache.wicket.cdi.testapp.TestConversationPage;
import org.apache.wicket.cdi.testapp.TestConversationalPage;
diff --git
a/wicket-cdi/src/test/java/org/apache/wicket/cdi/WicketCdiTestCase.java
b/wicket-cdi/src/test/java/org/apache/wicket/cdi/WicketCdiTestCase.java
index 3e64077..b63b00c 100644
--- a/wicket-cdi/src/test/java/org/apache/wicket/cdi/WicketCdiTestCase.java
+++ b/wicket-cdi/src/test/java/org/apache/wicket/cdi/WicketCdiTestCase.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.cdi;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.wicket.Component;
import org.apache.wicket.Page;
diff --git
a/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestAppScope.java
b/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestAppScope.java
index b36f8a7..61f776e 100644
--- a/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestAppScope.java
+++ b/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestAppScope.java
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.cdi.testapp;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
/**
* @author jsarman
diff --git
a/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestCdiApplication.java
b/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestCdiApplication.java
index 1bd8656..95d70bb 100644
---
a/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestCdiApplication.java
+++
b/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestCdiApplication.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.cdi.testapp;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.wicket.Page;
import org.apache.wicket.cdi.CdiConfiguration;
diff --git
a/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestConversationBean.java
b/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestConversationBean.java
index 140ecdb..057fde5 100644
---
a/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestConversationBean.java
+++
b/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestConversationBean.java
@@ -19,7 +19,7 @@ package org.apache.wicket.cdi.testapp;
import java.io.Serializable;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.enterprise.context.ConversationScoped;
+import jakarta.enterprise.context.ConversationScoped;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestConversationPage.java
b/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestConversationPage.java
index 926a17e..a59539d 100644
---
a/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestConversationPage.java
+++
b/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestConversationPage.java
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.cdi.testapp;
-import javax.enterprise.context.Conversation;
-import javax.inject.Inject;
+import jakarta.enterprise.context.Conversation;
+import jakarta.inject.Inject;
import java.util.Locale;
import org.apache.wicket.markup.html.WebPage;
diff --git
a/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestConversationalPage.java
b/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestConversationalPage.java
index 93c7ce8..a1cad0c 100644
---
a/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestConversationalPage.java
+++
b/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestConversationalPage.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.cdi.testapp;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Locale;
import org.apache.wicket.cdi.ConversationalComponent;
diff --git
a/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestNonConversationalPage.java
b/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestNonConversationalPage.java
index 7728e81..84b8178 100644
---
a/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestNonConversationalPage.java
+++
b/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestNonConversationalPage.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.cdi.testapp;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
diff --git
a/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestPage.java
b/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestPage.java
index cf5108b..de6ee35 100644
--- a/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestPage.java
+++ b/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestPage.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.cdi.testapp;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
diff --git
a/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestQualifier.java
b/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestQualifier.java
index dcd0289..e5d513f 100644
--- a/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestQualifier.java
+++ b/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestQualifier.java
@@ -22,7 +22,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
/**
* @author jsarman
