From 11856be840bc4b815e19043e174f19bdee24195c Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Thu, 25 Jan 2024 15:41:07 +0100 Subject: [PATCH 1/5] Update Gradle Maven extensions --- .mvn/extensions.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index 3dd605930da93..1cb948d149067 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -2,11 +2,11 @@ com.gradle gradle-enterprise-maven-extension - 1.18.1 + 1.20 com.gradle common-custom-user-data-maven-extension - 1.12.2 + 1.12.5 From 27bd879c50da691b3f56cf8d2eb2a149926b227c Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Thu, 25 Jan 2024 15:57:07 +0100 Subject: [PATCH 2/5] Regroup two enforcer executions as an optimization --- independent-projects/parent/pom.xml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/independent-projects/parent/pom.xml b/independent-projects/parent/pom.xml index e95d2a0190965..f69a3fe8c5769 100644 --- a/independent-projects/parent/pom.xml +++ b/independent-projects/parent/pom.xml @@ -125,7 +125,7 @@ maven-enforcer-plugin - enforce-java-version + enforce-java-maven-prerequisites enforce @@ -150,16 +150,6 @@ ${jdk.min.version} - - - - - enforce-maven-version - - enforce - - - To build this project Maven ${maven.min.version} (or greater) is required. Please install it. @@ -414,6 +404,7 @@ com.gradle gradle-enterprise-maven-extension + From e8d09c5d3a4c011b5333adfef7317d88843deb83 Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Thu, 25 Jan 2024 15:57:45 +0100 Subject: [PATCH 3/5] Add cache for formatter and impsort plugins --- independent-projects/parent/pom.xml | 201 ++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) diff --git a/independent-projects/parent/pom.xml b/independent-projects/parent/pom.xml index f69a3fe8c5769..6e0aae74f6c24 100644 --- a/independent-projects/parent/pom.xml +++ b/independent-projects/parent/pom.xml @@ -687,6 +687,207 @@ + + net.revelc.code.formatter + formatter-maven-plugin + + + + sourceDirectory + + true + + + + testSourceDirectory + + true + + + + directories + + true + + + + + + includes + + + excludes + + + compilerSource + + + compilerCompliance + + + compilerTargetPlatform + + + lineEnding + + + configFile + + + configJsFile + + + configHtmlFile + + + configXmlFile + + + configJsonFile + + + configCssFile + + + skipFormattingCache + + + skipJavaFormatting + + + skipJsFormatting + + + skipHtmlFormatting + + + skipXmlFormatting + + + skipJsonFormatting + + + skipCssFormatting + + + skipFormatting + + + useEclipseDefaults + + + javaExclusionPattern + + + removeTrailingWhitespace + + + includeResources + + + + project + targetDirectory + basedir + + + + + encoding + + + + displayName + + + + + + + + + cachedir + + + check should only run when inputs change + + + + + net.revelc.code + impsort-maven-plugin + + + + sourceDirectory + + true + + + + testSourceDirectory + + true + + + + directories + + true + + + + + + sourceEncoding + + + skip + + + staticGroups + + + groups + + + staticAfter + + + joinStaticWithNonStatic + + + includes + + + excludes + + + removeUnused + + + treatSamePackageAsUnused + + + breadthFirstComparator + + + lineEnding + + + compliance + + + + project + plugin + + + + check should only run when inputs change + + + From 6792d89beccb4c68eb25131720b560cc54b97abd Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Thu, 25 Jan 2024 16:00:06 +0100 Subject: [PATCH 4/5] Add cache for the Maven Enforcer plugin --- independent-projects/parent/pom.xml | 52 +++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/independent-projects/parent/pom.xml b/independent-projects/parent/pom.xml index 6e0aae74f6c24..14b6a0f80f7b1 100644 --- a/independent-projects/parent/pom.xml +++ b/independent-projects/parent/pom.xml @@ -888,6 +888,58 @@ + + org.apache.maven.plugins + maven-enforcer-plugin + + + + foo + + ${project.basedir}/pom.xml + + RELATIVE_PATH + + + + + skip + + + fail + + + failFast + + + failIfNoRules + + + rules + + + rules + + + rulesToExecute + + + rulesToSkip + + + ignoreCache + + + + mojoExecution + session + project + + + + check should only run when inputs change + + From 4875c2bf573526805df8eaab1bf21e8cc61143da Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Thu, 25 Jan 2024 16:42:25 +0100 Subject: [PATCH 5/5] Add some useful documentation --- independent-projects/parent/pom.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/independent-projects/parent/pom.xml b/independent-projects/parent/pom.xml index 14b6a0f80f7b1..f9c41a3d19ba4 100644 --- a/independent-projects/parent/pom.xml +++ b/independent-projects/parent/pom.xml @@ -405,6 +405,10 @@ gradle-enterprise-maven-extension + @@ -884,6 +888,14 @@ + check should only run when inputs change