This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 7fd1db820b Update OWB version numbers
7fd1db820b is described below
commit 7fd1db820b668a29e0faa6f5e1a5ec0e98df9cda
Author: remm <[email protected]>
AuthorDate: Fri Nov 10 14:09:19 2023 +0100
Update OWB version numbers
---
modules/owb/pom.xml | 39 +++++++++++++---------
.../web/tomcat/OpenWebBeansInstanceManager.java | 7 ++--
.../apache/webbeans/web/tomcat/TomcatPlugin.java | 4 +--
.../webbeans/web/tomcat/TomcatSecurityService.java | 5 +--
webapps/docs/changelog.xml | 3 ++
5 files changed, 35 insertions(+), 23 deletions(-)
diff --git a/modules/owb/pom.xml b/modules/owb/pom.xml
index 303f9d2982..e496d235ef 100644
--- a/modules/owb/pom.xml
+++ b/modules/owb/pom.xml
@@ -26,34 +26,41 @@
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-owb</artifactId>
- <name>Apache Tomcat CDI 2 support</name>
- <description>Apache Tomcat CDI 2 support using Apache
OpenWebBeans</description>
+ <name>Apache Tomcat CDI 4 support</name>
+ <description>Apache Tomcat CDI 4 support using Apache
OpenWebBeans</description>
<!-- This is the Apache OpenWebBeans version -->
- <version>2.0.27</version>
+ <version>4.0.0</version>
<packaging>jar</packaging>
<properties>
- <geronimo-atinject.version>1.2</geronimo-atinject.version>
- <geronimo-interceptor.version>1.2</geronimo-interceptor.version>
- <geronimo-jcdi.version>1.3</geronimo-jcdi.version>
- <tomcat.version>10.1.0</tomcat.version>
+ <jakarta-inject.version>2.0.1</jakarta-inject.version>
+ <jakarta-interceptor.version>2.1.0</jakarta-interceptor.version>
+ <jakarta-enterprise-cdi.version>4.0.1</jakarta-enterprise-cdi.version>
+ <jakarta-annotation-api.version>2.1.1</jakarta-annotation-api.version>
+ <tomcat.version>10.1.15</tomcat.version>
</properties>
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>${geronimo-atinject.version}</version>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
+ <version>${jakarta-inject.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.2_spec</artifactId>
- <version>${geronimo-interceptor.version}</version>
+ <groupId>jakarta.interceptor</groupId>
+ <artifactId>jakarta.interceptor-api</artifactId>
+ <version>${jakarta-interceptor.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_2.0_spec</artifactId>
- <version>${geronimo-jcdi.version}</version>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
+ <version>${jakarta-enterprise-cdi.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>${jakarta-annotation-api.version}</version>
+ <scope>provided</scope>
</dependency>
<!-- Apache OpenWebBeans -->
<dependency>
diff --git
a/modules/owb/src/main/java/org/apache/webbeans/web/tomcat/OpenWebBeansInstanceManager.java
b/modules/owb/src/main/java/org/apache/webbeans/web/tomcat/OpenWebBeansInstanceManager.java
index 6ccc9e3f19..d1b39d7704 100644
---
a/modules/owb/src/main/java/org/apache/webbeans/web/tomcat/OpenWebBeansInstanceManager.java
+++
b/modules/owb/src/main/java/org/apache/webbeans/web/tomcat/OpenWebBeansInstanceManager.java
@@ -22,11 +22,12 @@ import java.lang.reflect.InvocationTargetException;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.Producer;
import javax.naming.NamingException;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.Producer;
+
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.InstanceManager;
diff --git
a/modules/owb/src/main/java/org/apache/webbeans/web/tomcat/TomcatPlugin.java
b/modules/owb/src/main/java/org/apache/webbeans/web/tomcat/TomcatPlugin.java
index 84be6408c1..383b39149e 100644
--- a/modules/owb/src/main/java/org/apache/webbeans/web/tomcat/TomcatPlugin.java
+++ b/modules/owb/src/main/java/org/apache/webbeans/web/tomcat/TomcatPlugin.java
@@ -18,6 +18,8 @@
*/
package org.apache.webbeans.web.tomcat;
+import java.util.EventListener;
+
import jakarta.servlet.Filter;
import jakarta.servlet.Servlet;
import jakarta.servlet.ServletContextAttributeListener;
@@ -29,8 +31,6 @@ import jakarta.servlet.http.HttpSessionAttributeListener;
import jakarta.servlet.http.HttpSessionBindingListener;
import jakarta.servlet.http.HttpSessionListener;
-import java.util.EventListener;
-
import org.apache.tomcat.util.res.StringManager;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.exception.WebBeansConfigurationException;
diff --git
a/modules/owb/src/main/java/org/apache/webbeans/web/tomcat/TomcatSecurityService.java
b/modules/owb/src/main/java/org/apache/webbeans/web/tomcat/TomcatSecurityService.java
index 43c2bd9a3e..8f290d4cfd 100644
---
a/modules/owb/src/main/java/org/apache/webbeans/web/tomcat/TomcatSecurityService.java
+++
b/modules/owb/src/main/java/org/apache/webbeans/web/tomcat/TomcatSecurityService.java
@@ -25,9 +25,10 @@ import java.util.Objects;
import java.util.function.Supplier;
import java.util.stream.Stream;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.CDI;
import javax.security.auth.Subject;
+
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.CDI;
import jakarta.servlet.http.HttpServletRequest;
import org.apache.webbeans.config.WebBeansContext;
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2a8d104f54..750696e541 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -246,6 +246,9 @@
The minimum Java version required to build Tomcat has been raised to
Java 17. (markt)
</update>
+ <update>
+ Update the OWB module to Apache OpenWebBeans 4.0.0. (remm)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
