You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2018/01/23 23:32:58 UTC
hbase git commit: HBASE-19780 Fix build in branch-2 - change
execution phase of checkstyle plugin back to default 'verify'
Repository: hbase
Updated Branches:
refs/heads/branch-2 8977aae43 -> b0b2d12d9
HBASE-19780 Fix build in branch-2 - change execution phase of checkstyle plugin back to default 'verify'
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b0b2d12d
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b0b2d12d
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b0b2d12d
Branch: refs/heads/branch-2
Commit: b0b2d12d9d434795a19167303dd3310ecd4b32a7
Parents: 8977aae
Author: Apekshit Sharma <ap...@apache.org>
Authored: Fri Jan 12 15:06:08 2018 -0800
Committer: Apekshit Sharma <ap...@apache.org>
Committed: Tue Jan 23 15:28:37 2018 -0800
----------------------------------------------------------------------
hbase-annotations/pom.xml | 15 ++-----
hbase-archetypes/pom.xml | 15 ++-----
hbase-build-support/hbase-error-prone/pom.xml | 15 ++-----
hbase-external-blockcache/pom.xml | 15 ++-----
hbase-metrics-api/pom.xml | 15 ++-----
hbase-metrics/pom.xml | 15 ++-----
hbase-protocol-shaded/pom.xml | 51 +++++++++-------------
pom.xml | 26 ++---------
8 files changed, 43 insertions(+), 124 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/b0b2d12d/hbase-annotations/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-annotations/pom.xml b/hbase-annotations/pom.xml
index 6ad3c12..8e73769 100644
--- a/hbase-annotations/pom.xml
+++ b/hbase-annotations/pom.xml
@@ -36,18 +36,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <executions>
- <execution>
- <id>checkstyle</id>
- <phase>validate</phase>
- <goals>
- <goal>check</goal>
- </goals>
- <configuration>
- <failOnViolation>true</failOnViolation>
- </configuration>
- </execution>
- </executions>
+ <configuration>
+ <failOnViolation>true</failOnViolation>
+ </configuration>
</plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/hbase/blob/b0b2d12d/hbase-archetypes/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-archetypes/pom.xml b/hbase-archetypes/pom.xml
index bc96c27..8f755f0 100644
--- a/hbase-archetypes/pom.xml
+++ b/hbase-archetypes/pom.xml
@@ -81,18 +81,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <executions>
- <execution>
- <id>checkstyle</id>
- <phase>validate</phase>
- <goals>
- <goal>check</goal>
- </goals>
- <configuration>
- <failOnViolation>true</failOnViolation>
- </configuration>
- </execution>
- </executions>
+ <configuration>
+ <failOnViolation>true</failOnViolation>
+ </configuration>
</plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/hbase/blob/b0b2d12d/hbase-build-support/hbase-error-prone/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-build-support/hbase-error-prone/pom.xml b/hbase-build-support/hbase-error-prone/pom.xml
index 00dad96..b9e5e1e 100644
--- a/hbase-build-support/hbase-error-prone/pom.xml
+++ b/hbase-build-support/hbase-error-prone/pom.xml
@@ -71,18 +71,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <executions>
- <execution>
- <id>checkstyle</id>
- <phase>validate</phase>
- <goals>
- <goal>check</goal>
- </goals>
- <configuration>
- <failOnViolation>true</failOnViolation>
- </configuration>
- </execution>
- </executions>
+ <configuration>
+ <failOnViolation>true</failOnViolation>
+ </configuration>
</plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/hbase/blob/b0b2d12d/hbase-external-blockcache/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-external-blockcache/pom.xml b/hbase-external-blockcache/pom.xml
index e9d4e60..4de7f34 100644
--- a/hbase-external-blockcache/pom.xml
+++ b/hbase-external-blockcache/pom.xml
@@ -98,18 +98,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <executions>
- <execution>
- <id>checkstyle</id>
- <phase>validate</phase>
- <goals>
- <goal>check</goal>
- </goals>
- <configuration>
- <failOnViolation>true</failOnViolation>
- </configuration>
- </execution>
- </executions>
+ <configuration>
+ <failOnViolation>true</failOnViolation>
+ </configuration>
</plugin>
</plugins>
<pluginManagement>
http://git-wip-us.apache.org/repos/asf/hbase/blob/b0b2d12d/hbase-metrics-api/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-metrics-api/pom.xml b/hbase-metrics-api/pom.xml
index 0327204..3389f7e 100644
--- a/hbase-metrics-api/pom.xml
+++ b/hbase-metrics-api/pom.xml
@@ -71,18 +71,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <executions>
- <execution>
- <id>checkstyle</id>
- <phase>validate</phase>
- <goals>
- <goal>check</goal>
- </goals>
- <configuration>
- <failOnViolation>true</failOnViolation>
- </configuration>
- </execution>
- </executions>
+ <configuration>
+ <failOnViolation>true</failOnViolation>
+ </configuration>
</plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/hbase/blob/b0b2d12d/hbase-metrics/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-metrics/pom.xml b/hbase-metrics/pom.xml
index 39b8cc8..3abca83 100644
--- a/hbase-metrics/pom.xml
+++ b/hbase-metrics/pom.xml
@@ -71,18 +71,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <executions>
- <execution>
- <id>checkstyle</id>
- <phase>validate</phase>
- <goals>
- <goal>check</goal>
- </goals>
- <configuration>
- <failOnViolation>true</failOnViolation>
- </configuration>
- </execution>
- </executions>
+ <configuration>
+ <failOnViolation>true</failOnViolation>
+ </configuration>
</plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/hbase/blob/b0b2d12d/hbase-protocol-shaded/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/pom.xml b/hbase-protocol-shaded/pom.xml
index 14151b0..c3b3916 100644
--- a/hbase-protocol-shaded/pom.xml
+++ b/hbase-protocol-shaded/pom.xml
@@ -58,7 +58,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- </plugin>
+ </plugin>
<plugin>
<!--Make it so assembly:single does nothing in here-->
<artifactId>maven-assembly-plugin</artifactId>
@@ -108,30 +108,30 @@
we run mvn install. There is probably a better way of avoiding the
double interpolation but this is it for now.
-->
- <plugin>
- <groupId>com.google.code.maven-replacer-plugin</groupId>
- <artifactId>replacer</artifactId>
- <version>1.5.3</version>
- <executions>
- <execution>
+ <plugin>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>replacer</artifactId>
+ <version>1.5.3</version>
+ <executions>
+ <execution>
<phase>generate-sources</phase>
- <goals>
+ <goals>
<goal>replace</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <basedir>${basedir}/target/generated-sources/</basedir>
- <includes>
- <include>**/*.java</include>
- </includes>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <basedir>${basedir}/target/generated-sources/</basedir>
+ <includes>
+ <include>**/*.java</include>
+ </includes>
<replacements>
<replacement>
- <token>([^\.])com.google.protobuf</token>
+ <token>([^\.])com.google.protobuf</token>
<value>$1org.apache.hbase.thirdparty.com.google.protobuf</value>
</replacement>
</replacements>
- </configuration>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -181,18 +181,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <executions>
- <execution>
- <id>checkstyle</id>
- <phase>validate</phase>
- <goals>
- <goal>check</goal>
- </goals>
- <configuration>
- <failOnViolation>true</failOnViolation>
- </configuration>
- </execution>
- </executions>
+ <configuration>
+ <failOnViolation>true</failOnViolation>
+ </configuration>
</plugin>
</plugins>
<pluginManagement>
http://git-wip-us.apache.org/repos/asf/hbase/blob/b0b2d12d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a06cad7..4329d5a 100755
--- a/pom.xml
+++ b/pom.xml
@@ -878,6 +878,9 @@
</configuration>
</plugin>
<plugin>
+ <!-- Approach followed here is roughly the same as mentioned here:
+ https://maven.apache.org/plugins/maven-checkstyle-plugin/examples/multi-module-config.html
+ -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${maven.checkstyle.version}</version>
@@ -1083,23 +1086,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-checkstyle</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>com.puppycrawl.tools</groupId>
- <artifactId>checkstyle</artifactId>
- <version>${checkstyle.version}</version>
- </dependency>
- </dependencies>
- <configuration>
- <configLocation>hbase/checkstyle.xml</configLocation>
- <suppressionsLocation>hbase/checkstyle-suppressions.xml</suppressionsLocation>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -1452,7 +1438,7 @@
Default is the build start timestamp. Up on jenkins pass in the jenkins build id by setting
this parameter by invoking mvn with -Dbuild.id=$BUILD_ID-->
<build.id>${maven.build.timestamp}</build.id>
- </properties>
+ </properties>
<!-- Sorted by groups of dependencies then groupId and artifactId -->
<dependencyManagement>
<dependencies>
@@ -3558,12 +3544,8 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>${maven.checkstyle.version}</version>
<configuration>
<excludes>target/**</excludes>
- <configLocation>hbase/checkstyle.xml</configLocation>
- <suppressionsLocation>hbase/checkstyle-suppressions.xml</suppressionsLocation>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
</configuration>
</plugin>