This is an automated email from the ASF dual-hosted git repository.
zhaijia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/master by this push:
new 7277657 ISSUE #249: Organize findbugs and checkstyle files in
buildtools module
7277657 is described below
commit 7277657740c276b6f036322177c147264ba5100b
Author: Sijie Guo <[email protected]>
AuthorDate: Tue Jul 18 16:50:57 2017 +0800
ISSUE #249: Organize findbugs and checkstyle files in buildtools module
Descriptions of the changes in this PR:
Organize findbugs and checkstyle files in buildtools module
Author: Sijie Guo <[email protected]>
Reviewers: Jia Zhai <None>, Matteo Merli <None>
This closes #250 from sijie/buildtools, closes #249
---
bookkeeper-benchmark/pom.xml | 23 +++++++++++-------
bookkeeper-server/pom.xml | 3 ---
.../codahale-metrics-provider/pom.xml | 23 +++++++++++-------
.../prometheus-metrics-provider/pom.xml | 23 +++++++++++-------
.../twitter-finagle-provider/pom.xml | 23 +++++++++++-------
.../twitter-ostrich-provider/pom.xml | 23 +++++++++++-------
.../twitter-science-provider/pom.xml | 23 +++++++++++-------
bookkeeper-stats/pom.xml | 23 +++++++++++-------
buildtools/pom.xml | 28 ++++++++++++++++++++++
.../src/main/resources/bookkeeper/checkstyle.xml | 0
.../main/resources/bookkeeper}/findbugsExclude.xml | 0
.../src/main/resources/bookkeeper/suppressions.xml | 0
pom.xml | 10 +++++++-
13 files changed, 135 insertions(+), 67 deletions(-)
diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml
index 98ed6d5..768e84d 100644
--- a/bookkeeper-benchmark/pom.xml
+++ b/bookkeeper-benchmark/pom.xml
@@ -52,14 +52,26 @@
<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>
@@ -67,13 +79,6 @@
<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>
diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml
index 36a9b57..7b05b6d 100644
--- a/bookkeeper-server/pom.xml
+++ b/bookkeeper-server/pom.xml
@@ -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>
diff --git a/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml
b/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml
index ed370d3..ddf3a2c 100644
--- a/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml
+++ b/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml
@@ -37,14 +37,26 @@
<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>
@@ -52,13 +64,6 @@
<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>
diff --git a/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml
b/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml
index ac0f09c..90b8f4e 100644
--- a/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml
+++ b/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml
@@ -38,14 +38,26 @@
<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>
@@ -53,13 +65,6 @@
<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>
diff --git a/bookkeeper-stats-providers/twitter-finagle-provider/pom.xml
b/bookkeeper-stats-providers/twitter-finagle-provider/pom.xml
index 89f95d7..b3aed81 100644
--- a/bookkeeper-stats-providers/twitter-finagle-provider/pom.xml
+++ b/bookkeeper-stats-providers/twitter-finagle-provider/pom.xml
@@ -37,14 +37,26 @@
<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>
@@ -52,13 +64,6 @@
<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>
diff --git a/bookkeeper-stats-providers/twitter-ostrich-provider/pom.xml
b/bookkeeper-stats-providers/twitter-ostrich-provider/pom.xml
index 3924cb8..0161687 100644
--- a/bookkeeper-stats-providers/twitter-ostrich-provider/pom.xml
+++ b/bookkeeper-stats-providers/twitter-ostrich-provider/pom.xml
@@ -37,14 +37,26 @@
<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>
@@ -52,13 +64,6 @@
<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>
diff --git a/bookkeeper-stats-providers/twitter-science-provider/pom.xml
b/bookkeeper-stats-providers/twitter-science-provider/pom.xml
index 2e0a8bc..0a59dc8 100644
--- a/bookkeeper-stats-providers/twitter-science-provider/pom.xml
+++ b/bookkeeper-stats-providers/twitter-science-provider/pom.xml
@@ -37,14 +37,26 @@
<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>
@@ -52,13 +64,6 @@
<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>
diff --git a/bookkeeper-stats/pom.xml b/bookkeeper-stats/pom.xml
index 785d737..f5e7571 100644
--- a/bookkeeper-stats/pom.xml
+++ b/bookkeeper-stats/pom.xml
@@ -36,14 +36,26 @@
<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>
@@ -51,13 +63,6 @@
<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>
diff --git a/buildtools/pom.xml b/buildtools/pom.xml
new file mode 100644
index 0000000..7776997
--- /dev/null
+++ b/buildtools/pom.xml
@@ -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>
diff --git a/checkstyle.xml
b/buildtools/src/main/resources/bookkeeper/checkstyle.xml
similarity index 100%
rename from checkstyle.xml
rename to buildtools/src/main/resources/bookkeeper/checkstyle.xml
diff --git a/bookkeeper-server/src/main/resources/findbugsExclude.xml
b/buildtools/src/main/resources/bookkeeper/findbugsExclude.xml
similarity index 100%
rename from bookkeeper-server/src/main/resources/findbugsExclude.xml
rename to buildtools/src/main/resources/bookkeeper/findbugsExclude.xml
diff --git a/suppressions.xml
b/buildtools/src/main/resources/bookkeeper/suppressions.xml
similarity index 100%
rename from suppressions.xml
rename to buildtools/src/main/resources/bookkeeper/suppressions.xml
diff --git a/pom.xml b/pom.xml
index 400faa8..85c7f8a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
@@ -46,6 +47,10 @@
<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>
@@ -53,7 +58,10 @@
<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>
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
