Repository: tajo Updated Branches: refs/heads/master 5e043bd87 -> 82dfb17ca
TAJO-1246: HBase info port conflict occasionally causes unit test failures in Jenkins CI. Closes #300 Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/82dfb17c Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/82dfb17c Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/82dfb17c Branch: refs/heads/master Commit: 82dfb17ca9878de90ab6b92b0c56a918789191cb Parents: 5e043bd Author: Hyunsik Choi <[email protected]> Authored: Mon Dec 15 18:08:54 2014 +0900 Committer: Hyunsik Choi <[email protected]> Committed: Mon Dec 15 18:08:54 2014 +0900 ---------------------------------------------------------------------- CHANGES | 3 +++ tajo-core/pom.xml | 6 ++++++ .../src/test/java/org/apache/tajo/HBaseTestClusterUtil.java | 2 ++ tajo-storage/tajo-storage-hbase/pom.xml | 6 ++++++ 4 files changed, 17 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/82dfb17c/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index e41ea56..98c533b 100644 --- a/CHANGES +++ b/CHANGES @@ -109,6 +109,9 @@ Release 0.9.1 - unreleased BUG FIXES + TAJO-1246: HBase info port conflict occasionally causes unit test + failures in Jenkins CI. (hyunsik) + TAJO-1242: Json scanner can not read some case of trucated text. (jinho) TAJO-1239: ORDER BY with null column desc miss some data. http://git-wip-us.apache.org/repos/asf/tajo/blob/82dfb17c/tajo-core/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-core/pom.xml b/tajo-core/pom.xml index a6fb5a5..8065e9d 100644 --- a/tajo-core/pom.xml +++ b/tajo-core/pom.xml @@ -433,6 +433,12 @@ <version>${hbase.version}</version> <type>test-jar</type> <scope>test</scope> + <exclusions> + <exclusion> + <artifactId>jdk.tools</artifactId> + <groupId>jdk.tools</groupId> + </exclusion> + </exclusions> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/tajo/blob/82dfb17c/tajo-core/src/test/java/org/apache/tajo/HBaseTestClusterUtil.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/HBaseTestClusterUtil.java b/tajo-core/src/test/java/org/apache/tajo/HBaseTestClusterUtil.java index a8e4a5c..fe2e281 100644 --- a/tajo-core/src/test/java/org/apache/tajo/HBaseTestClusterUtil.java +++ b/tajo-core/src/test/java/org/apache/tajo/HBaseTestClusterUtil.java @@ -104,6 +104,8 @@ public class HBaseTestClusterUtil { createRootDir(); Configuration c = HBaseConfiguration.create(this.conf); + // randomize hbase info port + c.setInt(HConstants.MASTER_INFO_PORT, 0); hbaseCluster = new MiniHBaseCluster(c, 1); http://git-wip-us.apache.org/repos/asf/tajo/blob/82dfb17c/tajo-storage/tajo-storage-hbase/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-hbase/pom.xml b/tajo-storage/tajo-storage-hbase/pom.xml index e37149d..b78c407 100644 --- a/tajo-storage/tajo-storage-hbase/pom.xml +++ b/tajo-storage/tajo-storage-hbase/pom.xml @@ -304,6 +304,12 @@ limitations under the License. <artifactId>hbase-client</artifactId> <version>${hbase.version}</version> <scope>provided</scope> + <exclusions> + <exclusion> + <artifactId>jdk.tools</artifactId> + <groupId>jdk.tools</groupId> + </exclusion> + </exclusions> </dependency> </dependencies>
