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

upgrade springboot 3.0 and java 17 #1620

Merged
merged 22 commits into from
Mar 6, 2024
Merged

upgrade springboot 3.0 and java 17 #1620

merged 22 commits into from
Mar 6, 2024

Conversation

tomsun28
Copy link
Contributor

@tomsun28 tomsun28 commented Mar 6, 2024

What's changed?

upgrade springboot 3.0 and java 17

Checklist

  • I hereby agree to the terms of the HertzBeat CLA
  • I have read the Contributing Guide
  • I have written the necessary doc or comment.
  • I have added the necessary unit tests and all cases have passed.

Add or update API

  • I have added the necessary e2e tests and all cases have passed.

zqr10159 and others added 17 commits August 24, 2023 22:19
# Conflicts:
#	manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/AbstractAlertNotifyHandlerImpl.java
#	manager/src/main/java/org/dromara/hertzbeat/manager/controller/MonitorsController.java
#	manager/src/main/java/org/dromara/hertzbeat/manager/controller/NoticeConfigController.java
#	manager/src/main/java/org/dromara/hertzbeat/manager/service/MonitorService.java
#	manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/MailServiceImpl.java
#	manager/src/test/java/org/dromara/hertzbeat/manager/ManagerTest.java
# Conflicts:
#	alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertReportController.java
#	manager/pom.xml
#	manager/src/main/java/org/dromara/hertzbeat/manager/config/ThymeleafConfig.java
#	manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/MonitorServiceImpl.java
#	pom.xml
Signed-off-by: tomsun28 <tomsun28@outlook.com>
Signed-off-by: tomsun28 <tomsun28@outlook.com>
Signed-off-by: tomsun28 <tomsun28@outlook.com>
@tomsun28 tomsun28 added enhancement New feature or request good first pull request Good for newcomers new feature labels Mar 6, 2024
@tomsun28 tomsun28 added this to the 1.5.1 milestone Mar 6, 2024
@dosubot dosubot bot added the size:L This PR changes 100-499 lines, ignoring generated files. label Mar 6, 2024
tomsun28 and others added 4 commits March 6, 2024 10:28
Signed-off-by: tomsun28 <tomsun28@outlook.com>
Signed-off-by: tomsun28 <tomsun28@outlook.com>
Signed-off-by: tomsun28 <tomsun28@outlook.com>
@tomsun28 tomsun28 requested a review from zqr10159 March 6, 2024 08:19
@dosubot dosubot bot added the lgtm This PR has been approved by a maintainer label Mar 6, 2024
@zqr10159 zqr10159 merged commit ee20f05 into master Mar 6, 2024
2 checks passed
@tomsun28 tomsun28 deleted the springboot3-java17 branch March 6, 2024 13:41
@tomsun28
Copy link
Contributor Author

tomsun28 commented Mar 6, 2024

@all-contributors please add @dudiao for code

Copy link
Contributor

@tomsun28

I've put up a pull request to add @dudiao! 🎉

tomsun28 added a commit that referenced this pull request Mar 9, 2024
Signed-off-by: tomsun28 <tomsun28@outlook.com>
Co-authored-by: Logic <zqr10159@dromara.org>
Co-authored-by: songyinyin <song_yinyin@163.com>
tomsun28 added a commit that referenced this pull request Mar 9, 2024
Signed-off-by: tomsun28 <tomsun28@outlook.com>
Co-authored-by: Logic <zqr10159@dromara.org>
Co-authored-by: songyinyin <song_yinyin@163.com>
tomsun28 added a commit that referenced this pull request Mar 9, 2024
Signed-off-by: tomsun28 <tomsun28@outlook.com>
Co-authored-by: Logic <zqr10159@dromara.org>
Co-authored-by: songyinyin <song_yinyin@163.com>
tomsun28 added a commit that referenced this pull request Mar 10, 2024
Signed-off-by: tomsun28 <tomsun28@outlook.com>
Co-authored-by: Logic <zqr10159@dromara.org>
Co-authored-by: songyinyin <song_yinyin@163.com>
tomsun28 added a commit that referenced this pull request Mar 10, 2024
Signed-off-by: tomsun28 <tomsun28@outlook.com>
Co-authored-by: Logic <zqr10159@dromara.org>
Co-authored-by: songyinyin <song_yinyin@163.com>
tomsun28 added a commit that referenced this pull request Mar 11, 2024
Signed-off-by: tomsun28 <tomsun28@outlook.com>
Co-authored-by: Logic <zqr10159@dromara.org>
Co-authored-by: songyinyin <song_yinyin@163.com>
tomsun28 added a commit that referenced this pull request Mar 11, 2024
Signed-off-by: tomsun28 <tomsun28@outlook.com>
Co-authored-by: Logic <zqr10159@dromara.org>
Co-authored-by: songyinyin <song_yinyin@163.com>
tomsun28 added a commit that referenced this pull request Mar 11, 2024
Signed-off-by: tomsun28 <tomsun28@outlook.com>
Co-authored-by: Logic <zqr10159@dromara.org>
Co-authored-by: songyinyin <song_yinyin@163.com>
tomsun28 added a commit that referenced this pull request Mar 11, 2024
Signed-off-by: tomsun28 <tomsun28@outlook.com>
Co-authored-by: Logic <zqr10159@dromara.org>
Co-authored-by: songyinyin <song_yinyin@163.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request good first pull request Good for newcomers lgtm This PR has been approved by a maintainer new feature size:L This PR changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants