diff --git a/README.md b/README.md index 023b9a4..0203e6c 100644 --- a/README.md +++ b/README.md @@ -6,18 +6,18 @@ For installation instructions please see corresponding agent module: -| Framework | Agent | Current version | -| ------------ | -----------------------| --------------- | -| TestNG | [agent-allure-testng](agent-allure-testng/) | [![Maven Central](https://img.shields.io/maven-central/v/com.epam.reportportal/agent-allure-testng.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22com.epam.reportportal%22%20AND%20a:%22agent-allure-testng%22) | -| JUnit 4 | [agent-allure-junit](agent-allure-junit/) | [![Maven Central](https://img.shields.io/maven-central/v/com.epam.reportportal/agent-allure-junit.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22com.epam.reportportal%22%20AND%20a:%22agent-allure-junit%22) | -| JUnit 5 | [agent-allure-junit5](agent-allure-junit5/) | [![Maven Central](https://img.shields.io/maven-central/v/com.epam.reportportal/agent-allure-junit5.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22com.epam.reportportal%22%20AND%20a:%22agent-allure-junit5%22) | -| Cucumber | [agent-allure-cucumber](agent-allure-cucumber/) | [![Maven Central](https://img.shields.io/maven-central/v/com.epam.reportportal/agent-allure-cucumber.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22com.epam.reportportal%22%20AND%20a:%22agent-allure-cucumber%22) | -| Cucumber 2 | [agent-allure-cucumber2](agent-allure-cucumber2/) | [![Maven Central](https://img.shields.io/maven-central/v/com.epam.reportportal/agent-allure-cucumber2.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22com.epam.reportportal%22%20AND%20a:%22agent-allure-cucumber2%22) | -| Cucumber 4 | [agent-allure-cucumber4](agent-allure-cucumber4/) | [![Maven Central](https://img.shields.io/maven-central/v/com.epam.reportportal/agent-allure-cucumber4.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22com.epam.reportportal%22%20AND%20a:%22agent-allure-cucumber4%22) | -| Cucumber 5 | [agent-allure-cucumber5](agent-allure-cucumber5/) | [![Maven Central](https://img.shields.io/maven-central/v/com.epam.reportportal/agent-allure-cucumber5.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22com.epam.reportportal%22%20AND%20a:%22agent-allure-cucumber5%22) | -| Cucumber 6-7 | [agent-allure-cucumber6](agent-allure-cucumber6/) | [![Maven Central](https://img.shields.io/maven-central/v/com.epam.reportportal/agent-allure-cucumber6.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22com.epam.reportportal%22%20AND%20a:%22agent-allure-cucumber6%22) | -| Spock | [agent-allure-spock](agent-allure-spock/) | [![Maven Central](https://img.shields.io/maven-central/v/com.epam.reportportal/agent-allure-spock.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22com.epam.reportportal%22%20AND%20a:%22agent-allure-spock%22) | -| JBehave | [agent-allure-jbehave](agent-allure-JBehave/) | [![Maven Central](https://img.shields.io/maven-central/v/com.epam.reportportal/agent-allure-jbehave.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22com.epam.reportportal%22%20AND%20a:%22agent-allure-jbehave%22) | +| Framework | Agent | Current version | +|--------------|---------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| TestNG | [agent-allure-testng](agent-allure-testng/) | [![Maven Central](https://img.shields.io/maven-central/v/com.epam.reportportal/agent-allure-testng.svg?label=Maven%20Central)](https://central.sonatype.com/artifact/com.epam.reportportal/agent-allure-testng) | +| JUnit 4 | [agent-allure-junit](agent-allure-junit/) | [![Maven Central](https://img.shields.io/maven-central/v/com.epam.reportportal/agent-allure-junit.svg?label=Maven%20Central)](https://central.sonatype.com/artifact/com.epam.reportportal/agent-allure-junit) | +| JUnit 5 | [agent-allure-junit5](agent-allure-junit5/) | [![Maven Central](https://img.shields.io/maven-central/v/com.epam.reportportal/agent-allure-junit5.svg?label=Maven%20Central)](https://central.sonatype.com/artifact/com.epam.reportportal/agent-allure-junit5) | +| Cucumber | [agent-allure-cucumber](agent-allure-cucumber/) | [![Maven Central](https://img.shields.io/maven-central/v/com.epam.reportportal/agent-allure-cucumber.svg?label=Maven%20Central)](https://central.sonatype.com/artifact/com.epam.reportportal/agent-allure-cucumber) | +| Cucumber 2 | [agent-allure-cucumber2](agent-allure-cucumber2/) | [![Maven Central](https://img.shields.io/maven-central/v/com.epam.reportportal/agent-allure-cucumber2.svg?label=Maven%20Central)](https://central.sonatype.com/artifact/com.epam.reportportal/agent-allure-cucumber2) | +| Cucumber 4 | [agent-allure-cucumber4](agent-allure-cucumber4/) | [![Maven Central](https://img.shields.io/maven-central/v/com.epam.reportportal/agent-allure-cucumber4.svg?label=Maven%20Central)](https://central.sonatype.com/artifact/com.epam.reportportal/agent-allure-cucumber4) | +| Cucumber 5 | [agent-allure-cucumber5](agent-allure-cucumber5/) | [![Maven Central](https://img.shields.io/maven-central/v/com.epam.reportportal/agent-allure-cucumber5.svg?label=Maven%20Central)](https://central.sonatype.com/artifact/com.epam.reportportal/agent-allure-cucumber5) | +| Cucumber 6-7 | [agent-allure-cucumber6](agent-allure-cucumber6/) | [![Maven Central](https://img.shields.io/maven-central/v/com.epam.reportportal/agent-allure-cucumber6.svg?label=Maven%20Central)](https://central.sonatype.com/artifact/com.epam.reportportal/agent-allure-cucumber6) | +| Spock | [agent-allure-spock](agent-allure-spock/) | [![Maven Central](https://img.shields.io/maven-central/v/com.epam.reportportal/agent-allure-spock.svg?label=Maven%20Central)](https://central.sonatype.com/artifact/com.epam.reportportal/agent-allure-spock) | +| JBehave | [agent-allure-jbehave](agent-allure-jbehave/) | [![Maven Central](https://img.shields.io/maven-central/v/com.epam.reportportal/agent-allure-jbehave.svg?label=Maven%20Central)](https://central.sonatype.com/artifact/com.epam.reportportal/agent-allure-jbehave) | [![CI Build](https://github.com/reportportal/allure-java/actions/workflows/ci.yml/badge.svg)](https://github.com/reportportal/allure-java/actions/workflows/ci.yml) [![Join Slack chat!](https://slack.epmrpp.reportportal.io/badge.svg)](https://slack.epmrpp.reportportal.io/) diff --git a/allure-common/CHANGELOG.md b/allure-common/CHANGELOG.md index 74e3c7e..5c4b576 100644 --- a/allure-common/CHANGELOG.md +++ b/allure-common/CHANGELOG.md @@ -1,6 +1,10 @@ # Changelog ## [Unreleased] +### Changed +- Client version updated on [5.2.1](https://github.com/reportportal/client-java/releases/tag/5.2.1), by @HardNorth +- Allure version updated on 2.25.0, by @HardNorth +- Allure dependency marked as `implementation` to force users specify their own versions, by @HardNorth ## [5.1.1] - Client version updated on [5.1.22](https://github.com/reportportal/client-java/releases/tag/5.1.22), by @HardNorth diff --git a/allure-common/build.gradle b/allure-common/build.gradle index 77891d8..2bc3819 100644 --- a/allure-common/build.gradle +++ b/allure-common/build.gradle @@ -43,12 +43,12 @@ compileTestJava.options.encoding = 'UTF-8' dependencies { api 'com.epam.reportportal:commons-model:5.0.0' api 'com.google.code.findbugs:jsr305:3.0.2' - api ("io.qameta.allure:allure-java-commons:${allure_version}") { + + implementation ("io.qameta.allure:allure-java-commons:${allure_version}") { exclude group: 'org.slf4j' } - implementation 'org.slf4j:slf4j-api:2.0.7' - implementation 'com.epam.reportportal:client-java:5.1.22' + implementation 'com.epam.reportportal:client-java:5.2.1' testImplementation 'com.epam.reportportal:agent-java-test-utils:0.0.2' testImplementation("org.junit.platform:junit-platform-runner:${junit5_runner_version}") { diff --git a/allure-common/gradle.properties b/allure-common/gradle.properties index c93a177..fa79296 100644 --- a/allure-common/gradle.properties +++ b/allure-common/gradle.properties @@ -1,3 +1,3 @@ name=allure-common -version=5.1.2-SNAPSHOT +version=5.2.0-SNAPSHOT description=Report Portal - Allure integration commons diff --git a/allure-common/src/main/java/com/epam/reportportal/allure/AttachmentAspect.java b/allure-common/src/main/java/com/epam/reportportal/allure/AttachmentAspect.java index 025547f..2c43abd 100644 --- a/allure-common/src/main/java/com/epam/reportportal/allure/AttachmentAspect.java +++ b/allure-common/src/main/java/com/epam/reportportal/allure/AttachmentAspect.java @@ -19,8 +19,8 @@ import com.epam.reportportal.listeners.LogLevel; import com.epam.reportportal.message.ReportPortalMessage; import com.epam.reportportal.service.ReportPortal; +import com.epam.reportportal.utils.files.ByteSource; import com.epam.reportportal.utils.files.Utils; -import com.google.common.io.ByteSource; import io.qameta.allure.Attachment; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.ProceedingJoinPoint; diff --git a/gradle.properties b/gradle.properties index 984d105..e592b36 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ name=allure-java group=com.epam.reportportal -version=5.1.0-SNAPSHOT +version=5.2.0-SNAPSHOT description=Report Portal - Allure integrations for Java test frameworks scripts_url=https://raw.githubusercontent.com/reportportal/gradle-scripts scripts_branch=master @@ -8,4 +8,4 @@ excludeTests= junit5_version=5.6.3 junit5_runner_version=1.6.3 mockito_version=3.3.3 -allure_version=2.23.0 +allure_version=2.25.0