diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom-sb3.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom-sb3.mustache
index f1b251a815d..0e23de07570 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom-sb3.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom-sb3.mustache
@@ -58,7 +58,8 @@
     <build>
         <sourceDirectory>src/main/java</sourceDirectory>
         <plugins>
-            {{^interfaceOnly}}<plugin>
+            {{^interfaceOnly}}
+            <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
@@ -74,8 +75,10 @@
                   </excludes>
                     {{/lombok}}
                 </configuration>
-            </plugin>{{/interfaceOnly}}
-            {{#interfaceOnly}}<plugin>
+            </plugin>
+            {{/interfaceOnly}}
+            {{#interfaceOnly}}
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
                 <executions>
@@ -86,7 +89,8 @@
                         </goals>
                     </execution>
                 </executions>
-            </plugin>{{/interfaceOnly}}
+            </plugin>
+            {{/interfaceOnly}}
             {{#apiFirst}}
             <plugin>
                 <groupId>org.openapitools</groupId>
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache
index b9d84091bc9..2eaf236d286 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache
@@ -51,7 +51,8 @@
     <build>
         <sourceDirectory>src/main/java</sourceDirectory>
         <plugins>
-            {{^interfaceOnly}}<plugin>
+            {{^interfaceOnly}}
+            <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
@@ -67,8 +68,10 @@
                     </excludes>
                 {{/lombok}}
                 </configuration>
-            </plugin>{{/interfaceOnly}}
-            {{#interfaceOnly}}<plugin>
+            </plugin>
+            {{/interfaceOnly}}
+            {{#interfaceOnly}}
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
                 <executions>
@@ -79,7 +82,8 @@
                         </goals>
                     </execution>
                 </executions>
-            </plugin>{{/interfaceOnly}}
+            </plugin>
+            {{/interfaceOnly}}
             {{#apiFirst}}
             <plugin>
                 <groupId>org.openapitools</groupId>
diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/pom.xml b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/pom.xml
index 9fbce051365..0c5273b87d7 100644
--- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/pom.xml
+++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/pom.xml
@@ -22,7 +22,6 @@
     <build>
         <sourceDirectory>src/main/java</sourceDirectory>
         <plugins>
-            
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
diff --git a/samples/openapi3/client/petstore/spring-stubs/pom.xml b/samples/openapi3/client/petstore/spring-stubs/pom.xml
index 9fbce051365..0c5273b87d7 100644
--- a/samples/openapi3/client/petstore/spring-stubs/pom.xml
+++ b/samples/openapi3/client/petstore/spring-stubs/pom.xml
@@ -22,7 +22,6 @@
     <build>
         <sourceDirectory>src/main/java</sourceDirectory>
         <plugins>
-            
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/pom.xml b/samples/openapi3/server/petstore/spring-boot-oneof/pom.xml
index f492b83a969..7113913e6ca 100644
--- a/samples/openapi3/server/petstore/spring-boot-oneof/pom.xml
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/pom.xml
@@ -28,7 +28,6 @@
                 <configuration>
                 </configuration>
             </plugin>
-            
         </plugins>
     </build>
     <dependencies>
diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/pom.xml b/samples/openapi3/server/petstore/spring-boot-springdoc/pom.xml
index 67c48412e17..230983b59c8 100644
--- a/samples/openapi3/server/petstore/spring-boot-springdoc/pom.xml
+++ b/samples/openapi3/server/petstore/spring-boot-springdoc/pom.xml
@@ -27,7 +27,6 @@
                 <configuration>
                 </configuration>
             </plugin>
-            
         </plugins>
     </build>
     <dependencies>
diff --git a/samples/openapi3/server/petstore/springboot-3/pom.xml b/samples/openapi3/server/petstore/springboot-3/pom.xml
index 3d20c6390a3..54c3603cbc9 100644
--- a/samples/openapi3/server/petstore/springboot-3/pom.xml
+++ b/samples/openapi3/server/petstore/springboot-3/pom.xml
@@ -43,7 +43,6 @@
                 <configuration>
                 </configuration>
             </plugin>
-            
         </plugins>
     </build>
     <dependencies>
diff --git a/samples/openapi3/server/petstore/springboot-delegate/pom.xml b/samples/openapi3/server/petstore/springboot-delegate/pom.xml
index fb60a61c9b9..67d552b723d 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/pom.xml
+++ b/samples/openapi3/server/petstore/springboot-delegate/pom.xml
@@ -28,7 +28,6 @@
                 <configuration>
                 </configuration>
             </plugin>
-            
         </plugins>
     </build>
     <dependencies>
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/pom.xml b/samples/openapi3/server/petstore/springboot-implicitHeaders/pom.xml
index d7299a0482d..5b071433c60 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/pom.xml
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/pom.xml
@@ -28,7 +28,6 @@
                 <configuration>
                 </configuration>
             </plugin>
-            
         </plugins>
     </build>
     <dependencies>
diff --git a/samples/openapi3/server/petstore/springboot-source/pom.xml b/samples/openapi3/server/petstore/springboot-source/pom.xml
index 53d9d81b327..3f54f4adede 100644
--- a/samples/openapi3/server/petstore/springboot-source/pom.xml
+++ b/samples/openapi3/server/petstore/springboot-source/pom.xml
@@ -27,7 +27,6 @@
                 <configuration>
                 </configuration>
             </plugin>
-            
         </plugins>
     </build>
     <dependencies>
diff --git a/samples/openapi3/server/petstore/springboot/pom.xml b/samples/openapi3/server/petstore/springboot/pom.xml
index 0919bc8dbd9..d60cccd3ff1 100644
--- a/samples/openapi3/server/petstore/springboot/pom.xml
+++ b/samples/openapi3/server/petstore/springboot/pom.xml
@@ -28,7 +28,6 @@
                 <configuration>
                 </configuration>
             </plugin>
-            
         </plugins>
     </build>
     <dependencies>
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/pom.xml b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/pom.xml
index a871967c2bb..2e96536c447 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/pom.xml
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/pom.xml
@@ -22,7 +22,6 @@
     <build>
         <sourceDirectory>src/main/java</sourceDirectory>
         <plugins>
-            
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
diff --git a/samples/server/petstore/spring-boot-nullable-set/pom.xml b/samples/server/petstore/spring-boot-nullable-set/pom.xml
index 0d5996f775d..5bbc7407c1e 100644
--- a/samples/server/petstore/spring-boot-nullable-set/pom.xml
+++ b/samples/server/petstore/spring-boot-nullable-set/pom.xml
@@ -22,7 +22,6 @@
     <build>
         <sourceDirectory>src/main/java</sourceDirectory>
         <plugins>
-            
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/pom.xml b/samples/server/petstore/springboot-beanvalidation-no-nullable/pom.xml
index bdf380a8706..6281f810cd3 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/pom.xml
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/pom.xml
@@ -28,7 +28,6 @@
                 <configuration>
                 </configuration>
             </plugin>
-            
         </plugins>
     </build>
     <dependencies>
diff --git a/samples/server/petstore/springboot-beanvalidation/pom.xml b/samples/server/petstore/springboot-beanvalidation/pom.xml
index 301dfba8efd..f48622e7ec8 100644
--- a/samples/server/petstore/springboot-beanvalidation/pom.xml
+++ b/samples/server/petstore/springboot-beanvalidation/pom.xml
@@ -27,7 +27,6 @@
                 <configuration>
                 </configuration>
             </plugin>
-            
         </plugins>
     </build>
     <dependencies>
diff --git a/samples/server/petstore/springboot-delegate-j8/pom.xml b/samples/server/petstore/springboot-delegate-j8/pom.xml
index 692bbb2b9b7..92bfa2cb5cb 100644
--- a/samples/server/petstore/springboot-delegate-j8/pom.xml
+++ b/samples/server/petstore/springboot-delegate-j8/pom.xml
@@ -28,7 +28,6 @@
                 <configuration>
                 </configuration>
             </plugin>
-            
         </plugins>
     </build>
     <dependencies>
diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/pom.xml b/samples/server/petstore/springboot-delegate-no-response-entity/pom.xml
index cdbb8636eeb..461339353f4 100644
--- a/samples/server/petstore/springboot-delegate-no-response-entity/pom.xml
+++ b/samples/server/petstore/springboot-delegate-no-response-entity/pom.xml
@@ -28,7 +28,6 @@
                 <configuration>
                 </configuration>
             </plugin>
-            
         </plugins>
     </build>
     <dependencies>
diff --git a/samples/server/petstore/springboot-delegate/pom.xml b/samples/server/petstore/springboot-delegate/pom.xml
index 38d2b4da909..726f5f2dae8 100644
--- a/samples/server/petstore/springboot-delegate/pom.xml
+++ b/samples/server/petstore/springboot-delegate/pom.xml
@@ -28,7 +28,6 @@
                 <configuration>
                 </configuration>
             </plugin>
-            
         </plugins>
     </build>
     <dependencies>
diff --git a/samples/server/petstore/springboot-file-delegate-optional/pom.xml b/samples/server/petstore/springboot-file-delegate-optional/pom.xml
index 41c63ba6811..9ac3410785c 100644
--- a/samples/server/petstore/springboot-file-delegate-optional/pom.xml
+++ b/samples/server/petstore/springboot-file-delegate-optional/pom.xml
@@ -43,7 +43,6 @@
                 <configuration>
                 </configuration>
             </plugin>
-            
         </plugins>
     </build>
     <dependencies>
diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/pom.xml b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/pom.xml
index 5e27d9762d0..68770011586 100644
--- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/pom.xml
+++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/pom.xml
@@ -26,7 +26,6 @@
                 <configuration>
                 </configuration>
             </plugin>
-            
         </plugins>
     </build>
     <dependencies>
diff --git a/samples/server/petstore/springboot-implicitHeaders/pom.xml b/samples/server/petstore/springboot-implicitHeaders/pom.xml
index 954d4535a06..d1c4c8d6452 100644
--- a/samples/server/petstore/springboot-implicitHeaders/pom.xml
+++ b/samples/server/petstore/springboot-implicitHeaders/pom.xml
@@ -28,7 +28,6 @@
                 <configuration>
                 </configuration>
             </plugin>
-            
         </plugins>
     </build>
     <dependencies>
diff --git a/samples/server/petstore/springboot-lombok-data/pom.xml b/samples/server/petstore/springboot-lombok-data/pom.xml
index 0cdbf58237d..16d607dab7b 100644
--- a/samples/server/petstore/springboot-lombok-data/pom.xml
+++ b/samples/server/petstore/springboot-lombok-data/pom.xml
@@ -34,7 +34,6 @@
                     </excludes>
                 </configuration>
             </plugin>
-            
         </plugins>
     </build>
     <dependencies>
diff --git a/samples/server/petstore/springboot-lombok-tostring/pom.xml b/samples/server/petstore/springboot-lombok-tostring/pom.xml
index d2714a2b793..0b079a60154 100644
--- a/samples/server/petstore/springboot-lombok-tostring/pom.xml
+++ b/samples/server/petstore/springboot-lombok-tostring/pom.xml
@@ -49,7 +49,6 @@
                   </excludes>
                 </configuration>
             </plugin>
-            
         </plugins>
     </build>
     <dependencies>
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/pom.xml b/samples/server/petstore/springboot-reactive-noResponseEntity/pom.xml
index fedfec8d382..d445bc501aa 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/pom.xml
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/pom.xml
@@ -28,7 +28,6 @@
                 <configuration>
                 </configuration>
             </plugin>
-            
         </plugins>
     </build>
     <dependencies>
diff --git a/samples/server/petstore/springboot-reactive/pom.xml b/samples/server/petstore/springboot-reactive/pom.xml
index c2864360a1e..586a1099ee6 100644
--- a/samples/server/petstore/springboot-reactive/pom.xml
+++ b/samples/server/petstore/springboot-reactive/pom.xml
@@ -28,7 +28,6 @@
                 <configuration>
                 </configuration>
             </plugin>
-            
         </plugins>
     </build>
     <dependencies>
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/pom.xml b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/pom.xml
index 2fe45d72699..814077ac4e1 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/pom.xml
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/pom.xml
@@ -28,7 +28,6 @@
                 <configuration>
                 </configuration>
             </plugin>
-            
         </plugins>
     </build>
     <dependencies>
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/pom.xml b/samples/server/petstore/springboot-spring-pageable-delegatePattern/pom.xml
index e0fd8e70efa..6623444ffa3 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/pom.xml
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/pom.xml
@@ -28,7 +28,6 @@
                 <configuration>
                 </configuration>
             </plugin>
-            
         </plugins>
     </build>
     <dependencies>
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/pom.xml b/samples/server/petstore/springboot-spring-pageable-without-j8/pom.xml
index 9986c18906a..b518d1dee9f 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/pom.xml
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/pom.xml
@@ -28,7 +28,6 @@
                 <configuration>
                 </configuration>
             </plugin>
-            
         </plugins>
     </build>
     <dependencies>
diff --git a/samples/server/petstore/springboot-spring-pageable/pom.xml b/samples/server/petstore/springboot-spring-pageable/pom.xml
index 585c369fb58..fed9f1d12e1 100644
--- a/samples/server/petstore/springboot-spring-pageable/pom.xml
+++ b/samples/server/petstore/springboot-spring-pageable/pom.xml
@@ -28,7 +28,6 @@
                 <configuration>
                 </configuration>
             </plugin>
-            
         </plugins>
     </build>
     <dependencies>
diff --git a/samples/server/petstore/springboot-spring-provide-args/pom.xml b/samples/server/petstore/springboot-spring-provide-args/pom.xml
index ed49ebfecf0..4057470ce3f 100644
--- a/samples/server/petstore/springboot-spring-provide-args/pom.xml
+++ b/samples/server/petstore/springboot-spring-provide-args/pom.xml
@@ -28,7 +28,6 @@
                 <configuration>
                 </configuration>
             </plugin>
-            
         </plugins>
     </build>
     <dependencies>
diff --git a/samples/server/petstore/springboot-useoptional/pom.xml b/samples/server/petstore/springboot-useoptional/pom.xml
index 6b7fd27c618..f4633149324 100644
--- a/samples/server/petstore/springboot-useoptional/pom.xml
+++ b/samples/server/petstore/springboot-useoptional/pom.xml
@@ -28,7 +28,6 @@
                 <configuration>
                 </configuration>
             </plugin>
-            
         </plugins>
     </build>
     <dependencies>
diff --git a/samples/server/petstore/springboot-virtualan/pom.xml b/samples/server/petstore/springboot-virtualan/pom.xml
index 214efbb9228..36bdd555a28 100644
--- a/samples/server/petstore/springboot-virtualan/pom.xml
+++ b/samples/server/petstore/springboot-virtualan/pom.xml
@@ -29,7 +29,6 @@
                 <configuration>
                 </configuration>
             </plugin>
-            
         </plugins>
     </build>
     <dependencies>
diff --git a/samples/server/petstore/springboot/pom.xml b/samples/server/petstore/springboot/pom.xml
index 187c7b784f3..dcce5e10d79 100644
--- a/samples/server/petstore/springboot/pom.xml
+++ b/samples/server/petstore/springboot/pom.xml
@@ -28,7 +28,6 @@
                 <configuration>
                 </configuration>
             </plugin>
-            
         </plugins>
     </build>
     <dependencies>