diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ffae5c4..85544ce 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,10 +33,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' @@ -45,4 +45,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 e70454d..0b26222 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,7 +38,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 @@ -48,7 +48,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' @@ -105,7 +105,7 @@ jobs: body: ${{ steps.readChangelogEntry.outputs.changes }} - name: Checkout develop branch - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: 'develop' fetch-depth: 0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 5414551..31bbc09 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,15 @@ # Changelog ## [Unreleased] +### Changed +- Client version updated on [5.2.4](https://github.com/reportportal/client-java/releases/tag/5.2.4), by @HardNorth +- `utils-java-formatting` library version updated on version [5.2.1](https://github.com/reportportal/utils-java-formatting/releases/tag/5.2.1), by @HardNorth +- All dependencies are marked as `implementation`, by @HardNorth +### Removed +- `commons-model` dependency to rely on `clinet-java` exclusions in security fixes, by @HardNorth ## [5.1.0] +### Changed - Client version updated on [5.2.0](https://github.com/reportportal/client-java/releases/tag/5.2.0), by @HardNorth - `utils-java-formatting` library version updated on version [5.2.0](https://github.com/reportportal/utils-java-formatting/releases/tag/5.2.0), by @HardNorth diff --git a/build.gradle b/build.gradle index 53afdc3..5011f90 100644 --- a/build.gradle +++ b/build.gradle @@ -37,10 +37,9 @@ repositories { } dependencies { - api 'com.epam.reportportal:client-java:5.2.0' - api 'com.google.code.findbugs:jsr305:3.0.2' - api 'com.epam.reportportal:commons-model:5.0.0' - api 'com.epam.reportportal:utils-java-formatting:5.2.0' + implementation 'com.epam.reportportal:client-java:5.2.4' + implementation 'com.google.code.findbugs:jsr305:3.0.2' + implementation 'com.epam.reportportal:utils-java-formatting:5.2.1' implementation 'org.apache.httpcomponents:httpcore:4.4.16' testImplementation 'com.epam.reportportal:agent-java-test-utils:0.0.2' @@ -53,8 +52,8 @@ dependencies { testImplementation 'org.hamcrest:hamcrest-core:2.2' testImplementation "org.mockito:mockito-core:${mockito_version}" testImplementation "org.mockito:mockito-inline:${mockito_version}" - testImplementation 'org.apache.httpcomponents:httpclient:4.5.14' - testImplementation 'org.apache.httpcomponents:httpmime:4.5.14' + testImplementation "org.apache.httpcomponents:httpclient:${httpclient_version}" + testImplementation "org.apache.httpcomponents:httpmime:${httpclient_version}" } test { diff --git a/gradle.properties b/gradle.properties index 6699057..ee2c72a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,6 +3,7 @@ description=Report Portal logger for Apache HttpComponents client junit5_version=5.6.3 junit5_runner_version=1.6.3 mockito_version=4.5.1 +httpclient_version=4.5.14 scripts_url=https://raw.githubusercontent.com/reportportal/gradle-scripts scripts_branch=master excludeTests=