You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ma...@apache.org on 2015/05/26 17:21:10 UTC
[24/32] incubator-kylin git commit: KYLIN-783 change hdp.version to
2.2.4.2-2
KYLIN-783 change hdp.version to 2.2.4.2-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/69c1a939
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/69c1a939
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/69c1a939
Branch: refs/heads/0.8.0
Commit: 69c1a939299dae8d1a8b66c081d496878942cfa3
Parents: 84e4d7f
Author: honma <ho...@ebay.com>
Authored: Tue May 26 11:20:03 2015 +0800
Committer: honma <ho...@ebay.com>
Committed: Tue May 26 23:21:27 2015 +0800
----------------------------------------------------------------------
.../org/apache/kylin/job/BuildCubeWithEngineTest.java | 2 +-
.../org/apache/kylin/job/BuildCubeWithStreamTest.java | 2 +-
.../java/org/apache/kylin/job/BuildIIWithEngineTest.java | 2 +-
.../java/org/apache/kylin/job/BuildIIWithStreamTest.java | 2 +-
.../kylin/job/ITKafkaBasedIIStreamBuilderTest.java | 2 +-
pom.xml | 2 +-
.../src/main/java/org/apache/kylin/rest/DebugTomcat.java | 11 +++++------
7 files changed, 11 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/69c1a939/job/src/test/java/org/apache/kylin/job/BuildCubeWithEngineTest.java
----------------------------------------------------------------------
diff --git a/job/src/test/java/org/apache/kylin/job/BuildCubeWithEngineTest.java b/job/src/test/java/org/apache/kylin/job/BuildCubeWithEngineTest.java
index 547a6e7..d3c3669 100644
--- a/job/src/test/java/org/apache/kylin/job/BuildCubeWithEngineTest.java
+++ b/job/src/test/java/org/apache/kylin/job/BuildCubeWithEngineTest.java
@@ -81,7 +81,7 @@ public class BuildCubeWithEngineTest {
logger.info("Adding to classpath: " + new File(HBaseMetadataTestCase.SANDBOX_TEST_DATA).getAbsolutePath());
ClassUtil.addClasspath(new File(HBaseMetadataTestCase.SANDBOX_TEST_DATA).getAbsolutePath());
System.setProperty(KylinConfig.KYLIN_CONF, "../examples/test_case_data/sandbox");
- System.setProperty("hdp.version", "2.2.0.0-2041"); // mapred-site.xml ref this
+ System.setProperty("hdp.version", "2.2.4.2-2"); // mapred-site.xml ref this
}
@Before
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/69c1a939/job/src/test/java/org/apache/kylin/job/BuildCubeWithStreamTest.java
----------------------------------------------------------------------
diff --git a/job/src/test/java/org/apache/kylin/job/BuildCubeWithStreamTest.java b/job/src/test/java/org/apache/kylin/job/BuildCubeWithStreamTest.java
index dc42dc5..a437bba 100644
--- a/job/src/test/java/org/apache/kylin/job/BuildCubeWithStreamTest.java
+++ b/job/src/test/java/org/apache/kylin/job/BuildCubeWithStreamTest.java
@@ -91,7 +91,7 @@ public class BuildCubeWithStreamTest {
public static void beforeClass() throws Exception {
logger.info("Adding to classpath: " + new File(HBaseMetadataTestCase.SANDBOX_TEST_DATA).getAbsolutePath());
ClassUtil.addClasspath(new File(HBaseMetadataTestCase.SANDBOX_TEST_DATA).getAbsolutePath());
- System.setProperty("hdp.version", "2.2.0.0-2041"); // mapred-site.xml ref this
+ System.setProperty("hdp.version", "2.2.4.2-2"); // mapred-site.xml ref this
}
@Before
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/69c1a939/job/src/test/java/org/apache/kylin/job/BuildIIWithEngineTest.java
----------------------------------------------------------------------
diff --git a/job/src/test/java/org/apache/kylin/job/BuildIIWithEngineTest.java b/job/src/test/java/org/apache/kylin/job/BuildIIWithEngineTest.java
index 9c0219a..612ba6c 100644
--- a/job/src/test/java/org/apache/kylin/job/BuildIIWithEngineTest.java
+++ b/job/src/test/java/org/apache/kylin/job/BuildIIWithEngineTest.java
@@ -84,7 +84,7 @@ public class BuildIIWithEngineTest {
public static void beforeClass() throws Exception {
logger.info("Adding to classpath: " + new File(HBaseMetadataTestCase.SANDBOX_TEST_DATA).getAbsolutePath());
ClassUtil.addClasspath(new File(HBaseMetadataTestCase.SANDBOX_TEST_DATA).getAbsolutePath());
- System.setProperty("hdp.version", "2.2.0.0-2041"); // mapred-site.xml ref this
+ System.setProperty("hdp.version", "2.2.4.2-2"); // mapred-site.xml ref this
}
@Before
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/69c1a939/job/src/test/java/org/apache/kylin/job/BuildIIWithStreamTest.java
----------------------------------------------------------------------
diff --git a/job/src/test/java/org/apache/kylin/job/BuildIIWithStreamTest.java b/job/src/test/java/org/apache/kylin/job/BuildIIWithStreamTest.java
index 6bceab7..9876ace 100644
--- a/job/src/test/java/org/apache/kylin/job/BuildIIWithStreamTest.java
+++ b/job/src/test/java/org/apache/kylin/job/BuildIIWithStreamTest.java
@@ -92,7 +92,7 @@ public class BuildIIWithStreamTest {
public static void beforeClass() throws Exception {
logger.info("Adding to classpath: " + new File(HBaseMetadataTestCase.SANDBOX_TEST_DATA).getAbsolutePath());
ClassUtil.addClasspath(new File(HBaseMetadataTestCase.SANDBOX_TEST_DATA).getAbsolutePath());
- System.setProperty("hdp.version", "2.2.0.0-2041"); // mapred-site.xml ref this
+ System.setProperty("hdp.version", "2.2.4.2-2"); // mapred-site.xml ref this
}
@Before
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/69c1a939/job/src/test/java/org/apache/kylin/job/ITKafkaBasedIIStreamBuilderTest.java
----------------------------------------------------------------------
diff --git a/job/src/test/java/org/apache/kylin/job/ITKafkaBasedIIStreamBuilderTest.java b/job/src/test/java/org/apache/kylin/job/ITKafkaBasedIIStreamBuilderTest.java
index d7aa856..2432220 100644
--- a/job/src/test/java/org/apache/kylin/job/ITKafkaBasedIIStreamBuilderTest.java
+++ b/job/src/test/java/org/apache/kylin/job/ITKafkaBasedIIStreamBuilderTest.java
@@ -60,7 +60,7 @@ public class ITKafkaBasedIIStreamBuilderTest {
@BeforeClass
public static void beforeClass() throws Exception {
ClassUtil.addClasspath(new File(HBaseMetadataTestCase.SANDBOX_TEST_DATA).getAbsolutePath());
- System.setProperty("hdp.version", "2.2.0.0-2041"); // mapred-site.xml ref this
+ System.setProperty("hdp.version", "2.2.4.2-2"); // mapred-site.xml ref this
}
@AfterClass
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/69c1a939/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e522050..21fbed8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -615,7 +615,7 @@
</property>
<property>
<name>hdp.version</name>
- <value>2.2.0.0-2041</value>
+ <value>2.2.4.2-2</value>
</property>
</systemProperties>
</configuration>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/69c1a939/server/src/main/java/org/apache/kylin/rest/DebugTomcat.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/DebugTomcat.java b/server/src/main/java/org/apache/kylin/rest/DebugTomcat.java
index a1cc86b..0b5db67 100644
--- a/server/src/main/java/org/apache/kylin/rest/DebugTomcat.java
+++ b/server/src/main/java/org/apache/kylin/rest/DebugTomcat.java
@@ -18,20 +18,19 @@
package org.apache.kylin.rest;
-import java.io.File;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-
import org.apache.catalina.Context;
import org.apache.catalina.core.AprLifecycleListener;
import org.apache.catalina.core.StandardServer;
import org.apache.catalina.deploy.ErrorPage;
import org.apache.catalina.startup.Tomcat;
import org.apache.hadoop.util.Shell;
-
import org.apache.kylin.common.KylinConfig;
import org.apache.kylin.rest.util.ClasspathUtil;
+import java.io.File;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+
public class DebugTomcat {
public static void setupDebugEnv() {
@@ -39,7 +38,7 @@ public class DebugTomcat {
// test_case_data/sandbox/ contains HDP 2.2 site xmls which is dev sandbox
ClasspathUtil.addClasspath(new File("../examples/test_case_data/sandbox").getAbsolutePath());
System.setProperty(KylinConfig.KYLIN_CONF, "../examples/test_case_data/sandbox");
- System.setProperty("hdp.version", "2.2.0.0-2041"); // mapred-site.xml ref this
+ System.setProperty("hdp.version", "2.2.4.2-2"); // mapred-site.xml ref this
System.setProperty("spring.profiles.active", "testing");
// workaround for job submission from win to linux -- https://issues.apache.org/jira/browse/MAPREDUCE-4052