From fe960b3beb13259ae581319e1b059eaf771a8a28 Mon Sep 17 00:00:00 2001
From: Vadzim Hushchanskou <vadzim_hushchanskou@epam.com>
Date: Thu, 14 Nov 2024 11:08:24 +0300
Subject: [PATCH] Client version update

---
 CHANGELOG.md                                                | 5 ++++-
 build.gradle                                                | 4 ++--
 gradle.properties                                           | 2 +-
 .../com/epam/reportportal/cucumber/AbstractReporter.java    | 6 +++---
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44b795f..734f2fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,11 @@
 # Changelog
 
 ## [Unreleased]
+### Added
+- Common Stack Trace frames skip in description and logs, by @HardNorth
 ### Changed
-- Client version updated on [5.2.14](https://github.com/reportportal/client-java/releases/tag/5.2.14), by @HardNorth
+- Client version updated on [5.2.20](https://github.com/reportportal/client-java/releases/tag/5.2.20), by @HardNorth
+- Cucumber version updated on 7.20.1, by @HardNorth
 
 ## [5.3.2]
 ### Changed
diff --git a/build.gradle b/build.gradle
index ccf4368..3379948 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,7 +39,7 @@ repositories {
 }
 
 dependencies {
-    api 'com.epam.reportportal:client-java:5.2.14'
+    api 'com.epam.reportportal:client-java:5.2.20'
 
     implementation "io.cucumber:cucumber-gherkin:${project.cucumber_version}"
     implementation 'org.slf4j:slf4j-api:2.0.7'
@@ -60,7 +60,7 @@ dependencies {
     testImplementation "org.junit.jupiter:junit-jupiter-api:${project.junit_version}"
     testImplementation "org.junit.jupiter:junit-jupiter-params:${project.junit_version}"
     testImplementation "org.junit.jupiter:junit-jupiter-engine:${project.junit_version}"
-    testImplementation 'org.apache.commons:commons-io:1.3.2'
+    testImplementation 'commons-io:commons-io:2.16.1'
 }
 
 test {
diff --git a/gradle.properties b/gradle.properties
index 0bf12d5..8765eeb 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 version=5.3.3-SNAPSHOT
 description=EPAM Report portal. Cucumber JVM version [6.0.0; ) adapter
-cucumber_version=7.13.0
+cucumber_version=7.20.1
 junit_version=5.6.3
 junit_runner_version=1.6.3
 scripts_url=https://raw.githubusercontent.com/reportportal/gradle-scripts
diff --git a/src/main/java/com/epam/reportportal/cucumber/AbstractReporter.java b/src/main/java/com/epam/reportportal/cucumber/AbstractReporter.java
index e3519c4..4040c40 100644
--- a/src/main/java/com/epam/reportportal/cucumber/AbstractReporter.java
+++ b/src/main/java/com/epam/reportportal/cucumber/AbstractReporter.java
@@ -27,8 +27,8 @@
 import com.epam.reportportal.service.tree.TestItemTree;
 import com.epam.reportportal.utils.*;
 import com.epam.reportportal.utils.files.ByteSource;
+import com.epam.reportportal.utils.formatting.MarkdownUtils;
 import com.epam.reportportal.utils.http.ContentType;
-import com.epam.reportportal.utils.markdown.MarkdownUtils;
 import com.epam.reportportal.utils.properties.SystemAttributesExtractor;
 import com.epam.reportportal.utils.reflect.Accessible;
 import com.epam.ta.reportportal.ws.model.FinishExecutionRQ;
@@ -59,9 +59,9 @@
 import static com.epam.reportportal.cucumber.Utils.*;
 import static com.epam.reportportal.cucumber.util.ItemTreeUtils.createKey;
 import static com.epam.reportportal.cucumber.util.ItemTreeUtils.retrieveLeaf;
+import static com.epam.reportportal.utils.formatting.ExceptionUtils.getStackTrace;
 import static java.util.Optional.ofNullable;
 import static org.apache.commons.lang3.StringUtils.isNotBlank;
-import static org.apache.commons.lang3.exception.ExceptionUtils.getStackTrace;
 
 /**
  * Abstract Cucumber 5.x formatter for Report Portal
@@ -559,7 +559,7 @@ protected void reportResult(@Nonnull Result result, @Nullable String message) {
 			sendLog(message, level);
 		}
 		if (result.getError() != null) {
-			sendLog(getStackTrace(result.getError()), level);
+			sendLog(getStackTrace(result.getError(), new Throwable()), level);
 		}
 	}