From c903cc69825e2499183c77982da3afc8d184344c Mon Sep 17 00:00:00 2001
From: Ivo Studensky <istudens@redhat.com>
Date: Wed, 26 Apr 2023 13:27:08 +0200
Subject: [PATCH] [WFLY-17825] replaced legacy arquillian-protocol-servlet
 dependency with arquillian-protocol-servlet-jakarta

---
 cmt/pom.xml                                                     | 2 +-
 contacts-jquerymobile/functional-tests/pom.xml                  | 2 +-
 .../functional-tests/src/test/resources/arquillian.xml          | 2 --
 ee-security/pom.xml                                             | 2 +-
 helloworld-ws/pom.xml                                           | 2 +-
 helloworld/pom.xml                                              | 2 +-
 jaxrs-client/pom.xml                                            | 2 +-
 kitchensink/pom.xml                                             | 2 +-
 servlet-security/pom.xml                                        | 2 +-
 tasks-jsf/pom.xml                                               | 2 +-
 todo-backend/pom.xml                                            | 2 +-
 11 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/cmt/pom.xml b/cmt/pom.xml
index baf32004db..2ea6a39ba4 100644
--- 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
index 142d6bd5ea..7539cefcdb 100644
--- 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
index eda7b569f1..3fedbae0df 100644
--- 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
index 8ed5c41873..4a189ba27d 100644
--- 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
index c4b0586712..7a2a251bae 100644
--- 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
index b7c5d75320..750e123334 100644
--- 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
index 8e79b577d7..c513147585 100644
--- 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
index a54ca95e97..b5608efd06 100644
--- 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
index df9323c73f..e9c738837b 100644
--- 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
index 02127a0f64..29e4cce260 100644
--- 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
index 4272c272fb..85208f401a 100644
--- 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>