diff --git a/.mergify.yml b/.mergify.yml index cfdf0dd0c7..2f2f17167d 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,13 +1,13 @@ pull_request_rules: - name: automatic merge conditions: - - status-success=build (macos-latest) + - status-success=build - status-success=WIP - "#changes-requested-reviews-by=0" - - base=master - - label=dependencies + - base=7.0.x + - author=renovate[bot] actions: merge: method: merge - update: + update: delete_head_branch: diff --git a/gradle.properties b/gradle.properties index 66c9b86365..17056e049b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -76,7 +76,7 @@ springBootTomcatVersion=10.1.18 # Spring versions ############################### -springBootVersion=3.2.1 +springBootVersion=3.2.2 springSecurityVersion=6.2.1 ########################################