diff --git a/.asf.yaml b/.asf.yaml
index 14b2e766557..46812c671e4 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -35,8 +35,11 @@ github:
     - java
     - jms
   enabled_merge_buttons:
-    # disable squash button:
-    squash:  false
+    # enable squash button:
+    squash: true
+    # default commit message when merging with a squash commit
+    # can either be: DEFAULT | PR_TITLE | PR_TITLE_AND_COMMIT_DETAILS | PR_TITLE_AND_DESC
+    squash_commit_message: PR_TITLE_AND_DESC
     # disable merge button:
     merge:   false
     # enable rebase button:
diff --git a/pom.xml b/pom.xml
index 2b61bbe0292..2278dbb0ff2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -165,7 +165,7 @@
       <version.micrometer>1.15.0</version.micrometer>
       <hamcrest.version>3.0</hamcrest.version>
       <junit.version>4.13.2</junit.version>
-      <junit5.version>5.12.2</junit5.version>
+      <junit5.version>6.0.0</junit5.version>
       <version.jaxb.runtime>2.3.9</version.jaxb.runtime>
       <paho.client.mqtt.version>1.2.5</paho.client.mqtt.version>
       <postgresql.version>42.7.6</postgresql.version>