From 3d9a0187a8302ca6d397a56c2c646b1092b56e0e Mon Sep 17 00:00:00 2001
From: hippi345 <13539685+hippi345@users.noreply.github.com>
Date: Mon, 26 Oct 2026 20:35:50 +0000
Subject: [PATCH] Batch safe Dependabot majors and group minor updates.

Take JUnit 6.1.3, Spotless 3.10.4, actions/checkout v7, and actions/setup-java v6. Leave JavaFX 27 on 21.0.6 because it requires JDK 25. Group future minor and patch Dependabot updates.
---
 .github/dependabot.yml   | 14 ++++++++++++++
 .github/workflows/ci.yml |  4 ++--
 README.md                |  4 ++--
 pom.xml                  |  4 ++--
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index d9d9d49..a1027af 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -5,8 +5,22 @@ updates:
     schedule:
       interval: weekly
     open-pull-requests-limit: 10
+    groups:
+      maven-minor-patch:
+        patterns:
+          - "*"
+        update-types:
+          - "minor"
+          - "patch"
 
   - package-ecosystem: github-actions
     directory: /
     schedule:
       interval: weekly
+    groups:
+      github-actions-minor-patch:
+        patterns:
+          - "*"
+        update-types:
+          - "minor"
+          - "patch"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0a9ec9a..b3ecabc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,10 +10,10 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
 
       - name: Set up JDK 21
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v6
         with:
           java-version: "21"
           distribution: temurin
diff --git a/README.md b/README.md
index 3a0f2e1..50783b2 100644
--- a/README.md
+++ b/README.md
@@ -57,7 +57,7 @@ mvn spotless:apply   # auto-format
 ## Project structure
 
 ```
-├── pom.xml                          # Maven build (Java 21, JavaFX, JUnit 5)
+├── pom.xml                          # Maven build (Java 21, JavaFX, JUnit 6)
 ├── src/main/java/sample/
 │   ├── Main.java                    # JavaFX application entry
 │   ├── Game.java                    # Game rules and turns
@@ -65,7 +65,7 @@ mvn spotless:apply   # auto-format
 │   ├── Constants.java               # Grid defaults
 │   ├── interfaces/                  # Game and point contracts
 │   └── models/                      # Bot, treasure, grid types
-└── src/test/java/                   # JUnit 5 tests
+└── src/test/java/                   # JUnit 6 tests
 ```
 
 ## License
diff --git a/pom.xml b/pom.xml
index 5978887..a6cb259 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.release>21</maven.compiler.release>
         <javafx.version>21.0.6</javafx.version>
-        <junit.version>5.11.4</junit.version>
+        <junit.version>6.1.3</junit.version>
     </properties>
 
     <dependencies>
@@ -55,7 +55,7 @@
             <plugin>
                 <groupId>com.diffplug.spotless</groupId>
                 <artifactId>spotless-maven-plugin</artifactId>
-                <version>2.43.0</version>
+                <version>3.10.4</version>
                 <configuration>
                     <java>
                         <googleJavaFormat>