From 6a2ce9172d6b58404ea17bedec32d0835be45157 Mon Sep 17 00:00:00 2001
From: William Storey <wstorey@maxmind.com>
Date: Tue, 13 Jan 2026 12:09:51 -0800
Subject: [PATCH 1/2] Remove unused checkstyle reporting config

The reporting section for checkstyle is not used - mvn site is never
run in CI or documented in release process.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
---
 pom.xml | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/pom.xml b/pom.xml
index 304c1f7b..2061fd18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -255,26 +255,6 @@
         <japicmp.baselineVersion>4.0.0</japicmp.baselineVersion>
     </properties>
 
-    <reporting>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>3.6.0</version>
-                <reportSets>
-                    <reportSet>
-                        <reports>
-                            <report>checkstyle</report>
-                        </reports>
-                        <configuration>
-                            <includeTestSourceDirectory>true</includeTestSourceDirectory>
-                        </configuration>
-                    </reportSet>
-                </reportSets>
-            </plugin>
-        </plugins>
-    </reporting>
-
     <distributionManagement>
         <repository>
             <id>sonatype-nexus-staging</id>

From 13fe6535274346c9bdb4ffb2fb7953b851826b0d Mon Sep 17 00:00:00 2001
From: William Storey <wstorey@maxmind.com>
Date: Tue, 13 Jan 2026 12:10:38 -0800
Subject: [PATCH 2/2] Run checkstyle as separate CI job on Linux with latest
 Java

Move checkstyle out of the test phase and into a dedicated CI job.
This allows dependabot to update the checkstyle version and speeds
up test runs on Windows/macOS by not running checkstyle there.

Checkstyle 13+ requires Java 21+, so we run it on Java 24 on Linux.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
---
 .github/workflows/checkstyle.yml | 17 ++++++++++
 pom.xml                          | 55 +++++++++++---------------------
 2 files changed, 35 insertions(+), 37 deletions(-)
 create mode 100644 .github/workflows/checkstyle.yml

diff --git a/.github/workflows/checkstyle.yml b/.github/workflows/checkstyle.yml
new file mode 100644
index 00000000..17378795
--- /dev/null
+++ b/.github/workflows/checkstyle.yml
@@ -0,0 +1,17 @@
+name: Run checkstyle
+# Checkstyle 13+ requires Java 21+.
+on: [push, pull_request]
+permissions: {}
+jobs:
+  checkstyle:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        with:
+          submodules: true
+          persist-credentials: false
+      - uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
+        with:
+          distribution: zulu
+          java-version: 24
+      - run: mvn checkstyle:check -B
diff --git a/pom.xml b/pom.xml
index 2061fd18..5b7a8840 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,6 +128,24 @@
                     </execution>
                 </executions>
             </plugin>
+            <!-- Checkstyle 13+ requires Java 21+. Run manually or via CI. -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>3.6.0</version>
+                <configuration>
+                    <consoleOutput>true</consoleOutput>
+                    <configLocation>checkstyle.xml</configLocation>
+                    <violationSeverity>warning</violationSeverity>
+                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>com.puppycrawl.tools</groupId>
+                        <artifactId>checkstyle</artifactId>
+                        <version>13.0.0</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
@@ -324,42 +342,5 @@
                 </plugins>
             </build>
         </profile>
-        <!-- Checkstyle 13+ requires Java 21+. -->
-        <profile>
-            <id>checkstyle-jdk21</id>
-            <activation>
-                <jdk>[21,)</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-checkstyle-plugin</artifactId>
-                        <version>3.6.0</version>
-                        <configuration>
-                            <consoleOutput>true</consoleOutput>
-                            <configLocation>checkstyle.xml</configLocation>
-                            <violationSeverity>warning</violationSeverity>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>com.puppycrawl.tools</groupId>
-                                <artifactId>checkstyle</artifactId>
-                                <version>13.0.0</version>
-                            </dependency>
-                        </dependencies>
-                        <executions>
-                            <execution>
-                                <id>checkstyle</id>
-                                <phase>test</phase>
-                                <goals>
-                                    <goal>check</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
     </profiles>
 </project>