You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2015/11/02 08:11:24 UTC

incubator-kylin git commit: fix warnings in pom.xml, upgrade spring.boot to 1.2.7.RELEASE

Repository: incubator-kylin
Updated Branches:
  refs/heads/1.x-staging d7a37e041 -> 2c1c19510


fix warnings in pom.xml, upgrade spring.boot to 1.2.7.RELEASE


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

Branch: refs/heads/1.x-staging
Commit: 2c1c19510c94f7e3a596f9cfbd11c58a999f514e
Parents: d7a37e0
Author: Yang Li <li...@apache.org>
Authored: Mon Nov 2 06:08:15 2015 +0000
Committer: Li, Yang <ya...@ebay.com>
Committed: Mon Nov 2 15:11:15 2015 +0800

----------------------------------------------------------------------
 monitor/pom.xml | 21 ---------------------
 pom.xml         |  8 ++------
 server/pom.xml  |  3 ++-
 3 files changed, 4 insertions(+), 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/2c1c1951/monitor/pom.xml
----------------------------------------------------------------------
diff --git a/monitor/pom.xml b/monitor/pom.xml
index 6530493..dfdd12d 100644
--- a/monitor/pom.xml
+++ b/monitor/pom.xml
@@ -67,27 +67,6 @@
             <artifactId>hadoop-common</artifactId>
             <scope>provided</scope>
         </dependency>
-        <!--hbase dependency-->
-        <dependency>
-            <groupId>org.apache.hbase</groupId>
-            <artifactId>hbase-hadoop2-compat</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.hbase</groupId>
-            <artifactId>hbase-common</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.hbase</groupId>
-            <artifactId>hbase-client</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.hbase</groupId>
-            <artifactId>hbase-server</artifactId>
-            <scope>provided</scope>
-        </dependency>
 
         <!--hbase dependency-->
         <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/2c1c1951/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d9b32be..1b4f862 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,6 +84,7 @@
 
         <!-- REST Service -->
         <spring.framework.version>3.1.2.RELEASE</spring.framework.version>
+        <spring.boot.version>1.2.7.RELEASE</spring.boot.version>
 
         <!-- Calcite Version -->
         <calcite.version>1.4.0-incubating</calcite.version>
@@ -544,12 +545,6 @@
                     <version>${maven-assembly.version}</version>
                 </plugin>
 
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-checkstyle-plugin</artifactId>
-                    <version>2.15</version>
-                </plugin>
-
                 <!--
                 <plugin>
                     <groupId>com.mycila</groupId>
@@ -582,6 +577,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-checkstyle-plugin</artifactId>
+                    <version>2.15</version>
                     <executions>
                         <execution>
                             <id>validate</id>

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/2c1c1951/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index f3f2380..8a17435 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -101,7 +101,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <version>0.5.0.M6</version>
+            <version>${spring.boot.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.springframework.boot</groupId>
@@ -449,6 +449,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${spring.boot.version}</version>
             </plugin>
         </plugins>
     </build>