Merge pull request #668 from istudens/WFLY-17825

[WFLY-17825] replaced legacy arquillian-protocol-servlet dependency w…
wildfly · Apr 26, 2023 · 1ab1ff4 · 1ab1ff4
2 parents 450312d + c903cc6
commit 1ab1ff4
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 12 deletions.
diff --git a/cmt/pom.xml b/cmt/pom.xml
@@ -187,7 +187,7 @@
         </dependency>
         <dependency>
             <groupId>org.jboss.arquillian.protocol</groupId>
-            <artifactId>arquillian-protocol-servlet</artifactId>
+            <artifactId>arquillian-protocol-servlet-jakarta</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/contacts-jquerymobile/functional-tests/pom.xml b/contacts-jquerymobile/functional-tests/pom.xml
@@ -124,7 +124,7 @@
 
         <dependency>
             <groupId>org.jboss.arquillian.protocol</groupId>
-            <artifactId>arquillian-protocol-servlet</artifactId>
+            <artifactId>arquillian-protocol-servlet-jakarta</artifactId>
             <scope>test</scope>
         </dependency>
 

diff --git a/contacts-jquerymobile/functional-tests/src/test/resources/arquillian.xml b/contacts-jquerymobile/functional-tests/src/test/resources/arquillian.xml
@@ -18,8 +18,6 @@
 <arquillian xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://jboss.org/schema/arquillian"
             xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
 
-    <defaultProtocol type="Servlet 3.0" />
-
     <!-- Example configuration for a managed JBoss EAP instance -->
     <container qualifier="jboss" default="true">
         <!-- By default, Arquillian will use the JBOSS_HOME environment variable to find the JBoss EAP installation.

diff --git a/ee-security/pom.xml b/ee-security/pom.xml
@@ -167,7 +167,7 @@
 
         <dependency>
             <groupId>org.jboss.arquillian.protocol</groupId>
-            <artifactId>arquillian-protocol-servlet</artifactId>
+            <artifactId>arquillian-protocol-servlet-jakarta</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/helloworld-ws/pom.xml b/helloworld-ws/pom.xml
@@ -147,7 +147,7 @@
         </dependency>
         <dependency>
             <groupId>org.jboss.arquillian.protocol</groupId>
-            <artifactId>arquillian-protocol-servlet</artifactId>
+            <artifactId>arquillian-protocol-servlet-jakarta</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/helloworld/pom.xml b/helloworld/pom.xml
@@ -162,7 +162,7 @@
         </dependency>
         <dependency>
             <groupId>org.jboss.arquillian.protocol</groupId>
-            <artifactId>arquillian-protocol-servlet</artifactId>
+            <artifactId>arquillian-protocol-servlet-jakarta</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/jaxrs-client/pom.xml b/jaxrs-client/pom.xml
@@ -185,7 +185,7 @@
 
         <dependency>
             <groupId>org.jboss.arquillian.protocol</groupId>
-            <artifactId>arquillian-protocol-servlet</artifactId>
+            <artifactId>arquillian-protocol-servlet-jakarta</artifactId>
             <scope>test</scope>
         </dependency>
 

diff --git a/kitchensink/pom.xml b/kitchensink/pom.xml
@@ -196,7 +196,7 @@
 
         <dependency>
             <groupId>org.jboss.arquillian.protocol</groupId>
-            <artifactId>arquillian-protocol-servlet</artifactId>
+            <artifactId>arquillian-protocol-servlet-jakarta</artifactId>
             <scope>test</scope>
         </dependency>
 

diff --git a/servlet-security/pom.xml b/servlet-security/pom.xml
@@ -168,7 +168,7 @@
 
         <dependency>
             <groupId>org.jboss.arquillian.protocol</groupId>
-            <artifactId>arquillian-protocol-servlet</artifactId>
+            <artifactId>arquillian-protocol-servlet-jakarta</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/tasks-jsf/pom.xml b/tasks-jsf/pom.xml
@@ -147,7 +147,7 @@
 
         <dependency>
             <groupId>org.jboss.arquillian.protocol</groupId>
-            <artifactId>arquillian-protocol-servlet</artifactId>
+            <artifactId>arquillian-protocol-servlet-jakarta</artifactId>
             <scope>test</scope>
         </dependency>
 

diff --git a/todo-backend/pom.xml b/todo-backend/pom.xml
@@ -160,7 +160,7 @@
         </dependency>
         <dependency>
             <groupId>org.jboss.arquillian.protocol</groupId>
-            <artifactId>arquillian-protocol-servlet</artifactId>
+            <artifactId>arquillian-protocol-servlet-jakarta</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>