Skip to content

Conversation

@dai-chen
Copy link
Collaborator

@dai-chen dai-chen commented Aug 12, 2022

Signed-off-by: Chen Dai [email protected]

Description

Back porting #745 to OpenSearch 1.3. The Github action is failing due to Jackson which will be version bumped in separate PR.

Issues Resolved

N/A

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc added
  • Commits are signed per the DCO using --signoff

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.

Signed-off-by: Chen Dai <[email protected]>
@dai-chen dai-chen added dependencies Pull requests that update a dependency file backport 1.3 labels Aug 12, 2022
@dai-chen dai-chen self-assigned this Aug 12, 2022
@dai-chen dai-chen marked this pull request as ready for review August 12, 2022 16:34
@dai-chen dai-chen requested a review from a team as a code owner August 12, 2022 16:34
@codecov-commenter
Copy link

Codecov Report

Merging #751 (8bd7877) into 1.3 (f24de26) will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##                1.3     #751   +/-   ##
=========================================
  Coverage     95.25%   95.25%           
  Complexity     2746     2746           
=========================================
  Files           276      276           
  Lines          7416     7416           
  Branches        545      545           
=========================================
  Hits           7064     7064           
  Misses          298      298           
  Partials         54       54           
Flag Coverage Δ
query-workbench 62.91% <ø> (ø)
sql-engine 98.40% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@dai-chen dai-chen requested a review from penghuo August 12, 2022 16:56
Copy link
Collaborator

@penghuo penghuo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@dai-chen dai-chen merged commit 9004850 into opensearch-project:1.3 Aug 12, 2022
@dai-chen dai-chen deleted the bump-spring-jackson-1.3 branch August 12, 2022 17:19
@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.3 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.3 1.3
# Navigate to the new working tree
cd .worktrees/backport-1.3
# Create a new branch
git switch --create backport/backport-751-to-1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 9004850d8f67731ca904e0323a075ac00bdf937a
# Push it to GitHub
git push --set-upstream origin backport/backport-751-to-1.3
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.3

Then, create a pull request where the base branch is 1.3 and the compare/head branch is backport/backport-751-to-1.3.

opensearch-trigger-bot bot pushed a commit that referenced this pull request Aug 12, 2022
Signed-off-by: Chen Dai <[email protected]>

Signed-off-by: Chen Dai <[email protected]>
(cherry picked from commit 9004850)
dai-chen added a commit to dai-chen/sql-1 that referenced this pull request Aug 12, 2022
Signed-off-by: Chen Dai <[email protected]>

Signed-off-by: Chen Dai <[email protected]>
dai-chen added a commit that referenced this pull request Aug 16, 2022
* Bump Spring version (#751)

Signed-off-by: Chen Dai <[email protected]>

Signed-off-by: Chen Dai <[email protected]>

* Bump jackson databind version to 1.13.2.2 (#756)

Signed-off-by: Chen Dai <[email protected]>

Signed-off-by: Chen Dai <[email protected]>

Signed-off-by: Chen Dai <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dependencies Pull requests that update a dependency file

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants