From e0366260631a6cf25245bd7627d5ed9f965880af Mon Sep 17 00:00:00 2001
From: Natalia Pozhidaeva <Natalia_Pozhidaeva@epam.com>
Date: Sun, 31 Dec 2023 23:27:26 -0500
Subject: [PATCH 1/3] Check jdk 21

---
 .github/workflows/main.yml                       | 2 +-
 jdi-bdd-tests/pom.xml                            | 2 +-
 jdi-eyes-demo/pom.xml                            | 2 +-
 jdi-light-angular-tests-with-mocks/pom.xml       | 2 +-
 jdi-light-angular-tests/pom.xml                  | 2 +-
 jdi-light-angular/pom.xml                        | 2 +-
 jdi-light-applitools-tests/pom.xml               | 2 +-
 jdi-light-bootstrap-tests/pom.xml                | 2 +-
 jdi-light-bootstrap/pom.xml                      | 2 +-
 jdi-light-core/pom.xml                           | 2 +-
 jdi-light-html-tests/pom.xml                     | 2 +-
 jdi-light-html/pom.xml                           | 2 +-
 jdi-light-material-ui-tests/pom.xml              | 2 +-
 jdi-light-material-ui/pom.xml                    | 2 +-
 jdi-light-mobile-tests/pom.xml                   | 2 +-
 jdi-light-mobile/pom.xml                         | 2 +-
 jdi-light-vuetify-tests/pom.xml                  | 2 +-
 jdi-light-vuetify/pom.xml                        | 2 +-
 test-examples/jdi-bdd-no-po-tests/pom.xml        | 2 +-
 test-examples/jdi-light-examples/pom.xml         | 2 +-
 test-examples/jdi-performance/pom.xml            | 2 +-
 test-templates/jdi-light-junit-template/pom.xml  | 2 +-
 test-templates/jdi-light-testng-template/pom.xml | 2 +-
 23 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4d72a0cf4a..4feed68224 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -50,7 +50,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [11, 15, 17, 18] # all [11, 12, 13, 14, 15, 16, 17, 18, 21]
+        java: [11, 15, 17, 18, 21] # all [11, 12, 13, 14, 15, 16, 17, 18, 21]
 
     steps:
     - uses: actions/checkout@v3
diff --git a/jdi-bdd-tests/pom.xml b/jdi-bdd-tests/pom.xml
index 69fcf13456..658e247b6a 100644
--- a/jdi-bdd-tests/pom.xml
+++ b/jdi-bdd-tests/pom.xml
@@ -14,7 +14,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <driver>chrome</driver>
         <jetty.version>9.4.12.RC2</jetty.version>
-        <aspectj.version>1.9.20</aspectj.version>
+        <aspectj.version>1.9.21</aspectj.version>
         <allure.maven>2.12.0</allure.maven>
         <testng.version>7.8.0</testng.version>
         <!-- - - add-opens java.base/java.lang=ALL-UNNAMED is needed for JDK 16+ -->
diff --git a/jdi-eyes-demo/pom.xml b/jdi-eyes-demo/pom.xml
index b91a4e5853..9757abaa9a 100644
--- a/jdi-eyes-demo/pom.xml
+++ b/jdi-eyes-demo/pom.xml
@@ -17,7 +17,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <allure.maven>2.12.0</allure.maven>
         <jetty.version>9.4.12.RC2</jetty.version>
-        <aspectj.version>1.9.20</aspectj.version>
+        <aspectj.version>1.9.21</aspectj.version>
         <allure.testng>2.25.0</allure.testng>
         <!-- - - add-opens java.base/java.lang=ALL-UNNAMED is needed for JDK 16+ -->
         <aspectj.args></aspectj.args>
diff --git a/jdi-light-angular-tests-with-mocks/pom.xml b/jdi-light-angular-tests-with-mocks/pom.xml
index 275a53433a..f377ac003e 100644
--- a/jdi-light-angular-tests-with-mocks/pom.xml
+++ b/jdi-light-angular-tests-with-mocks/pom.xml
@@ -12,7 +12,7 @@
     <properties>
         <jdi.version>1.5.3-SNAPSHOT</jdi.version>
         <driver>chrome</driver>
-        <aspectj.version>1.9.20</aspectj.version>
+        <aspectj.version>1.9.21</aspectj.version>
         <java.version>11</java.version>
         <allure.testng>2.25.0</allure.testng>
         <allure.maven>2.12.0</allure.maven>
diff --git a/jdi-light-angular-tests/pom.xml b/jdi-light-angular-tests/pom.xml
index 270156c91a..c125647df8 100644
--- a/jdi-light-angular-tests/pom.xml
+++ b/jdi-light-angular-tests/pom.xml
@@ -12,7 +12,7 @@
     <properties>
         <jdi.version>1.5.3-SNAPSHOT</jdi.version>
         <driver>chrome</driver>
-        <aspectj.version>1.9.20</aspectj.version>
+        <aspectj.version>1.9.21</aspectj.version>
         <java.version>11</java.version>
         <allure.testng>2.25.0</allure.testng>
         <allure.maven>2.12.0</allure.maven>
diff --git a/jdi-light-angular/pom.xml b/jdi-light-angular/pom.xml
index a3be1c5a6f..d635997266 100644
--- a/jdi-light-angular/pom.xml
+++ b/jdi-light-angular/pom.xml
@@ -14,7 +14,7 @@
 
     <properties>
         <jdi.version>1.5.3-SNAPSHOT</jdi.version>
-        <aspectj.version>1.9.20</aspectj.version>
+        <aspectj.version>1.9.21</aspectj.version>
         <aspectj.maven>1.14.0</aspectj.maven>
         <java.version>11</java.version>
         <jetty.version>9.4.12.RC2</jetty.version>
diff --git a/jdi-light-applitools-tests/pom.xml b/jdi-light-applitools-tests/pom.xml
index b41463f1fe..0631747590 100644
--- a/jdi-light-applitools-tests/pom.xml
+++ b/jdi-light-applitools-tests/pom.xml
@@ -17,7 +17,7 @@
         <applitools.version>3.157.10</applitools.version>
         <driver>chrome</driver>
         <domain>https://jdi-testing.github.io/jdi-light/</domain>
-        <aspectj.version>1.9.20</aspectj.version>
+        <aspectj.version>1.9.21</aspectj.version>
         <allure.testng>2.25.0</allure.testng>
         <allure.maven>2.12.0</allure.maven>
         <jetty.version>9.4.12.RC2</jetty.version>
diff --git a/jdi-light-bootstrap-tests/pom.xml b/jdi-light-bootstrap-tests/pom.xml
index 03901e87e4..1ac5a88ec2 100644
--- a/jdi-light-bootstrap-tests/pom.xml
+++ b/jdi-light-bootstrap-tests/pom.xml
@@ -15,7 +15,7 @@
         <!--driver>firefox</driver-->
         <allure.maven>2.12.0</allure.maven>
         <allure.testng>2.25.0</allure.testng>
-        <aspectj.version>1.9.20</aspectj.version>
+        <aspectj.version>1.9.21</aspectj.version>
         <testng.version>7.8.0</testng.version>
         <!-- - - add-opens java.base/java.lang=ALL-UNNAMED is needed for JDK 16+ -->
         <aspectj.args></aspectj.args>
diff --git a/jdi-light-bootstrap/pom.xml b/jdi-light-bootstrap/pom.xml
index 1c1380e58f..014c3544a8 100644
--- a/jdi-light-bootstrap/pom.xml
+++ b/jdi-light-bootstrap/pom.xml
@@ -14,7 +14,7 @@
 
     <properties>
         <jdi.version>1.5.3-SNAPSHOT</jdi.version>
-        <aspectj.version>1.9.20</aspectj.version>
+        <aspectj.version>1.9.21</aspectj.version>
         <aspectj.maven>1.14.0</aspectj.maven>
         <java.version>11</java.version>
         <gpg.key></gpg.key>
diff --git a/jdi-light-core/pom.xml b/jdi-light-core/pom.xml
index 898cec6591..1a821ed5e6 100644
--- a/jdi-light-core/pom.xml
+++ b/jdi-light-core/pom.xml
@@ -14,7 +14,7 @@
 
     <properties>
         <surefire.version>2.21.0</surefire.version>
-        <aspectj.version>1.9.20</aspectj.version>
+        <aspectj.version>1.9.21</aspectj.version>
         <aspectj.maven>1.14.0</aspectj.maven>
         <java.version>11</java.version>
         <allure.version>2.25.0</allure.version>
diff --git a/jdi-light-html-tests/pom.xml b/jdi-light-html-tests/pom.xml
index 41166906e4..ca3ac8f996 100644
--- a/jdi-light-html-tests/pom.xml
+++ b/jdi-light-html-tests/pom.xml
@@ -17,7 +17,7 @@
         <allure.testng>2.25.0</allure.testng>
         <allure.maven>2.12.0</allure.maven>
         <testng.version>7.8.0</testng.version>
-        <aspectj.version>1.9.20</aspectj.version>
+        <aspectj.version>1.9.21</aspectj.version>
         <suite-xml-file>src/test/resources/general.xml</suite-xml-file>
         <java.version>11</java.version>
         <!-- - - add-opens java.base/java.lang=ALL-UNNAMED is needed for JDK 16+ -->
diff --git a/jdi-light-html/pom.xml b/jdi-light-html/pom.xml
index 63565bf928..b13433e371 100644
--- a/jdi-light-html/pom.xml
+++ b/jdi-light-html/pom.xml
@@ -14,7 +14,7 @@
 
     <properties>
         <jdi.version>1.5.3-SNAPSHOT</jdi.version>
-        <aspectj.version>1.9.20</aspectj.version>
+        <aspectj.version>1.9.21</aspectj.version>
         <aspectj.maven>1.14.0</aspectj.maven>
         <java.version>11</java.version>
         <gpg.key></gpg.key>
diff --git a/jdi-light-material-ui-tests/pom.xml b/jdi-light-material-ui-tests/pom.xml
index bb67c0eba2..bb69da8fae 100644
--- a/jdi-light-material-ui-tests/pom.xml
+++ b/jdi-light-material-ui-tests/pom.xml
@@ -11,7 +11,7 @@
 
     <properties>
         <driver>chrome</driver>
-        <aspectj.version>1.9.20</aspectj.version>
+        <aspectj.version>1.9.21</aspectj.version>
         <java.version>11</java.version>
         <allure.testng>2.25.0</allure.testng>
         <allure.maven>2.12.0</allure.maven>
diff --git a/jdi-light-material-ui/pom.xml b/jdi-light-material-ui/pom.xml
index 6a31928bf5..87c2c3dcca 100644
--- a/jdi-light-material-ui/pom.xml
+++ b/jdi-light-material-ui/pom.xml
@@ -13,7 +13,7 @@
     <description>JDI Light Material UI Elements library for version 4</description>
 
     <properties>
-        <aspectj.version>1.9.20</aspectj.version>
+        <aspectj.version>1.9.21</aspectj.version>
         <aspectj.maven>1.14.0</aspectj.maven>
         <java.version>11</java.version>
         <jdi.version>1.5.3-SNAPSHOT</jdi.version>
diff --git a/jdi-light-mobile-tests/pom.xml b/jdi-light-mobile-tests/pom.xml
index 795ebab1df..06e250ab8d 100644
--- a/jdi-light-mobile-tests/pom.xml
+++ b/jdi-light-mobile-tests/pom.xml
@@ -17,7 +17,7 @@
         <allure.testng>2.25.0</allure.testng>
         <allure.maven>2.12.0</allure.maven>
         <jetty.version>9.4.12.RC2</jetty.version>
-        <aspectj.version>1.9.20</aspectj.version>
+        <aspectj.version>1.9.21</aspectj.version>
         <testng.version>7.8.0</testng.version>
         <suite.xml.file>src/test/resources/android10SystemTests.xml</suite.xml.file>
         <suite.xml.file>src/test/resources/android11SystemTests.xml</suite.xml.file>
diff --git a/jdi-light-mobile/pom.xml b/jdi-light-mobile/pom.xml
index 854aa8f114..091d4ca52c 100644
--- a/jdi-light-mobile/pom.xml
+++ b/jdi-light-mobile/pom.xml
@@ -14,7 +14,7 @@
 
     <properties>
         <jdi.version>1.5.3-SNAPSHOT</jdi.version>
-        <aspectj.version>1.9.20</aspectj.version>
+        <aspectj.version>1.9.21</aspectj.version>
         <aspectj.maven>1.14.0</aspectj.maven>
         <java.version>11</java.version>
         <gpg.key></gpg.key>
diff --git a/jdi-light-vuetify-tests/pom.xml b/jdi-light-vuetify-tests/pom.xml
index 35b7834bda..de69458d2d 100644
--- a/jdi-light-vuetify-tests/pom.xml
+++ b/jdi-light-vuetify-tests/pom.xml
@@ -11,7 +11,7 @@
 
     <properties>
         <driver>chrome</driver>
-        <aspectj.version>1.9.20</aspectj.version>
+        <aspectj.version>1.9.21</aspectj.version>
         <java.version>11</java.version>
         <allure.testng>2.25.0</allure.testng>
         <allure.maven>2.12.0</allure.maven>
diff --git a/jdi-light-vuetify/pom.xml b/jdi-light-vuetify/pom.xml
index ff35a97033..923eeaddf5 100644
--- a/jdi-light-vuetify/pom.xml
+++ b/jdi-light-vuetify/pom.xml
@@ -13,7 +13,7 @@
     <description>JDI Light Vuetify UI Elements library for version 2</description>
 
     <properties>
-        <aspectj.version>1.9.20</aspectj.version>
+        <aspectj.version>1.9.21</aspectj.version>
         <aspectj.maven>1.14.0</aspectj.maven>
         <java.version>11</java.version>
         <jdi.version>1.5.3-SNAPSHOT</jdi.version>
diff --git a/test-examples/jdi-bdd-no-po-tests/pom.xml b/test-examples/jdi-bdd-no-po-tests/pom.xml
index 0ad395ed4f..f49f33b66a 100644
--- a/test-examples/jdi-bdd-no-po-tests/pom.xml
+++ b/test-examples/jdi-bdd-no-po-tests/pom.xml
@@ -14,7 +14,7 @@
         <driver>chrome</driver>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jetty.version>9.4.12.RC2</jetty.version>
-        <aspectj.version>1.9.20</aspectj.version>
+        <aspectj.version>1.9.21</aspectj.version>
         <allure.maven>2.12.0</allure.maven>
         <aspectj.args></aspectj.args>
         <java.version>11</java.version>
diff --git a/test-examples/jdi-light-examples/pom.xml b/test-examples/jdi-light-examples/pom.xml
index 2441723249..47b4f52479 100644
--- a/test-examples/jdi-light-examples/pom.xml
+++ b/test-examples/jdi-light-examples/pom.xml
@@ -15,7 +15,7 @@
         <allure.testng>2.25.0</allure.testng>
         <allure.maven>2.12.0</allure.maven>
         <jetty.version>9.4.12.RC2</jetty.version>
-        <aspectj.version>1.9.20</aspectj.version>
+        <aspectj.version>1.9.21</aspectj.version>
         <!-- - - add-opens java.base/java.lang=ALL-UNNAMED is needed for JDK 16+ -->
         <aspectj.args></aspectj.args>
         <java.version>11</java.version>
diff --git a/test-examples/jdi-performance/pom.xml b/test-examples/jdi-performance/pom.xml
index e72aba630c..99269e5849 100644
--- a/test-examples/jdi-performance/pom.xml
+++ b/test-examples/jdi-performance/pom.xml
@@ -15,7 +15,7 @@
         <driver>chrome</driver>
         <!--driver>firefox</driver-->
         <domain>https://jdi-testing.github.io/jdi-light/</domain>
-        <aspectj.version>1.9.20</aspectj.version>
+        <aspectj.version>1.9.21</aspectj.version>
         <allure.testng>2.25.0</allure.testng>
         <allure.maven>2.12.0</allure.maven>
         <jetty.version>9.4.12.RC2</jetty.version>
diff --git a/test-templates/jdi-light-junit-template/pom.xml b/test-templates/jdi-light-junit-template/pom.xml
index ef5eb4fee0..6fc472dca7 100644
--- a/test-templates/jdi-light-junit-template/pom.xml
+++ b/test-templates/jdi-light-junit-template/pom.xml
@@ -17,7 +17,7 @@
         <allure.version>2.19.0</allure.version>
         <allure.maven>2.12.0</allure.maven>
         <surfire.version>2.19.1</surfire.version>
-        <aspectj.version>1.9.20</aspectj.version>
+        <aspectj.version>1.9.21</aspectj.version>
         <java.version>11</java.version>
     </properties>
 
diff --git a/test-templates/jdi-light-testng-template/pom.xml b/test-templates/jdi-light-testng-template/pom.xml
index 10931564c9..b88d3f459b 100644
--- a/test-templates/jdi-light-testng-template/pom.xml
+++ b/test-templates/jdi-light-testng-template/pom.xml
@@ -14,7 +14,7 @@
         <driver>chrome</driver>
         <!--driver>firefox</driver-->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <aspectj.version>1.9.20</aspectj.version>
+        <aspectj.version>1.9.21</aspectj.version>
         <domain>https://jdi-testing.github.io/jdi-light/</domain>
         <allure.testng>2.25.0</allure.testng>
         <allure.maven>2.12.0</allure.maven>

From 5a7c388c0f1d2fa6a40fe5b44a2de8d082c48681 Mon Sep 17 00:00:00 2001
From: Natalia Pozhidaeva <Natalia_Pozhidaeva@epam.com>
Date: Mon, 1 Jan 2024 00:24:43 -0500
Subject: [PATCH 2/3] Fix profile for JDK 21

---
 jdi-bdd-tests/pom.xml                            | 2 +-
 jdi-light-angular-tests-with-mocks/pom.xml       | 2 +-
 jdi-light-angular-tests/pom.xml                  | 2 +-
 jdi-light-applitools-tests/pom.xml               | 2 +-
 jdi-light-bootstrap-tests/pom.xml                | 2 +-
 jdi-light-html-tests/pom.xml                     | 2 +-
 jdi-light-material-ui-tests/pom.xml              | 2 +-
 jdi-light-mobile-selenium3-tests/pom.xml         | 2 +-
 jdi-light-mobile-tests/pom.xml                   | 2 +-
 jdi-light-vuetify-tests/pom.xml                  | 2 +-
 test-examples/jdi-bdd-no-po-tests/pom.xml        | 2 +-
 test-examples/jdi-light-examples/pom.xml         | 2 +-
 test-examples/jdi-performance/pom.xml            | 2 +-
 test-templates/jdi-light-testng-template/pom.xml | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/jdi-bdd-tests/pom.xml b/jdi-bdd-tests/pom.xml
index 658e247b6a..84f0e1d53c 100644
--- a/jdi-bdd-tests/pom.xml
+++ b/jdi-bdd-tests/pom.xml
@@ -26,7 +26,7 @@
         <profile>
             <id>jdk16</id>
             <activation>
-                <jdk>[16, 20]</jdk>
+                <jdk>[16, 21]</jdk>
             </activation>
             <properties>
                 <aspectj.args>--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED  --add-opens=java.desktop/java.awt.font=ALL-UNNAMED</aspectj.args>
diff --git a/jdi-light-angular-tests-with-mocks/pom.xml b/jdi-light-angular-tests-with-mocks/pom.xml
index f377ac003e..3e50c5ecb0 100644
--- a/jdi-light-angular-tests-with-mocks/pom.xml
+++ b/jdi-light-angular-tests-with-mocks/pom.xml
@@ -25,7 +25,7 @@
         <profile>
             <id>jdk16</id>
             <activation>
-                <jdk>[16, 20]</jdk>
+                <jdk>[16, 21]</jdk>
             </activation>
             <properties>
                 <aspectj.args>--add-opens java.base/java.lang=ALL-UNNAMED</aspectj.args>
diff --git a/jdi-light-angular-tests/pom.xml b/jdi-light-angular-tests/pom.xml
index c125647df8..9a487cb443 100644
--- a/jdi-light-angular-tests/pom.xml
+++ b/jdi-light-angular-tests/pom.xml
@@ -146,7 +146,7 @@
         <profile>
             <id>jdk16</id>
             <activation>
-                <jdk>[16, 20]</jdk>
+                <jdk>[16, 21]</jdk>
             </activation>
             <properties>
                 <aspectj.args>--add-opens java.base/java.lang=ALL-UNNAMED</aspectj.args>
diff --git a/jdi-light-applitools-tests/pom.xml b/jdi-light-applitools-tests/pom.xml
index 0631747590..a259eea14d 100644
--- a/jdi-light-applitools-tests/pom.xml
+++ b/jdi-light-applitools-tests/pom.xml
@@ -30,7 +30,7 @@
         <profile>
             <id>jdk16</id>
             <activation>
-                <jdk>[16, 20]</jdk>
+                <jdk>[16, 21]</jdk>
             </activation>
             <properties>
                 <aspectj.args>--add-opens java.base/java.lang=ALL-UNNAMED</aspectj.args>
diff --git a/jdi-light-bootstrap-tests/pom.xml b/jdi-light-bootstrap-tests/pom.xml
index 1ac5a88ec2..0aeba009f3 100644
--- a/jdi-light-bootstrap-tests/pom.xml
+++ b/jdi-light-bootstrap-tests/pom.xml
@@ -26,7 +26,7 @@
         <profile>
             <id>jdk16</id>
             <activation>
-                <jdk>[16, 20]</jdk>
+                <jdk>[16, 21]</jdk>
             </activation>
             <properties>
                 <aspectj.args>--add-opens java.base/java.lang=ALL-UNNAMED</aspectj.args>
diff --git a/jdi-light-html-tests/pom.xml b/jdi-light-html-tests/pom.xml
index ca3ac8f996..1436f09e63 100644
--- a/jdi-light-html-tests/pom.xml
+++ b/jdi-light-html-tests/pom.xml
@@ -135,7 +135,7 @@
         <profile>
             <id>jdk16</id>
             <activation>
-                <jdk>[16, 20]</jdk>
+                <jdk>[16, 21]</jdk>
             </activation>
             <properties>
                 <aspectj.args>--add-opens java.base/java.lang=ALL-UNNAMED</aspectj.args>
diff --git a/jdi-light-material-ui-tests/pom.xml b/jdi-light-material-ui-tests/pom.xml
index bb69da8fae..c51142cddd 100644
--- a/jdi-light-material-ui-tests/pom.xml
+++ b/jdi-light-material-ui-tests/pom.xml
@@ -118,7 +118,7 @@
         <profile>
             <id>jdk16</id>
             <activation>
-                <jdk>[16, 20]</jdk>
+                <jdk>[16, 21]</jdk>
             </activation>
             <properties>
                 <aspectj.args>--add-opens java.base/java.lang=ALL-UNNAMED</aspectj.args>
diff --git a/jdi-light-mobile-selenium3-tests/pom.xml b/jdi-light-mobile-selenium3-tests/pom.xml
index c87dbf3e02..63305eb1f7 100644
--- a/jdi-light-mobile-selenium3-tests/pom.xml
+++ b/jdi-light-mobile-selenium3-tests/pom.xml
@@ -33,7 +33,7 @@
         <profile>
             <id>jdk16</id>
             <activation>
-                <jdk>[16, 20]</jdk>
+                <jdk>[16, 21]</jdk>
             </activation>
             <properties>
                 <aspectj.args>--add-opens java.base/java.lang=ALL-UNNAMED</aspectj.args>
diff --git a/jdi-light-mobile-tests/pom.xml b/jdi-light-mobile-tests/pom.xml
index 06e250ab8d..22e4363e18 100644
--- a/jdi-light-mobile-tests/pom.xml
+++ b/jdi-light-mobile-tests/pom.xml
@@ -34,7 +34,7 @@
         <profile>
             <id>jdk16</id>
             <activation>
-                <jdk>[16, 20]</jdk>
+                <jdk>[16, 21]</jdk>
             </activation>
             <properties>
                 <aspectj.args>--add-opens java.base/java.lang=ALL-UNNAMED</aspectj.args>
diff --git a/jdi-light-vuetify-tests/pom.xml b/jdi-light-vuetify-tests/pom.xml
index de69458d2d..70b040c9c8 100644
--- a/jdi-light-vuetify-tests/pom.xml
+++ b/jdi-light-vuetify-tests/pom.xml
@@ -143,7 +143,7 @@
         <profile>
             <id>jdk16</id>
             <activation>
-                <jdk>[16, 20]</jdk>
+                <jdk>[16, 21]</jdk>
             </activation>
             <properties>
                 <aspectj.args>--add-opens java.base/java.lang=ALL-UNNAMED</aspectj.args>
diff --git a/test-examples/jdi-bdd-no-po-tests/pom.xml b/test-examples/jdi-bdd-no-po-tests/pom.xml
index f49f33b66a..9b15fb0baf 100644
--- a/test-examples/jdi-bdd-no-po-tests/pom.xml
+++ b/test-examples/jdi-bdd-no-po-tests/pom.xml
@@ -25,7 +25,7 @@
         <profile>
             <id>jdk16</id>
             <activation>
-                <jdk>[16, 20]</jdk>
+                <jdk>[16, 21]</jdk>
             </activation>
             <properties>
                 <aspectj.args>--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED  --add-opens=java.desktop/java.awt.font=ALL-UNNAMED</aspectj.args>
diff --git a/test-examples/jdi-light-examples/pom.xml b/test-examples/jdi-light-examples/pom.xml
index 47b4f52479..2887a06e20 100644
--- a/test-examples/jdi-light-examples/pom.xml
+++ b/test-examples/jdi-light-examples/pom.xml
@@ -26,7 +26,7 @@
         <profile>
             <id>jdk16</id>
             <activation>
-                <jdk>[16, 20]</jdk>
+                <jdk>[16, 21]</jdk>
             </activation>
             <properties>
                 <aspectj.args>--add-opens java.base/java.lang=ALL-UNNAMED</aspectj.args>
diff --git a/test-examples/jdi-performance/pom.xml b/test-examples/jdi-performance/pom.xml
index 99269e5849..63181cbade 100644
--- a/test-examples/jdi-performance/pom.xml
+++ b/test-examples/jdi-performance/pom.xml
@@ -29,7 +29,7 @@
         <profile>
             <id>jdk16</id>
             <activation>
-                <jdk>[16, 20]</jdk>
+                <jdk>[16, 21]</jdk>
             </activation>
             <properties>
                 <aspectj.args>--add-opens java.base/java.lang=ALL-UNNAMED</aspectj.args>
diff --git a/test-templates/jdi-light-testng-template/pom.xml b/test-templates/jdi-light-testng-template/pom.xml
index b88d3f459b..157706b49c 100644
--- a/test-templates/jdi-light-testng-template/pom.xml
+++ b/test-templates/jdi-light-testng-template/pom.xml
@@ -29,7 +29,7 @@
         <profile>
             <id>jdk16</id>
             <activation>
-                <jdk>[16, 20]</jdk>
+                <jdk>[16, 21]</jdk>
             </activation>
             <properties>
                 <aspectj.args>--add-opens java.base/java.lang=ALL-UNNAMED</aspectj.args>

From f803caf8a147df552acf609cd7cd60af50bdab54 Mon Sep 17 00:00:00 2001
From: Natalia Pozhidaeva <Natalia_Pozhidaeva@epam.com>
Date: Mon, 1 Jan 2024 13:54:08 -0500
Subject: [PATCH 3/3] Fix profile for JDK 21

---
 jdi-bdd-tests/pom.xml                            | 2 +-
 jdi-light-angular-tests-with-mocks/pom.xml       | 2 +-
 jdi-light-angular-tests/pom.xml                  | 2 +-
 jdi-light-applitools-tests/pom.xml               | 2 +-
 jdi-light-bootstrap-tests/pom.xml                | 2 +-
 jdi-light-html-tests/pom.xml                     | 2 +-
 jdi-light-material-ui-tests/pom.xml              | 2 +-
 jdi-light-mobile-selenium3-tests/pom.xml         | 2 +-
 jdi-light-mobile-tests/pom.xml                   | 2 +-
 jdi-light-vuetify-tests/pom.xml                  | 2 +-
 test-examples/jdi-bdd-no-po-tests/pom.xml        | 2 +-
 test-examples/jdi-light-examples/pom.xml         | 2 +-
 test-examples/jdi-performance/pom.xml            | 2 +-
 test-templates/jdi-light-testng-template/pom.xml | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/jdi-bdd-tests/pom.xml b/jdi-bdd-tests/pom.xml
index 84f0e1d53c..f65f1b675c 100644
--- a/jdi-bdd-tests/pom.xml
+++ b/jdi-bdd-tests/pom.xml
@@ -26,7 +26,7 @@
         <profile>
             <id>jdk16</id>
             <activation>
-                <jdk>[16, 21]</jdk>
+                <jdk>[16,)</jdk>
             </activation>
             <properties>
                 <aspectj.args>--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED  --add-opens=java.desktop/java.awt.font=ALL-UNNAMED</aspectj.args>
diff --git a/jdi-light-angular-tests-with-mocks/pom.xml b/jdi-light-angular-tests-with-mocks/pom.xml
index 3e50c5ecb0..df9471d72f 100644
--- a/jdi-light-angular-tests-with-mocks/pom.xml
+++ b/jdi-light-angular-tests-with-mocks/pom.xml
@@ -25,7 +25,7 @@
         <profile>
             <id>jdk16</id>
             <activation>
-                <jdk>[16, 21]</jdk>
+                <jdk>[16,)</jdk>
             </activation>
             <properties>
                 <aspectj.args>--add-opens java.base/java.lang=ALL-UNNAMED</aspectj.args>
diff --git a/jdi-light-angular-tests/pom.xml b/jdi-light-angular-tests/pom.xml
index 9a487cb443..9552db5560 100644
--- a/jdi-light-angular-tests/pom.xml
+++ b/jdi-light-angular-tests/pom.xml
@@ -146,7 +146,7 @@
         <profile>
             <id>jdk16</id>
             <activation>
-                <jdk>[16, 21]</jdk>
+                <jdk>[16,)</jdk>
             </activation>
             <properties>
                 <aspectj.args>--add-opens java.base/java.lang=ALL-UNNAMED</aspectj.args>
diff --git a/jdi-light-applitools-tests/pom.xml b/jdi-light-applitools-tests/pom.xml
index a259eea14d..96cc7c2f0d 100644
--- a/jdi-light-applitools-tests/pom.xml
+++ b/jdi-light-applitools-tests/pom.xml
@@ -30,7 +30,7 @@
         <profile>
             <id>jdk16</id>
             <activation>
-                <jdk>[16, 21]</jdk>
+                <jdk>[16,)</jdk>
             </activation>
             <properties>
                 <aspectj.args>--add-opens java.base/java.lang=ALL-UNNAMED</aspectj.args>
diff --git a/jdi-light-bootstrap-tests/pom.xml b/jdi-light-bootstrap-tests/pom.xml
index 0aeba009f3..62995b8c10 100644
--- a/jdi-light-bootstrap-tests/pom.xml
+++ b/jdi-light-bootstrap-tests/pom.xml
@@ -26,7 +26,7 @@
         <profile>
             <id>jdk16</id>
             <activation>
-                <jdk>[16, 21]</jdk>
+                <jdk>[16,)</jdk>
             </activation>
             <properties>
                 <aspectj.args>--add-opens java.base/java.lang=ALL-UNNAMED</aspectj.args>
diff --git a/jdi-light-html-tests/pom.xml b/jdi-light-html-tests/pom.xml
index 1436f09e63..6ab2d5e88a 100644
--- a/jdi-light-html-tests/pom.xml
+++ b/jdi-light-html-tests/pom.xml
@@ -135,7 +135,7 @@
         <profile>
             <id>jdk16</id>
             <activation>
-                <jdk>[16, 21]</jdk>
+                <jdk>[16,)</jdk>
             </activation>
             <properties>
                 <aspectj.args>--add-opens java.base/java.lang=ALL-UNNAMED</aspectj.args>
diff --git a/jdi-light-material-ui-tests/pom.xml b/jdi-light-material-ui-tests/pom.xml
index c51142cddd..4f3dcfd2de 100644
--- a/jdi-light-material-ui-tests/pom.xml
+++ b/jdi-light-material-ui-tests/pom.xml
@@ -118,7 +118,7 @@
         <profile>
             <id>jdk16</id>
             <activation>
-                <jdk>[16, 21]</jdk>
+                <jdk>[16,)</jdk>
             </activation>
             <properties>
                 <aspectj.args>--add-opens java.base/java.lang=ALL-UNNAMED</aspectj.args>
diff --git a/jdi-light-mobile-selenium3-tests/pom.xml b/jdi-light-mobile-selenium3-tests/pom.xml
index 63305eb1f7..78fbe66169 100644
--- a/jdi-light-mobile-selenium3-tests/pom.xml
+++ b/jdi-light-mobile-selenium3-tests/pom.xml
@@ -33,7 +33,7 @@
         <profile>
             <id>jdk16</id>
             <activation>
-                <jdk>[16, 21]</jdk>
+                <jdk>[16,)</jdk>
             </activation>
             <properties>
                 <aspectj.args>--add-opens java.base/java.lang=ALL-UNNAMED</aspectj.args>
diff --git a/jdi-light-mobile-tests/pom.xml b/jdi-light-mobile-tests/pom.xml
index 22e4363e18..c6f00adb47 100644
--- a/jdi-light-mobile-tests/pom.xml
+++ b/jdi-light-mobile-tests/pom.xml
@@ -34,7 +34,7 @@
         <profile>
             <id>jdk16</id>
             <activation>
-                <jdk>[16, 21]</jdk>
+                <jdk>[16,)</jdk>
             </activation>
             <properties>
                 <aspectj.args>--add-opens java.base/java.lang=ALL-UNNAMED</aspectj.args>
diff --git a/jdi-light-vuetify-tests/pom.xml b/jdi-light-vuetify-tests/pom.xml
index 70b040c9c8..13071f4ccf 100644
--- a/jdi-light-vuetify-tests/pom.xml
+++ b/jdi-light-vuetify-tests/pom.xml
@@ -143,7 +143,7 @@
         <profile>
             <id>jdk16</id>
             <activation>
-                <jdk>[16, 21]</jdk>
+                <jdk>[16,)</jdk>
             </activation>
             <properties>
                 <aspectj.args>--add-opens java.base/java.lang=ALL-UNNAMED</aspectj.args>
diff --git a/test-examples/jdi-bdd-no-po-tests/pom.xml b/test-examples/jdi-bdd-no-po-tests/pom.xml
index 9b15fb0baf..d8ca5a6655 100644
--- a/test-examples/jdi-bdd-no-po-tests/pom.xml
+++ b/test-examples/jdi-bdd-no-po-tests/pom.xml
@@ -25,7 +25,7 @@
         <profile>
             <id>jdk16</id>
             <activation>
-                <jdk>[16, 21]</jdk>
+                <jdk>[16,)</jdk>
             </activation>
             <properties>
                 <aspectj.args>--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED  --add-opens=java.desktop/java.awt.font=ALL-UNNAMED</aspectj.args>
diff --git a/test-examples/jdi-light-examples/pom.xml b/test-examples/jdi-light-examples/pom.xml
index 2887a06e20..104169d053 100644
--- a/test-examples/jdi-light-examples/pom.xml
+++ b/test-examples/jdi-light-examples/pom.xml
@@ -26,7 +26,7 @@
         <profile>
             <id>jdk16</id>
             <activation>
-                <jdk>[16, 21]</jdk>
+                <jdk>[16,)</jdk>
             </activation>
             <properties>
                 <aspectj.args>--add-opens java.base/java.lang=ALL-UNNAMED</aspectj.args>
diff --git a/test-examples/jdi-performance/pom.xml b/test-examples/jdi-performance/pom.xml
index 63181cbade..ed93daeba2 100644
--- a/test-examples/jdi-performance/pom.xml
+++ b/test-examples/jdi-performance/pom.xml
@@ -29,7 +29,7 @@
         <profile>
             <id>jdk16</id>
             <activation>
-                <jdk>[16, 21]</jdk>
+                <jdk>[16,)</jdk>
             </activation>
             <properties>
                 <aspectj.args>--add-opens java.base/java.lang=ALL-UNNAMED</aspectj.args>
diff --git a/test-templates/jdi-light-testng-template/pom.xml b/test-templates/jdi-light-testng-template/pom.xml
index 157706b49c..d1b4c8ecf7 100644
--- a/test-templates/jdi-light-testng-template/pom.xml
+++ b/test-templates/jdi-light-testng-template/pom.xml
@@ -29,7 +29,7 @@
         <profile>
             <id>jdk16</id>
             <activation>
-                <jdk>[16, 21]</jdk>
+                <jdk>[16,)</jdk>
             </activation>
             <properties>
                 <aspectj.args>--add-opens java.base/java.lang=ALL-UNNAMED</aspectj.args>