Merge pull request #516 from jdi-testing/fix_jdk17

remove domain from profile
jdi-testing · Sep 7, 2023 · 9ab69c3 · 9ab69c3
2 parents c23d8da + 03a440f
commit 9ab69c3
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 23 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -103,7 +103,7 @@ jobs:
 #          comment-on-pull-request: true
 
       - name: Test Coverage
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v3
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
 

diff --git a/jdi-dark-bdd/pom.xml b/jdi-dark-bdd/pom.xml
@@ -104,7 +104,7 @@
                     <dependency>
                         <groupId>com.thoughtworks.xstream</groupId>
                         <artifactId>xstream</artifactId>
-                        <version>1.4.15</version>
+                        <version>1.4.20</version>
                     </dependency>
                 </dependencies>
             </plugin>

diff --git a/jdi-dark-tests/pom.xml b/jdi-dark-tests/pom.xml
@@ -15,7 +15,9 @@
         <aspectj.version>1.9.5</aspectj.version>
         <suiteXML.file>general.xml</suiteXML.file>
         <jdi.dark.version>1.1.14-SNAPSHOT</jdi.dark.version>
-        <maven.dep.version>3.2.0</maven.dep.version>
+        <maven.dep.version>3.3.1</maven.dep.version>
+        <domain>local=http://localhost:8080, trello=https://api.trello.com/1, google=https://google.com</domain>
+        <log.level>INFO</log.level>
         <!-- - - add-opens java.base/java.lang=ALL-UNNAMED is needed for JDK 16+ -->
         <aspectj.args></aspectj.args>
     </properties>
@@ -262,23 +264,6 @@
     </reporting>
 
     <profiles>
-        <profile>
-            <id>info</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <domain>local=http://localhost:8080, trello=https://api.trello.com/1, google=https://google.com</domain>
-                <log.level>INFO</log.level>
-            </properties>
-        </profile>
-        <profile>
-            <id>debug</id>
-            <properties>
-                <domain>local=http://localhost:8080, trello=https://api.trello.com/1, google=https://google.com</domain>
-                <log.level>DEBUG</log.level>
-            </properties>
-        </profile>
         <profile>
             <id>jdk16</id>
             <activation>

diff --git a/jdi-dark-tests/src/test/java/com/epam/jdi/httptests/examples/custom/PreconditionTests.java b/jdi-dark-tests/src/test/java/com/epam/jdi/httptests/examples/custom/PreconditionTests.java
@@ -25,7 +25,7 @@
 import static org.hamcrest.core.IsEqual.equalTo;
 
 public class PreconditionTests {
-    public static final String CSV_DATA_FILE = "src/test/resources/testWithPreconditions.csv";
+    public static final String CSV_DATA_FILE = "./testWithPreconditions.csv";
     private ArrayList<String> createdBoardsId = new ArrayList<String>();
     private static String newOrgId;
 

diff --git a/jdi-dark-ws/pom.xml b/jdi-dark-ws/pom.xml
@@ -80,7 +80,7 @@
                     <dependency>
                         <groupId>com.thoughtworks.xstream</groupId>
                         <artifactId>xstream</artifactId>
-                        <version>1.4.15</version>
+                        <version>1.4.20</version>
                     </dependency>
                 </dependencies>
             </plugin>

diff --git a/jdi-dark/pom.xml b/jdi-dark/pom.xml
@@ -205,7 +205,7 @@
                     <dependency>
                         <groupId>com.thoughtworks.xstream</groupId>
                         <artifactId>xstream</artifactId>
-                        <version>1.4.15</version>
+                        <version>1.4.20</version>
                     </dependency>
                 </dependencies>
             </plugin>