From cea0ff0f8e7408765441fa1c7bc8e9e2497c5e65 Mon Sep 17 00:00:00 2001
From: Rajeshbabu Chintaguntla <rajeshbabu@apache.org>
Date: Mon, 26 Feb 2024 19:01:52 +0530
Subject: [PATCH 1/2] HBASE-28350 [JDK17] Unable to run hbase-it tests with JDK
 17

---
 hbase-it/pom.xml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml
index dbf34c404155..3dd55419158b 100644
--- a/hbase-it/pom.xml
+++ b/hbase-it/pom.xml
@@ -37,6 +37,11 @@
     <integrationtest.include>**/IntegrationTest*.java</integrationtest.include>
     <!-- To Run Tests with a particular Xmx Value use -Dfailsafe.Xmx=XXXg -->
     <failsafe.Xmx>4g</failsafe.Xmx>
+    <failsafe.jdk8.flags>-XX:+CMSClassUnloadingEnabled</failsafe.jdk8.flags>
+    <hbase-failsafe.argLine>-enableassertions -Xmx${failsafe.Xmx}
+         -Djava.security.egd=file:/dev/./urandom ${failsafe.jdk8.flags}
+	    -verbose:gc -XX:+PrintCommandLineFlags  -XX:+PrintFlagsFinal</hbase-failsafe.argLine>
+    <argLine>${hbase-failsafe.argLine} @{jacocoArgLine}</argLine>
     <!-- To run a single integration test, use -Dit.test=IntegrationTestXXX -->
   </properties>
 
@@ -282,9 +287,6 @@
           <!-- TODO: failsafe does timeout, but verify does not fail the build because of the timeout.
                  I believe it is a failsafe bug, we may consider using surefire -->
           <forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds>
-          <argLine>-enableassertions -Xmx${failsafe.Xmx}
-                -Djava.security.egd=file:/dev/./urandom -XX:+CMSClassUnloadingEnabled
-                -verbose:gc -XX:+PrintCommandLineFlags  -XX:+PrintFlagsFinal @{jacocoArgLine}</argLine>
         </configuration>
       </plugin>
       <plugin>
@@ -336,6 +338,11 @@
       <activation>
         <jdk>[1.11,)</jdk>
       </activation>
+      <properties>
+        <failsafe.jdk8.flags/>
+        <argLine>${hbase-surefire.jdk11.flags} ${hbase-failsafe.argLine} @{jacocoArgLine}</argLine>
+      </properties>
+
       <dependencies>
         <dependency>
           <groupId>com.sun.xml.ws</groupId>

From 65cd75931f7fed5057d97a4f64d5ed53511bb40d Mon Sep 17 00:00:00 2001
From: Rajeshbabu Chintaguntla <rajeshbabu@apache.org>
Date: Thu, 29 Feb 2024 14:35:29 +0530
Subject: [PATCH 2/2] incorporated review comments

---
 hbase-it/pom.xml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml
index 3dd55419158b..96033b151299 100644
--- a/hbase-it/pom.xml
+++ b/hbase-it/pom.xml
@@ -38,10 +38,7 @@
     <!-- To Run Tests with a particular Xmx Value use -Dfailsafe.Xmx=XXXg -->
     <failsafe.Xmx>4g</failsafe.Xmx>
     <failsafe.jdk8.flags>-XX:+CMSClassUnloadingEnabled</failsafe.jdk8.flags>
-    <hbase-failsafe.argLine>-enableassertions -Xmx${failsafe.Xmx}
-         -Djava.security.egd=file:/dev/./urandom ${failsafe.jdk8.flags}
-	    -verbose:gc -XX:+PrintCommandLineFlags  -XX:+PrintFlagsFinal</hbase-failsafe.argLine>
-    <argLine>${hbase-failsafe.argLine} @{jacocoArgLine}</argLine>
+    <failsafe.profile.overrides>${failsafe.jdk8.flags}</failsafe.profile.overrides>
     <!-- To run a single integration test, use -Dit.test=IntegrationTestXXX -->
   </properties>
 
@@ -287,6 +284,9 @@
           <!-- TODO: failsafe does timeout, but verify does not fail the build because of the timeout.
                  I believe it is a failsafe bug, we may consider using surefire -->
           <forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds>
+          <argLine>-enableassertions -Xmx${failsafe.Xmx}
+	         -Djava.security.egd=file:/dev/./urandom ${failsafe.profile.overrides}
+                -verbose:gc -XX:+PrintCommandLineFlags  -XX:+PrintFlagsFinal @{jacocoArgLine}</argLine>
         </configuration>
       </plugin>
       <plugin>
@@ -339,8 +339,7 @@
         <jdk>[1.11,)</jdk>
       </activation>
       <properties>
-        <failsafe.jdk8.flags/>
-        <argLine>${hbase-surefire.jdk11.flags} ${hbase-failsafe.argLine} @{jacocoArgLine}</argLine>
+        <failsafe.profile.overrides>${hbase-surefire.jdk11.flags}</failsafe.profile.overrides>
       </properties>
 
       <dependencies>