From ec1b78b59d5e23b050cd1cf029efb9cf72917ac9 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Wed, 9 Jun 2021 18:27:56 +0200 Subject: [PATCH 1/2] Improve the use of checkstyle in the build --- .mvn/readme.txt | 1 + build/checkstyle-suppressions.xml | 30 +++++++++++++++++++ .../execution/BuildResumptionAnalyzer.java | 2 +- .../BuildResumptionDataRepository.java | 6 ++-- .../collector/ProjectCollectionStrategy.java | 2 +- .../DefaultBuildPomXMLFilterFactory.java | 2 +- maven-model/pom.xml | 4 --- pom.xml | 25 ++++++++++++++-- 8 files changed, 60 insertions(+), 12 deletions(-) create mode 100644 .mvn/readme.txt create mode 100644 build/checkstyle-suppressions.xml diff --git a/.mvn/readme.txt b/.mvn/readme.txt new file mode 100644 index 000000000000..3b197a806015 --- /dev/null +++ b/.mvn/readme.txt @@ -0,0 +1 @@ +The .mvn folder is needed to be able to use the ${maven.multiModuleProjectDirectory} property. \ No newline at end of file diff --git a/build/checkstyle-suppressions.xml b/build/checkstyle-suppressions.xml new file mode 100644 index 000000000000..78e9e3c05eeb --- /dev/null +++ b/build/checkstyle-suppressions.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + diff --git a/maven-core/src/main/java/org/apache/maven/execution/BuildResumptionAnalyzer.java b/maven-core/src/main/java/org/apache/maven/execution/BuildResumptionAnalyzer.java index 1778946b001a..fa3db8a34320 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/BuildResumptionAnalyzer.java +++ b/maven-core/src/main/java/org/apache/maven/execution/BuildResumptionAnalyzer.java @@ -32,5 +32,5 @@ public interface BuildResumptionAnalyzer * @param result Outcome of the current Maven build. * @return A {@link BuildResumptionData} instance or {@link Optional#empty()} if resuming the build is not possible. */ - Optional determineBuildResumptionData( final MavenExecutionResult result ); + Optional determineBuildResumptionData( MavenExecutionResult result ); } diff --git a/maven-core/src/main/java/org/apache/maven/execution/BuildResumptionDataRepository.java b/maven-core/src/main/java/org/apache/maven/execution/BuildResumptionDataRepository.java index 3d0be6f6076f..36453f662ad1 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/BuildResumptionDataRepository.java +++ b/maven-core/src/main/java/org/apache/maven/execution/BuildResumptionDataRepository.java @@ -37,7 +37,7 @@ public interface BuildResumptionDataRepository * @param buildResumptionData Information needed to resume the build. * @throws BuildResumptionPersistenceException When an error occurs while persisting data. */ - void persistResumptionData( final MavenProject rootProject, final BuildResumptionData buildResumptionData ) + void persistResumptionData( MavenProject rootProject, BuildResumptionData buildResumptionData ) throws BuildResumptionPersistenceException; /** @@ -45,12 +45,12 @@ void persistResumptionData( final MavenProject rootProject, final BuildResumptio * @param request The execution request that will be enriched. * @param rootProject The root project that is being built. */ - void applyResumptionData( final MavenExecutionRequest request, final MavenProject rootProject ); + void applyResumptionData( MavenExecutionRequest request, MavenProject rootProject ); /** * Removes previously stored resumption data. * @param rootProject The root project that is being built. */ - void removeResumptionData( final MavenProject rootProject ); + void removeResumptionData( MavenProject rootProject ); } diff --git a/maven-core/src/main/java/org/apache/maven/project/collector/ProjectCollectionStrategy.java b/maven-core/src/main/java/org/apache/maven/project/collector/ProjectCollectionStrategy.java index e1931fe43af9..53521f09d9e0 100644 --- a/maven-core/src/main/java/org/apache/maven/project/collector/ProjectCollectionStrategy.java +++ b/maven-core/src/main/java/org/apache/maven/project/collector/ProjectCollectionStrategy.java @@ -36,6 +36,6 @@ public interface ProjectCollectionStrategy * @return * @throws ProjectBuildingException */ - List collectProjects( final MavenExecutionRequest request ) + List collectProjects( MavenExecutionRequest request ) throws ProjectBuildingException; } diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultBuildPomXMLFilterFactory.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultBuildPomXMLFilterFactory.java index 2cd3c6b252b5..906584d5a7ff 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultBuildPomXMLFilterFactory.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultBuildPomXMLFilterFactory.java @@ -64,7 +64,7 @@ protected Function> getRelativePathMapper() @Override protected BiFunction getDependencyKeyToVersionMapper() { - return (g, a) -> Optional.ofNullable( context.getRawModel( g, a ) ) + return ( g, a ) -> Optional.ofNullable( context.getRawModel( g, a ) ) .map( m -> toVersion( m ) ) .orElse( null ); } diff --git a/maven-model/pom.xml b/maven-model/pom.xml index abb6add6b705..83f4bf54ecf1 100644 --- a/maven-model/pom.xml +++ b/maven-model/pom.xml @@ -33,10 +33,6 @@ under the License. Maven Model Model for Maven POM (Project Object Model) - - FileLength - - org.codehaus.plexus diff --git a/pom.xml b/pom.xml index ee2f76f0c7a8..1d535f8e9531 100644 --- a/pom.xml +++ b/pom.xml @@ -76,8 +76,6 @@ under the License. Maven Apache Maven ref/4-LATEST - None - **/package-info.java 2021-04-05T08:12:18Z @@ -574,6 +572,8 @@ under the License. + src/main/appended-resources/licenses/MIT-slf4j-api-1.7.30.txt + src/main/appended-resources/licenses/MIT-jsoup-1.12.1.txt src/main/appended-resources/licenses/CDDL-1.0.txt src/main/appended-resources/licenses/EPL-1.0.txt src/main/appended-resources/licenses/unrecognized-javax.annotation-api-1.3.2.txt @@ -655,6 +655,27 @@ under the License. + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.1.2 + + info + ${maven.multiModuleProjectDirectory}/build/checkstyle-suppressions.xml + + + + com.puppycrawl.tools + checkstyle + 8.41.1 + + + org.apache.maven.shared + maven-shared-resources + 3 + + + From f23171e32d1f5e1bff2a69099fbcc83d2171d9d4 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Thu, 10 Jun 2021 08:35:55 +0200 Subject: [PATCH 2/2] Fix wording --- .mvn/readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/readme.txt b/.mvn/readme.txt index 3b197a806015..c2d3655427cd 100644 --- a/.mvn/readme.txt +++ b/.mvn/readme.txt @@ -1 +1 @@ -The .mvn folder is needed to be able to use the ${maven.multiModuleProjectDirectory} property. \ No newline at end of file +The .mvn directory is needed to be able to use the ${maven.multiModuleProjectDirectory} property. \ No newline at end of file