This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openwebbeans.git
The following commit(s) were added to refs/heads/main by this push:
new e7af802e1 OSB-1417 re-enable 3 more owb modules
e7af802e1 is described below
commit e7af802e1d814c340737af0de3a456f9ce27a4df
Author: Mark Struberg <[email protected]>
AuthorDate: Tue Jan 24 20:40:20 2023 +0100
OSB-1417 re-enable 3 more owb modules
---
.../META-INF/openwebbeans/openwebbeans.properties | 2 +-
pom.xml | 5 +--
readme/README.txt | 4 +--
readme/README_1_0_0-alpha-1.txt | 2 +-
readme/README_1_0_0-alpha-2.txt | 2 +-
readme/README_1_0_0.txt | 2 +-
readme/README_1_1_0.txt | 2 +-
readme/README_1_1_1.txt | 2 +-
readme/README_1_1_2.txt | 2 +-
readme/README_1_1_3.txt | 2 +-
readme/README_1_1_4.txt | 4 +--
readme/README_1_1_5.txt | 4 +--
readme/README_1_1_6.txt | 4 +--
readme/README_1_2_0.txt | 4 +--
webbeans-ee-common/pom.xml | 27 ++++++++--------
webbeans-ee/pom.xml | 33 +++++++++-----------
.../webbeans/ee/beans/UserTransactionBean.java | 3 +-
.../webbeans/ee/beans/UserTransactionProvider.java | 2 +-
.../apache/webbeans/ee/beans/ValidatorBean.java | 2 +-
.../webbeans/ee/beans/ValidatorFactoryBean.java | 2 +-
.../ee/beans/ValidatorFactoryProvider.java | 2 +-
.../webbeans/ee/beans/ValidatorProvider.java | 2 +-
.../ee/event/TransactionalEventNotifier.java | 10 +++---
webbeans-jms/pom.xml | 36 +++++++++-------------
.../org/apache/webbeans/jms/component/JmsBean.java | 2 +-
.../jms/component/JmsComponentFactory.java | 20 ++++++------
.../apache/webbeans/jms/util/JmsProxyHandler.java | 22 ++++++-------
.../java/org/apache/webbeans/jms/util/JmsUtil.java | 34 ++++++++++----------
webbeans-porting/pom.xml | 2 +-
webbeans-tck/pom.xml | 2 +-
30 files changed, 114 insertions(+), 128 deletions(-)
diff --git
a/atinject-tck/src/test/resources/META-INF/openwebbeans/openwebbeans.properties
b/atinject-tck/src/test/resources/META-INF/openwebbeans/openwebbeans.properties
index 2c35ac11d..0bc600c29 100644
---
a/atinject-tck/src/test/resources/META-INF/openwebbeans/openwebbeans.properties
+++
b/atinject-tck/src/test/resources/META-INF/openwebbeans/openwebbeans.properties
@@ -32,7 +32,7 @@
# use the static HashMap instead of storing objects in JNDI as default
org.apache.webbeans.spi.JNDIService=org.apache.webbeans.corespi.se.DefaultJndiService
-# lookup the javax.transaction.TransactionManager via JNDI as default
+# lookup the jakarta.transaction.TransactionManager via JNDI as default
org.apache.webbeans.spi.TransactionService=org.apache.webbeans.corespi.se.DefaultTransactionService
#use the web metadata as default
diff --git a/pom.xml b/pom.xml
index a3f206177..8a2f50f26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,6 +84,7 @@
<jakarta.transaction-api.version>2.0.0</jakarta.transaction-api.version>
<jakarta.validation-api.version>3.0.0</jakarta.validation-api.version>
<jakarta.ejb-api.version>4.0.0</jakarta.ejb-api.version>
+ <jakarta.jms-api.version>3.0.0</jakarta.jms-api.version>
<tomcat.version>10.1.5</tomcat.version>
@@ -765,11 +766,11 @@
<module>webbeans-junit5</module>
<module>webbeans-porting</module>
<module>atinject-tck</module>
-<!--X TODO re-enable
<module>webbeans-ee-common</module>
<module>webbeans-ee</module>
- <module>webbeans-jetty9</module>
<module>webbeans-jms</module>
+<!--X TODO re-enable
+ <module>webbeans-jetty9</module>
<module>webbeans-jsf</module>
<module>webbeans-resource</module>
<module>webbeans-osgi</module>
diff --git a/readme/README.txt b/readme/README.txt
index aad760013..2a2f8abd5 100644
--- a/readme/README.txt
+++ b/readme/README.txt
@@ -985,7 +985,7 @@ Bug
* [OWB-567] - Lookup of Provider results in NullPointerException on get()
* [OWB-574] - NewBean doesn't support EJBs
* [OWB-580] - ObserverMethodImpl needs support for EJB's whose Bean Types
do not include the EJB class
- * [OWB-602] - OpenWebBeans OpenEJB integration OSGi bundle declares the
wrong version for the javax.transaction package
+ * [OWB-602] - OpenWebBeans OpenEJB integration OSGi bundle declares the
wrong version for the jakarta.transaction package
* [OWB-617] - NullPointerException in InstanceBean#createInstance
* [OWB-628] - Event injection doesn't work in observer methods.
* [OWB-633] - define stereotypes & thirdparty
@@ -1402,7 +1402,7 @@ Improvement
* [OWB-136] - fix 'broken' license headers in our java files
* [OWB-170] - Address findbug issues in webbeans-impl
* [OWB-183] - Improve webbeans-doc module to get a documentation more user
friendly
- * [OWB-214] - get rid of javax.transaction.Transaction dependency in
webbeans-impl
+ * [OWB-214] - get rid of jakarta.transaction.Transaction dependency in
webbeans-impl
* [OWB-237] - NoSuchElementException when WebBeansConfigurationListener is
absent
* [OWB-275] - remove unused imports and cleanup code
* [OWB-286] - java.lang.NoClassDefFoundError: javax/validation/Validator
diff --git a/readme/README_1_0_0-alpha-1.txt b/readme/README_1_0_0-alpha-1.txt
index 3f1af8b47..a46cf6ee8 100644
--- a/readme/README_1_0_0-alpha-1.txt
+++ b/readme/README_1_0_0-alpha-1.txt
@@ -117,7 +117,7 @@ Improvement
* [OWB-136] - fix 'broken' license headers in our java files
* [OWB-170] - Address findbug issues in webbeans-impl
* [OWB-183] - Improve webbeans-doc module to get a documentation more user
friendly
- * [OWB-214] - get rid of javax.transaction.Transaction dependency in
webbeans-impl
+ * [OWB-214] - get rid of jakarta.transaction.Transaction dependency in
webbeans-impl
* [OWB-237] - NoSuchElementException when WebBeansConfigurationListener is
absent
* [OWB-275] - remove unused imports and cleanup code
* [OWB-286] - java.lang.NoClassDefFoundError: javax/validation/Validator
diff --git a/readme/README_1_0_0-alpha-2.txt b/readme/README_1_0_0-alpha-2.txt
index ae31fdcc1..a44faec4a 100644
--- a/readme/README_1_0_0-alpha-2.txt
+++ b/readme/README_1_0_0-alpha-2.txt
@@ -191,7 +191,7 @@ Improvement
* [OWB-136] - fix 'broken' license headers in our java files
* [OWB-170] - Address findbug issues in webbeans-impl
* [OWB-183] - Improve webbeans-doc module to get a documentation more user
friendly
- * [OWB-214] - get rid of javax.transaction.Transaction dependency in
webbeans-impl
+ * [OWB-214] - get rid of jakarta.transaction.Transaction dependency in
webbeans-impl
* [OWB-237] - NoSuchElementException when WebBeansConfigurationListener is
absent
* [OWB-275] - remove unused imports and cleanup code
* [OWB-286] - java.lang.NoClassDefFoundError: javax/validation/Validator
diff --git a/readme/README_1_0_0.txt b/readme/README_1_0_0.txt
index 742b37800..86105cb77 100644
--- a/readme/README_1_0_0.txt
+++ b/readme/README_1_0_0.txt
@@ -236,7 +236,7 @@ Improvement
* [OWB-136] - fix 'broken' license headers in our java files
* [OWB-170] - Address findbug issues in webbeans-impl
* [OWB-183] - Improve webbeans-doc module to get a documentation more user
friendly
- * [OWB-214] - get rid of javax.transaction.Transaction dependency in
webbeans-impl
+ * [OWB-214] - get rid of jakarta.transaction.Transaction dependency in
webbeans-impl
* [OWB-237] - NoSuchElementException when WebBeansConfigurationListener is
absent
* [OWB-275] - remove unused imports and cleanup code
* [OWB-286] - java.lang.NoClassDefFoundError: javax/validation/Validator
diff --git a/readme/README_1_1_0.txt b/readme/README_1_1_0.txt
index 555d4575b..8ee2ecb4c 100644
--- a/readme/README_1_1_0.txt
+++ b/readme/README_1_1_0.txt
@@ -348,7 +348,7 @@ Improvement
* [OWB-136] - fix 'broken' license headers in our java files
* [OWB-170] - Address findbug issues in webbeans-impl
* [OWB-183] - Improve webbeans-doc module to get a documentation more user
friendly
- * [OWB-214] - get rid of javax.transaction.Transaction dependency in
webbeans-impl
+ * [OWB-214] - get rid of jakarta.transaction.Transaction dependency in
webbeans-impl
* [OWB-237] - NoSuchElementException when WebBeansConfigurationListener is
absent
* [OWB-275] - remove unused imports and cleanup code
* [OWB-286] - java.lang.NoClassDefFoundError: javax/validation/Validator
diff --git a/readme/README_1_1_1.txt b/readme/README_1_1_1.txt
index fd45a764d..7187e348e 100644
--- a/readme/README_1_1_1.txt
+++ b/readme/README_1_1_1.txt
@@ -409,7 +409,7 @@ Improvement
* [OWB-136] - fix 'broken' license headers in our java files
* [OWB-170] - Address findbug issues in webbeans-impl
* [OWB-183] - Improve webbeans-doc module to get a documentation more user
friendly
- * [OWB-214] - get rid of javax.transaction.Transaction dependency in
webbeans-impl
+ * [OWB-214] - get rid of jakarta.transaction.Transaction dependency in
webbeans-impl
* [OWB-237] - NoSuchElementException when WebBeansConfigurationListener is
absent
* [OWB-275] - remove unused imports and cleanup code
* [OWB-286] - java.lang.NoClassDefFoundError: javax/validation/Validator
diff --git a/readme/README_1_1_2.txt b/readme/README_1_1_2.txt
index 0195b62ad..c61609ff0 100644
--- a/readme/README_1_1_2.txt
+++ b/readme/README_1_1_2.txt
@@ -441,7 +441,7 @@ Improvement
* [OWB-136] - fix 'broken' license headers in our java files
* [OWB-170] - Address findbug issues in webbeans-impl
* [OWB-183] - Improve webbeans-doc module to get a documentation more user
friendly
- * [OWB-214] - get rid of javax.transaction.Transaction dependency in
webbeans-impl
+ * [OWB-214] - get rid of jakarta.transaction.Transaction dependency in
webbeans-impl
* [OWB-237] - NoSuchElementException when WebBeansConfigurationListener is
absent
* [OWB-275] - remove unused imports and cleanup code
* [OWB-286] - java.lang.NoClassDefFoundError: javax/validation/Validator
diff --git a/readme/README_1_1_3.txt b/readme/README_1_1_3.txt
index 5a3541fcf..47a7b34b5 100644
--- a/readme/README_1_1_3.txt
+++ b/readme/README_1_1_3.txt
@@ -461,7 +461,7 @@ Improvement
* [OWB-136] - fix 'broken' license headers in our java files
* [OWB-170] - Address findbug issues in webbeans-impl
* [OWB-183] - Improve webbeans-doc module to get a documentation more user
friendly
- * [OWB-214] - get rid of javax.transaction.Transaction dependency in
webbeans-impl
+ * [OWB-214] - get rid of jakarta.transaction.Transaction dependency in
webbeans-impl
* [OWB-237] - NoSuchElementException when WebBeansConfigurationListener is
absent
* [OWB-275] - remove unused imports and cleanup code
* [OWB-286] - java.lang.NoClassDefFoundError: javax/validation/Validator
diff --git a/readme/README_1_1_4.txt b/readme/README_1_1_4.txt
index 3f25d6070..2f0f8e8fd 100644
--- a/readme/README_1_1_4.txt
+++ b/readme/README_1_1_4.txt
@@ -84,7 +84,7 @@ Bug
* [OWB-567] - Lookup of Provider results in NullPointerException on get()
* [OWB-574] - NewBean doesn't support EJBs
* [OWB-580] - ObserverMethodImpl needs support for EJB's whose Bean Types
do not include the EJB class
- * [OWB-602] - OpenWebBeans OpenEJB integration OSGi bundle declares the
wrong version for the javax.transaction package
+ * [OWB-602] - OpenWebBeans OpenEJB integration OSGi bundle declares the
wrong version for the jakarta.transaction package
* [OWB-617] - NullPointerException in InstanceBean#createInstance
* [OWB-628] - Event injection doesn't work in observer methods.
* [OWB-633] - define stereotypes & thirdparty
@@ -501,7 +501,7 @@ Improvement
* [OWB-136] - fix 'broken' license headers in our java files
* [OWB-170] - Address findbug issues in webbeans-impl
* [OWB-183] - Improve webbeans-doc module to get a documentation more user
friendly
- * [OWB-214] - get rid of javax.transaction.Transaction dependency in
webbeans-impl
+ * [OWB-214] - get rid of jakarta.transaction.Transaction dependency in
webbeans-impl
* [OWB-237] - NoSuchElementException when WebBeansConfigurationListener is
absent
* [OWB-275] - remove unused imports and cleanup code
* [OWB-286] - java.lang.NoClassDefFoundError: javax/validation/Validator
diff --git a/readme/README_1_1_5.txt b/readme/README_1_1_5.txt
index 2389f9426..97b7b75a7 100644
--- a/readme/README_1_1_5.txt
+++ b/readme/README_1_1_5.txt
@@ -123,7 +123,7 @@ Bug
* [OWB-567] - Lookup of Provider results in NullPointerException on get()
* [OWB-574] - NewBean doesn't support EJBs
* [OWB-580] - ObserverMethodImpl needs support for EJB's whose Bean Types
do not include the EJB class
- * [OWB-602] - OpenWebBeans OpenEJB integration OSGi bundle declares the
wrong version for the javax.transaction package
+ * [OWB-602] - OpenWebBeans OpenEJB integration OSGi bundle declares the
wrong version for the jakarta.transaction package
* [OWB-617] - NullPointerException in InstanceBean#createInstance
* [OWB-628] - Event injection doesn't work in observer methods.
* [OWB-633] - define stereotypes & thirdparty
@@ -540,7 +540,7 @@ Improvement
* [OWB-136] - fix 'broken' license headers in our java files
* [OWB-170] - Address findbug issues in webbeans-impl
* [OWB-183] - Improve webbeans-doc module to get a documentation more user
friendly
- * [OWB-214] - get rid of javax.transaction.Transaction dependency in
webbeans-impl
+ * [OWB-214] - get rid of jakarta.transaction.Transaction dependency in
webbeans-impl
* [OWB-237] - NoSuchElementException when WebBeansConfigurationListener is
absent
* [OWB-275] - remove unused imports and cleanup code
* [OWB-286] - java.lang.NoClassDefFoundError: javax/validation/Validator
diff --git a/readme/README_1_1_6.txt b/readme/README_1_1_6.txt
index 73cc84a94..5c6c8e3d6 100644
--- a/readme/README_1_1_6.txt
+++ b/readme/README_1_1_6.txt
@@ -147,7 +147,7 @@ Bug
* [OWB-567] - Lookup of Provider results in NullPointerException on get()
* [OWB-574] - NewBean doesn't support EJBs
* [OWB-580] - ObserverMethodImpl needs support for EJB's whose Bean Types
do not include the EJB class
- * [OWB-602] - OpenWebBeans OpenEJB integration OSGi bundle declares the
wrong version for the javax.transaction package
+ * [OWB-602] - OpenWebBeans OpenEJB integration OSGi bundle declares the
wrong version for the jakarta.transaction package
* [OWB-617] - NullPointerException in InstanceBean#createInstance
* [OWB-628] - Event injection doesn't work in observer methods.
* [OWB-633] - define stereotypes & thirdparty
@@ -564,7 +564,7 @@ Improvement
* [OWB-136] - fix 'broken' license headers in our java files
* [OWB-170] - Address findbug issues in webbeans-impl
* [OWB-183] - Improve webbeans-doc module to get a documentation more user
friendly
- * [OWB-214] - get rid of javax.transaction.Transaction dependency in
webbeans-impl
+ * [OWB-214] - get rid of jakarta.transaction.Transaction dependency in
webbeans-impl
* [OWB-237] - NoSuchElementException when WebBeansConfigurationListener is
absent
* [OWB-275] - remove unused imports and cleanup code
* [OWB-286] - java.lang.NoClassDefFoundError: javax/validation/Validator
diff --git a/readme/README_1_2_0.txt b/readme/README_1_2_0.txt
index 366c18158..d793b9405 100644
--- a/readme/README_1_2_0.txt
+++ b/readme/README_1_2_0.txt
@@ -323,7 +323,7 @@ Bug
* [OWB-567] - Lookup of Provider results in NullPointerException on get()
* [OWB-574] - NewBean doesn't support EJBs
* [OWB-580] - ObserverMethodImpl needs support for EJB's whose Bean Types
do not include the EJB class
- * [OWB-602] - OpenWebBeans OpenEJB integration OSGi bundle declares the
wrong version for the javax.transaction package
+ * [OWB-602] - OpenWebBeans OpenEJB integration OSGi bundle declares the
wrong version for the jakarta.transaction package
* [OWB-617] - NullPointerException in InstanceBean#createInstance
* [OWB-628] - Event injection doesn't work in observer methods.
* [OWB-633] - define stereotypes & thirdparty
@@ -740,7 +740,7 @@ Improvement
* [OWB-136] - fix 'broken' license headers in our java files
* [OWB-170] - Address findbug issues in webbeans-impl
* [OWB-183] - Improve webbeans-doc module to get a documentation more user
friendly
- * [OWB-214] - get rid of javax.transaction.Transaction dependency in
webbeans-impl
+ * [OWB-214] - get rid of jakarta.transaction.Transaction dependency in
webbeans-impl
* [OWB-237] - NoSuchElementException when WebBeansConfigurationListener is
absent
* [OWB-275] - remove unused imports and cleanup code
* [OWB-286] - java.lang.NoClassDefFoundError: javax/validation/Validator
diff --git a/webbeans-ee-common/pom.xml b/webbeans-ee-common/pom.xml
index 812c10c4c..7e8c4bd3f 100644
--- a/webbeans-ee-common/pom.xml
+++ b/webbeans-ee-common/pom.xml
@@ -29,33 +29,30 @@
<description>Apache OpenWebBeans Java EE Common</description>
<dependencies>
-
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-impl</artifactId>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
</dependency>
-
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>
- <dependency>
- <groupId>jakarta.inject</groupId>
- <artifactId>jakarta.inject-api</artifactId>
- </dependency>
-
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-spi</artifactId>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-impl</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
diff --git a/webbeans-ee/pom.xml b/webbeans-ee/pom.xml
index 5c6214009..b4f431801 100644
--- a/webbeans-ee/pom.xml
+++ b/webbeans-ee/pom.xml
@@ -28,38 +28,38 @@
<description>Apache OpenWebBeans Java EE Utility</description>
<dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-el_2.2_spec</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
</dependency>
-
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
+ </dependency>
<dependency>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
</dependency>
-
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-spi</artifactId>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-impl</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-ee-common</artifactId>
@@ -67,14 +67,9 @@
</dependency>
<dependency>
- <groupId>jakarta.inject</groupId>
- <artifactId>jakarta.inject-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-spi</artifactId>
- <optional>true</optional>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
diff --git
a/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/UserTransactionBean.java
b/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/UserTransactionBean.java
index ebc167ee5..92f212504 100644
---
a/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/UserTransactionBean.java
+++
b/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/UserTransactionBean.java
@@ -18,7 +18,7 @@
*/
package org.apache.webbeans.ee.beans;
-import javax.transaction.UserTransaction;
+import jakarta.transaction.UserTransaction;
import org.apache.webbeans.component.BuiltInOwbBean;
import org.apache.webbeans.component.SimpleProducerFactory;
@@ -29,7 +29,6 @@ import org.apache.webbeans.portable.ProviderBasedProducer;
//used by BeansDeployer (created via reflection)
public class UserTransactionBean extends BuiltInOwbBean<UserTransaction>
{
-
public UserTransactionBean(WebBeansContext webBeansContext)
{
super(webBeansContext,
diff --git
a/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/UserTransactionProvider.java
b/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/UserTransactionProvider.java
index 226990460..527258171 100644
---
a/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/UserTransactionProvider.java
+++
b/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/UserTransactionProvider.java
@@ -19,7 +19,7 @@
package org.apache.webbeans.ee.beans;
import jakarta.inject.Provider;
-import javax.transaction.UserTransaction;
+import jakarta.transaction.UserTransaction;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.spi.TransactionService;
diff --git
a/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/ValidatorBean.java
b/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/ValidatorBean.java
index 14d4e0965..bdf682634 100644
--- a/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/ValidatorBean.java
+++ b/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/ValidatorBean.java
@@ -18,7 +18,7 @@
*/
package org.apache.webbeans.ee.beans;
-import javax.validation.Validator;
+import jakarta.validation.Validator;
import org.apache.webbeans.component.BuiltInOwbBean;
import org.apache.webbeans.component.SimpleProducerFactory;
diff --git
a/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/ValidatorFactoryBean.java
b/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/ValidatorFactoryBean.java
index a6a4162bf..73db8eee2 100644
---
a/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/ValidatorFactoryBean.java
+++
b/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/ValidatorFactoryBean.java
@@ -18,7 +18,7 @@
*/
package org.apache.webbeans.ee.beans;
-import javax.validation.ValidatorFactory;
+import jakarta.validation.ValidatorFactory;
import org.apache.webbeans.component.BuiltInOwbBean;
import org.apache.webbeans.component.SimpleProducerFactory;
diff --git
a/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/ValidatorFactoryProvider.java
b/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/ValidatorFactoryProvider.java
index 87284e250..b675b8bca 100644
---
a/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/ValidatorFactoryProvider.java
+++
b/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/ValidatorFactoryProvider.java
@@ -19,7 +19,7 @@
package org.apache.webbeans.ee.beans;
import jakarta.inject.Provider;
-import javax.validation.ValidatorFactory;
+import jakarta.validation.ValidatorFactory;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.spi.ValidatorService;
diff --git
a/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/ValidatorProvider.java
b/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/ValidatorProvider.java
index b4bfb1b07..709c49ad2 100644
---
a/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/ValidatorProvider.java
+++
b/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/ValidatorProvider.java
@@ -19,7 +19,7 @@
package org.apache.webbeans.ee.beans;
import jakarta.inject.Provider;
-import javax.validation.Validator;
+import jakarta.validation.Validator;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.spi.ValidatorService;
diff --git
a/webbeans-ee/src/main/java/org/apache/webbeans/ee/event/TransactionalEventNotifier.java
b/webbeans-ee/src/main/java/org/apache/webbeans/ee/event/TransactionalEventNotifier.java
index 7633d5d4f..028e16896 100644
---
a/webbeans-ee/src/main/java/org/apache/webbeans/ee/event/TransactionalEventNotifier.java
+++
b/webbeans-ee/src/main/java/org/apache/webbeans/ee/event/TransactionalEventNotifier.java
@@ -21,11 +21,11 @@ package org.apache.webbeans.ee.event;
import jakarta.enterprise.event.TransactionPhase;
import jakarta.enterprise.inject.spi.EventMetadata;
import jakarta.enterprise.inject.spi.ObserverMethod;
-import javax.transaction.RollbackException;
-import javax.transaction.Status;
-import javax.transaction.Synchronization;
-import javax.transaction.SystemException;
-import javax.transaction.Transaction;
+import jakarta.transaction.RollbackException;
+import jakarta.transaction.Status;
+import jakarta.transaction.Synchronization;
+import jakarta.transaction.SystemException;
+import jakarta.transaction.Transaction;
import org.apache.webbeans.config.OWBLogConst;
import org.apache.webbeans.config.WebBeansContext;
diff --git a/webbeans-jms/pom.xml b/webbeans-jms/pom.xml
index 2ce4f0a78..58e412767 100644
--- a/webbeans-jms/pom.xml
+++ b/webbeans-jms/pom.xml
@@ -27,41 +27,35 @@
<name>JMS plugin</name>
<description>Apache OpenWebBeans JMS Integration</description>
<dependencies>
-
<dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-impl</artifactId>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
</dependency>
-
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>
-
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1.1</version>
- <optional>true</optional>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
+ <version>${jakarta.jms-api.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_2.0_spec</artifactId>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-spi</artifactId>
<optional>true</optional>
</dependency>
-
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <optional>true</optional>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-impl</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-spi</artifactId>
- <optional>true</optional>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
diff --git
a/webbeans-jms/src/main/java/org/apache/webbeans/jms/component/JmsBean.java
b/webbeans-jms/src/main/java/org/apache/webbeans/jms/component/JmsBean.java
index 3fcf496d1..24e342d93 100644
--- a/webbeans-jms/src/main/java/org/apache/webbeans/jms/component/JmsBean.java
+++ b/webbeans-jms/src/main/java/org/apache/webbeans/jms/component/JmsBean.java
@@ -20,7 +20,7 @@ package org.apache.webbeans.jms.component;
import jakarta.enterprise.inject.spi.BeanAttributes;
import jakarta.enterprise.inject.spi.Producer;
-import javax.jms.Destination;
+import jakarta.jms.Destination;
import org.apache.webbeans.component.AbstractOwbBean;
import org.apache.webbeans.component.JmsBeanMarker;
diff --git
a/webbeans-jms/src/main/java/org/apache/webbeans/jms/component/JmsComponentFactory.java
b/webbeans-jms/src/main/java/org/apache/webbeans/jms/component/JmsComponentFactory.java
index 93ae4c74a..6358a7c18 100644
---
a/webbeans-jms/src/main/java/org/apache/webbeans/jms/component/JmsComponentFactory.java
+++
b/webbeans-jms/src/main/java/org/apache/webbeans/jms/component/JmsComponentFactory.java
@@ -23,16 +23,16 @@ import java.lang.reflect.Type;
import java.util.HashSet;
import java.util.Set;
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueReceiver;
-import javax.jms.QueueSender;
-import javax.jms.QueueSession;
-import javax.jms.Topic;
-import javax.jms.TopicConnection;
-import javax.jms.TopicPublisher;
-import javax.jms.TopicSession;
-import javax.jms.TopicSubscriber;
+import jakarta.jms.Queue;
+import jakarta.jms.QueueConnection;
+import jakarta.jms.QueueReceiver;
+import jakarta.jms.QueueSender;
+import jakarta.jms.QueueSession;
+import jakarta.jms.Topic;
+import jakarta.jms.TopicConnection;
+import jakarta.jms.TopicPublisher;
+import jakarta.jms.TopicSession;
+import jakarta.jms.TopicSubscriber;
import org.apache.webbeans.component.BeanAttributesImpl;
import org.apache.webbeans.config.WebBeansContext;
diff --git
a/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsProxyHandler.java
b/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsProxyHandler.java
index 90ea91ee0..2f174b6bc 100644
---
a/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsProxyHandler.java
+++
b/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsProxyHandler.java
@@ -24,17 +24,17 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.Session;
-import javax.jms.TopicConnection;
-import javax.jms.TopicConnectionFactory;
+import jakarta.jms.Connection;
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.Destination;
+import jakarta.jms.JMSException;
+import jakarta.jms.MessageConsumer;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.QueueConnection;
+import jakarta.jms.QueueConnectionFactory;
+import jakarta.jms.Session;
+import jakarta.jms.TopicConnection;
+import jakarta.jms.TopicConnectionFactory;
import org.apache.webbeans.exception.WebBeansException;
import org.apache.webbeans.jms.JMSModel;
diff --git
a/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsUtil.java
b/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsUtil.java
index 98aa814d7..5f9aead0c 100644
--- a/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsUtil.java
+++ b/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsUtil.java
@@ -20,23 +20,23 @@ package org.apache.webbeans.jms.util;
import java.io.Serializable;
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueReceiver;
-import javax.jms.QueueSender;
-import javax.jms.QueueSession;
-import javax.jms.Session;
-import javax.jms.Topic;
-import javax.jms.TopicConnection;
-import javax.jms.TopicConnectionFactory;
-import javax.jms.TopicPublisher;
-import javax.jms.TopicSession;
-import javax.jms.TopicSubscriber;
+import jakarta.jms.Connection;
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.MessageConsumer;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Queue;
+import jakarta.jms.QueueConnection;
+import jakarta.jms.QueueConnectionFactory;
+import jakarta.jms.QueueReceiver;
+import jakarta.jms.QueueSender;
+import jakarta.jms.QueueSession;
+import jakarta.jms.Session;
+import jakarta.jms.Topic;
+import jakarta.jms.TopicConnection;
+import jakarta.jms.TopicConnectionFactory;
+import jakarta.jms.TopicPublisher;
+import jakarta.jms.TopicSession;
+import jakarta.jms.TopicSubscriber;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.exception.WebBeansCreationException;
diff --git a/webbeans-porting/pom.xml b/webbeans-porting/pom.xml
index f851dcd1c..68a54061b 100644
--- a/webbeans-porting/pom.xml
+++ b/webbeans-porting/pom.xml
@@ -124,7 +124,7 @@
<artifactId>jsp-api</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.transaction</groupId>
+ <groupId>jakarta.transaction</groupId>
<artifactId>jta</artifactId>
</exclusion>
</exclusions>
diff --git a/webbeans-tck/pom.xml b/webbeans-tck/pom.xml
index 02749de6d..52d2afd42 100644
--- a/webbeans-tck/pom.xml
+++ b/webbeans-tck/pom.xml
@@ -108,7 +108,7 @@
<artifactId>jsp-api</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.transaction</groupId>
+ <groupId>jakarta.transaction</groupId>
<artifactId>jta</artifactId>
</exclusion>
</exclusions>
