You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2023/01/24 16:25:29 UTC
[openwebbeans] branch main updated: OWB-1417 enable owb-ejb and owb-porting
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 4f4688575 OWB-1417 enable owb-ejb and owb-porting
4f4688575 is described below
commit 4f4688575b49768f359c6acef9cd8d8853abe928
Author: Mark Struberg <st...@apache.org>
AuthorDate: Tue Jan 24 17:25:05 2023 +0100
OWB-1417 enable owb-ejb and owb-porting
---
pom.xml | 24 ++--
webbeans-ejb/pom.xml | 32 +++---
.../webbeans/ejb/common/util/EjbConstants.java | 1 -
.../webbeans/ejb/common/util/EjbValidator.java | 1 -
.../ejb/plugin/OpenWebBeansEjbLCAPluginImpl.java | 5 +-
.../apache/webbeans/util/WebBeansConstants.java | 8 +-
webbeans-porting/pom.xml | 125 ++++++++++++++++-----
7 files changed, 133 insertions(+), 63 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2496a5027..9b3421bd9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,6 +83,7 @@
<jakarta.el-api.version>4.0.0</jakarta.el-api.version>
<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>
<tomcat.version>10.1.5</tomcat.version>
@@ -102,7 +103,7 @@
<!-- jetty 9.4.13+ broke session persistence: https://github.com/eclipse/jetty.project/issues/3597 -->
<jetty.version>9.4.12.v20180830</jetty.version>
<myfaces.version>2.3.6</myfaces.version>
- <cdi.tck.version>2.0.5.Final</cdi.tck.version>
+ <cdi.tck.version>4.0.7</cdi.tck.version>
<osgi.servlet.range>2.4</osgi.servlet.range>
<osgi.el.range>2.2</osgi.el.range>
@@ -757,10 +758,12 @@
<module>webbeans-se</module>
<module>webbeans-web</module>
<module>webbeans-tomcat</module>
+ <module>webbeans-ejb</module>
<module>webbeans-arquillian</module>
<module>webbeans-slf4j</module>
<module>webbeans-gradle</module>
<module>webbeans-junit5</module>
+ <module>webbeans-porting</module>
<!--X TODO re-enable
<module>webbeans-ee-common</module>
<module>webbeans-ee</module>
@@ -769,7 +772,6 @@
<module>webbeans-jsf</module>
<module>webbeans-resource</module>
<module>webbeans-osgi</module>
- <module>webbeans-porting</module>
<module>samples</module>
<module>atinject-tck</module>
<module>webbeans-tck</module>
@@ -841,8 +843,19 @@
<version>${tomcat.version}</version>
</dependency>
+ <dependency>
+ <groupId>jakarta.ejb</groupId>
+ <artifactId>jakarta.ejb-api</artifactId>
+ <version>${jakarta.ejb-api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ejb_3.1_spec</artifactId>
+ <version>${geronimo_ejb.version}</version>
+ </dependency>
+
-<!-- OLD REMOVE -->
+ <!-- OLD REMOVE -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxws_2.2_spec</artifactId>
@@ -856,11 +869,6 @@
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.1_spec</artifactId>
- <version>${geronimo_ejb.version}</version>
- </dependency>
diff --git a/webbeans-ejb/pom.xml b/webbeans-ejb/pom.xml
index faf40c531..ffc3bc945 100644
--- a/webbeans-ejb/pom.xml
+++ b/webbeans-ejb/pom.xml
@@ -26,27 +26,28 @@
<artifactId>openwebbeans-ejb</artifactId>
<name>EJB plugin</name>
<description>Apache OpenWebBeans Java EE EJB plugin</description>
- <dependencies>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-impl</artifactId>
- </dependency>
+ <dependencies>
<dependency>
- <groupId>jakarta.interceptor</groupId>
- <artifactId>jakarta.interceptor-api</artifactId>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
+ <scope>provided</scope>
</dependency>
-
<dependency>
- <groupId>jakarta.inject</groupId>
- <artifactId>jakarta.inject-api</artifactId>
+ <groupId>jakarta.interceptor</groupId>
+ <artifactId>jakarta.interceptor-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.ejb</groupId>
+ <artifactId>jakarta.ejb-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -54,17 +55,16 @@
<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>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
</dependencies>
diff --git a/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbConstants.java b/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbConstants.java
index 338ab39fe..66b72c4f2 100644
--- a/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbConstants.java
+++ b/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbConstants.java
@@ -19,7 +19,6 @@
package org.apache.webbeans.ejb.common.util;
/**
- * @version $Rev: 889852 $ $Date: 2009-12-12 01:11:53 +0200 (Sat, 12 Dec 2009) $
*/
public final class EjbConstants
{
diff --git a/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbValidator.java b/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbValidator.java
index 6c3f24a3a..b990a3b83 100644
--- a/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbValidator.java
+++ b/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbValidator.java
@@ -43,7 +43,6 @@ import org.apache.webbeans.util.Asserts;
/**
* Validates session beans.
*
- * @version $Rev: 915746 $ $Date: 2010-02-24 12:43:43 +0200 (Wed, 24 Feb 2010) $
*/
public final class EjbValidator
{
diff --git a/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/plugin/OpenWebBeansEjbLCAPluginImpl.java b/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/plugin/OpenWebBeansEjbLCAPluginImpl.java
index e50d79d7c..45e9f63d5 100644
--- a/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/plugin/OpenWebBeansEjbLCAPluginImpl.java
+++ b/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/plugin/OpenWebBeansEjbLCAPluginImpl.java
@@ -20,8 +20,8 @@ package org.apache.webbeans.ejb.plugin;
import java.lang.annotation.Annotation;
-import javax.ejb.PrePassivate;
-import javax.ejb.PostActivate;
+import jakarta.ejb.PrePassivate;
+import jakarta.ejb.PostActivate;
import jakarta.interceptor.AroundTimeout;
import org.apache.webbeans.plugins.OpenWebBeansEjbLCAPlugin;
@@ -29,7 +29,6 @@ import org.apache.webbeans.spi.plugins.AbstractOwbPlugin;
/**
* EJB Plugin for EJB related components.
- * @version $Rev$ $Date$
*/
public class OpenWebBeansEjbLCAPluginImpl extends AbstractOwbPlugin implements OpenWebBeansEjbLCAPlugin
{
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansConstants.java b/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansConstants.java
index 12469d604..a710ba7ec 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansConstants.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansConstants.java
@@ -32,11 +32,11 @@ public final class WebBeansConstants
throw new UnsupportedOperationException();
}
- public static final String [] OWB_INJECTABLE_RESOURCE_ANNOTATIONS = {"javax.ejb.EJB",
+ public static final String [] OWB_INJECTABLE_RESOURCE_ANNOTATIONS = {"jakarta.ejb.EJB",
"jakarta.annotation.Resource",
- "javax.xml.ws.WebServiceRef",
- "javax.persistence.PersistenceUnit",
- "javax.persistence.PersistenceContext"};
+ "jakarta.xml.ws.WebServiceRef",
+ "jakarta.persistence.PersistenceUnit",
+ "jakarta.persistence.PersistenceContext"};
public static final String WEB_BEANS_XML_INTERCEPTORS_ELEMENT = "interceptors";
public static final String WEB_BEANS_XML_DECORATORS_ELEMENT = "decorators";
diff --git a/webbeans-porting/pom.xml b/webbeans-porting/pom.xml
index 5f5f4acdb..f851dcd1c 100644
--- a/webbeans-porting/pom.xml
+++ b/webbeans-porting/pom.xml
@@ -31,10 +31,79 @@
<name>TCK Porting Pkg</name>
<packaging>jar</packaging>
<description>Apache OpenWebBeans TCK Porting Package</description>
-
+
<dependencies>
<dependency>
- <groupId>org.jboss.cdi.tck</groupId>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>cdi-tck-core-impl</artifactId>
+ <version>${cdi.tck.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.servlet.jsp</groupId>
+ <artifactId>jakarta.servlet.jsp-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.interceptor</groupId>
+ <artifactId>jakarta.interceptor-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.ejb</groupId>
+ <artifactId>jakarta.ejb-api</artifactId>
+ </exclusion>
+ <!-- not yet G jakarta jars
+ <exclusion>
+ <groupId>jakarta.resource</groupId>
+ <artifactId>jakarta.resource-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.faces</groupId>
+ <artifactId>jakarta.faces-api</artifactId>
+ </exclusion>
+ -->
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.enterprise</groupId>
<artifactId>cdi-tck-api</artifactId>
<version>${cdi.tck.version}</version>
<exclusions>
@@ -65,63 +134,59 @@
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-spi</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-impl</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-el22</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_2.0_spec</artifactId>
</dependency>
+
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
-
<dependency>
- <groupId>jakarta.transaction</groupId>
- <artifactId>jakarta.transaction-api</artifactId>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
</dependency>
-
<dependency>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
- <version>${geronimo_annotation.version}</version>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>
-
<dependency>
<groupId>jakarta.interceptor</groupId>
<artifactId>jakarta.interceptor-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>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
</dependency>
-
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-el_2.2_spec</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.ejb</groupId>
+ <artifactId>jakarta.ejb-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jasper-el</artifactId>
- <version>${tomcat7.version}</version>
+ <version>${tomcat.version}</version>
</dependency>
</dependencies>