Skip to content

Commit

Permalink
[Backport] [2.x] Bump org.apache.httpcomponents.core5:httpcore5 from …
Browse files Browse the repository at this point in the history
…5.3.2 to 5.3.3, org.apache.httpcomponents.client5:httpclient5 from 5.4.1 to 5.4.2 (#1406)

* Bump org.apache.httpcomponents.core5:httpcore5 from 5.3.2 to 5.3.3 (#1402)

* Bump org.apache.httpcomponents.core5:httpcore5 from 5.3.2 to 5.3.3

Bumps [org.apache.httpcomponents.core5:httpcore5](https://github.com/apache/httpcomponents-core) from 5.3.2 to 5.3.3.
- [Changelog](https://github.com/apache/httpcomponents-core/blob/rel/v5.3.3/RELEASE_NOTES.txt)
- [Commits](apache/httpcomponents-core@rel/v5.3.2...rel/v5.3.3)

---
updated-dependencies:
- dependency-name: org.apache.httpcomponents.core5:httpcore5
  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>
(cherry picked from commit 51bc61d)

* Bump org.apache.httpcomponents.client5:httpclient5 from 5.4.1 to 5.4.2 in /java-client (#1401)

* Bump org.apache.httpcomponents.client5:httpclient5 in /java-client

Bumps [org.apache.httpcomponents.client5:httpclient5](https://github.com/apache/httpcomponents-client) from 5.4.1 to 5.4.2.
- [Changelog](https://github.com/apache/httpcomponents-client/blob/rel/v5.4.2/RELEASE_NOTES.txt)
- [Commits](apache/httpcomponents-client@rel/v5.4.1...rel/v5.4.2)

---
updated-dependencies:
- dependency-name: org.apache.httpcomponents.client5:httpclient5
  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>
(cherry picked from commit b6a9d93)

---------

Signed-off-by: Thomas Farr <tsfarr@amazon.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Thomas Farr <tsfarr@amazon.com>
  • Loading branch information
3 people authored Feb 3, 2025
1 parent ab8e5bd commit b0dbd23
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)

### Dependencies
- Bump `org.junit:junit-bom` from 5.11.3 to 5.11.4 ([#1367](https://github.com/opensearch-project/opensearch-java/pull/1367))
- Bumps `org.apache.httpcomponents.core5:httpcore5` from 5.3 to 5.3.2 ([#1383](https://github.com/opensearch-project/opensearch-java/pull/1383))
- Bumps `org.apache.httpcomponents.client5:httpclient5` from 5.4 to 5.4.2 ([#1401](https://github.com/opensearch-project/opensearch-java/pull/1401))
- Bumps `org.apache.httpcomponents.core5:httpcore5` from 5.3 to 5.3.3 ([#1383](https://github.com/opensearch-project/opensearch-java/pull/1383), [#1402](https://github.com/opensearch-project/opensearch-java/pull/1402))
- Bump `org.owasp.dependencycheck` from 11.1.1 to 12.0.2 ([#1381](https://github.com/opensearch-project/opensearch-java/pull/1381), [#1393](https://github.com/opensearch-project/opensearch-java/pull/1393), [#1399](https://github.com/opensearch-project/opensearch-java/pull/1399))

### Changed
Expand Down
6 changes: 3 additions & 3 deletions java-client/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -210,11 +210,11 @@ dependencies {
testImplementation("com.fasterxml.jackson.datatype", "jackson-datatype-jakarta-jsonp", jacksonVersion)

// ApacheHttpClient5Transport dependencies (optional)
implementation("org.apache.httpcomponents.client5", "httpclient5", "5.4.1") {
implementation("org.apache.httpcomponents.client5", "httpclient5", "5.4.2") {
exclude(group = "org.apache.httpcomponents.core5")
}
implementation("org.apache.httpcomponents.core5", "httpcore5", "5.3.2")
implementation("org.apache.httpcomponents.core5", "httpcore5-h2", "5.3.2")
implementation("org.apache.httpcomponents.core5", "httpcore5", "5.3.3")
implementation("org.apache.httpcomponents.core5", "httpcore5-h2", "5.3.3")

// For AwsSdk2Transport
"awsSdk2SupportCompileOnly"("software.amazon.awssdk", "sdk-core", "[2.21,3.0)")
Expand Down

0 comments on commit b0dbd23

Please sign in to comment.