From 4305b35aa9ea43295f334df6231c7cc5fe0c9544 Mon Sep 17 00:00:00 2001
From: Justin Bertram <jbertram@apache.org>
Date: Fri, 30 May 2025 13:32:16 -0500
Subject: [PATCH 1/2] f

---
 .asf.yaml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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:

From 6fc02253a1822e09f951fcfc036b2384b250f124 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Oct 2025 02:21:43 +0000
Subject: [PATCH 2/2] ARTEMIS-X Bump com.puppycrawl.tools:checkstyle from
 10.24.0 to 12.1.1

Bumps [com.puppycrawl.tools:checkstyle](https://github.com/checkstyle/checkstyle) from 10.24.0 to 12.1.1.
- [Release notes](https://github.com/checkstyle/checkstyle/releases)
- [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-10.24.0...checkstyle-12.1.1)

---
updated-dependencies:
- dependency-name: com.puppycrawl.tools:checkstyle
  dependency-version: 12.1.1
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2b61bbe0292..2bb8c838b86 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,7 +116,7 @@
       <versions.maven.plugin.version>2.16.1</versions.maven.plugin.version>
       <maven.pmd.plugin.version>3.26.0</maven.pmd.plugin.version>
       <sevntu.checks.version>1.44.1</sevntu.checks.version>
-      <checkstyle.version>10.24.0</checkstyle.version>
+      <checkstyle.version>12.1.1</checkstyle.version>
       <mockito.version>5.18.0</mockito.version>
       <jctools.version>4.0.5</jctools.version>
       <netty.version>4.1.121.Final</netty.version>