From 9047020d425c867b50427fdf7803f8a6068038ae Mon Sep 17 00:00:00 2001
From: Jeff Mesnil <jmesnil@redhat.com>
Date: Mon, 26 Aug 2024 10:19:43 +0200
Subject: [PATCH] Upgrade to WildFly 33.0.1.Final

* temporary fix for org.jboss.arquillian.protocol:arquillian-protocol-servlet-jakarta

Signed-off-by: Jeff Mesnil <jmesnil@redhat.com>
---
 pom.xml                                             |  2 +-
 .../resources-filtered/archetype-resources/pom.xml  | 13 +++++++++----
 .../resources-filtered/archetype-resources/pom.xml  | 10 ++++++++++
 .../main/resources/archetype-resources/web/pom.xml  |  5 -----
 .../resources-filtered/archetype-resources/pom.xml  | 13 +++++++++----
 5 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index 651b63b..c3d356a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
         actually use these dependencies.
     -->
     <properties>
-        <version.wildfly.bom>33.0.0.Final</version.wildfly.bom>
+        <version.wildfly.bom>33.0.1.Final</version.wildfly.bom>
         <version.wildfly.core>25.0.1.Final</version.wildfly.core>
         <version.wildfly.maven.plugin>5.0.0.Final</version.wildfly.maven.plugin>
 
diff --git a/wildfly-getting-started-archetype/src/main/resources-filtered/archetype-resources/pom.xml b/wildfly-getting-started-archetype/src/main/resources-filtered/archetype-resources/pom.xml
index 11edddd..8cdcef5 100644
--- a/wildfly-getting-started-archetype/src/main/resources-filtered/archetype-resources/pom.xml
+++ b/wildfly-getting-started-archetype/src/main/resources-filtered/archetype-resources/pom.xml
@@ -162,11 +162,16 @@
         <dependency>
             <groupId>org.jboss.arquillian.junit5</groupId>
             <artifactId>arquillian-junit5-container</artifactId>
-            <!-- temporary overriding as the 1.8.1.Final version pulled by
-                 WildFly BOM does not work with JUnit 5
-                 https://github.com/arquillian/arquillian-core/issues/576
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jboss.arquillian.protocol</groupId>
+            <artifactId>arquillian-protocol-servlet-jakarta</artifactId>
+            <!-- temporary overriding as the 1.9.1.Final version pulled by
+                 WildFly BOM does not exist.
             -->
-            <version>1.9.1.Final</version>
+            <version>10.0.0.Final</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/wildfly-jakartaee-ear-archetype/src/main/resources-filtered/archetype-resources/pom.xml b/wildfly-jakartaee-ear-archetype/src/main/resources-filtered/archetype-resources/pom.xml
index 4dcbbf5..b30ac74 100644
--- a/wildfly-jakartaee-ear-archetype/src/main/resources-filtered/archetype-resources/pom.xml
+++ b/wildfly-jakartaee-ear-archetype/src/main/resources-filtered/archetype-resources/pom.xml
@@ -166,6 +166,16 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+
+            <dependency>
+                <groupId>org.jboss.arquillian.protocol</groupId>
+                <artifactId>arquillian-protocol-servlet-jakarta</artifactId>
+                <!-- temporary overriding as the 1.9.1.Final version pulled by
+                     WildFly BOM does not exist.
+                -->
+                <version>10.0.0.Final</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <build>
diff --git a/wildfly-jakartaee-ear-archetype/src/main/resources/archetype-resources/web/pom.xml b/wildfly-jakartaee-ear-archetype/src/main/resources/archetype-resources/web/pom.xml
index 7ccd4dd..6387a95 100644
--- a/wildfly-jakartaee-ear-archetype/src/main/resources/archetype-resources/web/pom.xml
+++ b/wildfly-jakartaee-ear-archetype/src/main/resources/archetype-resources/web/pom.xml
@@ -108,11 +108,6 @@
         <dependency>
             <groupId>org.jboss.arquillian.junit5</groupId>
             <artifactId>arquillian-junit5-container</artifactId>
-            <!-- temporary overriding as the 1.8.1.Final version pulled by
-                 WildFly BOM does not work with JUnit 5
-                 https://github.com/arquillian/arquillian-core/issues/576
-            -->
-            <version>1.9.1.Final</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/wildfly-jakartaee-webapp-archetype/src/main/resources-filtered/archetype-resources/pom.xml b/wildfly-jakartaee-webapp-archetype/src/main/resources-filtered/archetype-resources/pom.xml
index 65155f2..03c18f6 100644
--- a/wildfly-jakartaee-webapp-archetype/src/main/resources-filtered/archetype-resources/pom.xml
+++ b/wildfly-jakartaee-webapp-archetype/src/main/resources-filtered/archetype-resources/pom.xml
@@ -214,11 +214,16 @@
         <dependency>
             <groupId>org.jboss.arquillian.junit5</groupId>
             <artifactId>arquillian-junit5-container</artifactId>
-            <!-- temporary overriding as the 1.8.1.Final version pulled by
-                 WildFly BOM does not work with JUnit 5
-                 https://github.com/arquillian/arquillian-core/issues/576
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jboss.arquillian.protocol</groupId>
+            <artifactId>arquillian-protocol-servlet-jakarta</artifactId>
+            <!-- temporary overriding as the 1.9.1.Final version pulled by
+                 WildFly BOM does not exist.
             -->
-            <version>1.9.1.Final</version>
+            <version>10.0.0.Final</version>
             <scope>test</scope>
         </dependency>