From d7ba9bc4c0b9a0b0ed307e858d0673191d2b07f6 Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Sun, 15 Jun 2025 18:20:40 +0200 Subject: [PATCH] consolidate root for spotless-maven-plugin, formatter-maven-plugin and impsort-maven-plugin --- build-parent/pom.xml | 90 ------------- extensions/websockets-next/deployment/pom.xml | 3 +- independent-projects/arc/pom.xml | 80 ----------- independent-projects/bootstrap/pom.xml | 80 ----------- independent-projects/enforcer-rules/pom.xml | 80 ----------- .../extension-maven-plugin/pom.xml | 80 ----------- .../junit5-virtual-threads/pom.xml | 80 ----------- independent-projects/parent/pom.xml | 125 ++++++++++++++---- independent-projects/qute/pom.xml | 80 ----------- .../resteasy-reactive/pom.xml | 40 ------ independent-projects/tools/pom.xml | 80 ----------- 11 files changed, 97 insertions(+), 721 deletions(-) diff --git a/build-parent/pom.xml b/build-parent/pom.xml index a5949779f4a01..2195d83151a43 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -673,11 +673,6 @@ smallrye-certificate-generator-maven-plugin ${smallrye-certificate-generator.version} - - com.diffplug.spotless - spotless-maven-plugin - 2.44.4 - @@ -723,92 +718,7 @@ - - validate - - true - - no-format - - - - - - net.revelc.code.formatter - formatter-maven-plugin - - - process-sources - - validate - - - - - - net.revelc.code - impsort-maven-plugin - - true - - - - check-imports - - check - - - - - - - - - format-kotlin - - true - - !no-format - - - src/main/kotlin - - - - - - com.diffplug.spotless - spotless-maven-plugin - - - format-kotlin - process-sources - - apply - - - - - - - - - - - - - - - - - - - dokka diff --git a/extensions/websockets-next/deployment/pom.xml b/extensions/websockets-next/deployment/pom.xml index d8e04df3c1ca5..3b93c2d5b737f 100644 --- a/extensions/websockets-next/deployment/pom.xml +++ b/extensions/websockets-next/deployment/pom.xml @@ -196,8 +196,7 @@ 21 21 - - + 21 diff --git a/independent-projects/arc/pom.xml b/independent-projects/arc/pom.xml index 410afac90e806..9f300ce55e72b 100644 --- a/independent-projects/arc/pom.xml +++ b/independent-projects/arc/pom.xml @@ -316,86 +316,6 @@ true - - format - - true - - !no-format - - - - - - net.revelc.code.formatter - formatter-maven-plugin - - - process-sources - - format - - - - - - net.revelc.code - impsort-maven-plugin - - - sort-imports - - sort - - - - - true - - - - - - - validate - - true - - no-format - - - - - - net.revelc.code.formatter - formatter-maven-plugin - - - process-sources - - validate - - - - - - net.revelc.code - impsort-maven-plugin - - true - - - - check-imports - - check - - - - - - - diff --git a/independent-projects/bootstrap/pom.xml b/independent-projects/bootstrap/pom.xml index b67d5cb2cb1d8..99e147a217ddb 100644 --- a/independent-projects/bootstrap/pom.xml +++ b/independent-projects/bootstrap/pom.xml @@ -228,85 +228,5 @@ true - - format - - true - - !no-format - - - - - - net.revelc.code.formatter - formatter-maven-plugin - - - process-sources - - format - - - - - - net.revelc.code - impsort-maven-plugin - - - sort-imports - - sort - - - - - true - - - - - - - validate - - true - - no-format - - - - - - net.revelc.code.formatter - formatter-maven-plugin - - - process-sources - - validate - - - - - - net.revelc.code - impsort-maven-plugin - - true - - - - check-imports - - check - - - - - - - diff --git a/independent-projects/enforcer-rules/pom.xml b/independent-projects/enforcer-rules/pom.xml index 3d1a381bbd198..d11b0c772cdfd 100644 --- a/independent-projects/enforcer-rules/pom.xml +++ b/independent-projects/enforcer-rules/pom.xml @@ -162,85 +162,5 @@ true - - format - - true - - !no-format - - - - - - net.revelc.code.formatter - formatter-maven-plugin - - - process-sources - - format - - - - - - net.revelc.code - impsort-maven-plugin - - - sort-imports - - sort - - - - - true - - - - - - - validate - - true - - no-format - - - - - - net.revelc.code.formatter - formatter-maven-plugin - - - process-sources - - validate - - - - - - net.revelc.code - impsort-maven-plugin - - true - - - - check-imports - - check - - - - - - - diff --git a/independent-projects/extension-maven-plugin/pom.xml b/independent-projects/extension-maven-plugin/pom.xml index fff7ce2423126..2f40e9133ba36 100644 --- a/independent-projects/extension-maven-plugin/pom.xml +++ b/independent-projects/extension-maven-plugin/pom.xml @@ -444,85 +444,5 @@ true - - format - - true - - !no-format - - - - - - net.revelc.code.formatter - formatter-maven-plugin - - - process-sources - - format - - - - - - net.revelc.code - impsort-maven-plugin - - - sort-imports - - sort - - - - - true - - - - - - - validate - - true - - no-format - - - - - - net.revelc.code.formatter - formatter-maven-plugin - - - process-sources - - validate - - - - - - net.revelc.code - impsort-maven-plugin - - true - - - - check-imports - - check - - - - - - - diff --git a/independent-projects/junit5-virtual-threads/pom.xml b/independent-projects/junit5-virtual-threads/pom.xml index df3fe91a9af04..b8ab621cf736b 100644 --- a/independent-projects/junit5-virtual-threads/pom.xml +++ b/independent-projects/junit5-virtual-threads/pom.xml @@ -207,86 +207,6 @@ true - - format - - true - - !no-format - - - - - - net.revelc.code.formatter - formatter-maven-plugin - - - process-sources - - format - - - - - - net.revelc.code - impsort-maven-plugin - - - sort-imports - - sort - - - - - true - - - - - - - validate - - true - - no-format - - - - - - net.revelc.code.formatter - formatter-maven-plugin - - - process-sources - - validate - - - - - - net.revelc.code - impsort-maven-plugin - - true - - - - check-imports - - check - - - - - - - diff --git a/independent-projects/parent/pom.xml b/independent-projects/parent/pom.xml index edab08578b05d..4f7b39788aa8c 100644 --- a/independent-projects/parent/pom.xml +++ b/independent-projects/parent/pom.xml @@ -26,15 +26,14 @@ 3.1.4 3.5.0 3.5.1 - 2.26.0 3.2.7 - 1.12.0 3.1.4 3.11.2 3.4.2 3.15.1 3.1.1 3.3.1 + 2.44.5 3.2.1 @@ -362,35 +361,51 @@ - net.revelc.code.formatter - formatter-maven-plugin - ${version.formatter.plugin} - - - quarkus-ide-config - io.quarkus - ${project.version} - - + com.diffplug.spotless + spotless-maven-plugin + ${version.spotless.plugin} - - .cache/formatter-maven-plugin-${version.formatter.plugin} - eclipse-format.xml - LF + + + + + + true + 2 + + + .gitignore + + + **gradlew** + **mvnw** + extensions/panache/**/pom.xml + test-framework/junit5/pom.xml + test-framework/security/pom.xml + + + + + + ${maven.multiModuleProjectDirectory}/independent-projects/ide-config/src/main/resources/eclipse-format.xml + + + ${maven.multiModuleProjectDirectory}/independent-projects/ide-config/src/main/resources/eclipse.importorder + + + + + **/src/main/java/io/quarkus/rest/client/reactive/deployment/ClientContextResolverHandler.java + **/src/main/java/io/quarkus/rest/client/reactive/deployment/ClientExceptionMapperHandler.java + **/src/main/java/io/quarkus/rest/client/reactive/deployment/ClientRedirectHandler.java + + ${format.skip} - - - - net.revelc.code - impsort-maven-plugin - ${version.impsort.plugin} - - - .cache/impsort-maven-plugin-${version.impsort.plugin} - java.,javax.,jakarta.,org.,com. - * - ${format.skip} - true + + + + + @@ -623,5 +638,57 @@ + + format + + true + + !no-format + + + + + + com.diffplug.spotless + spotless-maven-plugin + + + apply + + apply + + process-sources + + + + + + + + validate + + true + + no-format + + + + + + com.diffplug.spotless + spotless-maven-plugin + + + check + + check + + verify + + + + + + diff --git a/independent-projects/qute/pom.xml b/independent-projects/qute/pom.xml index 6ae14611f928b..3b57ad9150318 100644 --- a/independent-projects/qute/pom.xml +++ b/independent-projects/qute/pom.xml @@ -219,86 +219,6 @@ true - - format - - true - - !no-format - - - - - - net.revelc.code.formatter - formatter-maven-plugin - - - process-sources - - format - - - - - - net.revelc.code - impsort-maven-plugin - - - sort-imports - - sort - - - - - true - - - - - - - validate - - true - - no-format - - - - - - net.revelc.code.formatter - formatter-maven-plugin - - - process-sources - - validate - - - - - - net.revelc.code - impsort-maven-plugin - - true - - - - check-imports - - check - - - - - - - diff --git a/independent-projects/resteasy-reactive/pom.xml b/independent-projects/resteasy-reactive/pom.xml index 4bed3527582ed..3ef49042ca8c6 100644 --- a/independent-projects/resteasy-reactive/pom.xml +++ b/independent-projects/resteasy-reactive/pom.xml @@ -615,46 +615,6 @@ - - validate - - true - - no-format - - - - - - net.revelc.code.formatter - formatter-maven-plugin - - - process-sources - - validate - - - - - - net.revelc.code - impsort-maven-plugin - - true - - - - check-imports - - check - - - - - - - diff --git a/independent-projects/tools/pom.xml b/independent-projects/tools/pom.xml index 70b8a7a32068b..0bd72f2ac2aab 100644 --- a/independent-projects/tools/pom.xml +++ b/independent-projects/tools/pom.xml @@ -295,85 +295,5 @@ true - - format - - true - - !no-format - - - - - - net.revelc.code.formatter - formatter-maven-plugin - - - process-sources - - format - - - - - - net.revelc.code - impsort-maven-plugin - - - sort-imports - - sort - - - - - true - - - - - - - validate - - true - - no-format - - - - - - net.revelc.code.formatter - formatter-maven-plugin - - - process-sources - - validate - - - - - - net.revelc.code - impsort-maven-plugin - - true - - - - check-imports - - check - - - - - - -