From c2f6d403bd4aeef22ef7ce7eb605f90e5929fa89 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Tue, 13 Feb 2024 14:27:18 +0300 Subject: [PATCH 01/12] Remove unused method --- CHANGELOG.md | 2 ++ .../com/epam/reportportal/jbehave/util/ItemTreeUtils.java | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d3d774..fb985f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Changelog ## [Unreleased] +### Removed +- `ItemTreeUtils.createKey(org.jbehave.core.model.Scenario)` unused method, by @HardNorth ## [5.3.2] ### Changed diff --git a/src/main/java/com/epam/reportportal/jbehave/util/ItemTreeUtils.java b/src/main/java/com/epam/reportportal/jbehave/util/ItemTreeUtils.java index e19a6a8..837bcfd 100644 --- a/src/main/java/com/epam/reportportal/jbehave/util/ItemTreeUtils.java +++ b/src/main/java/com/epam/reportportal/jbehave/util/ItemTreeUtils.java @@ -17,7 +17,6 @@ package com.epam.reportportal.jbehave.util; import com.epam.reportportal.service.tree.TestItemTree; -import org.jbehave.core.model.Scenario; import org.jbehave.core.model.Story; import javax.annotation.Nonnull; @@ -40,10 +39,6 @@ public static TestItemTree.ItemTreeKey createKey(@Nonnull final Story key) { return TestItemTree.ItemTreeKey.of(key.getPath()); } - public static TestItemTree.ItemTreeKey createKey(@Nonnull final Scenario key) { - return TestItemTree.ItemTreeKey.of(key.getTitle()); - } - public static TestItemTree.ItemTreeKey createKey(@Nonnull final Map example) { return TestItemTree.ItemTreeKey.of(formatExampleKey(example)); } From ea5ab94f869a0d77e55710265e87975142e26d32 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Fri, 23 Feb 2024 16:56:48 +0300 Subject: [PATCH 02/12] Dependency versions update --- CHANGELOG.md | 3 +++ build.gradle | 12 +++++------- gradle.properties | 4 ++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fb985f6..7b9cdf5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ # Changelog ## [Unreleased] +### Changed +- JBehave dependency marked as `compileOnly` to force users specify their own versions, by @HardNorth +- Client version updated on [5.2.5](https://github.com/reportportal/client-java/releases/tag/5.2.5), by @HardNorth ### Removed - `ItemTreeUtils.createKey(org.jbehave.core.model.Scenario)` unused method, by @HardNorth diff --git a/build.gradle b/build.gradle index ed2ff57..e7f5952 100644 --- a/build.gradle +++ b/build.gradle @@ -39,27 +39,25 @@ repositories { } dependencies { - api 'com.epam.reportportal:client-java:5.2.4' + api 'com.epam.reportportal:client-java:5.2.5' api 'com.google.code.findbugs:jsr305:3.0.2' - implementation ("org.jbehave:jbehave-core:${project.jbehave_version}") { + compileOnly ("org.jbehave:jbehave-core:${project.jbehave_version}") { exclude group: 'junit' exclude group: 'org.junit.vintage' } implementation 'org.slf4j:slf4j-api:2.0.7' - testImplementation 'com.epam.reportportal:agent-java-test-utils:0.0.2' + testImplementation 'com.epam.reportportal:agent-java-test-utils:0.0.3' testImplementation 'org.aspectj:aspectjweaver:1.9.19' testImplementation 'org.hamcrest:hamcrest-core:2.2' testImplementation "org.mockito:mockito-core:${project.mockito_version}" testImplementation "org.mockito:mockito-junit-jupiter:${project.mockito_version}" testImplementation 'ch.qos.logback:logback-classic:1.3.12' - testImplementation 'com.epam.reportportal:logger-java-logback:5.2.0' - testImplementation ("org.junit.platform:junit-platform-runner:${project.junit5_launcher_version}") { - exclude group: 'junit' - } + testImplementation 'com.epam.reportportal:logger-java-logback:5.2.1' testImplementation "org.junit.jupiter:junit-jupiter-api:${project.junit5_version}" testImplementation "org.junit.jupiter:junit-jupiter-params:${project.junit5_version}" testImplementation "org.junit.jupiter:junit-jupiter-engine:${project.junit5_version}" + testImplementation "org.junit.platform:junit-platform-launcher:${project.junit5_launcher_version}" testImplementation 'org.apache.commons:commons-io:1.3.2' testImplementation ("org.jbehave:jbehave-gherkin:${project.jbehave_version}") { exclude group: 'junit' diff --git a/gradle.properties b/gradle.properties index 57fb834..cdf3fa0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,8 +16,8 @@ version=5.3.3-SNAPSHOT description=JBehave reporters for Report Portal jbehave_version=5.2.0 -junit5_version=5.8.2 -junit5_launcher_version=1.8.2 +junit5_version=5.9.3 +junit5_launcher_version=1.9.3 mockito_version=3.3.3 scripts_url=https://raw.githubusercontent.com/reportportal/gradle-scripts scripts_branch=master From f933db40339ceb5f7c7e7b5ee6c3c75547c5afde Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Fri, 23 Feb 2024 17:00:19 +0300 Subject: [PATCH 03/12] Actions versions update --- .github/workflows/ci.yml | 8 +++++--- .github/workflows/release.yml | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index debdd63..8438984 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,10 +35,10 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up JDK 1.8 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: '8' @@ -47,4 +47,6 @@ jobs: run: ./gradlew build - name: Codecov upload - run: bash <(curl -s https://codecov.io/bash) + uses: codecov/codecov-action@v4 + with: + token: ${{ secrets.CODECOV_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index af89118..36c2502 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,7 +40,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Generate versions uses: HardNorth/github-version-generate@v1 @@ -50,7 +50,7 @@ jobs: version-file-extraction-pattern: ${{ env.VERSION_EXTRACT_PATTERN }} - name: Set up JDK 1.8 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: '8' @@ -108,7 +108,7 @@ jobs: - name: Checkout develop branch if: ${{ github.ref }} == 'master' - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: 'develop' fetch-depth: 0 From 04dfee19707046dfca7eeea4156137a5a530be55 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Fri, 23 Feb 2024 17:01:09 +0300 Subject: [PATCH 04/12] Slack link update --- README.md | 2 +- README_TEMPLATE.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 381f1b1..177f144 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ [![Maven Central](https://img.shields.io/maven-central/v/com.epam.reportportal/agent-java-jbehave.svg?label=Maven%20Central)](https://central.sonatype.com/artifact/com.epam.reportportal/agent-java-jbehave) [![CI Build](https://github.com/reportportal/agent-java-jbehave/actions/workflows/ci.yml/badge.svg)](https://github.com/reportportal/agent-java-jbehave/actions/workflows/ci.yml) [![codecov](https://codecov.io/gh/reportportal/agent-java-jbehave/branch/develop/graph/badge.svg?token=BCglguEcoR)](https://codecov.io/gh/reportportal/agent-java-jbehave) -[![Join Slack chat!](https://slack.epmrpp.reportportal.io/badge.svg)](https://slack.epmrpp.reportportal.io/) +[![Join Slack chat!](https://img.shields.io/badge/slack-join-brightgreen.svg)](https://slack.epmrpp.reportportal.io/) [![stackoverflow](https://img.shields.io/badge/reportportal-stackoverflow-orange.svg?style=flat)](http://stackoverflow.com/questions/tagged/reportportal) [![Build with Love](https://img.shields.io/badge/build%20with-❤%EF%B8%8F%E2%80%8D-lightgrey.svg)](http://reportportal.io?style=flat) diff --git a/README_TEMPLATE.md b/README_TEMPLATE.md index c1e508e..cfe8e5c 100644 --- a/README_TEMPLATE.md +++ b/README_TEMPLATE.md @@ -7,7 +7,7 @@ [![Maven Central](https://img.shields.io/maven-central/v/com.epam.reportportal/agent-java-jbehave.svg?label=Maven%20Central)](https://central.sonatype.com/artifact/com.epam.reportportal/agent-java-jbehave) [![CI Build](https://github.com/reportportal/agent-java-jbehave/actions/workflows/ci.yml/badge.svg)](https://github.com/reportportal/agent-java-jbehave/actions/workflows/ci.yml) [![codecov](https://codecov.io/gh/reportportal/agent-java-jbehave/branch/develop/graph/badge.svg?token=BCglguEcoR)](https://codecov.io/gh/reportportal/agent-java-jbehave) -[![Join Slack chat!](https://slack.epmrpp.reportportal.io/badge.svg)](https://slack.epmrpp.reportportal.io/) +[![Join Slack chat!](https://img.shields.io/badge/slack-join-brightgreen.svg)](https://slack.epmrpp.reportportal.io/) [![stackoverflow](https://img.shields.io/badge/reportportal-stackoverflow-orange.svg?style=flat)](http://stackoverflow.com/questions/tagged/reportportal) [![Build with Love](https://img.shields.io/badge/build%20with-❤%EF%B8%8F%E2%80%8D-lightgrey.svg)](http://reportportal.io?style=flat) From a13748b4eba1d85b121c81bdd66ebc1b019519e6 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Fri, 23 Feb 2024 17:06:00 +0300 Subject: [PATCH 05/12] Actions versions update --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8438984..2ac34a6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,6 @@ on: jobs: build: runs-on: ubuntu-latest - steps: - name: Checkout repository uses: actions/checkout@v4 From a6daf246ebaf161e650e5db5515e657b58f5b36a Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Wed, 27 Mar 2024 15:26:59 +0300 Subject: [PATCH 06/12] Dependency update --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e7f5952..1254c8f 100644 --- a/build.gradle +++ b/build.gradle @@ -53,7 +53,7 @@ dependencies { testImplementation "org.mockito:mockito-core:${project.mockito_version}" testImplementation "org.mockito:mockito-junit-jupiter:${project.mockito_version}" testImplementation 'ch.qos.logback:logback-classic:1.3.12' - testImplementation 'com.epam.reportportal:logger-java-logback:5.2.1' + testImplementation 'com.epam.reportportal:logger-java-logback:5.2.2' testImplementation "org.junit.jupiter:junit-jupiter-api:${project.junit5_version}" testImplementation "org.junit.jupiter:junit-jupiter-params:${project.junit5_version}" testImplementation "org.junit.jupiter:junit-jupiter-engine:${project.junit5_version}" From e072ba858606af632759958d5ece1a7885ecdfcf Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Wed, 27 Mar 2024 15:27:25 +0300 Subject: [PATCH 07/12] ReadMes update --- README.md | 4 ++-- README_TEMPLATE.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 177f144..9feb93d 100644 --- a/README.md +++ b/README.md @@ -160,7 +160,7 @@ dependencies { testCompile "org.jbehave:jbehave-core:${jbehaveVersion}" testCompile "org.jbehave:jbehave-navigator:${jbehaveVersion}" testCompile 'com.epam.reportportal:agent-java-jbehave:5.3.2' - testCompile 'com.epam.reportportal:logger-java-logback:5.1.1' + testCompile 'com.epam.reportportal:logger-java-logback:5.2.2' } test { @@ -252,7 +252,7 @@ To route your logs into Report Portal you should add `logger-java-logback` depen ```groovy // inside 'dependencies' section -testCompile 'com.epam.reportportal:logger-java-logback:5.1.1' +testCompile 'com.epam.reportportal:logger-java-logback:5.2.2' ``` It should be already here if you used gradle configuration listed above. diff --git a/README_TEMPLATE.md b/README_TEMPLATE.md index cfe8e5c..1880e09 100644 --- a/README_TEMPLATE.md +++ b/README_TEMPLATE.md @@ -160,7 +160,7 @@ dependencies { testCompile "org.jbehave:jbehave-core:${jbehaveVersion}" testCompile "org.jbehave:jbehave-navigator:${jbehaveVersion}" testCompile 'com.epam.reportportal:agent-java-jbehave:$LATEST_VERSION' - testCompile 'com.epam.reportportal:logger-java-logback:5.1.1' + testCompile 'com.epam.reportportal:logger-java-logback:5.2.2' } test { @@ -252,7 +252,7 @@ To route your logs into Report Portal you should add `logger-java-logback` depen ```groovy // inside 'dependencies' section -testCompile 'com.epam.reportportal:logger-java-logback:5.1.1' +testCompile 'com.epam.reportportal:logger-java-logback:5.2.2' ``` It should be already here if you used gradle configuration listed above. From 0de531e10743b5e95231147e29634cc6f9e37101 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Wed, 3 Apr 2024 14:48:54 +0300 Subject: [PATCH 08/12] Client version update --- CHANGELOG.md | 2 +- build.gradle | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b9cdf5..4d6e6bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ ## [Unreleased] ### Changed - JBehave dependency marked as `compileOnly` to force users specify their own versions, by @HardNorth -- Client version updated on [5.2.5](https://github.com/reportportal/client-java/releases/tag/5.2.5), by @HardNorth +- Client version updated on [5.2.11](https://github.com/reportportal/client-java/releases/tag/5.2.11), by @HardNorth ### Removed - `ItemTreeUtils.createKey(org.jbehave.core.model.Scenario)` unused method, by @HardNorth diff --git a/build.gradle b/build.gradle index 1254c8f..d0d7382 100644 --- a/build.gradle +++ b/build.gradle @@ -39,8 +39,8 @@ repositories { } dependencies { - api 'com.epam.reportportal:client-java:5.2.5' - api 'com.google.code.findbugs:jsr305:3.0.2' + api 'com.epam.reportportal:client-java:5.2.11' + compileOnly ("org.jbehave:jbehave-core:${project.jbehave_version}") { exclude group: 'junit' exclude group: 'org.junit.vintage' From 392a4d627f9f5d38130b7f2863293d66e1ffed15 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Wed, 3 Apr 2024 14:54:21 +0300 Subject: [PATCH 09/12] Client version update --- build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index d0d7382..8649a86 100644 --- a/build.gradle +++ b/build.gradle @@ -47,6 +47,10 @@ dependencies { } implementation 'org.slf4j:slf4j-api:2.0.7' + testImplementation ("org.jbehave:jbehave-gherkin:${project.jbehave_version}") { + exclude group: 'junit' + exclude group: 'org.junit.vintage' + } testImplementation 'com.epam.reportportal:agent-java-test-utils:0.0.3' testImplementation 'org.aspectj:aspectjweaver:1.9.19' testImplementation 'org.hamcrest:hamcrest-core:2.2' @@ -59,10 +63,6 @@ dependencies { testImplementation "org.junit.jupiter:junit-jupiter-engine:${project.junit5_version}" testImplementation "org.junit.platform:junit-platform-launcher:${project.junit5_launcher_version}" testImplementation 'org.apache.commons:commons-io:1.3.2' - testImplementation ("org.jbehave:jbehave-gherkin:${project.jbehave_version}") { - exclude group: 'junit' - exclude group: 'org.junit.vintage' - } testImplementation 'com.squareup.okhttp3:okhttp:4.12.0' } From 9cedfbd2ba159a258b079002d5b041a246e5af4f Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Wed, 3 Apr 2024 14:54:41 +0300 Subject: [PATCH 10/12] Client version update --- build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8649a86..dc1202c 100644 --- a/build.gradle +++ b/build.gradle @@ -40,7 +40,6 @@ repositories { dependencies { api 'com.epam.reportportal:client-java:5.2.11' - compileOnly ("org.jbehave:jbehave-core:${project.jbehave_version}") { exclude group: 'junit' exclude group: 'org.junit.vintage' From ba1cea10634cb95ba95a31f16c4a8c3f49a88d70 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Wed, 3 Apr 2024 15:13:31 +0300 Subject: [PATCH 11/12] Dependency update --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index dc1202c..d915555 100644 --- a/build.gradle +++ b/build.gradle @@ -50,7 +50,7 @@ dependencies { exclude group: 'junit' exclude group: 'org.junit.vintage' } - testImplementation 'com.epam.reportportal:agent-java-test-utils:0.0.3' + testImplementation 'com.epam.reportportal:agent-java-test-utils:0.0.6' testImplementation 'org.aspectj:aspectjweaver:1.9.19' testImplementation 'org.hamcrest:hamcrest-core:2.2' testImplementation "org.mockito:mockito-core:${project.mockito_version}" From 22d1e9df12d8ec750ea6ba06e7daf2518b6f77f3 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Wed, 3 Apr 2024 15:15:48 +0300 Subject: [PATCH 12/12] Mute AspectJ warnings --- src/main/resources/META-INF/aop-ajc.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/META-INF/aop-ajc.xml b/src/main/resources/META-INF/aop-ajc.xml index 73e40af..9d39ffd 100644 --- a/src/main/resources/META-INF/aop-ajc.xml +++ b/src/main/resources/META-INF/aop-ajc.xml @@ -15,6 +15,7 @@ --> +