From acbb318c72eb423bad8229b18ac984b9b98b148c Mon Sep 17 00:00:00 2001 From: Pavel Bortnik Date: Fri, 5 Apr 2024 20:05:02 +0300 Subject: [PATCH] EPMRPP-89703 || Lib updates with merged ones --- build.gradle | 6 ++++-- .../java/com/epam/reportportal/saucelabs/AssetsCommand.java | 6 +++--- .../reportportal/saucelabs/GenerateAuthTokenCommand.java | 4 ++-- .../com/epam/reportportal/saucelabs/GetLogsCommand.java | 6 +++--- .../com/epam/reportportal/saucelabs/JobInfoCommand.java | 6 +++--- .../java/com/epam/reportportal/saucelabs/RestClient.java | 4 ++-- .../com/epam/reportportal/saucelabs/ValidationUtils.java | 4 ++-- 7 files changed, 19 insertions(+), 17 deletions(-) diff --git a/build.gradle b/build.gradle index 72198a9..58ca514 100644 --- 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 index 68bdf34..9f6e8b7 100644 --- 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 index ff13c92..720eae3 100644 --- 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 index 82fd3bc..9f1cc1b 100644 --- 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 index 33f3aa9..24b6d5f 100644 --- 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 index 4d9479d..abd78ce 100644 --- 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 index f247df2..c803936 100644 --- 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; /**