Skip to content

Commit

Permalink
Merge pull request #31 from reportportal/develop
Browse files Browse the repository at this point in the history
Release
  • Loading branch information
HardNorth authored Apr 4, 2024
2 parents 0a701c8 + bf98f99 commit 376279e
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 14 deletions.
7 changes: 2 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,13 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up JDK 11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '11'

- name: Build with Gradle
run: ./gradlew build

- name: Codecov upload
uses: codecov/codecov-action@v3
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -50,7 +50,7 @@ jobs:
version-file-extraction-pattern: ${{ env.VERSION_EXTRACT_PATTERN }}

- name: Set up JDK 11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '11'
Expand Down Expand Up @@ -108,7 +108,7 @@ jobs:

- name: Checkout develop branch
if: ${{ github.ref }} == 'main'
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: 'develop'
fetch-depth: 0
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ For installation instructions please see corresponding agent module:
| 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/)
[![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)
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
2 changes: 2 additions & 0 deletions allure-common/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Changelog

## [Unreleased]
### Changed
- Client version updated on [5.2.11](https://github.com/reportportal/client-java/releases/tag/5.2.11), by @HardNorth

## [5.2.0]
### Changed
Expand Down
7 changes: 3 additions & 4 deletions allure-common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,15 @@ compileJava.options.encoding = 'UTF-8'
compileTestJava.options.encoding = 'UTF-8'

dependencies {
api 'com.epam.reportportal:commons-model:5.0.0'
api 'com.google.code.findbugs:jsr305:3.0.2'
compileOnly 'com.epam.reportportal:client-java:5.2.13'

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.2.1'
implementation "org.aspectj:aspectjweaver:${aspectj_version}"

testImplementation 'com.epam.reportportal:agent-java-test-utils:0.0.2'
testImplementation 'com.epam.reportportal:agent-java-test-utils:0.0.6'
testImplementation("org.junit.platform:junit-platform-runner:${junit5_runner_version}") {
exclude module: 'junit'
}
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ configure(allprojects - project('allure-common')) {
exclude group: 'org.slf4j'
}
testImplementation 'ch.qos.logback:logback-classic:1.3.12'
testImplementation 'com.epam.reportportal:logger-java-logback:5.2.0'
testImplementation 'com.epam.reportportal:logger-java-logback:5.2.2'
testImplementation 'com.epam.reportportal:agent-java-test-utils:0.0.2'
testImplementation("org.junit.platform:junit-platform-runner:${junit5_runner_version}") {
exclude module: 'junit'
Expand Down
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ junit5_version=5.6.3
junit5_runner_version=1.6.3
mockito_version=3.3.3
allure_version=2.25.0
aspectj_version=1.9.19

0 comments on commit 376279e

Please sign in to comment.