Merge pull request #77 from reportportal/develop

Release
reportportal · Apr 3, 2024 · 6360c0c · 6360c0c
2 parents ee05c2c + 22d1e9d
commit 6360c0c
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 32 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -32,13 +32,12 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-
     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 +46,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
@@ -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

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Changelog
 
 ## [Unreleased]
+### Changed
+- JBehave dependency marked as `compileOnly` to force users specify their own versions, 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
 
 ## [5.3.2]
 ### Changed

diff --git 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)
 
@@ -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
@@ -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)
 
@@ -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.

diff --git a/build.gradle b/build.gradle
@@ -39,32 +39,29 @@ repositories {
 }
 
 dependencies {
-    api 'com.epam.reportportal:client-java:5.2.4'
-    api 'com.google.code.findbugs:jsr305:3.0.2'
-    implementation ("org.jbehave:jbehave-core:${project.jbehave_version}") {
+    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'
     }
     implementation 'org.slf4j:slf4j-api:2.0.7'
 
-    testImplementation 'com.epam.reportportal:agent-java-test-utils:0.0.2'
+    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.6'
     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.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}"
+    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'
 }
 

diff --git 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://github.com/raw/reportportal/gradle-scripts
 scripts_branch=master

diff --git 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<String, String> example) {
 		return TestItemTree.ItemTreeKey.of(formatExampleKey(example));
 	}

diff --git a/src/main/resources/META-INF/aop-ajc.xml b/src/main/resources/META-INF/aop-ajc.xml
@@ -15,6 +15,7 @@
   -->
 
 <aspectj>
+    <weaver options="-nowarn -Xset:weaveJavaPackages=false,weaveJavaxPackages=false" />
     <aspects>
         <aspect name="com.epam.reportportal.aspect.StepAspect"/>
     </aspects>