From df7fc449930222f125b98b95644fac0a6c09a637 Mon Sep 17 00:00:00 2001
From: Igor Dianov <igor@dianov.com>
Date: Fri, 2 Feb 2024 14:05:02 -0800
Subject: [PATCH 1/2] Revert "Update Java release build version to 21 (#441)"

This reverts commit fd42ca9af72f5e6080754f80b2b2809e82696925.
---
 .github/workflows/build.yml | 2 +-
 pom.xml                     | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 683cce92e..74815bfdc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '21' ]
+        java: [ '17', '19', '21' ]
     steps:
     - uses: actions/checkout@v4
 
diff --git a/pom.xml b/pom.xml
index 2318c789f..db589ed1d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
   </description>
 
   <properties>
-    <java.version>21</java.version>
+    <java.version>17</java.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
 
@@ -28,7 +28,6 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <skipPrettier>false</skipPrettier>
     <skipStaging>false</skipStaging>
-    <generateBackupPoms>false</generateBackupPoms>
   </properties>
 
   <distributionManagement>

From 1b28465a3fd1a973f731536497254a8c36d78c97 Mon Sep 17 00:00:00 2001
From: Igor Dianov <igor@dianov.com>
Date: Fri, 2 Feb 2024 14:09:09 -0800
Subject: [PATCH 2/2] Activate Gatling test module profile on jdk21 condition

---
 pom.xml               |  1 +
 tests/gatling/pom.xml |  1 +
 tests/pom.xml         | 12 +++++++++++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index db589ed1d..b031bfcf7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,6 +28,7 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <skipPrettier>false</skipPrettier>
     <skipStaging>false</skipStaging>
+    <generateBackupPoms>false</generateBackupPoms> 
   </properties>
 
   <distributionManagement>
diff --git a/tests/gatling/pom.xml b/tests/gatling/pom.xml
index a08345cf8..595e0ab8a 100644
--- a/tests/gatling/pom.xml
+++ b/tests/gatling/pom.xml
@@ -11,6 +11,7 @@
   <artifactId>graphql-jpa-query-tests-gatling</artifactId>
 
   <properties>
+    <java.version>21</java.version>
     <activiti-cloud.version>8.1.0</activiti-cloud.version>
     <gatling.version>3.10.3</gatling.version>
     <gatling-maven-plugin.version>4.7.0</gatling-maven-plugin.version>
diff --git a/tests/pom.xml b/tests/pom.xml
index 4144e8652..7ef05e127 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -22,7 +22,17 @@
     <module>starwars</module>
     <module>boot-starter</module>
     <module>web</module>
-    <module>gatling</module>
   </modules>
 
+  <profiles>
+    <profile>
+      <id>java21</id>
+      <activation>
+        <jdk>21</jdk>
+      </activation>
+      <modules>
+        <module>gatling</module>
+      </modules>
+    </profile>
+  </profiles>
 </project>