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.

Sign up for GitHub

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

Jump to bottom

Update Spring Boot to 3.0.4 #3451

Merged
merged 2 commits into from
Mar 6, 2023
Merged

Update Spring Boot to 3.0.4 #3451

merged 2 commits into from
Mar 6, 2023

Conversation

JohnNiang
Copy link
Member

What type of PR is this?

/kind improvement
/area core

What this PR does / why we need it:

See #3450 for more.

Which issue(s) this PR fixes:

Fixes #3450

Does this PR introduce a user-facing change?

升级 Spring Boot 至 3.0.4

@JohnNiang
Update Spring Boot to 3.0.4
a091eaf 
Update Gradle to 7.6.1 as well.

Signed-off-by: johnniang <johnniang@fastmail.com>
@f2c-ci-robot f2c-ci-robot bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/improvement Categorizes issue or PR as related to a improvement. area/core Issues or PRs related to the Halo Core labels Mar 4, 2023
@f2c-ci-robot f2c-ci-robot bot requested review from guqing and LIlGG March 4, 2023 04:32
@codecov
Copy link

codecov bot commented Mar 4, 2023 •
edited
Loading

Codecov Report

Merging #3451 (6257583) into main (c43a810) will increase coverage by 0.02%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##               main    #3451      +/-   ##
============================================
+ Coverage     61.11%   61.13%   +0.02%     
- Complexity     2461     2464       +3     
============================================
  Files           393      393              
  Lines         12560    12560              
  Branches       1017     1017              
============================================
+ Hits           7676     7679       +3     
+ Misses         4403     4398       -5     
- Partials        481      483       +2
Impacted Files Coverage Δ
...java/run/halo/app/extension/gc/GcSynchronizer.java 70.83% <0.00%> (ø)
...a/run/halo/app/metrics/VisitedEventReconciler.java 30.50% <0.00%> (+3.38%) ⬆️
.../app/core/extension/attachment/PolicyTemplate.java 14.28% <0.00%> (+14.28%) ⬆️

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

@JohnNiang
Update Gradle wrapper for Gradle 7.6
6257583 
Signed-off-by: johnniang <johnniang@fastmail.com>
ruibaby
ruibaby approved these changes Mar 5, 2023
View reviewed changes
Copy link
Member

@ruibaby ruibaby left a comment

Choose a reason for hiding this comment

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

/approve

@f2c-ci-robot
Copy link

f2c-ci-robot bot commented Mar 5, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ruibaby

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@f2c-ci-robot f2c-ci-robot bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 5, 2023
@JohnNiang JohnNiang added this to the 2.4.x milestone Mar 6, 2023
@JohnNiang
Copy link
Member Author

/cherrypick release-2.3

@halo-dev-bot
Copy link
Collaborator

@JohnNiang: once the present PR merges, I will cherry-pick it on top of release-2.3 in a new PR and assign it to you.

In response to this:

/cherrypick release-2.3

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

guqing
guqing reviewed Mar 6, 2023
View reviewed changes
Copy link
Member

@guqing guqing left a comment

Choose a reason for hiding this comment

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

/lgtm

@f2c-ci-robot f2c-ci-robot bot added the lgtm Indicates that a PR is ready to be merged. label Mar 6, 2023
@f2c-ci-robot f2c-ci-robot bot merged commit 062af6f into halo-dev:main Mar 6, 2023
@halo-dev-bot halo-dev-bot mentioned this pull request Mar 6, 2023
Merged
@halo-dev-bot
Copy link
Collaborator

@JohnNiang: new pull request created: #3459

In response to this:

/cherrypick release-2.3

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@JohnNiang JohnNiang deleted the chore/update-spring-b00t branch March 6, 2023 05:07
@JohnNiang
Copy link
Member Author

/cherrypick release-2.2

@halo-dev-bot
Copy link
Collaborator

@JohnNiang: #3451 failed to apply on top of branch "release-2.2":

Applying: Update Spring Boot to 3.0.4
Using index info to reconstruct a base tree...
M	build.gradle
Falling back to patching base and 3-way merge...
Auto-merging build.gradle
CONFLICT (content): Merge conflict in build.gradle
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Update Spring Boot to 3.0.4
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-2.2

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@JohnNiang
Copy link
Member Author

/cherrypick release-2.2

@halo-dev-bot halo-dev-bot mentioned this pull request Mar 6, 2023
Merged
@halo-dev-bot
Copy link
Collaborator

@JohnNiang: new pull request created: #3462

In response to this:

/cherrypick release-2.2

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

f2c-ci-robot bot pushed a commit that referenced this pull request Mar 6, 2023
@halo-dev-bot
[release-2.2] Update Spring Boot to 3.0.4 (#3462)
e690d2c 
This is an automated cherry-pick of #3451

/assign JohnNiang

```release-note
升级 Spring Boot 至 3.0.4
```
f2c-ci-robot bot pushed a commit that referenced this pull request Mar 7, 2023
@halo-dev-bot
[release-2.3] Update Spring Boot to 3.0.4 (#3459)
fd2b59d 
This is an automated cherry-pick of #3451

/assign JohnNiang

```release-note
升级 Spring Boot 至 3.0.4
```
@ruibaby ruibaby removed this from the 2.4.x milestone Mar 13, 2023
@ruibaby ruibaby added this to the 2.4.0 milestone Mar 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@guqing guqing guqing left review comments

@ruibaby ruibaby ruibaby approved these changes

@LIlGG LIlGG Awaiting requested review from LIlGG

Assignees

@guqing guqing

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/core Issues or PRs related to the Halo Core kind/improvement Categorizes issue or PR as related to a improvement. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes.
Projects
None yet
Milestone
2.4.0
Development

Successfully merging this pull request may close these issues.

Update Spring Boot to 3.0.4
4 participants
@JohnNiang @halo-dev-bot @ruibaby @guqing