From 967b64f6999226325d2777bc177f5544cac51956 Mon Sep 17 00:00:00 2001 From: Reingold Shekhtel <13565058+raikbitters@users.noreply.github.com> Date: Fri, 9 Feb 2024 13:46:59 +0400 Subject: [PATCH 1/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cba8aa4..b323ca0 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-log4j.svg?label=Maven%20Central)](https://central.sonatype.com/artifact/com.epam.reportportal/logger-java-log4j) [![CI Build](https://github.com/reportportal/logger-java-log4j/actions/workflows/ci.yml/badge.svg)](https://github.com/reportportal/logger-java-log4j/actions/workflows/ci.yml) [![codecov](https://codecov.io/gh/reportportal/logger-java-log4j/branch/develop/graph/badge.svg?token=iEy7fURz1P)](https://codecov.io/gh/reportportal/logger-java-log4j) -[![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 1bf374adaa536cf47be30245d2d6252f989a38f0 Mon Sep 17 00:00:00 2001 From: Reingold Shekhtel <13565058+raikbitters@users.noreply.github.com> Date: Fri, 9 Feb 2024 13:47:13 +0400 Subject: [PATCH 2/7] Update README.md From b6929b66971116a5d3cb6e92165e8e205f3bb08e Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Wed, 21 Feb 2024 13:12:11 +0300 Subject: [PATCH 3/7] 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 ba5963fd9a50db940f3a9091f7137338bbf5ca36 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Tue, 12 Mar 2024 16:17:06 +0300 Subject: [PATCH 4/7] `client-java` and `og4j-core` 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 cab36a4..04e3364 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 `og4j-core` 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 5a2b8fa..6ef22d2 100644 --- a/build.gradle +++ b/build.gradle @@ -35,9 +35,9 @@ repositories { } dependencies { - implementation "org.apache.logging.log4j:log4j-core:${log4j_version}" annotationProcessor "org.apache.logging.log4j:log4j-core:${log4j_version}" - implementation 'com.epam.reportportal:client-java:5.2.4' + compileOnly "org.apache.logging.log4j:log4j-core:${log4j_version}" + compileOnly 'com.epam.reportportal:client-java:5.2.5' testImplementation 'com.epam.reportportal:agent-java-test-utils:0.0.2' testImplementation('org.awaitility:awaitility:4.0.2') { From 7a6ce5fe721b68ac4e40ead00930ce582ff54d30 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Tue, 12 Mar 2024 16:17:35 +0300 Subject: [PATCH 5/7] CHANGELOG.md update --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 04e3364..b2ab69b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ ## [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 `og4j-core` dependencies marked as `compileOnly` to force users specify their own dependencies, by @HardNorth +- `client-java` and `log4j-core` dependencies marked as `compileOnly` to force users specify their own dependencies, by @HardNorth ## [5.2.1] ### Changed From a70748fa0c66f9dc64349fb261d2b15a8b5bdc8d Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Wed, 13 Mar 2024 17:46:59 +0300 Subject: [PATCH 6/7] README_TEMPLATE.md update --- README_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_TEMPLATE.md b/README_TEMPLATE.md index 444fc78..b8eed63 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-log4j.svg?label=Maven%20Central)](https://central.sonatype.com/artifact/com.epam.reportportal/logger-java-log4j) [![CI Build](https://github.com/reportportal/logger-java-log4j/actions/workflows/ci.yml/badge.svg)](https://github.com/reportportal/logger-java-log4j/actions/workflows/ci.yml) [![codecov](https://codecov.io/gh/reportportal/logger-java-log4j/branch/develop/graph/badge.svg?token=iEy7fURz1P)](https://codecov.io/gh/reportportal/logger-java-log4j) -[![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 295cb8ca26688d27cfb315063a2878769a1ccb83 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Wed, 13 Mar 2024 17:48:56 +0300 Subject: [PATCH 7/7] Fix tests --- build.gradle | 4 +++- gradle.properties | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 6ef22d2..e60a2b1 100644 --- a/build.gradle +++ b/build.gradle @@ -37,8 +37,10 @@ repositories { dependencies { annotationProcessor "org.apache.logging.log4j:log4j-core:${log4j_version}" compileOnly "org.apache.logging.log4j:log4j-core:${log4j_version}" - compileOnly 'com.epam.reportportal:client-java:5.2.5' + compileOnly "com.epam.reportportal:client-java:${client_version}" + testImplementation "org.apache.logging.log4j:log4j-core:${log4j_version}" + testImplementation "com.epam.reportportal:client-java:${client_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 7be2b25..4050a73 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,6 +2,7 @@ version=5.2.2-SNAPSHOT description=EPAM Report portal. Log4j Integration scripts_url=https://raw.githubusercontent.com/reportportal/gradle-scripts scripts_branch=master +client_version=5.2.5 junit_version=5.6.3 junit_runner_version=1.6.3 mockito_version=3.3.3