From cc51183c45e7c360000043446ae7bbb94b6380a9 Mon Sep 17 00:00:00 2001
From: marko-bekhta <marko.prykladna@gmail.com>
Date: Mon, 9 Dec 2024 18:38:25 +0100
Subject: [PATCH 1/3] HV-2075 Upgrade to wildfly-arquillian-container-managed
 5.1.0.Beta9 for testing

to address issues with security manager on JDK 24
---
 pom.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9a81ff1f5e..b6bd3fa1f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,6 +134,7 @@
         <version.org.jboss.logging.jboss-logging-tools>3.0.3.Final</version.org.jboss.logging.jboss-logging-tools>
 
         <!-- Currently supported version of WildFly -->
+        <!-- Update JDK 24 configuration when changing this version: -->
         <version.wildfly>34.0.1.Final</version.wildfly>
         <!-- Used to create a patch file for the second version of WildFly we support -->
         <!--<version.wildfly.secondary>18.0.1.Final</version.wildfly.secondary>-->
@@ -165,8 +166,8 @@
             They should be aligned with the ones from the Wildfly version we support
             See http://search.maven.org/#search|gav|1|g%3A"org.wildfly"%20AND%20a%3A"wildfly-parent"
         -->
-        <version.org.jboss.weld.weld>6.0.0.Beta4</version.org.jboss.weld.weld>
-        <version.org.wildfly.arquillian>5.0.0.Alpha3</version.org.wildfly.arquillian>
+        <version.org.jboss.weld.weld>6.0.0.Final</version.org.jboss.weld.weld>
+        <version.org.wildfly.arquillian>5.1.0.Beta9</version.org.wildfly.arquillian>
         <version.jakarta.jakartaee-bom>11.0.0-M4</version.jakarta.jakartaee-bom>
         <!--
             These are now managed by the BOM ^ but we want to have version properties available to us
@@ -399,7 +400,8 @@
 
         <arquillian.wildfly.jvm.args.add-opens></arquillian.wildfly.jvm.args.add-opens>
         <arquillian.wildfly.jvm.args.add-modules></arquillian.wildfly.jvm.args.add-modules>
-        <arquillian.wildfly.jvm.args>-Duser.language=en -Duser.country=US ${arquillian.wildfly.jvm.args.add-opens} ${arquillian.wildfly.jvm.args.add-modules}</arquillian.wildfly.jvm.args>
+        <arquillian.jvm.args.java-version></arquillian.jvm.args.java-version>
+        <arquillian.wildfly.jvm.args>-Duser.language=en -Duser.country=US ${arquillian.wildfly.jvm.args.add-opens} ${arquillian.wildfly.jvm.args.add-modules} ${arquillian.jvm.args.java-version}</arquillian.wildfly.jvm.args>
 
         <!-- JDK version required for the build -->
         <!-- Remember to update README when changing the version here. -->
@@ -1790,8 +1792,6 @@
             <properties>
                 <!-- ForbiddenAPIs doesn't work with JDK20+ yet -->
                 <forbiddenapis.skip>true</forbiddenapis.skip>
-                <!-- We need net.bytebuddy.experimental=true to make Bytebuddy work with JDK21+ -->
-                <surefire.jvm.args.java-version>-Dnet.bytebuddy.experimental=true</surefire.jvm.args.java-version>
             </properties>
         </profile>
         <profile>
@@ -1805,8 +1805,6 @@
             <properties>
                 <!-- ForbiddenAPIs doesn't work with JDK23+ yet -->
                 <forbiddenapis.skip>true</forbiddenapis.skip>
-                <!-- We need net.bytebuddy.experimental=true to make Bytebuddy work with JDK23+ -->
-                <surefire.jvm.args.java-version>-Dnet.bytebuddy.experimental=true</surefire.jvm.args.java-version>
             </properties>
         </profile>
         <profile>
@@ -1822,6 +1820,7 @@
                 <forbiddenapis.skip>true</forbiddenapis.skip>
                 <!-- We need net.bytebuddy.experimental=true to make Bytebuddy work with JDK24+ -->
                 <surefire.jvm.args.java-version>-Dnet.bytebuddy.experimental=true</surefire.jvm.args.java-version>
+                <arquillian.jvm.args.java-version>-Dnet.bytebuddy.experimental=true</arquillian.jvm.args.java-version>
             </properties>
         </profile>
         <profile>
@@ -1837,6 +1836,7 @@
                 <forbiddenapis.skip>true</forbiddenapis.skip>
                 <!-- We need net.bytebuddy.experimental=true to make Bytebuddy work with JDK25+ -->
                 <surefire.jvm.args.java-version>-Dnet.bytebuddy.experimental=true</surefire.jvm.args.java-version>
+                <arquillian.jvm.args.java-version>-Dnet.bytebuddy.experimental=true</arquillian.jvm.args.java-version>
             </properties>
         </profile>
         <profile>

From d75d9579df9b610d58024e0cb8572df2964300e0 Mon Sep 17 00:00:00 2001
From: marko-bekhta <marko.prykladna@gmail.com>
Date: Tue, 7 Jan 2025 14:39:43 +0100
Subject: [PATCH 2/3] HV-2075 Test against Wildfly 35.Beta1 with JDK24/25

---
 pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pom.xml b/pom.xml
index b6bd3fa1f3..1e962e005b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1816,6 +1816,8 @@
                 </property>
             </activation>
             <properties>
+                <!-- Remove once there's a 35 Final available -->
+                <version.wildfly>35.0.0.Beta1</version.wildfly>
                 <!-- ForbiddenAPIs doesn't work with JDK24+ yet -->
                 <forbiddenapis.skip>true</forbiddenapis.skip>
                 <!-- We need net.bytebuddy.experimental=true to make Bytebuddy work with JDK24+ -->
@@ -1832,6 +1834,8 @@
                 </property>
             </activation>
             <properties>
+                <!-- Remove once there's a 35 Final available -->
+                <version.wildfly>35.0.0.Beta1</version.wildfly>
                 <!-- ForbiddenAPIs doesn't work with JDK25+ yet -->
                 <forbiddenapis.skip>true</forbiddenapis.skip>
                 <!-- We need net.bytebuddy.experimental=true to make Bytebuddy work with JDK25+ -->

From e71982393fcf3d31d77b74ff05c521bf99518a99 Mon Sep 17 00:00:00 2001
From: marko-bekhta <marko.prykladna@gmail.com>
Date: Tue, 7 Jan 2025 14:40:51 +0100
Subject: [PATCH 3/3] HV-2075 Don't skip integration tests for JDK24/25

reverts 252c474e
---
 integrationtest/wildfly/pom.xml | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/integrationtest/wildfly/pom.xml b/integrationtest/wildfly/pom.xml
index 1408c84c7b..c64a417152 100644
--- a/integrationtest/wildfly/pom.xml
+++ b/integrationtest/wildfly/pom.xml
@@ -28,7 +28,6 @@
 
         <hibernate-validator-parent.path>../..</hibernate-validator-parent.path>
         <skip.wildfly.integration.test.hibernate.validator>false</skip.wildfly.integration.test.hibernate.validator>
-        <skip.failsafe.execution>false</skip.failsafe.execution>
     </properties>
 
     <dependencies>
@@ -180,7 +179,6 @@
                             <goal>verify</goal>
                         </goals>
                         <configuration>
-                            <skip>${skip.failsafe.execution}</skip>
                             <systemPropertyVariables>
                                 <arquillian.launch>wildfly-current</arquillian.launch>
                             </systemPropertyVariables>
@@ -260,29 +258,5 @@
                 <surefire.jvm.args.add-opens>--add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED</surefire.jvm.args.add-opens>
             </properties>
         </profile>
-        <profile>
-            <id>testWithJdk24</id>
-            <activation>
-                <property>
-                    <name>java-version.test.release</name>
-                    <value>24</value>
-                </property>
-            </activation>
-            <properties>
-                <skip.failsafe.execution>true</skip.failsafe.execution>
-            </properties>
-        </profile>
-        <profile>
-            <id>testWithJdk25</id>
-            <activation>
-                <property>
-                    <name>java-version.test.release</name>
-                    <value>25</value>
-                </property>
-            </activation>
-            <properties>
-                <skip.failsafe.execution>true</skip.failsafe.execution>
-            </properties>
-        </profile>
     </profiles>
 </project>