diff --git a/.mvn/jvm.config b/.mvn/jvm.config
deleted file mode 100644
index faf08556636..00000000000
--- a/.mvn/jvm.config
+++ /dev/null
@@ -1,5 +0,0 @@
---add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
---add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
---add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
---add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
---add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 06cde403bee..8a5fff2dcb6 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -21,6 +21,20 @@ the `dev` profile in your Maven command to use those artifacts instead of buildi
 Modifying the native op generation code (not the annotation processor) or the JavaCPP configuration (not the abstract Pointers) will require a
 complete build could be required to reflect the changes, otherwise `-Pdev` should be fine.
 
+## JDK 16+
+
+If you're using JDK 16+, you need to add some exports for the formatter plugin:
+
+```
+--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
+```
+
+This can be done in `.mvn/jvm.config` or `MAVEN_OPTS`.
+
 ### Native Builds
 
 In some cases, like when adding GPU support or re-generating op classes, you will need to re-build the native library. 99% of this is building
diff --git a/pom.xml b/pom.xml
index f9272d26421..76504524ae9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
     <maven.javadoc.skip>true</maven.javadoc.skip>
     <maven.source.skip>true</maven.source.skip>
     <gpg.skip>true</gpg.skip>
-    <spotless.version>2.10.3</spotless.version>
+    <spotless.version>2.11.1</spotless.version>
   </properties>
 
   <repositories>
@@ -229,6 +229,33 @@
         </plugins>
       </build>
     </profile>
+
+    <profile>
+      <id>format</id>
+      <activation>
+        <jdk>(,16)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>com.diffplug.spotless</groupId>
+            <artifactId>spotless-maven-plugin</artifactId>
+            <version>${spotless.version}</version>
+
+            <executions>
+              <execution>
+                <!-- Runs in initialize phase to fail fast in case of formatting issues (should be before codegen).-->
+                <id>spotless-check</id>
+                <phase>initialize</phase>
+                <goals>
+                  <goal>check</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
 
   <!-- http://central.sonatype.org/pages/requirements.html#developer-information -->
@@ -305,6 +332,7 @@
         <artifactId>spotless-maven-plugin</artifactId>
         <version>${spotless.version}</version>
         <configuration>
+
           <ratchetFrom>origin/master</ratchetFrom>
 
           <lineEndings/>
@@ -318,17 +346,6 @@
             </licenseHeader>
           </java>
         </configuration>
-
-        <executions>
-          <execution>
-            <!-- Runs in initialize phase to fail fast in case of formatting issues (should be before codegen).-->
-            <id>spotless-check</id>
-            <phase>initialize</phase>
-            <goals>
-              <goal>check</goal>
-            </goals>
-          </execution>
-        </executions>
       </plugin>
     </plugins>
     <pluginManagement>