You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by qh...@apache.org on 2015/10/05 17:43:12 UTC

incubator-kylin git commit: KYLIN-1059

Repository: incubator-kylin
Updated Branches:
  refs/heads/1.x-HBase1.x 49e16eb44 -> 95cc9229b


KYLIN-1059


Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/95cc9229
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/95cc9229
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/95cc9229

Branch: refs/heads/1.x-HBase1.x
Commit: 95cc9229bee1250a1a6190daddeedc612c74f4f0
Parents: 49e16eb
Author: qianhao.zhou <qi...@ebay.com>
Authored: Mon Oct 5 23:43:36 2015 +0800
Committer: qianhao.zhou <qi...@ebay.com>
Committed: Mon Oct 5 23:43:36 2015 +0800

----------------------------------------------------------------------
 job/pom.xml |  4 ----
 pom.xml     | 42 +++++++++++++++++++-----------------------
 2 files changed, 19 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/95cc9229/job/pom.xml
----------------------------------------------------------------------
diff --git a/job/pom.xml b/job/pom.xml
index 6df92ba..ba73760 100644
--- a/job/pom.xml
+++ b/job/pom.xml
@@ -81,10 +81,6 @@
             <artifactId>jackson-databind</artifactId>
         </dependency>
         <dependency>
-            <groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
-        </dependency>
-        <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/95cc9229/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d3a0a3a..4eaa55c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -535,11 +535,29 @@
                     <artifactId>maven-assembly-plugin</artifactId>
                     <version>${maven-assembly.version}</version>
                 </plugin>
-
+                
+                <!-- Checkstyle Plugin -->
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-checkstyle-plugin</artifactId>
                     <version>2.15</version>
+                    <executions>
+                        <execution>
+                            <id>validate</id>
+                            <phase>validate</phase>
+                            <configuration>
+                                <configLocation>src/main/config/checkstyle/checkstyle.xml</configLocation>
+                                <suppressionsLocation>src/main/config/checkstyle/suppressions.xml</suppressionsLocation>
+                                <consoleOutput>true</consoleOutput>
+                                <headerLocation>src/main/config/checkstyle/checkstyle-java-header.txt</headerLocation>
+                                <failOnViolation>true</failOnViolation>
+                                <includeTestSourceDirectory>true</includeTestSourceDirectory>
+                            </configuration>
+                            <goals>
+                                <goal>check</goal>
+                            </goals>
+                        </execution>
+                    </executions>
                 </plugin>
 
                 <!--
@@ -570,28 +588,6 @@
                         <skip>true</skip>
                     </configuration>
                 </plugin>
-                <!-- Checkstyle Plugin -->
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-checkstyle-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>validate</id>
-                            <phase>validate</phase>
-                            <configuration>
-                                <configLocation>src/main/config/checkstyle/checkstyle.xml</configLocation>
-                                <suppressionsLocation>src/main/config/checkstyle/suppressions.xml</suppressionsLocation>
-                                <consoleOutput>true</consoleOutput>
-                                <headerLocation>src/main/config/checkstyle/checkstyle-java-header.txt</headerLocation>
-                                <failOnViolation>true</failOnViolation>
-                                <includeTestSourceDirectory>true</includeTestSourceDirectory>
-                            </configuration>
-                            <goals>
-                                <goal>check</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>