You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2018/05/10 11:48:49 UTC
[15/17] flink git commit: [FLINK-9323][build] Properly organize
checkstyle-plugin configuration
[FLINK-9323][build] Properly organize checkstyle-plugin configuration
This closes #5972.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/3495b4d2
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/3495b4d2
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/3495b4d2
Branch: refs/heads/master
Commit: 3495b4d2560f176907ba51e7b1576b763a2b8b6c
Parents: 84e7fe4
Author: zentol <ch...@apache.org>
Authored: Wed May 9 13:20:41 2018 +0200
Committer: zentol <ch...@apache.org>
Committed: Thu May 10 08:26:54 2018 +0200
----------------------------------------------------------------------
flink-core/pom.xml | 23 +-----------------
flink-optimizer/pom.xml | 23 +-----------------
flink-runtime/pom.xml | 23 +-----------------
pom.xml | 55 ++++++++++++++++++++++++--------------------
4 files changed, 33 insertions(+), 91 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/3495b4d2/flink-core/pom.xml
----------------------------------------------------------------------
diff --git a/flink-core/pom.xml b/flink-core/pom.xml
index f860c20..efd7b12 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>
http://git-wip-us.apache.org/repos/asf/flink/blob/3495b4d2/flink-optimizer/pom.xml
----------------------------------------------------------------------
diff --git a/flink-optimizer/pom.xml b/flink-optimizer/pom.xml
index 903621a..d5b6bfb 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>
http://git-wip-us.apache.org/repos/asf/flink/blob/3495b4d2/flink-runtime/pom.xml
----------------------------------------------------------------------
diff --git a/flink-runtime/pom.xml b/flink-runtime/pom.xml
index 5ed096a..f195bd5 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 -->
http://git-wip-us.apache.org/repos/asf/flink/blob/3495b4d2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 574bd22..eb0a802 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 -->
@@ -1395,6 +1370,36 @@ 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>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version><!--$NO-MVN-MAN-VER$-->
<configuration>