From 183ea537bf2d9235fd3be8128a02a9076d10a862 Mon Sep 17 00:00:00 2001 From: Reingold Shekhtel <13565058+raikbitters@users.noreply.github.com> Date: Fri, 9 Feb 2024 13:48:37 +0400 Subject: [PATCH 1/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0288b9a..61ec009 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![Maven Central](https://img.shields.io/maven-central/v/com.epam.reportportal/logger-java-logback.svg?label=Maven%20Central)](https://central.sonatype.com/artifact/com.epam.reportportal/logger-java-logback) [![CI Build](https://github.com/reportportal/logger-java-logback/actions/workflows/ci.yml/badge.svg)](https://github.com/reportportal/logger-java-logback/actions/workflows/ci.yml) [![codecov](https://codecov.io/gh/reportportal/logger-java-logback/branch/develop/graph/badge.svg?token=uD9LyYQRl4)](https://codecov.io/gh/reportportal/logger-java-logback) -[![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) From 3d757e789e593fd1a41cf76c1c45a6f6bb303004 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Wed, 21 Feb 2024 13:17:33 +0300 Subject: [PATCH 2/5] 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 5e832f80953a9fd32404d056841e922ffb7cdb3c Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Fri, 23 Feb 2024 15:28:21 +0300 Subject: [PATCH 3/5] Slack link update --- README_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_TEMPLATE.md b/README_TEMPLATE.md index 8bdbc88..3144024 100644 --- a/README_TEMPLATE.md +++ b/README_TEMPLATE.md @@ -3,7 +3,7 @@ [![Maven Central](https://img.shields.io/maven-central/v/com.epam.reportportal/logger-java-logback.svg?label=Maven%20Central)](https://central.sonatype.com/artifact/com.epam.reportportal/logger-java-logback) [![CI Build](https://github.com/reportportal/logger-java-logback/actions/workflows/ci.yml/badge.svg)](https://github.com/reportportal/logger-java-logback/actions/workflows/ci.yml) [![codecov](https://codecov.io/gh/reportportal/logger-java-logback/branch/develop/graph/badge.svg?token=uD9LyYQRl4)](https://codecov.io/gh/reportportal/logger-java-logback) -[![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) From c3418ac7798ca6f98f00b4a2f57e5d3bb57383c6 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Tue, 12 Mar 2024 16:10:15 +0300 Subject: [PATCH 4/5] Slack link update`client-java` and `logback-classic` dependencies marked as `compileOnly` --- CHANGELOG.md | 5 ++++- build.gradle | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e2b8297..f64d71a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,15 @@ # Changelog ## [Unreleased] +### Changed +- Client version updated on [5.2.5](https://github.com/reportportal/client-java/releases/tag/5.2.5), by @HardNorth +- `client-java` and `logback-classic` dependencies marked as `compileOnly` to force users specify their own dependencies, by @HardNorth ## [5.2.1] ### Changed - Client version updated on [5.2.4](https://github.com/reportportal/client-java/releases/tag/5.2.4), by @HardNorth ### Removed -- `commons-model` dependency to rely on `clinet-java` exclusions in security fixes, by @HardNorth +- `commons-model` dependency to rely on `client-java` exclusions in security fixes, by @HardNorth ## [5.2.0] ### Changed diff --git a/build.gradle b/build.gradle index 9604db9..d4cc909 100644 --- a/build.gradle +++ b/build.gradle @@ -37,8 +37,8 @@ repositories { } dependencies { - implementation 'com.epam.reportportal:client-java:5.2.4' - implementation 'ch.qos.logback:logback-classic:1.3.12' + compileOnly 'com.epam.reportportal:client-java:5.2.5' + compileOnly 'ch.qos.logback:logback-classic:1.3.12' testImplementation 'com.epam.reportportal:agent-java-test-utils:0.0.2' testImplementation('org.awaitility:awaitility:4.0.2') { From 9e876e8fb4722a2dfd41db45ce8e39b08653b842 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Thu, 14 Mar 2024 11:28:27 +0300 Subject: [PATCH 5/5] Fix tests --- build.gradle | 6 ++++-- gradle.properties | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index d4cc909..39e97d8 100644 --- a/build.gradle +++ b/build.gradle @@ -37,9 +37,11 @@ repositories { } dependencies { - compileOnly 'com.epam.reportportal:client-java:5.2.5' - compileOnly 'ch.qos.logback:logback-classic:1.3.12' + compileOnly "com.epam.reportportal:client-java:${client_version}" + compileOnly "ch.qos.logback:logback-classic:${logback_version}" + testImplementation "com.epam.reportportal:client-java:${client_version}" + testImplementation "ch.qos.logback:logback-classic:${logback_version}" testImplementation 'com.epam.reportportal:agent-java-test-utils:0.0.2' testImplementation('org.awaitility:awaitility:4.0.2') { exclude group: 'org.hamcrest' diff --git a/gradle.properties b/gradle.properties index 33eee8e..3985a87 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,6 +2,8 @@ version=5.2.2-SNAPSHOT description=EPAM Report portal. Logback Integration scripts_url=https://raw.githubusercontent.com/reportportal/gradle-scripts scripts_branch=master +client_version=5.2.5 +logback_version=1.3.12 junit_version=5.6.3 junit_runner_version=1.6.3 mockito_version=3.3.3