Skip to content

Commit

Permalink
ISSUE #249: Organize findbugs and checkstyle files in buildtools module
Browse files Browse the repository at this point in the history 
Descriptions of the changes in this PR:

Organize findbugs and checkstyle files in buildtools module

Author: Sijie Guo <sijie@apache.org>

Reviewers: Jia Zhai <None>, Matteo Merli <None>

This closes #250 from sijie/buildtools, closes #249
  • Loading branch information
@sijie
sijie authored and jiazhai committed Jul 18, 2017
1 parent f47dd42 commit 7277657
Show file tree
Hide file tree
Showing 13 changed files with 135 additions and 67 deletions.
23 changes: 14 additions & 9 deletions bookkeeper-benchmark/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,28 +52,33 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.17</version>
<version>${maven-checkstyle-plugin.version}</version>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>6.19</version>
<version>${puppycrawl.checkstyle.version}</version>
</dependency>
<dependency>
<groupId>org.apache.bookkeeper</groupId>
<artifactId>buildtools</artifactId>
<version>${project.parent.version}</version>
</dependency>
</dependencies>
<configuration>
<configLocation>bookkeeper/checkstyle.xml</configLocation>
<suppressionsLocation>bookkeeper/suppressions.xml</suppressionsLocation>
<encoding>UTF-8</encoding>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
</configuration>
<executions>
<execution>
<id>checkstyle</id>
<phase>validate</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<configLocation>../checkstyle.xml</configLocation>
<suppressionsLocation>../suppressions.xml</suppressionsLocation>
<encoding>UTF-8</encoding>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
</configuration>
</execution>
</executions>
</plugin>
Expand Down
3 changes: 0 additions & 3 deletions bookkeeper-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -341,9 +341,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<configuration>
<excludeFilterFile>${basedir}/src/main/resources/findbugsExclude.xml</excludeFilterFile>
</configuration>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
Expand Down
23 changes: 14 additions & 9 deletions bookkeeper-stats-providers/codahale-metrics-provider/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,28 +37,33 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.17</version>
<version>${maven-checkstyle-plugin.version}</version>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>6.19</version>
<version>${puppycrawl.checkstyle.version}</version>
</dependency>
<dependency>
<groupId>org.apache.bookkeeper</groupId>
<artifactId>buildtools</artifactId>
<version>${project.parent.version}</version>
</dependency>
</dependencies>
<configuration>
<configLocation>bookkeeper/checkstyle.xml</configLocation>
<suppressionsLocation>bookkeeper/suppressions.xml</suppressionsLocation>
<encoding>UTF-8</encoding>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
</configuration>
<executions>
<execution>
<id>checkstyle</id>
<phase>validate</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<configLocation>../../checkstyle.xml</configLocation>
<suppressionsLocation>../../suppressions.xml</suppressionsLocation>
<encoding>UTF-8</encoding>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
</configuration>
</execution>
</executions>
</plugin>
Expand Down
23 changes: 14 additions & 9 deletions bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,28 +38,33 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.17</version>
<version>${maven-checkstyle-plugin.version}</version>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>6.19</version>
<version>${puppycrawl.checkstyle.version}</version>
</dependency>
<dependency>
<groupId>org.apache.bookkeeper</groupId>
<artifactId>buildtools</artifactId>
<version>${project.parent.version}</version>
</dependency>
</dependencies>
<configuration>
<configLocation>bookkeeper/checkstyle.xml</configLocation>
<suppressionsLocation>bookkeeper/suppressions.xml</suppressionsLocation>
<encoding>UTF-8</encoding>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
</configuration>
<executions>
<execution>
<id>checkstyle</id>
<phase>validate</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<configLocation>../../checkstyle.xml</configLocation>
<suppressionsLocation>../../suppressions.xml</suppressionsLocation>
<encoding>UTF-8</encoding>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
</configuration>
</execution>
</executions>
</plugin>
Expand Down
23 changes: 14 additions & 9 deletions bookkeeper-stats-providers/twitter-finagle-provider/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,28 +37,33 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.17</version>
<version>${maven-checkstyle-plugin.version}</version>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>6.19</version>
<version>${puppycrawl.checkstyle.version}</version>
</dependency>
<dependency>
<groupId>org.apache.bookkeeper</groupId>
<artifactId>buildtools</artifactId>
<version>${project.parent.version}</version>
</dependency>
</dependencies>
<configuration>
<configLocation>bookkeeper/checkstyle.xml</configLocation>
<suppressionsLocation>bookkeeper/suppressions.xml</suppressionsLocation>
<encoding>UTF-8</encoding>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
</configuration>
<executions>
<execution>
<id>checkstyle</id>
<phase>validate</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<configLocation>../../checkstyle.xml</configLocation>
<suppressionsLocation>../../suppressions.xml</suppressionsLocation>
<encoding>UTF-8</encoding>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
</configuration>
</execution>
</executions>
</plugin>
Expand Down
23 changes: 14 additions & 9 deletions bookkeeper-stats-providers/twitter-ostrich-provider/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,28 +37,33 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.17</version>
<version>${maven-checkstyle-plugin.version}</version>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>6.19</version>
<version>${puppycrawl.checkstyle.version}</version>
</dependency>
<dependency>
<groupId>org.apache.bookkeeper</groupId>
<artifactId>buildtools</artifactId>
<version>${project.parent.version}</version>
</dependency>
</dependencies>
<configuration>
<configLocation>bookkeeper/checkstyle.xml</configLocation>
<suppressionsLocation>bookkeeper/suppressions.xml</suppressionsLocation>
<encoding>UTF-8</encoding>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
</configuration>
<executions>
<execution>
<id>checkstyle</id>
<phase>validate</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<configLocation>../../checkstyle.xml</configLocation>
<suppressionsLocation>../../suppressions.xml</suppressionsLocation>
<encoding>UTF-8</encoding>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
</configuration>
</execution>
</executions>
</plugin>
Expand Down
23 changes: 14 additions & 9 deletions bookkeeper-stats-providers/twitter-science-provider/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,28 +37,33 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.17</version>
<version>${maven-checkstyle-plugin.version}</version>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>6.19</version>
<version>${puppycrawl.checkstyle.version}</version>
</dependency>
<dependency>
<groupId>org.apache.bookkeeper</groupId>
<artifactId>buildtools</artifactId>
<version>${project.parent.version}</version>
</dependency>
</dependencies>
<configuration>
<configLocation>bookkeeper/checkstyle.xml</configLocation>
<suppressionsLocation>bookkeeper/suppressions.xml</suppressionsLocation>
<encoding>UTF-8</encoding>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
</configuration>
<executions>
<execution>
<id>checkstyle</id>
<phase>validate</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<configLocation>../../checkstyle.xml</configLocation>
<suppressionsLocation>../../suppressions.xml</suppressionsLocation>
<encoding>UTF-8</encoding>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
</configuration>
</execution>
</executions>
</plugin>
Expand Down
23 changes: 14 additions & 9 deletions bookkeeper-stats/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,28 +36,33 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.17</version>
<version>${maven-checkstyle-plugin.version}</version>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>6.19</version>
<version>${puppycrawl.checkstyle.version}</version>
</dependency>
<dependency>
<groupId>org.apache.bookkeeper</groupId>
<artifactId>buildtools</artifactId>
<version>${project.parent.version}</version>
</dependency>
</dependencies>
<configuration>
<configLocation>bookkeeper/checkstyle.xml</configLocation>
<suppressionsLocation>bookkeeper/suppressions.xml</suppressionsLocation>
<encoding>UTF-8</encoding>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
</configuration>
<executions>
<execution>
<id>checkstyle</id>
<phase>validate</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<configLocation>../checkstyle.xml</configLocation>
<suppressionsLocation>../suppressions.xml</suppressionsLocation>
<encoding>UTF-8</encoding>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
</configuration>
</execution>
</executions>
</plugin>
Expand Down
28 changes: 28 additions & 0 deletions buildtools/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.bookkeeper</groupId>
<artifactId>bookkeeper</artifactId>
<version>4.5.0-SNAPSHOT</version>
</parent>
<artifactId>buildtools</artifactId>
<name>Apache BookKeeper :: Build Tools</name>
<version>4.5.0-SNAPSHOT</version>
</project>
0 checkstyle.xml → .../main/resources/bookkeeper/checkstyle.xml
View file
File renamed without changes.
0 ...er/src/main/resources/findbugsExclude.xml → .../resources/bookkeeper/findbugsExclude.xml
View file
File renamed without changes.
0 suppressions.xml → ...ain/resources/bookkeeper/suppressions.xml
View file
File renamed without changes.
10 changes: 9 additions & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
<name>bookkeeper</name>
<inceptionYear>2011</inceptionYear>
<modules>
<module>buildtools</module>
<module>compat-deps</module>
<module>bookkeeper-stats</module>
<module>bookkeeper-server</module>
Expand All @@ -46,14 +47,21 @@
<protobuf.version>2.6.1</protobuf.version>
<slf4j.version>1.7.25</slf4j.version>
<zookeeper.version>3.5.3-beta</zookeeper.version>
<!-- plugin dependencies -->
<findbugs-maven-plugin.version>3.0.3</findbugs-maven-plugin.version>
<puppycrawl.checkstyle.version>6.19</puppycrawl.checkstyle.version>
<maven-checkstyle-plugin.version>2.17</maven-checkstyle-plugin.version>
</properties>
<url>http://bookkeeper.apache.org</url>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>3.0.4</version>
<version>${findbugs-maven-plugin.version}</version>
<configuration>
<excludeFilterFile>${session.executionRootDirectory}/buildtools/src/main/resources/bookkeeper/findbugsExclude.xml</excludeFilterFile>
</configuration>
</plugin>
<plugin>
<groupId>org.eluder.coveralls</groupId>
Expand Down

0 comments on commit 7277657

Please sign in to comment.