Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ If you prefer using **Logback** logging library, add following dependencies:
<dependency>
<groupId>com.epam.reportportal</groupId>
<artifactId>logger-java-logback</artifactId>
<version>5.2.2</version>
<version>5.4.0</version>
</dependency>
```
> 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)
Expand All @@ -157,7 +157,7 @@ If you prefer using **Logback** logging library, add following dependencies:
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.10</version>
<version>1.5.19</version>
</dependency>
```

Expand All @@ -168,7 +168,7 @@ If you prefer using **Log4j** logging library, add following dependencies:
<dependency>
<groupId>com.epam.reportportal</groupId>
<artifactId>logger-java-log4j</artifactId>
<version>5.2.2</version>
<version>5.4.0</version>
</dependency>
```
> 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)
Expand All @@ -178,13 +178,13 @@ If you prefer using **Log4j** logging library, add following dependencies:
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.17.1</version>
<version>2.25.2</version>
</dependency>

<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.25.2</version>
</dependency>
```

Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ protected void finishBeforeAll(Invocation<Void> invocation, ReflectiveInvocation
*/
protected void finishBeforeEach(Invocation<Void> invocation, ReflectiveInvocationContext<Method> invocationContext,
ExtensionContext context, Maybe<String> id) throws Throwable {
Instant startTime = Instant.now();
Instant startTime = Instant.now().truncatedTo(ChronoUnit.MICROS);
try {
finishBeforeAfter(invocation, context, id);
} catch (Throwable throwable) {
Expand Down Expand Up @@ -927,10 +927,10 @@ protected String createConfigurationDescription(Class<?> testClass, Method metho
*/
protected void reportSkippedStep(ReflectiveInvocationContext<Method> 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);
Expand Down