From ebd368057df176c3071bafa467a3d778c054d90c Mon Sep 17 00:00:00 2001
From: Natalia Pozhidaeva <Natalia_Pozhidaeva@epam.com>
Date: Fri, 25 Aug 2023 15:25:39 -0500
Subject: [PATCH] Update dependencies

---
 .github/workflows/main.yml | 18 ++----------------
 jdi-dark-bdd-tests/pom.xml |  5 ++++-
 jdi-dark-tests/pom.xml     | 11 ++++++++++-
 jdi-dark/pom.xml           | 21 ++++++++++++++++-----
 4 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ba6fad25..8a1754db 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -44,20 +44,6 @@ jobs:
           java -Xmx32m -version
           env
 
-      - name: Set parameters for AspectJ
-        id: aspect_j_params
-        if: ${{ matrix.java > 15 }}
-        run: |
-          echo "ASPECT_ARGS=-Daspectj.args="\"$SUREFIRE_ARGS\" >> $GITHUB_ENV
-          echo "ASPECT_ARGS_BDD=-Daspectj.args="\"$SUREFIRE_ARGS_BDD\" >> $GITHUB_ENV
-
-      - name: Set parameters for AspectJ
-        id: aspect_j_params_empty
-        if: ${{ matrix.java < 16 }}
-        run: |
-          echo "ASPECT_ARGS=-Daspectj.args=''" >> $GITHUB_ENV
-          echo "ASPECT_ARGS_BDD=-Daspectj.args=''" >> $GITHUB_ENV
-
 # run cann't start from comment
 #  curl -o allure-${ALLURE_VERSION}.tgz -Ls https://dl.bintray.com/qameta/generic/io/qameta/allure/allure/${ALLURE_VERSION}/allure-${ALLURE_VERSION}.tgz
       - name: Install Allure
@@ -80,14 +66,14 @@ jobs:
         if: steps.jdi-compile.outcome == 'success'
         timeout-minutes: 30 # prevent blocking
         continue-on-error: true
-        run: mvn verify -pl $BDD_TESTS ${{ env.ASPECT_ARGS_BDD }} --fail-at-end
+        run: mvn verify -pl $BDD_TESTS --fail-at-end
 
       - name: Run tests - HTTP
         id: testsHttp
         if: steps.jdi-compile.outcome == 'success'
         timeout-minutes: 30 # prevent blocking
         continue-on-error: true
-        run: mvn verify -pl $HTTP_TESTS ${{ env.ASPECT_ARGS }} --fail-at-end
+        run: mvn verify -pl $HTTP_TESTS --fail-at-end
 
       - name: Collect reports
         if: steps.jdi-compile.outcome == 'success'
diff --git a/jdi-dark-bdd-tests/pom.xml b/jdi-dark-bdd-tests/pom.xml
index 7a947e35..69eeca23 100644
--- a/jdi-dark-bdd-tests/pom.xml
+++ b/jdi-dark-bdd-tests/pom.xml
@@ -24,8 +24,11 @@
     <profiles>
         <profile>
             <id>jdk16</id>
+            <activation>
+                <jdk>[16, 20]</jdk>
+            </activation>
             <properties>
-                <aspectj.args>--add-opens java.base/java.lang=ALL-UNNAMED</aspectj.args>
+                <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>
             </properties>
         </profile>
     </profiles>
diff --git a/jdi-dark-tests/pom.xml b/jdi-dark-tests/pom.xml
index c475411d..454e14cd 100644
--- a/jdi-dark-tests/pom.xml
+++ b/jdi-dark-tests/pom.xml
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
-            <version>7.5</version>
+            <version>7.5.1</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
@@ -279,5 +279,14 @@
                 <log.level>DEBUG</log.level>
             </properties>
         </profile>
+        <profile>
+            <id>jdk16</id>
+            <activation>
+                <jdk>[16, 20]</jdk>
+            </activation>
+            <properties>
+                <aspectj.args>--add-opens java.base/java.lang=ALL-UNNAMED</aspectj.args>
+            </properties>
+        </profile>
     </profiles>
 </project>
\ No newline at end of file
diff --git a/jdi-dark/pom.xml b/jdi-dark/pom.xml
index 3dde782c..0408870e 100644
--- a/jdi-dark/pom.xml
+++ b/jdi-dark/pom.xml
@@ -14,11 +14,11 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>1.8</java.version>
         <gson.version>2.8.9</gson.version>
-        <rest-assured.version>5.3.0</rest-assured.version>
+        <rest-assured.version>5.3.1</rest-assured.version>
         <jdi-light-saber.version>3.0.7</jdi-light-saber.version>
-        <allure-rest-assured.version>2.14.0</allure-rest-assured.version>
-        <log4j2.version>2.17.1</log4j2.version>
-        <lombok.version>1.18.20</lombok.version>
+        <allure-rest-assured.version>2.23.0</allure-rest-assured.version>
+        <log4j2.version>2.20.0</log4j2.version>
+        <lombok.version>1.18.28</lombok.version>
         <gpg.key></gpg.key>
     </properties>
 
@@ -57,6 +57,17 @@
             <groupId>com.jdiai.tools</groupId>
             <artifactId>jdi-light-saber</artifactId>
             <version>${jdi-light-saber.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-databind</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.15.2</version>
         </dependency>
         <dependency>
             <groupId>io.qameta.allure</groupId>
@@ -76,7 +87,7 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.2.3</version>
+            <version>1.4.11</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>