diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache
index 687a34a2ac..c97cb873e9 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache
@@ -145,6 +145,9 @@ javadoc {
 // To apply changes directly to the file, run `gradlew spotlessApply`
 // Ref: https://github.com/diffplug/spotless/tree/main/plugin-gradle
 spotless {
+    // comment out below to run spotless as part of the `check` task
+    enforceCheck false
+
     format 'misc', {
         // define the files (e.g. '*.gradle', '*.md') to apply `misc` to
         target '.gitignore'
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache
index 84685f3dc3..cae6437881 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache
@@ -206,8 +206,8 @@
                     <trimTrailingWhitespace/>
                     <endWithNewline/>
                     <indent>
-                      <tabs>true</tabs>
-                      <spacesPerTab>4</spacesPerTab>
+                      <spaces>true</spaces> <!-- or <tabs>true</tabs> -->
+                      <spacesPerTab>4</spacesPerTab> <!-- optional, default is 4 -->
                     </indent>
                   </format>
                 </formats>
diff --git a/samples/client/others/java/okhttp-gson-streaming/build.gradle b/samples/client/others/java/okhttp-gson-streaming/build.gradle
index d016f3c43b..fe39242f70 100644
--- a/samples/client/others/java/okhttp-gson-streaming/build.gradle
+++ b/samples/client/others/java/okhttp-gson-streaming/build.gradle
@@ -128,6 +128,9 @@ javadoc {
 // To apply changes directly to the file, run `gradlew spotlessApply`
 // Ref: https://github.com/diffplug/spotless/tree/main/plugin-gradle
 spotless {
+    // comment out below to run spotless as part of the `check` task
+    enforceCheck false
+
     format 'misc', {
         // define the files (e.g. '*.gradle', '*.md') to apply `misc` to
         target '.gitignore'
diff --git a/samples/client/others/java/okhttp-gson-streaming/pom.xml b/samples/client/others/java/okhttp-gson-streaming/pom.xml
index 5204f8c8e0..be9a75c0b5 100644
--- a/samples/client/others/java/okhttp-gson-streaming/pom.xml
+++ b/samples/client/others/java/okhttp-gson-streaming/pom.xml
@@ -199,8 +199,8 @@
                     <trimTrailingWhitespace/>
                     <endWithNewline/>
                     <indent>
-                      <tabs>true</tabs>
-                      <spacesPerTab>4</spacesPerTab>
+                      <spaces>true</spaces> <!-- or <tabs>true</tabs> -->
+                      <spacesPerTab>4</spacesPerTab> <!-- optional, default is 4 -->
                     </indent>
                   </format>
                 </formats>
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/build.gradle b/samples/client/petstore/java/okhttp-gson-dynamicOperations/build.gradle
index 359107bb13..3344fafe8d 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/build.gradle
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/build.gradle
@@ -130,6 +130,9 @@ javadoc {
 // To apply changes directly to the file, run `gradlew spotlessApply`
 // Ref: https://github.com/diffplug/spotless/tree/main/plugin-gradle
 spotless {
+    // comment out below to run spotless as part of the `check` task
+    enforceCheck false
+
     format 'misc', {
         // define the files (e.g. '*.gradle', '*.md') to apply `misc` to
         target '.gitignore'
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/pom.xml b/samples/client/petstore/java/okhttp-gson-dynamicOperations/pom.xml
index 9343c2f8ac..9c060a66c6 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/pom.xml
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/pom.xml
@@ -199,8 +199,8 @@
                     <trimTrailingWhitespace/>
                     <endWithNewline/>
                     <indent>
-                      <tabs>true</tabs>
-                      <spacesPerTab>4</spacesPerTab>
+                      <spaces>true</spaces> <!-- or <tabs>true</tabs> -->
+                      <spacesPerTab>4</spacesPerTab> <!-- optional, default is 4 -->
                     </indent>
                   </format>
                 </formats>
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle b/samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle
index 1214fbf86c..2f38938124 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle
@@ -129,6 +129,9 @@ javadoc {
 // To apply changes directly to the file, run `gradlew spotlessApply`
 // Ref: https://github.com/diffplug/spotless/tree/main/plugin-gradle
 spotless {
+    // comment out below to run spotless as part of the `check` task
+    enforceCheck false
+
     format 'misc', {
         // define the files (e.g. '*.gradle', '*.md') to apply `misc` to
         target '.gitignore'
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml b/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml
index 78ceff3bcb..098e028ec8 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml
@@ -199,8 +199,8 @@
                     <trimTrailingWhitespace/>
                     <endWithNewline/>
                     <indent>
-                      <tabs>true</tabs>
-                      <spacesPerTab>4</spacesPerTab>
+                      <spaces>true</spaces> <!-- or <tabs>true</tabs> -->
+                      <spacesPerTab>4</spacesPerTab> <!-- optional, default is 4 -->
                     </indent>
                   </format>
                 </formats>
diff --git a/samples/client/petstore/java/okhttp-gson/build.gradle b/samples/client/petstore/java/okhttp-gson/build.gradle
index ea20da73a3..c88a30679c 100644
--- a/samples/client/petstore/java/okhttp-gson/build.gradle
+++ b/samples/client/petstore/java/okhttp-gson/build.gradle
@@ -129,6 +129,9 @@ javadoc {
 // To apply changes directly to the file, run `gradlew spotlessApply`
 // Ref: https://github.com/diffplug/spotless/tree/main/plugin-gradle
 spotless {
+    // comment out below to run spotless as part of the `check` task
+    enforceCheck false
+
     format 'misc', {
         // define the files (e.g. '*.gradle', '*.md') to apply `misc` to
         target '.gitignore'
diff --git a/samples/client/petstore/java/okhttp-gson/pom.xml b/samples/client/petstore/java/okhttp-gson/pom.xml
index d0156120e1..da2dbbe58e 100644
--- a/samples/client/petstore/java/okhttp-gson/pom.xml
+++ b/samples/client/petstore/java/okhttp-gson/pom.xml
@@ -199,8 +199,8 @@
                     <trimTrailingWhitespace/>
                     <endWithNewline/>
                     <indent>
-                      <tabs>true</tabs>
-                      <spacesPerTab>4</spacesPerTab>
+                      <spaces>true</spaces> <!-- or <tabs>true</tabs> -->
+                      <spacesPerTab>4</spacesPerTab> <!-- optional, default is 4 -->
                     </indent>
                   </format>
                 </formats>