From 51ee1c8175b03e30283603263242c92ee7e8997b Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Mon, 6 Oct 2025 14:17:19 +0300 Subject: [PATCH 1/4] Update dependency versions in README.md Updated version numbers for Logback and Log4j dependencies in README. --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ee8c132..08cc220 100644 --- a/README.md +++ b/README.md @@ -157,7 +157,7 @@ If you prefer using **Logback** logging library, add following dependencies: ch.qos.logback logback-classic - 1.2.10 + 1.5.19 ``` @@ -168,7 +168,7 @@ If you prefer using **Log4j** logging library, add following dependencies: com.epam.reportportal logger-java-log4j - 5.2.2 + 5.4.0 ``` > Up to date version could be found [here](https://search.maven.org/search?q=g:%22com.epam.reportportal%22%20AND%20a:%22logger-java-log4j%22) @@ -178,13 +178,13 @@ If you prefer using **Log4j** logging library, add following dependencies: org.apache.logging.log4j log4j-api - 2.17.1 + 2.25.2 org.apache.logging.log4j log4j-core - 2.17.1 + 2.25.2 ``` From 0da6d03b1f7d8136bb9d82dddd32a3466380467b Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Mon, 6 Oct 2025 14:18:04 +0300 Subject: [PATCH 2/4] Update logger-java-logback version to 5.4.0 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 08cc220..616024d 100644 --- a/README.md +++ b/README.md @@ -147,7 +147,7 @@ If you prefer using **Logback** logging library, add following dependencies: com.epam.reportportal logger-java-logback - 5.2.2 + 5.4.0 ``` > Up to date version could be found [here](https://search.maven.org/search?q=g:%22com.epam.reportportal%22%20AND%20a:%22logger-java-logback%22) From 73cff7544f6fbdc841b98cd96e2428060c3f506d Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Thu, 16 Oct 2025 11:43:27 +0300 Subject: [PATCH 3/4] Dependency versions update --- CHANGELOG.md | 2 ++ build.gradle | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9fc41ed..d283178 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Changelog ## [Unreleased] +### Changed +- Client version updated on [5.4.4](https://github.com/reportportal/client-java/releases/tag/5.4.4), by @HardNorth ## [5.5.2] ### Changed diff --git a/build.gradle b/build.gradle index 761bc12..cf37fc3 100644 --- a/build.gradle +++ b/build.gradle @@ -37,7 +37,7 @@ repositories { } dependencies { - api 'com.epam.reportportal:client-java:5.4.3' + api 'com.epam.reportportal:client-java:5.4.4' compileOnly "org.junit.jupiter:junit-jupiter-api:${junit_version}" implementation 'org.slf4j:slf4j-api:2.0.7' @@ -50,7 +50,7 @@ dependencies { testImplementation 'org.aspectj:aspectjweaver:1.9.19' testImplementation 'org.hamcrest:hamcrest:2.2' testImplementation 'org.mockito:mockito-core:3.3.3' - testImplementation 'ch.qos.logback:logback-classic:1.5.18' + testImplementation 'ch.qos.logback:logback-classic:1.5.19' testImplementation 'com.epam.reportportal:logger-java-logback:5.4.0' testImplementation 'org.assertj:assertj-core:3.23.1' testImplementation 'com.squareup.okhttp3:okhttp:4.12.0' From c81aa2dcb28295c1e9ca634084d32891aea62248 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Thu, 16 Oct 2025 13:18:42 +0300 Subject: [PATCH 4/4] Minor step order fix --- .../com/epam/reportportal/junit5/ReportPortalExtension.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/epam/reportportal/junit5/ReportPortalExtension.java b/src/main/java/com/epam/reportportal/junit5/ReportPortalExtension.java index 0618297..805f733 100644 --- a/src/main/java/com/epam/reportportal/junit5/ReportPortalExtension.java +++ b/src/main/java/com/epam/reportportal/junit5/ReportPortalExtension.java @@ -403,7 +403,7 @@ protected void finishBeforeAll(Invocation invocation, ReflectiveInvocation */ protected void finishBeforeEach(Invocation invocation, ReflectiveInvocationContext invocationContext, ExtensionContext context, Maybe id) throws Throwable { - Instant startTime = Instant.now(); + Instant startTime = Instant.now().truncatedTo(ChronoUnit.MICROS); try { finishBeforeAfter(invocation, context, id); } catch (Throwable throwable) { @@ -927,10 +927,10 @@ protected String createConfigurationDescription(Class testClass, Method metho */ protected void reportSkippedStep(ReflectiveInvocationContext invocationContext, ExtensionContext context, Throwable throwable, Instant eventTime) { - Instant skipStartTime = Instant.now(); + Instant skipStartTime = Instant.now().truncatedTo(ChronoUnit.MICROS); if (skipStartTime.compareTo(eventTime) > 0) { // to fix item ordering when @AfterEach starts in the same millisecond as skipped test - skipStartTime = skipStartTime.minus(1, ChronoUnit.MILLIS); + skipStartTime = skipStartTime.minus(1, ChronoUnit.MICROS); } final ItemType itemType = STEP; startTestItem(context, invocationContext.getArguments(), itemType, createStepDescription(context, itemType), skipStartTime);