Skip to content

Commit 2825cc2

Browse files
Multiple backports (#2022)
* Bump org.apache.httpcomponents.client5:httpclient5 from 5.6 to 5.6.1 (#1967) * Bump org.apache.httpcomponents.client5:httpclient5 from 5.6 to 5.6.1 Bumps [org.apache.httpcomponents.client5:httpclient5](https://github.com/apache/httpcomponents-client) from 5.6 to 5.6.1. - [Changelog](https://github.com/apache/httpcomponents-client/blob/rel/v5.6.1/RELEASE_NOTES.txt) - [Commits](apache/httpcomponents-client@rel/v5.6...rel/v5.6.1) --- updated-dependencies: - dependency-name: org.apache.httpcomponents.client5:httpclient5 dependency-version: 5.6.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Update changelog Signed-off-by: dependabot[bot] <support@github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump gradle-wrapper from 9.5.1 to 9.6.0 (#2014) Bumps [gradle-wrapper](https://github.com/gradle/gradle) from 9.5.1 to 9.6.0. - [Release notes](https://github.com/gradle/gradle/releases) - [Commits](gradle/gradle@v9.5.1...v9.6.0) --- updated-dependencies: - dependency-name: gradle-wrapper dependency-version: 9.6.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump org.apache.httpcomponents.core5:httpcore5-h2 in /java-client (#2025) Bumps [org.apache.httpcomponents.core5:httpcore5-h2](https://github.com/apache/httpcomponents-core) from 5.4.2 to 5.4.3. - [Changelog](https://github.com/apache/httpcomponents-core/blob/rel/v5.4.3/RELEASE_NOTES.txt) - [Commits](apache/httpcomponents-core@rel/v5.4.2...rel/v5.4.3) --- updated-dependencies: - dependency-name: org.apache.httpcomponents.core5:httpcore5-h2 dependency-version: 5.4.3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump gradle-wrapper from 9.6.0 to 9.6.1 (#2027) Bumps [gradle-wrapper](https://github.com/gradle/gradle) from 9.6.0 to 9.6.1. - [Release notes](https://github.com/gradle/gradle/releases) - [Commits](gradle/gradle@v9.6.0...v9.6.1) --- updated-dependencies: - dependency-name: gradle-wrapper dependency-version: 9.6.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent fed35a0 commit 2825cc2

5 files changed

Lines changed: 12 additions & 9 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
77
- Add document lifecycle guide and runnable sample ([#2017](https://github.com/opensearch-project/opensearch-java/pull/2017))
88

99
### Dependencies
10+
- Bump `org.apache.httpcomponents.client5:httpclient5` from 5.6 to 5.6.1 ([#1967](https://github.com/opensearch-project/opensearch-java/pull/1967))
1011

1112
### Changed
1213

gradle/wrapper/gradle-wrapper.properties

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,10 @@
2828

2929
distributionBase=GRADLE_USER_HOME
3030
distributionPath=wrapper/dists
31-
distributionSha256Sum=553c78f50dafcd54d65b9a444649057857469edf836431389695608536d6b746
32-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
31+
distributionSha256Sum=9c0f7faeeb306cb14e4279a3e084ca6b596894089a0638e68a07c945a32c9e14
32+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
33+
networkTimeout=10000
34+
retries=0
3335
retryBackOffMs=500
3436
zipStoreBase=GRADLE_USER_HOME
3537
zipStorePath=wrapper/dists

gradlew

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

java-client/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,11 +193,11 @@ dependencies {
193193
}
194194
testImplementation("org.opensearch.client", "opensearch-rest-client", opensearchVersion)
195195

196-
api("org.apache.httpcomponents.client5:httpclient5:5.6") {
196+
api("org.apache.httpcomponents.client5:httpclient5:5.6.1") {
197197
exclude(group = "org.apache.httpcomponents.core5")
198198
}
199-
api("org.apache.httpcomponents.core5:httpcore5:5.4.2")
200-
api("org.apache.httpcomponents.core5:httpcore5-h2:5.4.2")
199+
api("org.apache.httpcomponents.core5:httpcore5:5.4.3")
200+
api("org.apache.httpcomponents.core5:httpcore5-h2:5.4.3")
201201

202202
// Apache 2.0
203203
// https://search.maven.org/artifact/com.google.code.findbugs/jsr305

0 commit comments

Comments
 (0)