Revert throwing on AwsSdk2 + ApacheHttpClient #1333
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Thomas Farr <tsfarr@amazon.com>
Xtansia
requested review from
reta,
Bukhtawar,
dblock,
szczepanczykd,
madhusudhankonda,
saratvemulapalli and
VachaShah
as code owners
Signed-off-by: Thomas Farr <tsfarr@amazon.com>
|
The fix to AWS SDK was released as part of Rather than completely reverting this check, it could be expanded to check the version of the awssdk apache-client dependency, but that might be over complicating things. Thoughts @reta @dblock? Build is currently failing because a new AWS SDK release is actively being published. |
reta
approved these changes
Nov 28, 2024
Open
5 tasks
|
The backport to To backport manually, run these commands in your terminal: # Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/opensearch-java/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/opensearch-java/backport-2.x
# Create a new branch
git switch --create backport/backport-1333-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 4279d36165cf5fcf2d8be3a689df0c5dbfa47831
# Push it to GitHub
git push --set-upstream origin backport/backport-1333-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/opensearch-java/backport-2.xThen, create a pull request where the |
Xtansia
added a commit
to Xtansia/opensearch-java
that referenced
this pull request
Nov 28, 2024
* Revert throwing on AwsSdk2 + ApacheHttpClient Signed-off-by: Thomas Farr <tsfarr@amazon.com> * Add PR number Signed-off-by: Thomas Farr <tsfarr@amazon.com> --------- Signed-off-by: Thomas Farr <tsfarr@amazon.com> (cherry picked from commit 4279d36)
Xtansia
added a commit
that referenced
this pull request
Nov 28, 2024
* Revert throwing on AwsSdk2 + ApacheHttpClient Signed-off-by: Thomas Farr <tsfarr@amazon.com> * Add PR number Signed-off-by: Thomas Farr <tsfarr@amazon.com> --------- Signed-off-by: Thomas Farr <tsfarr@amazon.com> (cherry picked from commit 4279d36)
Xtansia
added a commit
to Xtansia/opensearch-java
that referenced
this pull request
Dec 4, 2024
…ject#1333)" This reverts commit 4279d36. Signed-off-by: Thomas Farr <tsfarr@amazon.com>
Xtansia
added a commit
that referenced
this pull request
Dec 4, 2024
Xtansia
added a commit
to Xtansia/opensearch-java
that referenced
this pull request
Dec 4, 2024
…ject#1333)" (opensearch-project#1338) This reverts commit 4279d36. Signed-off-by: Thomas Farr <tsfarr@amazon.com> (cherry picked from commit f783196)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Revert throwing on AwsSdk2 + ApacheHttpClient
Issues Resolved
Fixes #712
Fixes #521
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.