diff --git a/.github/workflows/code-generation.yml b/.github/workflows/code-generation.yml index 425734431f..82182e8ef8 100644 --- a/.github/workflows/code-generation.yml +++ b/.github/workflows/code-generation.yml @@ -73,7 +73,7 @@ jobs: private-key: ${{ secrets.APP_PRIVATE_KEY }} - name: Create Pull Request - uses: peter-evans/create-pull-request@v7 + uses: peter-evans/create-pull-request@v8 with: token: ${{ steps.github_app_token.outputs.token || secrets.GITHUB_TOKEN }} committer: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> diff --git a/.github/workflows/test-integration-unreleased.yml b/.github/workflows/test-integration-unreleased.yml index ab7cca8383..9d98c6b9b2 100644 --- a/.github/workflows/test-integration-unreleased.yml +++ b/.github/workflows/test-integration-unreleased.yml @@ -40,7 +40,7 @@ jobs: - name: Restore cached build id: cache-restore - uses: actions/cache/restore@v4 + uses: actions/cache/restore@v5 with: path: opensearch/distribution/archives/linux-tar/build/distributions key: ${{ steps.get-key.outputs.key }} @@ -64,7 +64,7 @@ jobs: - name: Save cached build if: steps.cache-restore.outputs.cache-hit != 'true' - uses: actions/cache/save@v4 + uses: actions/cache/save@v5 with: path: opensearch/distribution/archives/linux-tar/build/distributions key: ${{ steps.get-key.outputs.key }} @@ -94,7 +94,7 @@ jobs: - name: Upload Reports if: failure() - uses: actions/upload-artifact@v5 + uses: actions/upload-artifact@v6 with: name: test-reports-os${{ matrix.entry.opensearch_ref }}-java${{ matrix.entry.java }} path: opensearch-java/java-client/build/reports/ diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml index 4ef8a5bada..ad1dbf76f7 100644 --- a/.github/workflows/test-integration.yml +++ b/.github/workflows/test-integration.yml @@ -61,7 +61,7 @@ jobs: - name: Upload Reports if: failure() - uses: actions/upload-artifact@v5 + uses: actions/upload-artifact@v6 with: name: test-reports-os${{ matrix.entry.opensearch_version }}-java${{ matrix.entry.java }} path: java-client/build/reports/ diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml index 727fdf383c..54975022c0 100644 --- a/.github/workflows/test-unit.yml +++ b/.github/workflows/test-unit.yml @@ -25,7 +25,7 @@ jobs: - name: Upload Reports if: failure() - uses: actions/upload-artifact@v5 + uses: actions/upload-artifact@v6 with: name: test-reports-java${{ matrix.java }}-${{ runner.os }} path: java-client/build/reports/ @@ -59,7 +59,7 @@ jobs: - name: Upload Reports if: failure() - uses: actions/upload-artifact@v5 + uses: actions/upload-artifact@v6 with: name: test-reports-java8-${{ runner.os }} path: java-client/build/reports/ diff --git a/CHANGELOG.md b/CHANGELOG.md index 708235e32a..83cae53933 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Bump `org.junit:junit-bom` from 5.13.3 to 6.0.1 ([#1704](https://github.com/opensearch-project/opensearch-java/pull/1704), [#1746](https://github.com/opensearch-project/opensearch-java/pull/1746), [#1780](https://github.com/opensearch-project/opensearch-java/pull/1780)) - Bump `org.opensearch.gradle:build-tools` from 3.2.0-SNAPSHOT to 3.4.0-SNAPSHOT ([#1714](https://github.com/opensearch-project/opensearch-java/pull/1714), [#1756](https://github.com/opensearch-project/opensearch-java/pull/1756)) - Bump `org.ajoberstar.grgit:grgit-gradle` from 5.3.2 to 5.3.3 ([#1723](https://github.com/opensearch-project/opensearch-java/pull/1723)) -- Bump `org.apache.httpcomponents.core5:httpcore5` from 5.3.4 to 5.3.6 ([#1726](https://github.com/opensearch-project/opensearch-java/pull/1726), [#1733](https://github.com/opensearch-project/opensearch-java/pull/1733)) +- Bump `org.apache.httpcomponents.core5:httpcore5` from 5.3.4 to 5.4 ([#1726](https://github.com/opensearch-project/opensearch-java/pull/1726), [#1733](https://github.com/opensearch-project/opensearch-java/pull/1733), [#1815](https://github.com/opensearch-project/opensearch-java/pull/1815)) - Bump `org.owasp.dependencycheck` from 12.1.3 to 12.1.9 ([#1735](https://github.com/opensearch-project/opensearch-java/pull/1735), [#1742](https://github.com/opensearch-project/opensearch-java/pull/1742), [#1754](https://github.com/opensearch-project/opensearch-java/pull/1754), [#1765](https://github.com/opensearch-project/opensearch-java/pull/1765), [#1796](https://github.com/opensearch-project/opensearch-java/pull/1796)) - Bump `org.apache.httpcomponents.client5:httpclient5` from 5.5 to 5.5.1 ([#1740](https://github.com/opensearch-project/opensearch-java/pull/1740)) - Added support for the `search_relevance` namespace ([#1748](https://github.com/opensearch-project/opensearch-java/pull/1748)) diff --git a/java-client/build.gradle.kts b/java-client/build.gradle.kts index 1a4dc60640..16906b0013 100644 --- a/java-client/build.gradle.kts +++ b/java-client/build.gradle.kts @@ -194,8 +194,8 @@ dependencies { api("org.apache.httpcomponents.client5:httpclient5:5.5.1") { exclude(group = "org.apache.httpcomponents.core5") } - api("org.apache.httpcomponents.core5:httpcore5:5.3.6") - api("org.apache.httpcomponents.core5:httpcore5-h2:5.3.6") + api("org.apache.httpcomponents.core5:httpcore5:5.4") + api("org.apache.httpcomponents.core5:httpcore5-h2:5.4") // Apache 2.0 // https://search.maven.org/artifact/com.google.code.findbugs/jsr305