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

Add spring_version variable to have single instance of spring version #3747

Merged
merged 2 commits into from
Nov 20, 2023

Conversation

cwperks
Copy link
Member

@cwperks cwperks commented Nov 20, 2023

Description

Extracts spring_version to a variable so it can be re-used. This will cut down slightly on maintenance where dependabot can make multiple PRs to update this version.

Recent examples:

  • Category (Enhancement, New feature, Bug fix, Test fix, Refactoring, Maintenance, Documentation)

Maintenance

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: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Craig Perkins <cwperx@amazon.com>
Copy link

codecov bot commented Nov 20, 2023

Codecov Report

Merging #3747 (e148414) into main (4496440) will decrease coverage by 0.01%.
Report is 5 commits behind head on main.
The diff coverage is n/a.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #3747      +/-   ##
==========================================
- Coverage   65.23%   65.22%   -0.01%     
==========================================
  Files         297      297              
  Lines       21129    21129              
  Branches     3451     3451              
==========================================
- Hits        13783    13782       -1     
  Misses       5647     5647              
- Partials     1699     1700       +1     

see 1 file with indirect coverage changes

@reta reta merged commit daa584d into opensearch-project:main Nov 20, 2023
79 checks passed
@reta reta added the backport 2.x backport to 2.x branch label Nov 20, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

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

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

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

peternied pushed a commit that referenced this pull request Nov 22, 2023
…3748)

Backport of #3747 to 2.x

Signed-off-by: Craig Perkins <cwperx@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x backport to 2.x branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants