You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by bi...@apache.org on 2017/01/10 16:50:34 UTC
kylin git commit: split IT
Repository: kylin
Updated Branches:
refs/heads/calcite-11 88cba3d15 -> 1f453cf10
split IT
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/1f453cf1
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/1f453cf1
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/1f453cf1
Branch: refs/heads/calcite-11
Commit: 1f453cf108bdd7dfe601d11d724b23708bd6b009
Parents: 88cba3d
Author: Billy Liu <bi...@apache.org>
Authored: Wed Jan 11 00:50:23 2017 +0800
Committer: Billy Liu <bi...@apache.org>
Committed: Wed Jan 11 00:50:23 2017 +0800
----------------------------------------------------------------------
dev-support/test_all_against_hdp_2_2_4_2_2.sh | 3 ++-
.../test_case_data/sandbox/kylin.properties | 2 +-
jdbc/pom.xml | 14 +------------
kylin-it/pom.xml | 21 +++++++-------------
pom.xml | 4 +---
server/pom.xml | 6 ------
6 files changed, 12 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/1f453cf1/dev-support/test_all_against_hdp_2_2_4_2_2.sh
----------------------------------------------------------------------
diff --git a/dev-support/test_all_against_hdp_2_2_4_2_2.sh b/dev-support/test_all_against_hdp_2_2_4_2_2.sh
index f7780dd..d0c352c 100755
--- a/dev-support/test_all_against_hdp_2_2_4_2_2.sh
+++ b/dev-support/test_all_against_hdp_2_2_4_2_2.sh
@@ -22,4 +22,5 @@ cd ${dir}
cd ..
mvn clean install -DskipTests 2>&1 | tee mci.log
-mvn verify -Dhdp.version=${HDP_VERSION:-"2.2.4.2-2"} -fae 2>&1 | tee mvnverify.log
+mvn verify -Psandbox-build -Dhdp.version=${HDP_VERSION:-"2.2.4.2-2"} -fae 2>&1 | tee mvnverify-build.log
+mvn verify -Psandbox-query -pl kylin-it -fae 2>&1 | tee mvnverify-query.log
http://git-wip-us.apache.org/repos/asf/kylin/blob/1f453cf1/examples/test_case_data/sandbox/kylin.properties
----------------------------------------------------------------------
diff --git a/examples/test_case_data/sandbox/kylin.properties b/examples/test_case_data/sandbox/kylin.properties
index 1724619..08caa7e 100644
--- a/examples/test_case_data/sandbox/kylin.properties
+++ b/examples/test_case_data/sandbox/kylin.properties
@@ -25,7 +25,7 @@ kylin.server.mode=all
kylin.storage.hbase.owner-tag=whoami@kylin.apache.org
# List of web servers in use, this enables one web server instance to sync up with other servers.
-kylin.server.cluster-servers=localhost:7070
+#kylin.server.cluster-servers=localhost:7070
# Display timezone on UI,format like[GMT+N or GMT-N]
kylin.web.timezone=GMT+8
http://git-wip-us.apache.org/repos/asf/kylin/blob/1f453cf1/jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index 0a70949..993822f 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -44,12 +44,7 @@
</dependency>
<dependency>
<groupId>org.apache.calcite.avatica</groupId>
- <artifactId>avatica</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- <version>${avatica.protobuf.version}</version>
+ <artifactId>avatica-core</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -72,13 +67,6 @@
</goals>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
- <artifactSet>
- <!-- jackson is already packaged into calcite-avatica.jar. To avoid including jackson
- twice, we include calcite-avatica which has jackson and exclude jackson. -->
- <excludes>
- <exclude>com.fasterxml.jackson.core:*</exclude>
- </excludes>
- </artifactSet>
<relocations>
<relocation>
<pattern>org.apache.calcite</pattern>
http://git-wip-us.apache.org/repos/asf/kylin/blob/1f453cf1/kylin-it/pom.xml
----------------------------------------------------------------------
diff --git a/kylin-it/pom.xml b/kylin-it/pom.xml
index 55b9f98..c5242b4 100644
--- a/kylin-it/pom.xml
+++ b/kylin-it/pom.xml
@@ -57,16 +57,6 @@
</dependency>
<dependency>
<groupId>org.apache.kylin</groupId>
- <artifactId>kylin-jdbc</artifactId>
- <exclusions>
- <exclusion>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.kylin</groupId>
<artifactId>kylin-tool</artifactId>
</dependency>
<dependency>
@@ -251,9 +241,8 @@
<id>sandbox-query</id>
<dependencies>
<dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- <version>${avatica.protobuf.version}</version>
+ <groupId>org.apache.kylin</groupId>
+ <artifactId>kylin-jdbc</artifactId>
</dependency>
</dependencies>
<build>
@@ -288,6 +277,10 @@
<name>log4j.configuration</name>
<value>file:${project.basedir}/..//build/conf/kylin-tools-log4j.properties</value>
</property>
+ <property>
+ <name>kylin.server.cluster-servers</name>
+ <value>localhost:7070</value>
+ </property>
</systemProperties>
<argLine>-Xms1G -Xmx2G -XX:PermSize=128M -XX:MaxPermSize=512M</argLine>
</configuration>
@@ -296,7 +289,7 @@
</build>
</profile>
<profile>
- <id>sandbox</id>
+ <id>sandbox-build</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
http://git-wip-us.apache.org/repos/asf/kylin/blob/1f453cf1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d64a058..1cd621f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,8 +114,6 @@
<!-- Calcite Version -->
<calcite.version>1.11.0</calcite.version>
<avatica.version>1.9.0</avatica.version>
- <!-- Since both Hive and Calcite has dependency with Avatica, but with different versions and different protocol dependencies, has to hard code the version and put the right place -->
- <avatica.protobuf.version>3.1.0</avatica.protobuf.version>
<!-- Sonar -->
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -458,7 +456,7 @@
</dependency>
<dependency>
<groupId>org.apache.calcite.avatica</groupId>
- <artifactId>avatica</artifactId>
+ <artifactId>avatica-core</artifactId>
<version>${avatica.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/kylin/blob/1f453cf1/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index 4416c2a..ed96442 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -85,12 +85,6 @@
<!-- Test & Env -->
<dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- <version>${avatica.protobuf.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin-core-common</artifactId>
<type>test-jar</type>