You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2021/11/29 13:06:16 UTC
[myfaces] branch master updated: fix integration tests
This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces.git
The following commit(s) were added to refs/heads/master by this push:
new 3f70dbf fix integration tests
3f70dbf is described below
commit 3f70dbf888720a19a750b706e16ba1438e46e816
Author: Thomas Andraschko <ta...@apache.org>
AuthorDate: Mon Nov 29 14:06:09 2021 +0100
fix integration tests
---
.../core/integrationtests/ajax/basic/TestBean.java | 4 +-
.../ajax/test1Protocol/JSF21Simulation.java | 8 +-
.../ajax/test1Protocol/ResponseMockup.java | 12 +--
.../ajax/test1Protocol/ResponseMockup22.java | 6 +-
.../responses/TableResponseMockups.java | 2 +-
.../ajax/src/main/webapp/WEB-INF/web.xml | 2 +-
.../core/integrationtests/IntegrationTestBean.java | 4 +-
.../src/main/webapp/WEB-INF/web.xml | 2 +-
.../core/integrationtests/IntegrationTestBean.java | 6 +-
.../exactMapping/src/main/webapp/WEB-INF/web.xml | 2 +-
.../src/main/webapp/WEB-INF/web.xml | 2 +-
.../src/main/webapp/WEB-INF/web.xml | 2 +-
integration-tests/pom.xml | 120 ++++-----------------
.../core/integrationtests/IntegrationTestBean.java | 4 +-
.../protectedViews/src/main/webapp/WEB-INF/web.xml | 2 +-
15 files changed, 48 insertions(+), 130 deletions(-)
diff --git a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/basic/TestBean.java b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/basic/TestBean.java
index efdeb4e..75937d9 100644
--- a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/basic/TestBean.java
+++ b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/basic/TestBean.java
@@ -18,9 +18,9 @@
*/
package org.apache.myfaces.core.integrationtests.ajax.basic;
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
import jakarta.faces.annotation.FacesConfig;
-import javax.inject.Named;
+import jakarta.inject.Named;
import static jakarta.faces.annotation.FacesConfig.Version.JSF_2_3;
diff --git a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/JSF21Simulation.java b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/JSF21Simulation.java
index cd87c7b..95a3faa 100644
--- a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/JSF21Simulation.java
+++ b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/JSF21Simulation.java
@@ -23,10 +23,10 @@ import org.apache.myfaces.core.integrationtests.ajax.test1Protocol.jsfxmlnodes.E
import org.apache.myfaces.core.integrationtests.ajax.test1Protocol.jsfxmlnodes.PartialResponse;
import org.apache.myfaces.core.integrationtests.ajax.test1Protocol.jsfxmlnodes.Update;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.PrintWriter;
diff --git a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/ResponseMockup.java b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/ResponseMockup.java
index 71257fa..545b166 100644
--- a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/ResponseMockup.java
+++ b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/ResponseMockup.java
@@ -21,10 +21,10 @@ package org.apache.myfaces.core.integrationtests.ajax.test1Protocol;
import org.apache.myfaces.core.integrationtests.ajax.test1Protocol.jsfxmlnodes.*;
import org.apache.myfaces.core.integrationtests.ajax.test1Protocol.responses.TableResponseMockups;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.*;
@@ -79,7 +79,7 @@ public class ResponseMockup extends HttpServlet {
*
* @param request servlet request
* @param response servlet response
- * @throws javax.servlet.ServletException if a servlet-specific error occurs
+ * @throws jakarta.servlet.ServletException if a servlet-specific error occurs
* @throws java.io.IOException if an I/O error occurs
*/
protected void processRequest(HttpServletRequest request, HttpServletResponse response)
@@ -332,7 +332,7 @@ public class ResponseMockup extends HttpServlet {
*
* @param request servlet request
* @param response servlet response
- * @throws javax.servlet.ServletException if a servlet-specific error occurs
+ * @throws jakarta.servlet.ServletException if a servlet-specific error occurs
* @throws java.io.IOException if an I/O error occurs
*/
@Override
diff --git a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/ResponseMockup22.java b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/ResponseMockup22.java
index b5a5963..71f526b 100644
--- a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/ResponseMockup22.java
+++ b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/ResponseMockup22.java
@@ -23,9 +23,9 @@ import org.apache.myfaces.core.integrationtests.ajax.test1Protocol.jsfxmlnodes.C
import org.apache.myfaces.core.integrationtests.ajax.test1Protocol.jsfxmlnodes.PartialResponse;
import org.apache.myfaces.core.integrationtests.ajax.test1Protocol.jsfxmlnodes.Update;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.PrintWriter;
diff --git a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/responses/TableResponseMockups.java b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/responses/TableResponseMockups.java
index 0f907c8..6e5e244 100644
--- a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/responses/TableResponseMockups.java
+++ b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/responses/TableResponseMockups.java
@@ -24,7 +24,7 @@ import org.apache.myfaces.core.integrationtests.ajax.test1Protocol.jsfxmlnodes.I
import org.apache.myfaces.core.integrationtests.ajax.test1Protocol.jsfxmlnodes.PartialResponse;
import org.apache.myfaces.core.integrationtests.ajax.test1Protocol.jsfxmlnodes.Update;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.io.PrintWriter;
/**
diff --git a/integration-tests/ajax/src/main/webapp/WEB-INF/web.xml b/integration-tests/ajax/src/main/webapp/WEB-INF/web.xml
index 1315fa7..26a4727 100644
--- a/integration-tests/ajax/src/main/webapp/WEB-INF/web.xml
+++ b/integration-tests/ajax/src/main/webapp/WEB-INF/web.xml
@@ -37,7 +37,7 @@
<listener>
- <listener-class>org.apache.webbeans.servlet.WebBeansConfigurationListener</listener-class>
+ <listener-class>org.jboss.weld.environment.servlet.Listener</listener-class>
</listener>
<listener>
<listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
diff --git a/integration-tests/autoLookupExpressionFactoryWithoutJSP/src/main/java/org/apache/myfaces/core/integrationtests/IntegrationTestBean.java b/integration-tests/autoLookupExpressionFactoryWithoutJSP/src/main/java/org/apache/myfaces/core/integrationtests/IntegrationTestBean.java
index c5a50c0..4970fde 100644
--- a/integration-tests/autoLookupExpressionFactoryWithoutJSP/src/main/java/org/apache/myfaces/core/integrationtests/IntegrationTestBean.java
+++ b/integration-tests/autoLookupExpressionFactoryWithoutJSP/src/main/java/org/apache/myfaces/core/integrationtests/IntegrationTestBean.java
@@ -20,9 +20,9 @@ package org.apache.myfaces.core.integrationtests;
import static jakarta.faces.annotation.FacesConfig.Version.JSF_2_3;
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
import jakarta.faces.annotation.FacesConfig;
-import javax.inject.Named;
+import jakarta.inject.Named;
@FacesConfig(version = JSF_2_3)
@Named
diff --git a/integration-tests/autoLookupExpressionFactoryWithoutJSP/src/main/webapp/WEB-INF/web.xml b/integration-tests/autoLookupExpressionFactoryWithoutJSP/src/main/webapp/WEB-INF/web.xml
index a9865fc..9e8d880 100644
--- a/integration-tests/autoLookupExpressionFactoryWithoutJSP/src/main/webapp/WEB-INF/web.xml
+++ b/integration-tests/autoLookupExpressionFactoryWithoutJSP/src/main/webapp/WEB-INF/web.xml
@@ -36,7 +36,7 @@
</context-param>
<listener>
- <listener-class>org.apache.webbeans.servlet.WebBeansConfigurationListener</listener-class>
+ <listener-class>org.jboss.weld.environment.servlet.Listener</listener-class>
</listener>
<listener>
<listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
diff --git a/integration-tests/exactMapping/src/main/java/org/apache/myfaces/core/integrationtests/IntegrationTestBean.java b/integration-tests/exactMapping/src/main/java/org/apache/myfaces/core/integrationtests/IntegrationTestBean.java
index a218680..f70f1b6 100644
--- a/integration-tests/exactMapping/src/main/java/org/apache/myfaces/core/integrationtests/IntegrationTestBean.java
+++ b/integration-tests/exactMapping/src/main/java/org/apache/myfaces/core/integrationtests/IntegrationTestBean.java
@@ -20,11 +20,11 @@ package org.apache.myfaces.core.integrationtests;
import static jakarta.faces.annotation.FacesConfig.Version.JSF_2_3;
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
import jakarta.faces.annotation.FacesConfig;
import jakarta.faces.context.FacesContext;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
@FacesConfig(version = JSF_2_3)
@Named
diff --git a/integration-tests/exactMapping/src/main/webapp/WEB-INF/web.xml b/integration-tests/exactMapping/src/main/webapp/WEB-INF/web.xml
index 8d455e0..eaa3b6d 100644
--- a/integration-tests/exactMapping/src/main/webapp/WEB-INF/web.xml
+++ b/integration-tests/exactMapping/src/main/webapp/WEB-INF/web.xml
@@ -37,7 +37,7 @@
</context-param>
<listener>
- <listener-class>org.apache.webbeans.servlet.WebBeansConfigurationListener</listener-class>
+ <listener-class>org.jboss.weld.environment.servlet.Listener</listener-class>
</listener>
<listener>
<listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
diff --git a/integration-tests/faceletToXhtmlMapping/src/main/webapp/WEB-INF/web.xml b/integration-tests/faceletToXhtmlMapping/src/main/webapp/WEB-INF/web.xml
index af6cf1e..b641264 100644
--- a/integration-tests/faceletToXhtmlMapping/src/main/webapp/WEB-INF/web.xml
+++ b/integration-tests/faceletToXhtmlMapping/src/main/webapp/WEB-INF/web.xml
@@ -32,7 +32,7 @@
</context-param>
<listener>
- <listener-class>org.apache.webbeans.servlet.WebBeansConfigurationListener</listener-class>
+ <listener-class>org.jboss.weld.environment.servlet.Listener</listener-class>
</listener>
<listener>
<listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
diff --git a/integration-tests/faceletToXhtmlMappingDisabled/src/main/webapp/WEB-INF/web.xml b/integration-tests/faceletToXhtmlMappingDisabled/src/main/webapp/WEB-INF/web.xml
index 58ec275..d0af9cd 100644
--- a/integration-tests/faceletToXhtmlMappingDisabled/src/main/webapp/WEB-INF/web.xml
+++ b/integration-tests/faceletToXhtmlMappingDisabled/src/main/webapp/WEB-INF/web.xml
@@ -37,7 +37,7 @@
</context-param>
<listener>
- <listener-class>org.apache.webbeans.servlet.WebBeansConfigurationListener</listener-class>
+ <listener-class>org.jboss.weld.environment.servlet.Listener</listener-class>
</listener>
<listener>
<listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 1a14dec..01db3c6 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -52,7 +52,7 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>9.4.11.v20180605</version>
+ <version>11.0.7</version>
<configuration>
<webAppConfig>
<contextPath>/</contextPath>
@@ -94,20 +94,20 @@
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
- <version>1.4.0.Final</version>
+ <version>1.7.0.Alpha10</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-bom</artifactId>
- <version>3.1.3</version>
+ <version>3.1.4</version>
<type>pom</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-depchain</artifactId>
- <version>3.1.3</version>
+ <version>3.1.4</version>
<type>pom</type>
<scope>test</scope>
</dependency>
@@ -119,13 +119,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>4.0.1</version>
- <scope>provided</scope>
- </dependency>
-
<!-- MyFaces -->
<dependency>
<groupId>org.apache.myfaces.core</groupId>
@@ -138,43 +131,16 @@
<version>${project.version}</version>
</dependency>
- <!-- CDI required APIs -->
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_2.0_spec</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.2_spec</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.3_spec</artifactId>
- <version>1.0</version>
- </dependency>
-
- <!-- CDI Impl -->
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-impl</artifactId>
- <version>2.0.9</version>
- </dependency>
<dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-web</artifactId>
- <version>2.0.9</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-jsf</artifactId>
- <version>2.0.9</version>
+ <groupId>org.jboss.weld.servlet</groupId>
+ <artifactId>weld-servlet-core</artifactId>
+ <version>4.0.2.Final</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
@@ -189,81 +155,33 @@
<profiles>
<profile>
- <id>tomcat-embedded-9</id>
+ <id>tomcat-embedded-10</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<dependencies>
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-tomcat-embedded-8</artifactId>
- <version>1.1.0.Final</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-core</artifactId>
- <version>9.0.31</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-jasper</artifactId>
- <version>9.0.31</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-websocket</artifactId>
- <version>9.0.31</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-logging-juli</artifactId>
- <version>9.0.0.M6</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jdt.core.compiler</groupId>
- <artifactId>ecj</artifactId>
- <version>4.6.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>tomcat-embedded-8</id>
- <dependencies>
- <dependency>
- <groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-tomcat-embedded-8</artifactId>
- <version>1.1.0.Final</version>
+ <artifactId>arquillian-tomcat-embedded-10</artifactId>
+ <version>1.2.0.Alpha1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
- <version>8.5.51</version>
+ <version>10.0.8</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-jasper</artifactId>
- <version>8.5.51</version>
+ <version>10.0.8</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-websocket</artifactId>
- <version>8.5.51</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-logging-juli</artifactId>
- <version>8.5.51</version>
+ <version>10.0.8</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/integration-tests/protectedViews/src/main/java/org/apache/myfaces/core/integrationtests/IntegrationTestBean.java b/integration-tests/protectedViews/src/main/java/org/apache/myfaces/core/integrationtests/IntegrationTestBean.java
index d63ed4d..711e346 100644
--- a/integration-tests/protectedViews/src/main/java/org/apache/myfaces/core/integrationtests/IntegrationTestBean.java
+++ b/integration-tests/protectedViews/src/main/java/org/apache/myfaces/core/integrationtests/IntegrationTestBean.java
@@ -20,9 +20,9 @@ package org.apache.myfaces.core.integrationtests;
import static jakarta.faces.annotation.FacesConfig.Version.JSF_2_3;
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
import jakarta.faces.annotation.FacesConfig;
-import javax.inject.Named;
+import jakarta.inject.Named;
@FacesConfig(version = JSF_2_3)
@Named
diff --git a/integration-tests/protectedViews/src/main/webapp/WEB-INF/web.xml b/integration-tests/protectedViews/src/main/webapp/WEB-INF/web.xml
index af6cf1e..b641264 100644
--- a/integration-tests/protectedViews/src/main/webapp/WEB-INF/web.xml
+++ b/integration-tests/protectedViews/src/main/webapp/WEB-INF/web.xml
@@ -32,7 +32,7 @@
</context-param>
<listener>
- <listener-class>org.apache.webbeans.servlet.WebBeansConfigurationListener</listener-class>
+ <listener-class>org.jboss.weld.environment.servlet.Listener</listener-class>
</listener>
<listener>
<listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>