Skip to content

Commit

Permalink
Merge branch 'staging'
Browse files Browse the repository at this point in the history
  • Loading branch information
lukehan committed Feb 6, 2015
2 parents bfd4860 + 69ebfe2 commit fdb4ecc
Show file tree
Hide file tree
Showing 11 changed files with 12 additions and 13 deletions.
2 changes: 1 addition & 1 deletion atopcalcite/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.kylinolap</groupId>
<artifactId>kylin</artifactId>
<version>0.6.4-SNAPSHOT</version>
<version>0.6.5-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.kylinolap</groupId>
<artifactId>kylin</artifactId>
<version>0.6.4-SNAPSHOT</version>
<version>0.6.5-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion cube/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.kylinolap</groupId>
<artifactId>kylin</artifactId>
<version>0.6.4-SNAPSHOT</version>
<version>0.6.5-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion dictionary/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.kylinolap</groupId>
<artifactId>kylin</artifactId>
<version>0.6.4-SNAPSHOT</version>
<version>0.6.5-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion jdbc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>com.kylinolap</groupId>
<artifactId>kylin</artifactId>
<version>0.6.4-SNAPSHOT</version>
<version>0.6.5-SNAPSHOT</version>
</parent>

<properties>
Expand Down
5 changes: 2 additions & 3 deletions job/pom.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<?xml version="1.0"?>
<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/xsd/maven-4.0.0.xsd">
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.kylinolap</groupId>
<artifactId>kylin</artifactId>
<version>0.6.4-SNAPSHOT</version>
<version>0.6.5-SNAPSHOT</version>
</parent>

<artifactId>kylin-job</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion metadata/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.kylinolap</groupId>
<artifactId>kylin</artifactId>
<version>0.6.4-SNAPSHOT</version>
<version>0.6.5-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<groupId>com.kylinolap</groupId>
<artifactId>kylin</artifactId>
<packaging>pom</packaging>
<version>0.6.4-SNAPSHOT</version>
<version>0.6.5-SNAPSHOT</version>
<name>Kylin:HadoopOLAPEngine</name>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion query/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>com.kylinolap</groupId>
<artifactId>kylin</artifactId>
<version>0.6.4-SNAPSHOT</version>
<version>0.6.5-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>com.kylinolap</groupId>
<artifactId>kylin</artifactId>
<version>0.6.4-SNAPSHOT</version>
<version>0.6.5-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion storage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.kylinolap</groupId>
<artifactId>kylin</artifactId>
<version>0.6.4-SNAPSHOT</version>
<version>0.6.5-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down

0 comments on commit fdb4ecc

Please sign in to comment.