diff --git a/build-parent/pom.xml b/build-parent/pom.xml index 7154b15edbbc7..3f630a23604fc 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -681,6 +681,48 @@ com.diffplug.spotless spotless-maven-plugin 2.44.4 + + + + + + + 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 + + + + + + + + @@ -698,28 +740,14 @@ - net.revelc.code.formatter - formatter-maven-plugin - - - process-sources - - format - - - - - - net.revelc.code - impsort-maven-plugin - - true - + com.diffplug.spotless + spotless-maven-plugin - sort-imports + spotless-apply + verify - sort + apply @@ -735,50 +763,6 @@ 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 - - @@ -786,29 +770,13 @@ spotless-maven-plugin - format-kotlin - process-sources + spotless-check + verify - apply + check - - - - - - - - - - - - diff --git a/independent-projects/arc/pom.xml b/independent-projects/arc/pom.xml index 247c010ffd77d..5f4438b01dd20 100644 --- a/independent-projects/arc/pom.xml +++ b/independent-projects/arc/pom.xml @@ -327,32 +327,18 @@ - net.revelc.code.formatter - formatter-maven-plugin + com.diffplug.spotless + spotless-maven-plugin - process-sources + spotless-apply + verify - format + apply - - net.revelc.code - impsort-maven-plugin - - - sort-imports - - sort - - - - - true - - @@ -367,26 +353,11 @@ - net.revelc.code.formatter - formatter-maven-plugin - - - process-sources - - validate - - - - - - net.revelc.code - impsort-maven-plugin - - true - + com.diffplug.spotless + spotless-maven-plugin - check-imports + verify check diff --git a/independent-projects/bootstrap/pom.xml b/independent-projects/bootstrap/pom.xml index 90230e504dde6..66f78c5c1dada 100644 --- a/independent-projects/bootstrap/pom.xml +++ b/independent-projects/bootstrap/pom.xml @@ -239,32 +239,18 @@ - net.revelc.code.formatter - formatter-maven-plugin + com.diffplug.spotless + spotless-maven-plugin - process-sources + spotless-apply + verify - format + apply - - net.revelc.code - impsort-maven-plugin - - - sort-imports - - sort - - - - - true - - @@ -279,26 +265,11 @@ - net.revelc.code.formatter - formatter-maven-plugin - - - process-sources - - validate - - - - - - net.revelc.code - impsort-maven-plugin - - true - + com.diffplug.spotless + spotless-maven-plugin - check-imports + verify check diff --git a/independent-projects/enforcer-rules/pom.xml b/independent-projects/enforcer-rules/pom.xml index 3d1a381bbd198..75d63e6a5bc57 100644 --- a/independent-projects/enforcer-rules/pom.xml +++ b/independent-projects/enforcer-rules/pom.xml @@ -173,32 +173,18 @@ - net.revelc.code.formatter - formatter-maven-plugin + com.diffplug.spotless + spotless-maven-plugin - process-sources + spotless-apply + verify - format + apply - - net.revelc.code - impsort-maven-plugin - - - sort-imports - - sort - - - - - true - - @@ -213,26 +199,11 @@ - net.revelc.code.formatter - formatter-maven-plugin - - - process-sources - - validate - - - - - - net.revelc.code - impsort-maven-plugin - - true - + com.diffplug.spotless + spotless-maven-plugin - check-imports + verify check diff --git a/independent-projects/extension-maven-plugin/pom.xml b/independent-projects/extension-maven-plugin/pom.xml index 5b415927fa244..77a1372bf1f75 100644 --- a/independent-projects/extension-maven-plugin/pom.xml +++ b/independent-projects/extension-maven-plugin/pom.xml @@ -455,32 +455,18 @@ - net.revelc.code.formatter - formatter-maven-plugin + com.diffplug.spotless + spotless-maven-plugin - process-sources + spotless-apply + verify - format + apply - - net.revelc.code - impsort-maven-plugin - - - sort-imports - - sort - - - - - true - - @@ -495,26 +481,11 @@ - net.revelc.code.formatter - formatter-maven-plugin - - - process-sources - - validate - - - - - - net.revelc.code - impsort-maven-plugin - - true - + com.diffplug.spotless + spotless-maven-plugin - check-imports + verify check diff --git a/independent-projects/junit5-virtual-threads/pom.xml b/independent-projects/junit5-virtual-threads/pom.xml index 22d0db159b16a..10986a42a2633 100644 --- a/independent-projects/junit5-virtual-threads/pom.xml +++ b/independent-projects/junit5-virtual-threads/pom.xml @@ -218,32 +218,18 @@ - net.revelc.code.formatter - formatter-maven-plugin + com.diffplug.spotless + spotless-maven-plugin - process-sources + spotless-apply + verify - format + apply - - net.revelc.code - impsort-maven-plugin - - - sort-imports - - sort - - - - - true - - @@ -258,26 +244,11 @@ - net.revelc.code.formatter - formatter-maven-plugin - - - process-sources - - validate - - - - - - net.revelc.code - impsort-maven-plugin - - true - + com.diffplug.spotless + spotless-maven-plugin - check-imports + verify check diff --git a/independent-projects/parent/pom.xml b/independent-projects/parent/pom.xml index e4bf460c9d2ca..2a1cfeef20c3d 100644 --- a/independent-projects/parent/pom.xml +++ b/independent-projects/parent/pom.xml @@ -378,19 +378,6 @@ ${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 - - org.apache.maven.plugins maven-surefire-plugin diff --git a/independent-projects/qute/pom.xml b/independent-projects/qute/pom.xml index bc8224be009a5..2fc86393f341b 100644 --- a/independent-projects/qute/pom.xml +++ b/independent-projects/qute/pom.xml @@ -230,32 +230,18 @@ - net.revelc.code.formatter - formatter-maven-plugin + com.diffplug.spotless + spotless-maven-plugin - process-sources + spotless-apply + verify - format + apply - - net.revelc.code - impsort-maven-plugin - - - sort-imports - - sort - - - - - true - - @@ -270,26 +256,11 @@ - net.revelc.code.formatter - formatter-maven-plugin - - - process-sources - - validate - - - - - - net.revelc.code - impsort-maven-plugin - - true - + com.diffplug.spotless + spotless-maven-plugin - check-imports + verify check diff --git a/independent-projects/resteasy-reactive/pom.xml b/independent-projects/resteasy-reactive/pom.xml index d27385c16dddd..e5e992fbfc189 100644 --- a/independent-projects/resteasy-reactive/pom.xml +++ b/independent-projects/resteasy-reactive/pom.xml @@ -585,37 +585,18 @@ - net.revelc.code.formatter - formatter-maven-plugin + com.diffplug.spotless + spotless-maven-plugin - process-sources + spotless-apply + verify - format + apply - - net.revelc.code - impsort-maven-plugin - - - sort-imports - - sort - - - - - - .cache/impsort-maven-plugin-${impsort-maven-plugin.version} - java.,javax.,jakarta.,org.,com. - * - ${format.skip} - true - - @@ -630,26 +611,11 @@ - net.revelc.code.formatter - formatter-maven-plugin - - - process-sources - - validate - - - - - - net.revelc.code - impsort-maven-plugin - - true - + com.diffplug.spotless + spotless-maven-plugin - check-imports + verify check diff --git a/independent-projects/tools/pom.xml b/independent-projects/tools/pom.xml index 872cee0a98093..843794d4d043f 100644 --- a/independent-projects/tools/pom.xml +++ b/independent-projects/tools/pom.xml @@ -306,32 +306,18 @@ - net.revelc.code.formatter - formatter-maven-plugin + com.diffplug.spotless + spotless-maven-plugin - process-sources + spotless-apply + verify - format + apply - - net.revelc.code - impsort-maven-plugin - - - sort-imports - - sort - - - - - true - - @@ -346,26 +332,11 @@ - net.revelc.code.formatter - formatter-maven-plugin - - - process-sources - - validate - - - - - - net.revelc.code - impsort-maven-plugin - - true - + com.diffplug.spotless + spotless-maven-plugin - check-imports + verify check diff --git a/integration-tests/virtual-threads/pom.xml b/integration-tests/virtual-threads/pom.xml index 5dd0ca4f757d3..2971fd8cfe635 100644 --- a/integration-tests/virtual-threads/pom.xml +++ b/integration-tests/virtual-threads/pom.xml @@ -78,21 +78,6 @@ - - net.revelc.code - impsort-maven-plugin - - - sort-imports - - sort - - - - - ${impsort.skip} - -