EPMRPP-89703 || Lib updates with merged ones

reportportal · Apr 5, 2024 · acbb318 · acbb318
1 parent 25476d1
commit acbb318
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 17 deletions.
diff --git a/build.gradle b/build.gradle
@@ -38,11 +38,13 @@ dependencyManagement {
 
 dependencies {
     if (releaseMode) {
+        implementation 'com.epam.reportportal:commons-dao'
         implementation 'com.epam.reportportal:plugin-api'
         annotationProcessor 'com.epam.reportportal:plugin-api'
     } else {
-        implementation 'com.github.reportportal:plugin-api:cc3c5c8e'
-        annotationProcessor 'com.github.reportportal:plugin-api:cc3c5c8e'
+        implementation 'com.github.reportportal:commons-dao:fa04c1f'
+        implementation 'com.github.reportportal:plugin-api:20ab960'
+        annotationProcessor 'com.github.reportportal:plugin-api:20ab960'
     }
     implementation 'com.saucelabs:saucerest:1.0.43'
 }

diff --git a/src/main/java/com/epam/reportportal/saucelabs/AssetsCommand.java b/src/main/java/com/epam/reportportal/saucelabs/AssetsCommand.java
@@ -20,10 +20,10 @@
 import static com.epam.reportportal.saucelabs.SaucelabsProperties.DATA_CENTER;
 
 import com.epam.reportportal.extension.PluginCommand;
-import com.epam.ta.reportportal.commons.validation.Suppliers;
+import com.epam.reportportal.rules.commons.validation.Suppliers;
 import com.epam.ta.reportportal.entity.integration.Integration;
-import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.reportportal.rules.exception.ReportPortalException;
+import com.epam.reportportal.rules.exception.ErrorType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.saucelabs.saucerest.SauceREST;
 import java.io.IOException;

diff --git a/src/main/java/com/epam/reportportal/saucelabs/GenerateAuthTokenCommand.java b/src/main/java/com/epam/reportportal/saucelabs/GenerateAuthTokenCommand.java
@@ -7,8 +7,8 @@
 
 import com.epam.reportportal.extension.PluginCommand;
 import com.epam.ta.reportportal.entity.integration.Integration;
-import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.reportportal.rules.exception.ReportPortalException;
+import com.epam.reportportal.rules.exception.ErrorType;
 import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.Map;

diff --git a/src/main/java/com/epam/reportportal/saucelabs/GetLogsCommand.java b/src/main/java/com/epam/reportportal/saucelabs/GetLogsCommand.java
@@ -20,10 +20,10 @@
 import static com.epam.reportportal.saucelabs.SaucelabsProperties.DATA_CENTER;
 
 import com.epam.reportportal.extension.PluginCommand;
-import com.epam.ta.reportportal.commons.validation.Suppliers;
+import com.epam.reportportal.rules.commons.validation.Suppliers;
 import com.epam.ta.reportportal.entity.integration.Integration;
-import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.reportportal.rules.exception.ReportPortalException;
+import com.epam.reportportal.rules.exception.ErrorType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.saucelabs.saucerest.SauceREST;
 import java.io.IOException;

diff --git a/src/main/java/com/epam/reportportal/saucelabs/JobInfoCommand.java b/src/main/java/com/epam/reportportal/saucelabs/JobInfoCommand.java
@@ -20,10 +20,10 @@
 import static com.epam.reportportal.saucelabs.SaucelabsProperties.DATA_CENTER;
 
 import com.epam.reportportal.extension.PluginCommand;
-import com.epam.ta.reportportal.commons.validation.Suppliers;
+import com.epam.reportportal.rules.commons.validation.Suppliers;
 import com.epam.ta.reportportal.entity.integration.Integration;
-import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.reportportal.rules.exception.ReportPortalException;
+import com.epam.reportportal.rules.exception.ErrorType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.saucelabs.saucerest.SauceREST;
 import java.io.IOException;

diff --git a/src/main/java/com/epam/reportportal/saucelabs/RestClient.java b/src/main/java/com/epam/reportportal/saucelabs/RestClient.java
@@ -23,8 +23,8 @@
 
 import com.epam.ta.reportportal.entity.integration.Integration;
 import com.epam.ta.reportportal.entity.integration.IntegrationParams;
-import com.epam.ta.reportportal.exception.ReportPortalException;
-import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.reportportal.rules.exception.ReportPortalException;
+import com.epam.reportportal.rules.exception.ErrorType;
 import com.saucelabs.saucerest.DataCenter;
 import com.saucelabs.saucerest.SauceREST;
 import org.apache.commons.lang3.StringUtils;

diff --git a/src/main/java/com/epam/reportportal/saucelabs/ValidationUtils.java b/src/main/java/com/epam/reportportal/saucelabs/ValidationUtils.java
@@ -16,11 +16,11 @@
 
 package com.epam.reportportal.saucelabs;
 
+import static com.epam.reportportal.rules.commons.validation.BusinessRule.expect;
 import static com.epam.reportportal.saucelabs.SaucelabsExtension.JOB_ID;
-import static com.epam.ta.reportportal.commons.validation.BusinessRule.expect;
 
 import com.epam.ta.reportportal.commons.Predicates;
-import com.epam.ta.reportportal.ws.reporting.ErrorType;
+import com.epam.reportportal.rules.exception.ErrorType;
 import java.util.Map;
 
 /**