diff --git a/flink-core/pom.xml b/flink-core/pom.xml index f860c20a047e0..efd7b12152498 100644 --- a/flink-core/pom.xml +++ b/flink-core/pom.xml @@ -121,30 +121,9 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.17</version> - <dependencies> - <dependency> - <groupId>com.puppycrawl.tools</groupId> - <artifactId>checkstyle</artifactId> - <version>8.4</version> - </dependency> - </dependencies> - <executions> - <execution> - <id>validate</id> - <phase>validate</phase> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> <configuration> - <configLocation>/tools/maven/checkstyle.xml</configLocation> - <suppressionsLocation>/tools/maven/suppressions-core.xml</suppressionsLocation> - <includeTestSourceDirectory>true</includeTestSourceDirectory> - <logViolationsToConsole>true</logViolationsToConsole> - <failOnViolation>true</failOnViolation> + <suppressionsLocation combine.self="override">/tools/maven/suppressions-core.xml</suppressionsLocation> </configuration> </plugin> diff --git a/flink-optimizer/pom.xml b/flink-optimizer/pom.xml index 903621a537c49..d5b6bfb00b158 100644 --- a/flink-optimizer/pom.xml +++ b/flink-optimizer/pom.xml @@ -80,30 +80,9 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.17</version> - <dependencies> - <dependency> - <groupId>com.puppycrawl.tools</groupId> - <artifactId>checkstyle</artifactId> - <version>8.4</version> - </dependency> - </dependencies> - <executions> - <execution> - <id>validate</id> - <phase>validate</phase> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> <configuration> - <configLocation>/tools/maven/checkstyle.xml</configLocation> - <suppressionsLocation>/tools/maven/suppressions-optimizer.xml</suppressionsLocation> - <includeTestSourceDirectory>true</includeTestSourceDirectory> - <logViolationsToConsole>true</logViolationsToConsole> - <failOnViolation>true</failOnViolation> + <suppressionsLocation combine.self="override">/tools/maven/suppressions-optimizer.xml</suppressionsLocation> </configuration> </plugin> <plugin> diff --git a/flink-runtime/pom.xml b/flink-runtime/pom.xml index 5ed096a6fcddd..f195bd57bc5f7 100644 --- a/flink-runtime/pom.xml +++ b/flink-runtime/pom.xml @@ -334,30 +334,9 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.17</version> - <dependencies> - <dependency> - <groupId>com.puppycrawl.tools</groupId> - <artifactId>checkstyle</artifactId> - <version>8.4</version> - </dependency> - </dependencies> - <executions> - <execution> - <id>validate</id> - <phase>validate</phase> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> <configuration> - <configLocation>/tools/maven/checkstyle.xml</configLocation> - <suppressionsLocation>/tools/maven/suppressions-runtime.xml</suppressionsLocation> - <includeTestSourceDirectory>true</includeTestSourceDirectory> - <logViolationsToConsole>true</logViolationsToConsole> - <failOnViolation>true</failOnViolation> + <suppressionsLocation combine.self="override">/tools/maven/suppressions-runtime.xml</suppressionsLocation> </configuration> </plugin> <!-- Scala Compiler --> diff --git a/pom.xml b/pom.xml index 574bd22d3aefa..eb0a8028aa0d8 100644 --- a/pom.xml +++ b/pom.xml @@ -1164,31 +1164,6 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.17</version> - <dependencies> - <dependency> - <groupId>com.puppycrawl.tools</groupId> - <artifactId>checkstyle</artifactId> - <!-- Note: match version with docs/internals/ide_setup.md --> - <version>8.4</version> - </dependency> - </dependencies> - <executions> - <execution> - <id>validate</id> - <phase>validate</phase> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - <configuration> - <suppressionsLocation>/tools/maven/suppressions.xml</suppressionsLocation> - <includeTestSourceDirectory>true</includeTestSourceDirectory> - <configLocation>/tools/maven/checkstyle.xml</configLocation> - <logViolationsToConsole>true</logViolationsToConsole> - <failOnViolation>true</failOnViolation> - </configuration> </plugin> <plugin> <!-- just define the Java version to be used for compiling and plugins --> @@ -1393,6 +1368,36 @@ under the License. <pluginManagement> <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>2.17</version> + <dependencies> + <dependency> + <groupId>com.puppycrawl.tools</groupId> + <artifactId>checkstyle</artifactId> + <!-- Note: match version with docs/internals/ide_setup.md --> + <version>8.4</version> + </dependency> + </dependencies> + <executions> + <execution> + <id>validate</id> + <phase>validate</phase> + <goals> + <goal>check</goal> + </goals> + </execution> + </executions> + <configuration> + <suppressionsLocation>/tools/maven/suppressions.xml</suppressionsLocation> + <includeTestSourceDirectory>true</includeTestSourceDirectory> + <configLocation>/tools/maven/checkstyle.xml</configLocation> + <logViolationsToConsole>true</logViolationsToConsole> + <failOnViolation>true</failOnViolation> + </configuration> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId>