This is an automated email from the ASF dual-hosted git repository.
mmuzaf pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new c508f3b IGNITE-13724 Fix checkstyle config for dymanic source
directories in ignite-examples (#8482)
c508f3b is described below
commit c508f3b101d23760ff10cc664fb6de4cb4b5de8b
Author: Maxim Muzafarov <mmu...@apache.org>
AuthorDate: Mon Nov 23 13:59:04 2020 +0300
IGNITE-13724 Fix checkstyle config for dymanic source directories in
ignite-examples (#8482)
---
examples/pom.xml | 35 ++++++++++++++++++++++++++
parent/pom.xml | 76 +++++++++++++++++++++++++++++++++++---------------------
2 files changed, 82 insertions(+), 29 deletions(-)
diff --git a/examples/pom.xml b/examples/pom.xml
index 388a78a..08fe50a 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -248,6 +248,16 @@
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <sourceDirectories combine.children="append">
+
<sourceDirectory>${spark.folder}</sourceDirectory>
+
<sourceDirectory>${spark.test.folder}</sourceDirectory>
+ </sourceDirectories>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>
@@ -279,6 +289,21 @@
<version>${project.version}</version>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <sourceDirectories combine.children="append">
+
<sourceDirectory>${lgpl.folder}</sourceDirectory>
+
<sourceDirectory>${lgpl.test.folder}</sourceDirectory>
+ </sourceDirectories>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</profile>
<profile>
<id>spark-2.4</id>
@@ -321,6 +346,16 @@
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <sourceDirectories combine.children="append">
+
<sourceDirectory>${spark.folder}</sourceDirectory>
+
<sourceDirectory>${spark.test.folder}</sourceDirectory>
+ </sourceDirectories>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>
diff --git a/parent/pom.xml b/parent/pom.xml
index 4291bec..ab52dbb 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -107,7 +107,7 @@
<lz4.version>1.5.0</lz4.version>
<maven.bundle.plugin.version>3.5.0</maven.bundle.plugin.version>
<maven.checkstyle.plugin.version>3.1.1</maven.checkstyle.plugin.version>
- <checkstyle.puppycrawl.version>8.35</checkstyle.puppycrawl.version>
+ <checkstyle.puppycrawl.version>8.37</checkstyle.puppycrawl.version>
<mockito.version>3.4.6</mockito.version>
<mysql.connector.version>8.0.13</mysql.connector.version>
<netlibjava.version>1.1.2</netlibjava.version>
@@ -227,6 +227,35 @@
<pluginManagement>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>${maven.checkstyle.plugin.version}</version>
+ <configuration>
+ <skip>true</skip>
+ <sourceDirectories>
+
<sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+
<sourceDirectory>${project.build.testSourceDirectory}</sourceDirectory>
+ </sourceDirectories>
+ <consoleOutput>true</consoleOutput>
+ <logViolationsToConsole>true</logViolationsToConsole>
+ <failsOnError>true</failsOnError>
+ <failOnViolation>true</failOnViolation>
+
<outputFile>${project.build.directory}/checkstyle-result.xml</outputFile>
+
<configLocation>../checkstyle/checkstyle.xml</configLocation>
+
<suppressionsLocation>../checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
+
<includeTestSourceDirectory>true</includeTestSourceDirectory>
+ <excludes>**/generated/**/*</excludes>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>com.puppycrawl.tools</groupId>
+ <artifactId>checkstyle</artifactId>
+ <version>${checkstyle.puppycrawl.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+
+ <plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<version>3.3.2</version>
@@ -736,6 +765,20 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>style</id>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <phase>validate</phase>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
@@ -747,34 +790,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>${maven.checkstyle.plugin.version}</version>
- <executions>
- <execution>
- <id>style</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>validate</phase>
- <configuration>
- <consoleOutput>true</consoleOutput>
-
<logViolationsToConsole>true</logViolationsToConsole>
- <failsOnError>true</failsOnError>
- <failOnViolation>true</failOnViolation>
-
<outputFile>${project.build.directory}/checkstyle-result.xml</outputFile>
-
<configLocation>../checkstyle/checkstyle.xml</configLocation>
-
<suppressionsLocation>../checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
-
<includeTestSourceDirectory>true</includeTestSourceDirectory>
- <excludes>**/generated/**/*</excludes>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>com.puppycrawl.tools</groupId>
- <artifactId>checkstyle</artifactId>
-
<version>${checkstyle.puppycrawl.version}</version>
- </dependency>
- </dependencies>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
</plugin>
</plugins>
</build>
