diff --git a/.springjavaformatconfig b/.springjavaformatconfig
new file mode 100644
index 000000000..e69de29bb
diff --git a/checkstyle.xml b/checkstyle.xml
new file mode 100644
index 000000000..2620b2405
--- /dev/null
+++ b/checkstyle.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+	"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+	"https://checkstyle.org/dtds/configuration_1_3.dtd">
+<module name="com.puppycrawl.tools.checkstyle.Checker">
+
+	<!-- Exclude third-party and generated code -->
+	<module name="BeforeExecutionExclusionFileFilter">
+		<property name="fileNamePattern" value="[/\\](com[/\\]serotonin|org[/\\]openscada|io[/\\]github[/\\]pnoker[/\\]driver[/\\]api[/\\]impl[/\\]nodave)[/\\]" />
+	</module>
+
+	<module name="NewlineAtEndOfFileCheck" />
+
+	<module name="com.puppycrawl.tools.checkstyle.TreeWalker">
+
+		<!-- Block Checks -->
+		<module name="EmptyBlockCheck">
+			<property name="option" value="text" />
+		</module>
+		<module name="LeftCurlyCheck" />
+		<module name="RightCurlyCheck">
+			<property name="option" value="alone" />
+		</module>
+		<!-- NeedBracesCheck excluded — too many existing single-line if/for without braces, fix incrementally -->
+
+		<!-- Coding -->
+		<module name="CovariantEqualsCheck" />
+		<module name="EmptyStatementCheck" />
+		<module name="EqualsHashCodeCheck" />
+		<module name="InnerAssignmentCheck" />
+		<module name="SimplifyBooleanExpressionCheck" />
+		<module name="SimplifyBooleanReturnCheck" />
+		<module name="StringLiteralEqualityCheck" />
+		<module name="MultipleVariableDeclarationsCheck" />
+		<module name="OneStatementPerLineCheck" />
+
+		<!-- Imports (AvoidStarImportCheck excluded — too many existing star imports, fix incrementally) -->
+		<module name="RedundantImportCheck" />
+		<module name="UnusedImportsCheck">
+			<property name="processJavadoc" value="true" />
+		</module>
+
+		<!-- Miscellaneous -->
+		<module name="UpperEllCheck" />
+		<module name="ArrayTypeStyleCheck" />
+		<module name="OuterTypeFilenameCheck" />
+
+		<!-- Modifiers -->
+		<module name="RedundantModifierCheck" />
+		<module name="ModifierOrderCheck" />
+
+		<!-- Regexp -->
+		<module name="RegexpCheck">
+			<property name="format" value="[ \t]+$" />
+			<property name="illegalPattern" value="true" />
+			<property name="message" value="Trailing whitespace" />
+		</module>
+
+		<!-- Whitespace -->
+		<module name="GenericWhitespaceCheck" />
+		<module name="WhitespaceAfterCheck" />
+		<module name="WhitespaceAroundCheck" />
+
+	</module>
+</module>
diff --git a/dc3-api/pom.xml b/dc3-api/pom.xml
index 8c6fabc0d..09d071a62 100644
--- a/dc3-api/pom.xml
+++ b/dc3-api/pom.xml
@@ -117,6 +117,53 @@
                 <groupId>org.xolstice.maven.plugins</groupId>
                 <artifactId>protobuf-maven-plugin</artifactId>
             </plugin>
+            <!-- Spring Java Format -->
+            <plugin>
+                <groupId>io.spring.javaformat</groupId>
+                <artifactId>spring-javaformat-maven-plugin</artifactId>
+                <version>0.0.47</version>
+                <executions>
+                    <execution>
+                        <id>validate</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>validate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- Checkstyle (Spring Java Format rules) -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>3.1.1</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>com.puppycrawl.tools</groupId>
+                        <artifactId>checkstyle</artifactId>
+                        <version>9.3</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>io.spring.javaformat</groupId>
+                        <artifactId>spring-javaformat-checkstyle</artifactId>
+                        <version>0.0.47</version>
+                    </dependency>
+                </dependencies>
+                <executions>
+                    <execution>
+                        <id>checkstyle-validation</id>
+                        <phase>validate</phase>
+                        <inherited>true</inherited>
+                        <configuration>
+                            <configLocation>${maven.multiModuleProjectDirectory}/checkstyle.xml</configLocation>
+                            <includeTestSourceDirectory>true</includeTestSourceDirectory>
+                        </configuration>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/dc3-common/pom.xml b/dc3-common/pom.xml
index 3a54dfed8..80bcd0942 100644
--- a/dc3-common/pom.xml
+++ b/dc3-common/pom.xml
@@ -117,6 +117,58 @@
 
     </dependencies>
 
+    <build>
+        <plugins>
+            <!-- Spring Java Format -->
+            <plugin>
+                <groupId>io.spring.javaformat</groupId>
+                <artifactId>spring-javaformat-maven-plugin</artifactId>
+                <version>0.0.47</version>
+                <executions>
+                    <execution>
+                        <id>validate</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>validate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- Checkstyle (Spring Java Format rules) -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>3.1.1</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>com.puppycrawl.tools</groupId>
+                        <artifactId>checkstyle</artifactId>
+                        <version>9.3</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>io.spring.javaformat</groupId>
+                        <artifactId>spring-javaformat-checkstyle</artifactId>
+                        <version>0.0.47</version>
+                    </dependency>
+                </dependencies>
+                <executions>
+                    <execution>
+                        <id>checkstyle-validation</id>
+                        <phase>validate</phase>
+                        <inherited>true</inherited>
+                        <configuration>
+                            <configLocation>${maven.multiModuleProjectDirectory}/checkstyle.xml</configLocation>
+                            <includeTestSourceDirectory>true</includeTestSourceDirectory>
+                        </configuration>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
     <profiles>
         <profile>
             <id>deploy</id>
diff --git a/pom.xml b/pom.xml
index 3e40bf15f..282cc814b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -304,7 +304,7 @@
             <plugin>
                 <groupId>io.spring.javaformat</groupId>
                 <artifactId>spring-javaformat-maven-plugin</artifactId>
-                <version>0.0.43</version>
+                <version>0.0.47</version>
                 <executions>
                     <execution>
                         <id>validate</id>
@@ -315,6 +315,38 @@
                     </execution>
                 </executions>
             </plugin>
+            <!-- Checkstyle (Spring Java Format rules) -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>3.1.1</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>com.puppycrawl.tools</groupId>
+                        <artifactId>checkstyle</artifactId>
+                        <version>9.3</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>io.spring.javaformat</groupId>
+                        <artifactId>spring-javaformat-checkstyle</artifactId>
+                        <version>0.0.47</version>
+                    </dependency>
+                </dependencies>
+                <executions>
+                    <execution>
+                        <id>checkstyle-validation</id>
+                        <phase>validate</phase>
+                        <inherited>true</inherited>
+                        <configuration>
+                            <configLocation>${maven.multiModuleProjectDirectory}/checkstyle.xml</configLocation>
+                            <includeTestSourceDirectory>true</includeTestSourceDirectory>
+                        </configuration>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>