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 011021b91 OWB-1417 upgrade owb-jsf plugin to jakarta.*
011021b91 is described below
commit 011021b910ff620ef347bab8a3bda2770ba10862
Author: Mark Struberg <[email protected]>
AuthorDate: Fri Jan 27 15:40:04 2023 +0100
OWB-1417 upgrade owb-jsf plugin to jakarta.*
---
pom.xml | 39 +--
readme/README_M4.txt | 2 +-
.../samples/conversation/ShoppingBean.java | 2 +-
.../src/main/webapp/WEB-INF/web.xml | 2 +-
.../org/apache/webbeans/sample/bean/LoginBean.java | 2 +-
.../apache/webbeans/sample/bean/LogoutBean.java | 2 +-
.../sample/conversation/ShoppingCardBean.java | 2 +-
.../webbeans/sample/guess/JSFNumberGuess.java | 4 +-
.../webbeans/sample/util/FacesMessageUtil.java | 6 +-
samples/guess/src/main/webapp/WEB-INF/web.xml | 4 +-
.../org/apache/webbeans/jsf2/HelloJsfBean.java | 6 +-
samples/jsf2sample/src/main/webapp/WEB-INF/web.xml | 4 +-
.../jsf2sample/src/main/webapp/conversation.xhtml | 2 +-
samples/jsf2sample/src/main/webapp/counter.xhtml | 2 +-
.../reservation/beans/admin/AdminListBean.java | 2 +-
.../reservation/beans/admin/AdminListUser.java | 2 +-
.../reservation/beans/user/UserListBean.java | 2 +-
.../beans/user/UserReservationBean.java | 4 +-
.../controller/user/UserController.java | 2 +-
.../reservation/model/ReservationModel.java | 2 +-
.../security/JSFSecurityPhaseListener.java | 8 +-
.../webbeans/reservation/util/JSFUtility.java | 6 +-
.../reservation/src/main/webapp/WEB-INF/web.xml | 4 +-
webbeans-jsf/pom.xml | 56 ++--
.../webbeans/jsf/ConversationAwareViewHandler.java | 6 +-
.../main/java/org/apache/webbeans/jsf/JSFUtil.java | 6 +-
.../org/apache/webbeans/jsf/OwbApplication.java | 6 +-
.../apache/webbeans/jsf/OwbApplicationFactory.java | 6 +-
.../apache/webbeans/jsf/OwbExceptionHandler.java | 10 +-
.../webbeans/jsf/OwbExceptionHandlerFactory.java | 4 +-
webbeans-porting/pom.xml | 2 +-
webbeans-tck-jakarta/dev-suite.xml | 39 ---
webbeans-tck-jakarta/pom.xml | 363 ---------------------
.../META-INF/openwebbeans/openwebbeans.properties | 47 ---
.../src/test/resources/META-INF/cdi-tck.properties | 25 --
webbeans-tck-jakarta/standalone-suite.xml | 166 ----------
36 files changed, 87 insertions(+), 760 deletions(-)
diff --git a/pom.xml b/pom.xml
index 41e3f458a..1bc875b88 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,24 +52,6 @@
<url>https://github.com/apache/openwebbeans</url>
</scm>
-<!-- Should not be needed anymore
- <repositories>
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Maven Repository Group</name>
- <url>https://repository.jboss.org/nexus/content/groups/public</url>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </repository>
- </repositories>
--->
-
<issueManagement>
<system>jira</system>
<url>https://issues.apache.org/jira/browse/OWB</url>
@@ -87,23 +69,15 @@
<jakarta.jms-api.version>3.0.0</jakarta.jms-api.version>
<tomcat.version>10.1.5</tomcat.version>
-
+ <myfaces.version>4.0.0-RC4</myfaces.version>
<httpclient.version>4.5.14</httpclient.version>
<xbean.version>4.22</xbean.version>
<arquillian.version>1.7.0.Alpha13</arquillian.version>
<!-- OLD remove: -->
- <geronimo_jaxws.version>1.2</geronimo_jaxws.version>
- <geronimo_servlet.version>1.0</geronimo_servlet.version>
- <geronimo_ejb.version>1.0.2</geronimo_ejb.version>
- <geronimo_jpa.version>1.1</geronimo_jpa.version>
- <geronimo_jta.version>1.1.1</geronimo_jta.version>
- <geronimo_jsp.version>1.0.1</geronimo_jsp.version>
- <geronimo_validation.version>1.1</geronimo_validation.version>
<!-- 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>4.0.7</cdi.tck.version>
<osgi.servlet.range>2.4</osgi.servlet.range>
@@ -111,9 +85,6 @@
<osgi.faces.range>2.0</osgi.faces.range>
<maven-shade-plugin.version>3.2.4</maven-shade-plugin.version>
-
- <!-- tck artifacts use a http:// repo we should disable to build with
mvn 3.8<jboss-public-repository>false</jboss-public-repository> -->
- <jboss-public-repository>false</jboss-public-repository>
</properties>
<mailingLists>
@@ -770,12 +741,11 @@
<module>webbeans-ee</module>
<module>webbeans-jms</module>
<module>webbeans-tck</module>
+ <module>webbeans-jsf</module>
<!--X TODO re-enable
<module>webbeans-jetty9</module>
- <module>webbeans-jsf</module>
<module>webbeans-osgi</module>
<module>samples</module>
- <module>webbeans-tck-jakarta</module>
<module>distribution</module>
<module>bom</module>
-->
@@ -868,11 +838,6 @@
<version>${geronimo_servlet.version}</version>
</dependency>
-
-
-
-
-
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
diff --git a/readme/README_M4.txt b/readme/README_M4.txt
index 478439f3d..6230b4e46 100644
--- a/readme/README_M4.txt
+++ b/readme/README_M4.txt
@@ -199,7 +199,7 @@ New Feature
* [OWB-137] - implement BusyConversationException use case
* [OWB-138] - implement NonexistentConversationException use case
* [OWB-226] - create a way to dynamically add Extensions to our tests
- * [OWB-229] - add support for the JSF2 javax.faces.bean.ViewScoped
annotation
+ * [OWB-229] - add support for the JSF2 jakarta.faces.bean.ViewScoped
annotation
* [OWB-230] - Enable/Disable Configuration of JSF2 Extensions
* [OWB-277] - Owb on Google App Engine
diff --git
a/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/ShoppingBean.java
b/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/ShoppingBean.java
index d58ce729f..b69d5a519 100644
---
a/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/ShoppingBean.java
+++
b/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/ShoppingBean.java
@@ -26,7 +26,7 @@ import jakarta.annotation.PostConstruct;
import jakarta.enterprise.context.Conversation;
import jakarta.enterprise.context.ConversationScoped;
import jakarta.enterprise.inject.Produces;
-import javax.faces.component.UIData;
+import jakarta.faces.component.UIData;
import jakarta.inject.Inject;
import jakarta.inject.Named;
diff --git a/samples/conversation-sample/src/main/webapp/WEB-INF/web.xml
b/samples/conversation-sample/src/main/webapp/WEB-INF/web.xml
index 2cbc4f2b4..4b5939dc4 100644
--- a/samples/conversation-sample/src/main/webapp/WEB-INF/web.xml
+++ b/samples/conversation-sample/src/main/webapp/WEB-INF/web.xml
@@ -27,7 +27,7 @@
<servlet>
<servlet-name>Faces Servlet</servlet-name>
- <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
diff --git
a/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LoginBean.java
b/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LoginBean.java
index 58015c0db..e796179cd 100644
--- a/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LoginBean.java
+++ b/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LoginBean.java
@@ -28,7 +28,7 @@ import jakarta.enterprise.inject.Default;
import jakarta.inject.Inject;
import jakarta.inject.Named;
import jakarta.enterprise.inject.Produces;
-import javax.faces.application.FacesMessage;
+import jakarta.faces.application.FacesMessage;
import org.apache.webbeans.sample.bindings.AppScopeBinding;
import org.apache.webbeans.sample.bindings.LoggedInUser;
diff --git
a/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LogoutBean.java
b/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LogoutBean.java
index cc1321abe..987a0fe1a 100644
---
a/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LogoutBean.java
+++
b/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LogoutBean.java
@@ -20,7 +20,7 @@ package org.apache.webbeans.sample.bean;
import jakarta.inject.Inject;
import jakarta.inject.Named;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
import jakarta.servlet.http.HttpSession;
import org.apache.webbeans.sample.bindings.LoggedInUser;
diff --git
a/samples/guess/src/main/java/org/apache/webbeans/sample/conversation/ShoppingCardBean.java
b/samples/guess/src/main/java/org/apache/webbeans/sample/conversation/ShoppingCardBean.java
index 14dccae58..1c80be881 100644
---
a/samples/guess/src/main/java/org/apache/webbeans/sample/conversation/ShoppingCardBean.java
+++
b/samples/guess/src/main/java/org/apache/webbeans/sample/conversation/ShoppingCardBean.java
@@ -25,7 +25,7 @@ import jakarta.enterprise.context.RequestScoped;
import jakarta.enterprise.inject.Default;
import jakarta.inject.Inject;
import jakarta.inject.Named;
-import javax.faces.application.FacesMessage;
+import jakarta.faces.application.FacesMessage;
import org.apache.webbeans.sample.model.conversation.ConversationModel;
import org.apache.webbeans.sample.util.FacesMessageUtil;
diff --git
a/samples/guess/src/main/java/org/apache/webbeans/sample/guess/JSFNumberGuess.java
b/samples/guess/src/main/java/org/apache/webbeans/sample/guess/JSFNumberGuess.java
index 699a9e755..844fe729d 100644
---
a/samples/guess/src/main/java/org/apache/webbeans/sample/guess/JSFNumberGuess.java
+++
b/samples/guess/src/main/java/org/apache/webbeans/sample/guess/JSFNumberGuess.java
@@ -28,8 +28,8 @@ import jakarta.inject.Named;
import jakarta.enterprise.inject.spi.Bean;
import jakarta.enterprise.inject.spi.BeanManager;
import jakarta.enterprise.util.AnnotationLiteral;
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.context.FacesContext;
import jakarta.inject.Inject;
@Named("game")
diff --git
a/samples/guess/src/main/java/org/apache/webbeans/sample/util/FacesMessageUtil.java
b/samples/guess/src/main/java/org/apache/webbeans/sample/util/FacesMessageUtil.java
index e7044d5cf..87a47975f 100644
---
a/samples/guess/src/main/java/org/apache/webbeans/sample/util/FacesMessageUtil.java
+++
b/samples/guess/src/main/java/org/apache/webbeans/sample/util/FacesMessageUtil.java
@@ -20,9 +20,9 @@ package org.apache.webbeans.sample.util;
import jakarta.enterprise.context.Dependent;
import jakarta.inject.Named;
-import javax.faces.application.FacesMessage;
-import javax.faces.application.FacesMessage.Severity;
-import javax.faces.context.FacesContext;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.application.FacesMessage.Severity;
+import jakarta.faces.context.FacesContext;
@Named("facesMessage")
@Dependent
diff --git a/samples/guess/src/main/webapp/WEB-INF/web.xml
b/samples/guess/src/main/webapp/WEB-INF/web.xml
index 05ab9c108..fd584ef39 100644
--- a/samples/guess/src/main/webapp/WEB-INF/web.xml
+++ b/samples/guess/src/main/webapp/WEB-INF/web.xml
@@ -30,7 +30,7 @@ under the License.
<servlet>
<servlet-name>Faces Servlet</servlet-name>
- <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
@@ -39,7 +39,7 @@ under the License.
</servlet-mapping>
<context-param>
- <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+ <param-name>jakarta.faces.DEFAULT_SUFFIX</param-name>
<param-value>.xhtml</param-value>
</context-param>
diff --git
a/samples/jsf2sample/src/main/java/org/apache/webbeans/jsf2/HelloJsfBean.java
b/samples/jsf2sample/src/main/java/org/apache/webbeans/jsf2/HelloJsfBean.java
index 9e0b55ab7..9604d9265 100644
---
a/samples/jsf2sample/src/main/java/org/apache/webbeans/jsf2/HelloJsfBean.java
+++
b/samples/jsf2sample/src/main/java/org/apache/webbeans/jsf2/HelloJsfBean.java
@@ -19,9 +19,9 @@
package org.apache.webbeans.jsf2;
import jakarta.enterprise.context.RequestScoped;
-import javax.faces.event.AbortProcessingException;
-import javax.faces.event.ActionEvent;
-import javax.faces.event.ActionListener;
+import jakarta.faces.event.AbortProcessingException;
+import jakarta.faces.event.ActionEvent;
+import jakarta.faces.event.ActionListener;
import jakarta.inject.Inject;
import jakarta.inject.Named;
diff --git a/samples/jsf2sample/src/main/webapp/WEB-INF/web.xml
b/samples/jsf2sample/src/main/webapp/WEB-INF/web.xml
index f2ec2e373..e80309121 100644
--- a/samples/jsf2sample/src/main/webapp/WEB-INF/web.xml
+++ b/samples/jsf2sample/src/main/webapp/WEB-INF/web.xml
@@ -19,7 +19,7 @@
version="2.5">
<context-param>
- <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+ <param-name>jakarta.faces.DEFAULT_SUFFIX</param-name>
<param-value>.xhtml</param-value>
</context-param>
@@ -30,7 +30,7 @@
<servlet>
<servlet-name>Faces Servlet</servlet-name>
- <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
diff --git a/samples/jsf2sample/src/main/webapp/conversation.xhtml
b/samples/jsf2sample/src/main/webapp/conversation.xhtml
index 32bc71db6..30695e9e4 100644
--- a/samples/jsf2sample/src/main/webapp/conversation.xhtml
+++ b/samples/jsf2sample/src/main/webapp/conversation.xhtml
@@ -37,7 +37,7 @@
<h:form id="form">
- <h:outputScript name="jsf.js" library="javax.faces"
target="body"></h:outputScript>
+ <h:outputScript name="jsf.js" library="jakarta.faces"
target="body"></h:outputScript>
<div>
<h:outputText value="Current Number : " style="color:red;"/>
diff --git a/samples/jsf2sample/src/main/webapp/counter.xhtml
b/samples/jsf2sample/src/main/webapp/counter.xhtml
index ec7851a8d..9635da57e 100644
--- a/samples/jsf2sample/src/main/webapp/counter.xhtml
+++ b/samples/jsf2sample/src/main/webapp/counter.xhtml
@@ -26,7 +26,7 @@
<h:form id="form">
- <h:outputScript name="jsf.js" library="javax.faces"
target="body"></h:outputScript>
+ <h:outputScript name="jsf.js" library="jakarta.faces"
target="body"></h:outputScript>
<div>
<h:commandButton id="button1" value="Count..."
actionListener="#{helloBean.processAction}"
diff --git
a/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminListBean.java
b/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminListBean.java
index 95878b2e6..f736432b2 100644
---
a/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminListBean.java
+++
b/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminListBean.java
@@ -26,7 +26,7 @@ import jakarta.enterprise.context.SessionScoped;
import jakarta.enterprise.inject.Default;
import jakarta.inject.Inject;
import jakarta.inject.Named;
-import javax.faces.component.html.HtmlDataTable;
+import jakarta.faces.component.html.HtmlDataTable;
import org.apache.webbeans.reservation.controller.admin.AdminController;
import org.apache.webbeans.reservation.entity.Hotel;
diff --git
a/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminListUser.java
b/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminListUser.java
index 187f4160e..a2e4e9784 100644
---
a/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminListUser.java
+++
b/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminListUser.java
@@ -27,7 +27,7 @@ import jakarta.enterprise.context.RequestScoped;
import jakarta.enterprise.inject.Default;
import jakarta.inject.Inject;
import jakarta.inject.Named;
-import javax.faces.component.html.HtmlDataTable;
+import jakarta.faces.component.html.HtmlDataTable;
import org.apache.webbeans.reservation.controller.admin.AdminController;
import org.apache.webbeans.reservation.entity.Hotel;
diff --git
a/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserListBean.java
b/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserListBean.java
index 6bfe45255..af819a410 100644
---
a/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserListBean.java
+++
b/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserListBean.java
@@ -25,7 +25,7 @@ import jakarta.enterprise.context.RequestScoped;
import jakarta.enterprise.inject.Default;
import jakarta.inject.Inject;
import jakarta.inject.Named;
-import javax.faces.component.html.HtmlDataTable;
+import jakarta.faces.component.html.HtmlDataTable;
import org.apache.webbeans.reservation.controller.user.UserController;
import org.apache.webbeans.reservation.entity.Reservation;
diff --git
a/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserReservationBean.java
b/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserReservationBean.java
index 66c24576e..61b113733 100644
---
a/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserReservationBean.java
+++
b/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserReservationBean.java
@@ -31,8 +31,8 @@ import jakarta.enterprise.context.ConversationScoped;
import jakarta.enterprise.inject.Default;
import jakarta.inject.Inject;
import jakarta.inject.Named;
-import javax.faces.component.html.HtmlDataTable;
-import javax.faces.model.SelectItem;
+import jakarta.faces.component.html.HtmlDataTable;
+import jakarta.faces.model.SelectItem;
import org.apache.webbeans.reservation.controller.admin.AdminController;
import org.apache.webbeans.reservation.controller.user.UserController;
diff --git
a/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/user/UserController.java
b/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/user/UserController.java
index a0837c1aa..752ccd699 100644
---
a/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/user/UserController.java
+++
b/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/user/UserController.java
@@ -26,7 +26,7 @@ import java.util.Set;
import jakarta.annotation.PostConstruct;
import jakarta.annotation.PreDestroy;
import jakarta.enterprise.context.RequestScoped;
-import javax.faces.model.SelectItem;
+import jakarta.faces.model.SelectItem;
import jakarta.inject.Inject;
import javax.persistence.EntityManager;
diff --git
a/samples/reservation/src/main/java/org/apache/webbeans/reservation/model/ReservationModel.java
b/samples/reservation/src/main/java/org/apache/webbeans/reservation/model/ReservationModel.java
index dce75b275..e0a51e7d8 100644
---
a/samples/reservation/src/main/java/org/apache/webbeans/reservation/model/ReservationModel.java
+++
b/samples/reservation/src/main/java/org/apache/webbeans/reservation/model/ReservationModel.java
@@ -20,7 +20,7 @@ package org.apache.webbeans.reservation.model;
import java.util.Date;
-import javax.faces.model.SelectItem;
+import jakarta.faces.model.SelectItem;
public class ReservationModel
{
diff --git
a/samples/reservation/src/main/java/org/apache/webbeans/reservation/security/JSFSecurityPhaseListener.java
b/samples/reservation/src/main/java/org/apache/webbeans/reservation/security/JSFSecurityPhaseListener.java
index 8380daf44..cf8881e6b 100644
---
a/samples/reservation/src/main/java/org/apache/webbeans/reservation/security/JSFSecurityPhaseListener.java
+++
b/samples/reservation/src/main/java/org/apache/webbeans/reservation/security/JSFSecurityPhaseListener.java
@@ -20,10 +20,10 @@ package org.apache.webbeans.reservation.security;
import java.io.IOException;
-import javax.faces.context.FacesContext;
-import javax.faces.event.PhaseEvent;
-import javax.faces.event.PhaseId;
-import javax.faces.event.PhaseListener;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.PhaseEvent;
+import jakarta.faces.event.PhaseId;
+import jakarta.faces.event.PhaseListener;
import org.apache.webbeans.reservation.entity.User;
import org.apache.webbeans.reservation.session.SessionTracker;
diff --git
a/samples/reservation/src/main/java/org/apache/webbeans/reservation/util/JSFUtility.java
b/samples/reservation/src/main/java/org/apache/webbeans/reservation/util/JSFUtility.java
index e5430ec73..ffde6dbac 100644
---
a/samples/reservation/src/main/java/org/apache/webbeans/reservation/util/JSFUtility.java
+++
b/samples/reservation/src/main/java/org/apache/webbeans/reservation/util/JSFUtility.java
@@ -18,9 +18,9 @@
*/
package org.apache.webbeans.reservation.util;
-import javax.faces.application.FacesMessage;
-import javax.faces.application.FacesMessage.Severity;
-import javax.faces.context.FacesContext;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.application.FacesMessage.Severity;
+import jakarta.faces.context.FacesContext;
import jakarta.servlet.http.HttpSession;
/**
diff --git a/samples/reservation/src/main/webapp/WEB-INF/web.xml
b/samples/reservation/src/main/webapp/WEB-INF/web.xml
index 0513dcc8c..9873afa15 100644
--- a/samples/reservation/src/main/webapp/WEB-INF/web.xml
+++ b/samples/reservation/src/main/webapp/WEB-INF/web.xml
@@ -23,13 +23,13 @@ under the License.
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";>
<display-name>guess</display-name>
<context-param>
- <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+ <param-name>jakarta.faces.DEFAULT_SUFFIX</param-name>
<param-value>.xhtml</param-value>
</context-param>
<servlet>
<servlet-name>Faces Servlet</servlet-name>
- <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
diff --git a/webbeans-jsf/pom.xml b/webbeans-jsf/pom.xml
index 92117752d..0cff98803 100644
--- a/webbeans-jsf/pom.xml
+++ b/webbeans-jsf/pom.xml
@@ -29,53 +29,55 @@
<dependencies>
<dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-impl</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-web</artifactId>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
</dependency>
-
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>
-
<dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <optional>true</optional>
+ <groupId>jakarta.interceptor</groupId>
+ <artifactId>jakarta.interceptor-api</artifactId>
</dependency>
-
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-el_2.2_spec</artifactId>
- <scope>provided</scope>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
</dependency>
-
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <scope>provided</scope>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
</dependency>
<dependency>
- <groupId>jakarta.enterprise</groupId>
- <artifactId>jakarta.enterprise.cdi-api</artifactId>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-spi</artifactId>
+ <optional>true</optional>
</dependency>
-
<dependency>
- <groupId>jakarta.inject</groupId>
- <artifactId>jakarta.inject-api</artifactId>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-impl</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-spi</artifactId>
+ <artifactId>openwebbeans-web</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+
</dependencies>
<build>
@@ -88,7 +90,7 @@
<Import-Package>
jakarta.servlet.*;version="[${osgi.servlet.range},5)",
jakarta.el.*;version="[${osgi.el.range},3)",
- javax.faces.*;version="[${osgi.faces.range},3)",
+ jakarta.faces.*;version="[${osgi.faces.range},3)",
*
</Import-Package>
</instructions>
diff --git
a/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/ConversationAwareViewHandler.java
b/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/ConversationAwareViewHandler.java
index 29c844666..3a0031989 100644
---
a/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/ConversationAwareViewHandler.java
+++
b/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/ConversationAwareViewHandler.java
@@ -23,9 +23,9 @@ import java.util.Map;
import jakarta.enterprise.context.ContextNotActiveException;
import jakarta.enterprise.context.Conversation;
-import javax.faces.application.ViewHandler;
-import javax.faces.application.ViewHandlerWrapper;
-import javax.faces.context.FacesContext;
+import jakarta.faces.application.ViewHandler;
+import jakarta.faces.application.ViewHandlerWrapper;
+import jakarta.faces.context.FacesContext;
import org.apache.webbeans.config.WebBeansContext;
diff --git a/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/JSFUtil.java
b/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/JSFUtil.java
index 555265cee..88be8a0aa 100644
--- a/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/JSFUtil.java
+++ b/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/JSFUtil.java
@@ -18,9 +18,9 @@
*/
package org.apache.webbeans.jsf;
-import javax.faces.component.UIViewRoot;
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
+import jakarta.faces.component.UIViewRoot;
+import jakarta.faces.context.ExternalContext;
+import jakarta.faces.context.FacesContext;
import jakarta.servlet.http.HttpSession;
import org.apache.webbeans.util.Asserts;
diff --git
a/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/OwbApplication.java
b/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/OwbApplication.java
index 03a32b5d4..e308dbcfa 100644
--- a/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/OwbApplication.java
+++ b/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/OwbApplication.java
@@ -19,8 +19,8 @@
package org.apache.webbeans.jsf;
import jakarta.el.ExpressionFactory;
-import javax.faces.application.Application;
-import javax.faces.application.ApplicationWrapper;
+import jakarta.faces.application.Application;
+import jakarta.faces.application.ApplicationWrapper;
import org.apache.webbeans.config.WebBeansContext;
@@ -37,7 +37,7 @@ public class OwbApplication extends ApplicationWrapper
/* (non-Javadoc)
- * @see javax.faces.application.Application#getExpressionFactory()
+ * @see jakarta.faces.application.Application#getExpressionFactory()
*/
@Override
public ExpressionFactory getExpressionFactory()
diff --git
a/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/OwbApplicationFactory.java
b/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/OwbApplicationFactory.java
index 95900015f..ba0d10d3f 100644
---
a/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/OwbApplicationFactory.java
+++
b/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/OwbApplicationFactory.java
@@ -20,8 +20,8 @@ package org.apache.webbeans.jsf;
import org.apache.webbeans.config.WebBeansContext;
-import javax.faces.application.Application;
-import javax.faces.application.ApplicationFactory;
+import jakarta.faces.application.Application;
+import jakarta.faces.application.ApplicationFactory;
public class OwbApplicationFactory extends ApplicationFactory
{
@@ -65,7 +65,7 @@ public class OwbApplicationFactory extends ApplicationFactory
}
/* (non-Javadoc)
- * @see javax.faces.application.ApplicationFactory#getWrapped()
+ * @see jakarta.faces.application.ApplicationFactory#getWrapped()
*/
@Override
public ApplicationFactory getWrapped()
diff --git
a/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/OwbExceptionHandler.java
b/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/OwbExceptionHandler.java
index dc687d230..ab6f8a83b 100644
---
a/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/OwbExceptionHandler.java
+++
b/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/OwbExceptionHandler.java
@@ -19,11 +19,11 @@
package org.apache.webbeans.jsf;
import jakarta.enterprise.context.NonexistentConversationException;
-import javax.faces.FacesException;
-import javax.faces.context.ExceptionHandler;
-import javax.faces.context.ExceptionHandlerWrapper;
-import javax.faces.event.ExceptionQueuedEvent;
-import javax.faces.event.ExceptionQueuedEventContext;
+import jakarta.faces.FacesException;
+import jakarta.faces.context.ExceptionHandler;
+import jakarta.faces.context.ExceptionHandlerWrapper;
+import jakarta.faces.event.ExceptionQueuedEvent;
+import jakarta.faces.event.ExceptionQueuedEventContext;
import java.util.Iterator;
public class OwbExceptionHandler extends ExceptionHandlerWrapper
diff --git
a/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/OwbExceptionHandlerFactory.java
b/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/OwbExceptionHandlerFactory.java
index 180725e90..ee67e3687 100644
---
a/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/OwbExceptionHandlerFactory.java
+++
b/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/OwbExceptionHandlerFactory.java
@@ -18,8 +18,8 @@
*/
package org.apache.webbeans.jsf;
-import javax.faces.context.ExceptionHandler;
-import javax.faces.context.ExceptionHandlerFactory;
+import jakarta.faces.context.ExceptionHandler;
+import jakarta.faces.context.ExceptionHandlerFactory;
public class OwbExceptionHandlerFactory extends ExceptionHandlerFactory
{
diff --git a/webbeans-porting/pom.xml b/webbeans-porting/pom.xml
index 68a54061b..2b3b2a1c6 100644
--- a/webbeans-porting/pom.xml
+++ b/webbeans-porting/pom.xml
@@ -112,7 +112,7 @@
<artifactId>cdi-api</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.faces</groupId>
+ <groupId>jakarta.faces</groupId>
<artifactId>jsf-api</artifactId>
</exclusion>
<exclusion>
diff --git a/webbeans-tck-jakarta/dev-suite.xml
b/webbeans-tck-jakarta/dev-suite.xml
deleted file mode 100644
index 97798d058..000000000
--- a/webbeans-tck-jakarta/dev-suite.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"; >
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version
- 2.0 (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0 Unless required by
- applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- CONDITIONS OF ANY KIND, either express or implied. See the License for
- the specific language governing permissions and limitations under the
- License.
--->
-<suite name="JSR-346-TCK" verbose="2" configfailurepolicy="continue">
- <test name="JSR-346 TCK">
- <classes>
- <class
name="org.jboss.cdi.tck.tests.extensions.beanDiscovery.event.ordering.LifecycleEventOrderingTest"
/>
- <!--
-
- <class
name="org.jboss.cdi.tck.tests.event.parameterized.ParameterizedEventTest" />
- <class name="org.jboss.cdi.tck.tests.event.fires.FireEventTest" />
- -->
- </classes>
- <groups>
- <run>
- <exclude name="integration"/>
- <exclude name="javaee-full"/>
- </run>
- </groups>
- </test>
- <listeners>
- <listener
class-name="org.jboss.cdi.tck.impl.testng.SingleTestClassMethodInterceptor"/>
- <listener
class-name="org.jboss.cdi.tck.impl.testng.ProgressLoggingTestListener"/>
- </listeners>
-</suite>
diff --git a/webbeans-tck-jakarta/pom.xml b/webbeans-tck-jakarta/pom.xml
deleted file mode 100644
index 3605ad33a..000000000
--- a/webbeans-tck-jakarta/pom.xml
+++ /dev/null
@@ -1,363 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>openwebbeans-tck-jakarta</artifactId>
- <name>CDI TCK runner (Jakarta)</name>
- <packaging>jar</packaging>
- <description>All TCK tests for the Apache OpenWebBeans Implementation for
Jakarta flavor</description>
-
- <properties>
- <tomcat-jakarta.version>10.0.21</tomcat-jakarta.version>
- <testng-suite>standalone</testng-suite> <!-- -Dtestng-suite=dev while
working on TCK -->
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.jboss.arquillian</groupId>
- <artifactId>arquillian-bom</artifactId>
- <version>${arquillian.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.2_spec</artifactId>
- <version>${geronimo_interceptor.version}</version>
- <classifier>jakarta</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.3_spec</artifactId>
- <version>${geronimo_annotation.version}</version>
- <classifier>jakarta</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>${geronimo_atinject.version}</version>
- <classifier>jakarta</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-spi</artifactId>
- <version>${project.version}</version>
- <classifier>jakarta</classifier>
- <exclusions>
- <exclusion>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-impl</artifactId>
- <version>${project.version}</version>
- <classifier>jakarta</classifier>
- <exclusions>
- <exclusion>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency> <!-- bring conversation service tck impl -->
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-tck</artifactId>
- <version>${project.version}</version>
- <classifier>jakarta</classifier>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-finder-shaded</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>6.14.3</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-ejb</artifactId>
- <version>${project.version}</version>
- <classifier>jakarta</classifier>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-el22</artifactId>
- <version>${project.version}</version>
- <classifier>jakarta</classifier>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_2.0_spec</artifactId>
- <version>${geronimo_cdi.version}</version>
- <classifier>jakarta</classifier>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.1_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>jakarta.enterprise</groupId>
- <artifactId>cdi-tck-impl</artifactId>
- <version>3.0.3</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>
- <!-- not yet G jakarta jars
- <exclusion>
- <groupId>jakarta.ejb</groupId>
- <artifactId>jakarta.ejb-api</artifactId>
- </exclusion>
- <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>
- </dependencies>
-
- <profiles>
- <profile>
- <id>tck</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-porting</artifactId>
- <version>${project.version}</version>
- <classifier>jakarta</classifier>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.openwebbeans.arquillian</groupId>
- <artifactId>owb-arquillian-standalone</artifactId>
- <version>${project.version}</version>
- <classifier>jakarta</classifier>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.arquillian.testenricher</groupId>
- <artifactId>arquillian-testenricher-cdi-jakarta</artifactId>
- <version>1.7.0.Alpha1</version>
- </dependency>
-
- <dependency>
- <!-- arquillian dependency hell hitting us again... -->
- <groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-container-test-impl-base</artifactId>
- <version>${arquillian.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-jsp-api</artifactId>
- <version>${tomcat-jakarta.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-el-api</artifactId>
- <version>${tomcat-jakarta.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-servlet-api</artifactId>
- <version>${tomcat-jakarta.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-jasper-el</artifactId>
- <version>${tomcat-jakarta.version}</version>
- <scope>test</scope>
- </dependency>
- <!--
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <scope>test</scope>
- </dependency>
- -->
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <trimStackTrace>false</trimStackTrace>
- <excludedGroups>integration,javaee-full</excludedGroups>
- <suiteXmlFiles>
- <suiteXmlFile>${testng-suite}-suite.xml</suiteXmlFile>
- </suiteXmlFiles>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-tck</id>
- <phase>generate-test-sources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
-
- <!-- OWB Porting Package -->
- <artifactItem>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-porting</artifactId>
- <classifier>jakarta</classifier>
- <overWrite>true</overWrite>
-
<outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
diff --git
a/webbeans-tck-jakarta/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
b/webbeans-tck-jakarta/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
deleted file mode 100644
index 4637dd826..000000000
---
a/webbeans-tck-jakarta/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-#Licensed to the Apache Software Foundation (ASF) under one
-#or more contributor license agreements. See the NOTICE file
-#distributed with this work for additional information
-#regarding copyright ownership. The ASF licenses this file
-#to you under the Apache License, Version 2.0 (the
-#"License"); you may not use this file except in compliance
-#with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-#Unless required by applicable law or agreed to in writing,
-#software distributed under the License is distributed on an
-#"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#KIND, either express or implied. See the License for the
-#specific language governing permissions and limitations
-#under the License.
-#---------------------------------------------------------------
-# The TCK configuration for OpenWebBeans
-#
-#---------------------------------------------------------------
-
-
-################################################################################################
-###################################### TCK CONFIGURATION SECTION
###############################
-################################################################################################
-
-# this is the tck configuration, thus it has a very high ordinal of 150
-configuration.ordinal=150
-
-org.apache.webbeans.application.supportsProducerInterception = false
-
-# enable verification of programmatic qualifiers
-org.apache.webbeans.strictDynamicValidation = true
-
-org.apache.webbeans.spi.ConversationService =
org.apache.openwebbeans.tck.conversation.TckConversationService
-org.apache.webbeans.application.supportsConversation=true
-
-
-# we have to switch back to the un-cached version of the normal scoping handler
-org.apache.webbeans.proxy.mapping.jakarta.enterprise.context.ApplicationScoped=org.apache.webbeans.intercept.NormalScopedBeanInterceptorHandler
-
-
-org.apache.webbeans.container.InjectionResolver.fastMatching = false
-
-# only
org.jboss.cdi.tck.tests.extensions.beanManager.beanAttributes.CreateBeanAttributesTest
currently
-# we can write an arquillian extension to avoid to set it globally
-org.apache.webbeans.service.DefaultInjectionPointService.implicitSupport =
false
diff --git
a/webbeans-tck-jakarta/src/test/resources/META-INF/cdi-tck.properties
b/webbeans-tck-jakarta/src/test/resources/META-INF/cdi-tck.properties
deleted file mode 100644
index e01925a80..000000000
--- a/webbeans-tck-jakarta/src/test/resources/META-INF/cdi-tck.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-org.jboss.cdi.tck.libraryDirectory=target/dependency/lib
-org.jboss.cdi.tck.testDataSource=java\:default
-org.jboss.cdi.tck.testJmsConnectionFactory=java\:default
-org.jboss.cdi.tck.testJmsQueue=java\:default
-org.jboss.cdi.tck.testJmsTopic=java\:default
-org.jboss.cdi.tck.spi.Beans=org.apache.webbeans.test.tck.BeansImpl
-org.jboss.cdi.tck.spi.Contexts=org.apache.webbeans.test.tck.ContextsImpl
-org.jboss.cdi.tck.spi.EL=org.apache.webbeans.test.tck.ELImpl
diff --git a/webbeans-tck-jakarta/standalone-suite.xml
b/webbeans-tck-jakarta/standalone-suite.xml
deleted file mode 100644
index 208b02a97..000000000
--- a/webbeans-tck-jakarta/standalone-suite.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"; >
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version
- 2.0 (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0 Unless required by
- applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- CONDITIONS OF ANY KIND, either express or implied. See the License for
- the specific language governing permissions and limitations under the
- License.
--->
-<suite name="JSR-346-TCK" verbose="2" configfailurepolicy="continue" >
-
- <listeners>
- <!-- Required - avoid randomly mixed test method execution -->
- <listener
class-name="org.jboss.cdi.tck.impl.testng.SingleTestClassMethodInterceptor"/>
- <!-- Optional - intended for debug purpose only -->
- <listener
class-name="org.jboss.cdi.tck.impl.testng.ConfigurationLoggingListener"/>
- <listener
class-name="org.jboss.cdi.tck.impl.testng.ProgressLoggingTestListener"/>
- <!-- Optional - it's recommended to disable the default JUnit XML
reporter -->
- <!-- this is slow, activate locally if needed
- <listener class-name="org.testng.reporters.SuiteHTMLReporter"/>
- <listener class-name="org.testng.reporters.FailedReporter"/>
- <listener class-name="org.testng.reporters.XMLReporter"/>
- <listener class-name="org.testng.reporters.EmailableReporter"/>
- <listener class-name="org.testng.reporters.TestHTMLReporter"/>
- -->
- </listeners>
-
- <test name="JSR-346 TCK">
- <groups>
- <run>
- <exclude name="integration" />
- <exclude name="javaee-full" />
- </run>
- </groups>
-
-
- <packages>
- <package name="org.jboss.cdi.tck.tests.*">
-
- <!--X TODO OWB-1182 CDI 2.0 exlcuded for now - current focus
on ee -->
- <exclude name="org.jboss.cdi.tck.tests.se.*" />
- </package>
-
- <package name="org.jboss.cdi.tck.interceptors.tests.*"/>
-
- </packages>
-
-
- <classes>
-
- <!-- Tests broken in the CDI-2.0 TCK: -->
-
- <!-- https://issues.jboss.org/projects/CDITCK/issues/CDITCK-576 -->
- <class
name="org.jboss.cdi.tck.tests.context.passivating.dependency.builtin.BuiltinBeanPassivationDependencyTest">
- <methods>
- <exclude name="testInjectionPoint"/>
- </methods>
- </class>
-
- <!-- https://issues.jboss.org/browse/CDITCK-577 -->
- <class
name="org.jboss.cdi.tck.tests.definition.bean.BeanDefinitionTest">
- <methods>
- <exclude name="testRawBeanTypes"/>
- </methods>
- </class>
-
- <!-- https://issues.jboss.org/browse/CDITCK-432 -->
- <class
name="org.jboss.cdi.tck.tests.decorators.builtin.event.complex.ComplexEventDecoratorTest">
- <methods><exclude name=".*"/></methods>
- </class>
-
- <!-- https://issues.jboss.org/browse/CDITCK-578,
https://issues.jboss.org/browse/CDITCK-579 -->
- <class
name="org.jboss.cdi.tck.tests.definition.bean.custom.CustomBeanImplementationTest">
- <methods>
- <exclude name="testCustomBeanIsPassivationCapable"/>
- <exclude
name="testCustomBeanIsPassivationCapableDependency"/>
- <exclude
name="testInjectionPointGetMemberIsUsedToDetermineTheClassThatDeclaresAnInjectionPoint"/>
- </methods>
- </class>
-
- <!-- this tests Weld specific internals -->
- <class
name="org.jboss.cdi.tck.tests.definition.bean.types.illegal.BeanTypesWithIllegalTypeTest">
- <methods><exclude name=".*"/></methods>
- </class>
-
- <!-- https://issues.jboss.org/browse/CDITCK-580 -->
- <class
name="org.jboss.cdi.tck.tests.inheritance.specialization.simple.SimpleBeanSpecializationTest">
- <methods><exclude name=".*"/></methods>
- </class>
-
- <!-- https://issues.jboss.org/browse/CDI-498 dots in EL names are
not allowed by the EL spec. -->
- <class
name="org.jboss.cdi.tck.tests.lookup.el.ResolutionByNameTest">
- <methods><exclude
name="testBeanNameWithSeparatedListOfELIdentifiers"/></methods>
- </class>
-
- <!-- OWB provides a bit more for @New than CDI requires
- https://issues.jboss.org/browse/CDITCK-581
- -->
- <class
name="org.jboss.cdi.tck.tests.lookup.dynamic.DynamicLookupTest">
- <methods>
- <exclude name="testNewBeanNotEnabledWithouInjectionPoint"/>
- <exclude name="testDuplicateBindingsThrowsException"/>
- </methods>
- </class>
-
- <!-- https://issues.jboss.org/browse/CDITCK-582 -->
- <class
name="org.jboss.cdi.tck.tests.deployment.discovery.BeanDiscoveryTest">
- <methods><exclude name=".*"/></methods>
- </class>
-
- <!-- https://issues.jboss.org/browse/CDITCK-586 -->
- <class
name="org.jboss.cdi.tck.tests.event.observer.async.basic.MixedObserversTest">
- <methods><exclude
name="testAsyncObserversCalledInDifferentThread"/></methods>
- </class>
-
- <!-- https://issues.jboss.org/browse/CDITCK-588 equals on
AnnotatedType -->
- <!-- https://issues.jboss.org/browse/CDITCK-589 because the ct
predicate ends up randomly removing from the wrong ct -->
- <class
name="org.jboss.cdi.tck.tests.extensions.configurators.annotatedTypeConfigurator.AnnotatedTypeConfiguratorTest">
- <methods><exclude name=".*"/></methods>
- </class>
-
- <!-- https://issues.jboss.org/browse/CDITCK-573 should be solved
with tck 2.0.1.Final -->
- <class
name="org.jboss.cdi.tck.tests.extensions.configurators.bean.BeanConfiguratorTest">
- <methods><exclude name=".*"/></methods>
- </class>
-
- <!-- https://issues.jboss.org/browse/CDITCK-591 -->
- <class
name="org.jboss.cdi.tck.tests.extensions.alternative.metadata.AlternativeMetadataTest">
- <methods><exclude name=".*"/></methods>
- </class>
-
- <!-- https://issues.jboss.org/browse/CDI-581 , both tests...-->
- <class
name="org.jboss.cdi.tck.tests.extensions.lifecycle.processBeanAttributes.specialization.VetoTest">
- <methods><exclude name=".*"/></methods>
- </class>
- <class
name="org.jboss.cdi.tck.tests.extensions.lifecycle.processBeanAttributes.specialization.SpecializationTest">
- <methods><exclude name=".*"/></methods>
- </class>
-
- <!-- CDITCK-466 -->
- <class
name="org.jboss.cdi.tck.tests.extensions.lifecycle.bbd.broken.passivatingScope.AddingPassivatingScopeTest">
- <methods>
- <exclude name=".*"/>
- </methods>
- </class>
-
- <!-- https://issues.redhat.com/browse/CDITCK-590 -->
- <class
name="org.jboss.cdi.tck.tests.extensions.beanDiscovery.event.ordering.LifecycleEventOrderingTest">
- <methods>
- <exclude name=".*"/>
- </methods>
- </class>
- </classes>
-
-
- </test>
-
-</suite>
