You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by lu...@apache.org on 2015/06/02 12:26:42 UTC
[48/49] incubator-kylin git commit: rollback due to failed rc
rollback due to failed rc
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/06136b84
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/06136b84
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/06136b84
Branch: refs/heads/0.7.1
Commit: 06136b848f7c72ce0fb4223bf38dcae7530b874d
Parents: a36025f
Author: Luke Han <lu...@apache.org>
Authored: Tue Jun 2 17:09:21 2015 +0800
Committer: Luke Han <lu...@apache.org>
Committed: Tue Jun 2 18:15:42 2015 +0800
----------------------------------------------------------------------
atopcalcite/pom.xml | 2 +-
common/pom.xml | 2 +-
cube/pom.xml | 2 +-
dictionary/pom.xml | 2 +-
invertedindex/pom.xml | 2 +-
jdbc/pom.xml | 2 +-
job/pom.xml | 2 +-
metadata/pom.xml | 2 +-
pom.xml | 145 ++++++++++++++++++++++++---------------------
query/pom.xml | 2 +-
server/pom.xml | 2 +-
storage/pom.xml | 2 +-
12 files changed, 87 insertions(+), 80 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/06136b84/atopcalcite/pom.xml
----------------------------------------------------------------------
diff --git a/atopcalcite/pom.xml b/atopcalcite/pom.xml
index 8986f0c..cf06b15 100644
--- a/atopcalcite/pom.xml
+++ b/atopcalcite/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>0.7.2-incubating-SNAPSHOT</version>
+ <version>0.7.1-incubating-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/06136b84/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index faed39d..e8cf42b 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>0.7.2-incubating-SNAPSHOT</version>
+ <version>0.7.1-incubating-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/06136b84/cube/pom.xml
----------------------------------------------------------------------
diff --git a/cube/pom.xml b/cube/pom.xml
index 07f9a58..0fdd708 100644
--- a/cube/pom.xml
+++ b/cube/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>0.7.2-incubating-SNAPSHOT</version>
+ <version>0.7.1-incubating-SNAPSHOT</version>
</parent>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/06136b84/dictionary/pom.xml
----------------------------------------------------------------------
diff --git a/dictionary/pom.xml b/dictionary/pom.xml
index 075fab1..524a52f 100644
--- a/dictionary/pom.xml
+++ b/dictionary/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>0.7.2-incubating-SNAPSHOT</version>
+ <version>0.7.1-incubating-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/06136b84/invertedindex/pom.xml
----------------------------------------------------------------------
diff --git a/invertedindex/pom.xml b/invertedindex/pom.xml
index 8e89ee4..dcf961b 100644
--- a/invertedindex/pom.xml
+++ b/invertedindex/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>0.7.2-incubating-SNAPSHOT</version>
+ <version>0.7.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>kylin-invertedindex</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/06136b84/jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index 7f707c7..24feef9 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>0.7.2-incubating-SNAPSHOT</version>
+ <version>0.7.1-incubating-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/06136b84/job/pom.xml
----------------------------------------------------------------------
diff --git a/job/pom.xml b/job/pom.xml
index 44a0f5f..d3c0b55 100644
--- a/job/pom.xml
+++ b/job/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>0.7.2-incubating-SNAPSHOT</version>
+ <version>0.7.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>kylin-job</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/06136b84/metadata/pom.xml
----------------------------------------------------------------------
diff --git a/metadata/pom.xml b/metadata/pom.xml
index e842673..e10777a 100644
--- a/metadata/pom.xml
+++ b/metadata/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>0.7.2-incubating-SNAPSHOT</version>
+ <version>0.7.1-incubating-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/06136b84/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e36601d..a448518 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,8 @@
limitations under the License.
-->
-<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/maven-v4_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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -29,7 +30,7 @@
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
<packaging>pom</packaging>
- <version>0.7.2-incubating-SNAPSHOT</version>
+ <version>0.7.1-incubating-SNAPSHOT</version>
<name>Kylin:HadoopOLAPEngine</name>
<url>http://kylin.incubator.apache.org</url>
<inceptionYear>2014</inceptionYear>
@@ -662,77 +663,21 @@
<id>apache-release</id>
<build>
<plugins>
- <!-- Override the parent assembly execution to customize the assembly
- descriptor and final name. -->
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>source-release-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptor>src/main/config/assemblies/source-assembly.xml</descriptor>
- <finalName>apache-kylin-${project.version}-src</finalName>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.16</version>
- <configuration>
- <reportsDirectory>${project.basedir}/../target/surefire-reports</reportsDirectory>
- <excludes>
- <exclude>**/BuildCubeWithEngineTest.java</exclude>
- <exclude>**/BuildIIWithEngineTest.java</exclude>
- <exclude>**/SampleCubeSetupTest.java</exclude>
- <exclude>**/KylinQueryTest.java</exclude>
- <exclude>**/SnapshotManagerTest.java</exclude>
- <exclude>**/HiveTableReaderTest.java</exclude>
- <exclude>**/TableControllerTest.java</exclude>
-
- <!--test case under server folder are problematic when tested against minicluster-->
- <exclude>**/ServiceTestBase.java</exclude>
- <exclude>**/JDBCDriverTest.java</exclude>
- <exclude>%regex[.*ControllerTest.*]</exclude>
- <exclude>%regex[.*ServiceTest.*]</exclude>
-
- </excludes>
- <systemProperties>
- <property>
- <name>useSandbox</name>
- <value>false</value>
- </property>
- <property>
- <name>buildCubeUsingProvidedData</name>
- <value>false</value>
- </property>
- </systemProperties>
- <argLine>-Xms1G -Xmx4G -XX:PermSize=128M -XX:MaxPermSize=512M</argLine>
- </configuration>
- </plugin>
<!-- Apache-RAT checks for files without headers.
- If run on a messy developer's sandbox, it will fail.
- This serves as a reminder to only build a release in a clean
- sandbox! -->
+ If run on a messy developer's sandbox, it will fail.
+ This serves as a reminder to only build a release in a clean
+ sandbox! -->
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
- <numUnapprovedLicenses>0</numUnapprovedLicenses>
<excludes>
- <exclude>.idea/**</exclude>
- <exclude>.git/**</exclude>
+ <exclude>**/.idea/**</exclude>
+ <exclude>**/.git/**</exclude>
<exclude>.settings/**</exclude>
+
<!-- text files without comments -->
- <exclude>**/*.csv</exclude>
+ <exclude>**//*.csv</exclude>
<exclude>**/*.json</exclude>
<exclude>**/*.md</exclude>
<!-- binary files -->
@@ -750,15 +695,18 @@
<exclude>docs/website/**</exclude>
- <!-- tomcat package -->
- <exclude>tomcat/**</exclude>
<!-- front end libary and generated files -->
+ <exclude>webapp/*.json</exclude>
+ <exclude>webapp/*.js</exclude>
<exclude>webapp/node_modules/**</exclude>
<exclude>webapp/dist/**</exclude>
<exclude>webapp/app/components/**</exclude>
<!-- json configuration file-->
<exclude>webapp/.bowerrc</exclude>
<exclude>webapp/.jshintrc</exclude>
+
+
+
<!-- generated dict files -->
<exclude>dictionary/metastore_db/**</exclude>
@@ -767,8 +715,10 @@
<exclude>webapp/app/css/AdminLTE.css</exclude>
<!-- jdbc log -->
- <exclude>jdbc/kylin_jdbc.log.*</exclude>
- <exclude>jdbc/kylin_jdbc.*</exclude>
+ <exclude>jdbc/kylin_jdbc.log*</exclude>
+
+ <!-- HBase MiniCluster Testing Data -->
+ <exclude>examples/test_case_data/minicluster/hbase-export.tar.gz</exclude>
</excludes>
</configuration>
@@ -794,6 +744,63 @@
</dependency>
</dependencies>
</plugin>
+ <!-- Override the parent assembly execution to customize the assembly
+ descriptor and final name. -->
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>source-release-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptor>src/main/config/assemblies/source-assembly.xml</descriptor>
+ <finalName>apache-kylin-${project.version}-src</finalName>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.16</version>
+ <configuration>
+ <reportsDirectory>${project.basedir}/../target/surefire-reports</reportsDirectory>
+ <excludes>
+ <exclude>**/BuildCubeWithEngineTest.java</exclude>
+ <exclude>**/BuildIIWithEngineTest.java</exclude>
+ <exclude>**/SampleCubeSetupTest.java</exclude>
+ <exclude>**/KylinQueryTest.java</exclude>
+ <exclude>**/SnapshotManagerTest.java</exclude>
+ <exclude>**/HiveTableReaderTest.java</exclude>
+ <exclude>**/TableControllerTest.java</exclude>
+
+ <!--test case under server folder are problematic when tested against minicluster-->
+ <exclude>**/ServiceTestBase.java</exclude>
+ <exclude>**/JDBCDriverTest.java</exclude>
+ <exclude>%regex[.*ControllerTest.*]</exclude>
+ <exclude>%regex[.*ServiceTest.*]</exclude>
+
+ </excludes>
+ <systemProperties>
+ <property>
+ <name>useSandbox</name>
+ <value>false</value>
+ </property>
+ <property>
+ <name>buildCubeUsingProvidedData</name>
+ <value>false</value>
+ </property>
+ </systemProperties>
+ <argLine>-Xms1G -Xmx4G -XX:PermSize=128M -XX:MaxPermSize=512M</argLine>
+ </configuration>
+ </plugin>
+
<plugin>
<groupId>net.ju-n.maven.plugins</groupId>
<artifactId>checksum-maven-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/06136b84/query/pom.xml
----------------------------------------------------------------------
diff --git a/query/pom.xml b/query/pom.xml
index 3881b4d..030482b 100644
--- a/query/pom.xml
+++ b/query/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>0.7.2-incubating-SNAPSHOT</version>
+ <version>0.7.1-incubating-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/06136b84/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index 1578c62..c99ed94 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>0.7.2-incubating-SNAPSHOT</version>
+ <version>0.7.1-incubating-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/06136b84/storage/pom.xml
----------------------------------------------------------------------
diff --git a/storage/pom.xml b/storage/pom.xml
index 0d5918a..177e731 100644
--- a/storage/pom.xml
+++ b/storage/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>0.7.2-incubating-SNAPSHOT</version>
+ <version>0.7.1-incubating-SNAPSHOT</version>
</parent>
<dependencies>