Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport 2.x] Resolve logback-classic to 1.2.13 #3824

Merged
merged 2 commits into from
Dec 14, 2023

Conversation

derek-ho
Copy link
Collaborator

@derek-ho derek-ho commented Dec 11, 2023

Description

Resolve logback-classic to 1.2.13
Backport of: #3823

Issues Resolved

[List any issues this PR will resolve]

Is this a backport? If so, please add backport PR # and/or commits #

Testing

[Please provide details of testing done: unit testing, integration testing and manual testing]

Check List

  • New functionality includes testing
  • New functionality has been documented
  • 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: Derek Ho <dxho@amazon.com>
@derek-ho derek-ho changed the title Resolve logback-classic to 1.2.13 [Backport 2.x] Resolve logback-classic to 1.2.13 Dec 11, 2023
willyborankin
willyborankin previously approved these changes Dec 11, 2023
Copy link

codecov bot commented Dec 11, 2023

Codecov Report

Merging #3824 (e7178a9) into 2.x (59fd5c2) will increase coverage by 0.02%.
Report is 2 commits behind head on 2.x.
The diff coverage is n/a.

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff              @@
##                2.x    #3824      +/-   ##
============================================
+ Coverage     64.90%   64.93%   +0.02%     
- Complexity     3663     3668       +5     
============================================
  Files           292      292              
  Lines         20648    20648              
  Branches       3402     3402              
============================================
+ Hits          13402    13408       +6     
+ Misses         5563     5561       -2     
+ Partials       1683     1679       -4     

see 5 files with indirect coverage changes

reta
reta previously approved these changes Dec 11, 2023
@cwperks cwperks added backport 1.x backport to 1.x branch backport 1.3 backport to 1.3 branch labels Dec 12, 2023
@peternied
Copy link
Member

@derek-ho Could you please resolve the conflicts in the build.gradle and create/update flaky test failures from this build?

Signed-off-by: Craig Perkins <cwperx@amazon.com>
@cwperks cwperks dismissed stale reviews from reta and willyborankin via e7178a9 December 13, 2023 17:28
@cwperks cwperks merged commit 3003149 into opensearch-project:2.x Dec 14, 2023
77 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.x 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.x 1.x
# Navigate to the new working tree
cd .worktrees/backport-1.x
# Create a new branch
git switch --create backport/backport-3824-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 300314931980c9727e11757c640c4692ae023c03
# Push it to GitHub
git push --set-upstream origin backport/backport-3824-to-1.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.x

Then, create a pull request where the base branch is 1.x and the compare/head branch is backport/backport-3824-to-1.x.

@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-3824-to-1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 300314931980c9727e11757c640c4692ae023c03
# Push it to GitHub
git push --set-upstream origin backport/backport-3824-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-3824-to-1.3.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 1.x backport to 1.x branch backport 1.3 backport to 1.3 branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants