Merge pull request #514 from jdi-testing/update_dependency

Update dependencies
jdi-testing · Sep 1, 2023 · c23d8da · c23d8da
2 parents ea894f4 + eac435a
commit c23d8da
Show file tree

Hide file tree

Showing 10 changed files with 66 additions and 52 deletions.
diff --git 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
@@ -12,7 +12,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <aspectj.version>1.9.5</aspectj.version>
         <allure.maven.version>2.10.0</allure.maven.version>
-        <allure.common.version>2.20.1</allure.common.version>
+        <allure.common.version>2.24.0</allure.common.version>
         <junit.version>4.12</junit.version>
         <surefire.version>3.0.0-M7</surefire.version>
         <jdi.dark.version>1.1.14-SNAPSHOT</jdi.dark.version>
@@ -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>
@@ -47,6 +50,12 @@
             <groupId>io.qameta.allure</groupId>
             <artifactId>allure-java-commons</artifactId>
             <version>${allure.common.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.qameta.allure</groupId>

diff --git a/jdi-dark-bdd/pom.xml b/jdi-dark-bdd/pom.xml
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.15.0</version>
+            <version>3.24.2</version>
         </dependency>
     </dependencies>
 
@@ -66,22 +66,6 @@
                     </execution>
                 </executions>
             </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>2.2.1</version>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>

diff --git a/jdi-dark-rest-service/pom.xml b/jdi-dark-rest-service/pom.xml
@@ -16,7 +16,7 @@
 
 	<properties>
 		<java.version>1.8</java.version>
-		<h2.version>2.1.210</h2.version>
+		<h2.version>2.2.220</h2.version>
 		<springdoc-openapi>1.2.10</springdoc-openapi>
 		<gson.version>2.8.9</gson.version>
 		<jjwt.version>0.9.1</jjwt.version>

diff --git 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>
diff --git a/jdi-dark-tests/src/test/java/com/epam/jdi/httptests/examples/DomainSwitchTest.java b/jdi-dark-tests/src/test/java/com/epam/jdi/httptests/examples/DomainSwitchTest.java
@@ -4,6 +4,7 @@
 import static org.hamcrest.Matchers.containsString;
 
 import com.epam.http.requests.ServiceSettings;
+import com.epam.http.response.ResponseStatusType;
 import com.epam.http.response.RestResponse;
 import com.epam.jdi.httptests.support.TwoServicesInit;
 import com.epam.jdi.services.QuotesService;
@@ -41,7 +42,7 @@ public static void testSearchChangingDomainAndOtherServiceCall() {
 
     final QuotesService quotesService = init(QuotesService.class);
     final RestResponse quotesServiceResp = quotesService.quoteOfTheDayCategories.call();
-    quotesServiceResp.isOk();
+    quotesServiceResp.isStatus(ResponseStatusType.CLIENT_ERROR);
 
     final ServiceNoDomainAnnotation googleSearch =
         init(ServiceNoDomainAnnotation.class, "https://google.com");

diff --git a/...sts/src/test/java/com/epam/jdi/httptests/examples/GoogleSearchGetChangingDomainTests.java b/...sts/src/test/java/com/epam/jdi/httptests/examples/GoogleSearchGetChangingDomainTests.java
@@ -40,9 +40,11 @@ public static void testSearchChangingDomainAndOtherServiceCall() {
         final RestResponse responseYahoo = yahoo.searchInstanceMethod.call();
         responseYahoo.isOk().body(containsString("yahoo.com"));
 
+/*      Service is available for free to debug
         final QuotesService quotesService = init(QuotesService.class);
         final RestResponse quotesServiceResp = quotesService.quoteOfTheDayCategories.call();
         quotesServiceResp.isOk();
+        */
 
         final GoogleSearch googleSearch = init(GoogleSearch.class, "https://google.com");
 

diff --git a/.../jdi/httptests/examples/requestparams/QuotesServiceStaticAndInstanceRestMethodsTests.java b/.../jdi/httptests/examples/requestparams/QuotesServiceStaticAndInstanceRestMethodsTests.java
@@ -8,9 +8,12 @@
 import java.util.HashMap;
 import java.util.Map;
 import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Ignore;
 import org.testng.annotations.Test;
 
 /** Created by oksana_cherniavskaia on 27.08.2020. */
+// Service is avaible for free only with token and 5 requests per day are free
+@Ignore
 public class QuotesServiceStaticAndInstanceRestMethodsTests {
     @BeforeTest
     public void before() {

diff --git a/jdi-dark/pom.xml b/jdi-dark/pom.xml
@@ -13,12 +13,13 @@
     <properties>
         <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>
+        <gson.version>2.10.1</gson.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>
+        <slf4j.version>2.0.7</slf4j.version>
         <gpg.key></gpg.key>
     </properties>
 
@@ -57,6 +58,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>
@@ -73,10 +85,26 @@
             <artifactId>log4j-core</artifactId>
             <version>${log4j2.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j2-impl</artifactId>
+            <version>${log4j2.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.2.3</version>
+            <version>1.3.11</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${slf4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-reload4j</artifactId>
+            <version>${slf4j.version}</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>

diff --git a/pom.xml b/pom.xml
@@ -16,14 +16,6 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.eluder.coveralls</groupId>
-            <artifactId>coveralls-maven-plugin</artifactId>
-            <version>4.3.0</version>
-        </dependency>
-    </dependencies>
-
     <build>
         <plugins>
             <plugin>