This is an automated email from the ASF dual-hosted git repository.
hashutosh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push:
new 292f6bb HIVE-21038 : Fix checkstyle for standalone-metastore (Miklos
Gergely via Ashutosh Chauhan)
292f6bb is described below
commit 292f6bb9450c20a68d669a67301a1a9b9b0af80c
Author: Miklos Gergely <[email protected]>
AuthorDate: Thu Dec 13 02:46:00 2018 -0800
HIVE-21038 : Fix checkstyle for standalone-metastore (Miklos Gergely via
Ashutosh Chauhan)
Signed-off-by: Ashutosh Chauhan <[email protected]>
---
standalone-metastore/metastore-common/pom.xml | 20 +++++---------------
standalone-metastore/metastore-server/pom.xml | 17 +++--------------
.../metastore-tools/metastore-benchmarks/pom.xml | 4 ++++
standalone-metastore/metastore-tools/pom.xml | 2 +-
.../metastore-tools/tools-common/pom.xml | 4 ++++
standalone-metastore/pom.xml | 17 ++++++++++++++++-
6 files changed, 33 insertions(+), 31 deletions(-)
diff --git a/standalone-metastore/metastore-common/pom.xml
b/standalone-metastore/metastore-common/pom.xml
index a255a5d..5c65cf5 100644
--- a/standalone-metastore/metastore-common/pom.xml
+++ b/standalone-metastore/metastore-common/pom.xml
@@ -12,6 +12,10 @@
<artifactId>hive-standalone-metastore-common</artifactId>
<name>Hive Standalone Metastore Common Code</name>
+ <properties>
+ <standalone.metastore.path.to.root>..</standalone.metastore.path.to.root>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.orc</groupId>
@@ -355,11 +359,6 @@
</dependencies>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>${maven.checkstyle.plugin.version}</version>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>${maven.exec.plugin.version}</version>
@@ -414,15 +413,6 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
-
<configLocation>${checkstyle.conf.dir}/checkstyle.xml</configLocation>
-
<propertyExpansion>config_loc=${checkstyle.conf.dir}</propertyExpansion>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- </configuration>
- </plugin>
- <plugin>
<groupId>com.github.os72</groupId>
<artifactId>protoc-jar-maven-plugin</artifactId>
<version>3.5.1.1</version>
@@ -612,4 +602,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/standalone-metastore/metastore-server/pom.xml
b/standalone-metastore/metastore-server/pom.xml
index 895abfc..2eeefa3 100644
--- a/standalone-metastore/metastore-server/pom.xml
+++ b/standalone-metastore/metastore-server/pom.xml
@@ -12,6 +12,9 @@
<artifactId>hive-standalone-metastore-server</artifactId>
<name>Hive Metastore Server</name>
+ <properties>
+ <standalone.metastore.path.to.root>..</standalone.metastore.path.to.root>
+ </properties>
<dependencies>
<dependency>
@@ -363,11 +366,6 @@
</dependencies>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>${maven.checkstyle.plugin.version}</version>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>${maven.exec.plugin.version}</version>
@@ -430,15 +428,6 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
-
<configLocation>${checkstyle.conf.dir}/checkstyle.xml</configLocation>
-
<propertyExpansion>config_loc=${checkstyle.conf.dir}</propertyExpansion>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- </configuration>
- </plugin>
- <plugin>
<groupId>com.github.os72</groupId>
<artifactId>protoc-jar-maven-plugin</artifactId>
<version>3.5.1.1</version>
diff --git a/standalone-metastore/metastore-tools/metastore-benchmarks/pom.xml
b/standalone-metastore/metastore-tools/metastore-benchmarks/pom.xml
index 079a07b..f54b161 100644
--- a/standalone-metastore/metastore-tools/metastore-benchmarks/pom.xml
+++ b/standalone-metastore/metastore-tools/metastore-benchmarks/pom.xml
@@ -27,6 +27,10 @@
<artifactId>hive-metastore-benchmarks</artifactId>
<name>Hive metastore benchmarks</name>
+ <properties>
+
<standalone.metastore.path.to.root>../..</standalone.metastore.path.to.root>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.hive</groupId>
diff --git a/standalone-metastore/metastore-tools/pom.xml
b/standalone-metastore/metastore-tools/pom.xml
index 5b2af62..fd24987 100644
--- a/standalone-metastore/metastore-tools/pom.xml
+++ b/standalone-metastore/metastore-tools/pom.xml
@@ -36,7 +36,6 @@
<properties>
<hive.version>4.0.0-SNAPSHOT</hive.version>
<maven.surefire.version>2.20.1</maven.surefire.version>
- <checkstyle.conf.dir>${basedir}/checkstyle</checkstyle.conf.dir>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<javac.errorprone.version>2.8</javac.errorprone.version>
@@ -46,6 +45,7 @@
<junit.jupiter.api.version>5.2.0</junit.jupiter.api.version>
<commons-math3.version>3.6.1</commons-math3.version>
<jetbrain-annotation.version>16.0.2</jetbrain-annotation.version>
+ <standalone.metastore.path.to.root>..</standalone.metastore.path.to.root>
</properties>
<dependencyManagement>
diff --git a/standalone-metastore/metastore-tools/tools-common/pom.xml
b/standalone-metastore/metastore-tools/tools-common/pom.xml
index 6b03dd5..4c226fa 100644
--- a/standalone-metastore/metastore-tools/tools-common/pom.xml
+++ b/standalone-metastore/metastore-tools/tools-common/pom.xml
@@ -27,6 +27,10 @@
<artifactId>metastore-tools-common</artifactId>
<name>Hive Metastore Tools common libraries</name>
+ <properties>
+
<standalone.metastore.path.to.root>../..</standalone.metastore.path.to.root>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.hive</groupId>
diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml
index 5c8ff31..08b4587 100644
--- a/standalone-metastore/pom.xml
+++ b/standalone-metastore/pom.xml
@@ -36,6 +36,7 @@
<properties>
<hive.version.shortname>4.0.0</hive.version.shortname>
+ <standalone.metastore.path.to.root>.</standalone.metastore.path.to.root>
<!-- Build properties -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -45,6 +46,7 @@
<maven.repo.local>${settings.localRepository}</maven.repo.local>
<maven.assembly.plugin.version>3.1.0</maven.assembly.plugin.version>
<maven.exec.plugin.version>1.6.0</maven.exec.plugin.version>
+
<checkstyle.conf.dir>${basedir}/${standalone.metastore.path.to.root}/checkstyle</checkstyle.conf.dir>
<!-- Test Properties -->
<log4j.conf.dir>${project.basedir}/src/test/resources</log4j.conf.dir>
@@ -60,7 +62,6 @@
<!-- Plugin versions -->
<ant.contrib.version>1.0b3</ant.contrib.version>
<maven.antrun.plugin.version>1.7</maven.antrun.plugin.version>
- <checkstyle.conf.dir>${basedir}/checkstyle/</checkstyle.conf.dir>
<maven.checkstyle.plugin.version>2.17</maven.checkstyle.plugin.version>
<maven.surefire.version>2.20.1</maven.surefire.version>
@@ -359,6 +360,11 @@
<failIfNoTests>false</failIfNoTests>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>${maven.checkstyle.plugin.version}</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -385,6 +391,15 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+
<configLocation>${checkstyle.conf.dir}/checkstyle.xml</configLocation>
+
<propertyExpansion>config_loc=${checkstyle.conf.dir}</propertyExpansion>
+ <includeTestSourceDirectory>true</includeTestSourceDirectory>
+ </configuration>
+ </plugin>
</plugins>
</build>
