Repository: incubator-streams-master Updated Branches: refs/heads/master c40213daf -> 4b2b9b076
STREAMS-439 Squashed Commit of the following: commit 62264b0cf34f5f884ce45a4357d0a0698bcea48c Author: Steve Blackmon @steveblackmon <sblack...@apache.org> Date: Mon Nov 7 11:03:39 2016 -0600 add scalastyle as well commit e3e37fe62e05b7f4203d1c240f0f2715ad983568 Author: Steve Blackmon @steveblackmon <sblack...@apache.org> Date: Sat Nov 5 20:55:55 2016 -0500 STREAMS-439: add and enable checkstyle plugin apply google_style.xml during validate phase donât fail on error Project: http://git-wip-us.apache.org/repos/asf/incubator-streams-master/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams-master/commit/4b2b9b07 Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams-master/tree/4b2b9b07 Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams-master/diff/4b2b9b07 Branch: refs/heads/master Commit: 4b2b9b076adf132742f99815868610673e7a96ca Parents: c40213d Author: Steve Blackmon @steveblackmon <sblack...@apache.org> Authored: Fri Nov 11 14:21:08 2016 -0600 Committer: Steve Blackmon @steveblackmon <sblack...@apache.org> Committed: Fri Nov 11 14:21:08 2016 -0600 ---------------------------------------------------------------------- pom.xml | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 66 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-streams-master/blob/4b2b9b07/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 793a25b..e0d2e3e 100644 --- a/pom.xml +++ b/pom.xml @@ -259,6 +259,7 @@ <apache-rat.plugin.version>0.12</apache-rat.plugin.version> <build-helper.plugin.version>1.8</build-helper.plugin.version> <bundle.plugin.version>1.4.3</bundle.plugin.version> + <checkstyle.plugin.version>2.17</checkstyle.plugin.version> <compiler.plugin.version>3.0</compiler.plugin.version> <clean.plugin.version>2.6</clean.plugin.version> <dependency.plugin.version>2.10</dependency.plugin.version> @@ -275,6 +276,7 @@ <reports.plugin.version>2.9</reports.plugin.version> <resources.plugin.version>2.7</resources.plugin.version> <scala.plugin.version>3.2.2</scala.plugin.version> + <scalastyle.plugin.version>0.8.0</scalastyle.plugin.version> <scm.plugin.version>1.9.4</scm.plugin.version> <shade.plugin.version>2.4.3</shade.plugin.version> <site.plugin.version>3.5</site.plugin.version> @@ -832,7 +834,51 @@ <plugin> <artifactId>maven-enforcer-plugin</artifactId> </plugin> - + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>${checkstyle.plugin.version}</version> + <executions> + <execution> + <id>validate</id> + <phase>validate</phase> + <configuration> + <configLocation>google_checks.xml</configLocation> + <encoding>UTF-8</encoding> + <consoleOutput>true</consoleOutput> + <failsOnError>false</failsOnError> + </configuration> + <goals> + <goal>check</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.scalastyle</groupId> + <artifactId>scalastyle-maven-plugin</artifactId> + <version>${scalastyle.plugin.version}</version> + <executions> + <execution> + <id>validate</id> + <phase>validate</phase> + <configuration> + <verbose>false</verbose> + <failOnViolation>false</failOnViolation> + <includeTestSourceDirectory>true</includeTestSourceDirectory> + <failOnWarning>false</failOnWarning> + <sourceDirectory>${project.basedir}/src/main/scala</sourceDirectory> + <testSourceDirectory>${project.basedir}/src/test/scala</testSourceDirectory> + <configLocation>https://raw.githubusercontent.com/databricks/sbt-databricks/master/scalastyle-config.xml</configLocation> + <outputFile>${project.build.directory}/scalastyle-output.xml</outputFile> + <outputEncoding>UTF-8</outputEncoding> + </configuration> + <goals> + <goal>check</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> @@ -1044,6 +1090,21 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>${checkstyle.plugin.version}</version> + <reportSets> + <reportSet> + <reports> + <report>checkstyle</report> + </reports> + </reportSet> + </reportSets> + <configuration> + <configLocation>google_checks.xml</configLocation> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> <version>${reports.plugin.version}</version> <configuration> @@ -1192,6 +1253,10 @@ <reporting> <plugins> <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + </plugin> + <plugin> <artifactId>maven-project-info-reports-plugin</artifactId> <configuration> <dependencyLocationsEnabled>false</dependencyLocationsEnabled> @@ -1222,10 +1287,6 @@ <artifactId>maven-site-plugin</artifactId> </plugin> <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - </plugin> - <plugin> <groupId>com.github.ferstl</groupId> <artifactId>depgraph-maven-plugin</artifactId> <version>${depgraph.plugin.version}</version>