Merge branch '7.0.x' into renovate/jasmine-monorepo

apereo · Feb 5, 2024 · 10e49a7 · 10e49a7
2 parents 6e8375a + 08396b6
commit 10e49a7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -76,7 +76,7 @@ springBootTomcatVersion=10.1.18
 # Spring versions
 ###############################
 
-springBootVersion=3.2.1
+springBootVersion=3.2.2
 springSecurityVersion=6.2.1
 ########################################