diff --git build-common.xml build-common.xml
index a746966..af57077 100644
--- build-common.xml
+++ build-common.xml
@@ -73,6 +73,8 @@
+
+
@@ -160,6 +162,11 @@
+
+
+
+
+
diff --git build.properties build.properties
index ffb3566..c0e8d4d 100644
--- build.properties
+++ build.properties
@@ -12,11 +12,13 @@ javac.args.warnings=
hadoop-0.20.version=0.20.1
hadoop-0.20S.version=0.20.3-CDH3-SNAPSHOT
+hadoop-1.0.version=1.0.0
hadoop-0.23.version=0.23.0
hadoop.version=${hadoop-0.20.version}
-hadoop.security.version=${hadoop-0.20S.version}
+hadoop.security.version=${hadoop-1.0.version}
hadoop.mirror=http://mirror.facebook.net/facebook/hive-deps
hadoop.mirror2=http://archive.cloudera.com/hive-deps
+hadoop.mirror3=http://mirrors.ibiblio.org/apache/
build.dir.hive=${hive.root}/build
build.dir.hadoop=${build.dir.hive}/hadoopcore
diff --git ivy/ivysettings.xml ivy/ivysettings.xml
index ec4eab3..af0e6a4 100644
--- ivy/ivysettings.xml
+++ ivy/ivysettings.xml
@@ -47,6 +47,10 @@
+
+
+
+
+
diff --git shims/build.xml shims/build.xml
index 850c791..5002fe1 100644
--- shims/build.xml
+++ shims/build.xml
@@ -52,7 +52,7 @@ to call at top-level: ant deploy-contrib compile-core-test
-
+
@@ -60,6 +60,8 @@ to call at top-level: ant deploy-contrib compile-core-test
+
+
diff --git shims/src/1.0/java/.gitignore shims/src/1.0/java/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git shims/src/common/java/org/apache/hadoop/hive/shims/ShimLoader.java shims/src/common/java/org/apache/hadoop/hive/shims/ShimLoader.java
index ec2e44f..909d51d 100644
--- shims/src/common/java/org/apache/hadoop/hive/shims/ShimLoader.java
+++ shims/src/common/java/org/apache/hadoop/hive/shims/ShimLoader.java
@@ -40,6 +40,7 @@ public abstract class ShimLoader {
static {
HADOOP_SHIM_CLASSES.put("0.20", "org.apache.hadoop.hive.shims.Hadoop20Shims");
HADOOP_SHIM_CLASSES.put("0.20S", "org.apache.hadoop.hive.shims.Hadoop20SShims");
+ HADOOP_SHIM_CLASSES.put("1.0", "org.apache.hadoop.hive.shims.Hadoop20SShims");
HADOOP_SHIM_CLASSES.put("0.23", "org.apache.hadoop.hive.shims.Hadoop23Shims");
}
@@ -53,6 +54,7 @@ public abstract class ShimLoader {
static {
JETTY_SHIM_CLASSES.put("0.20", "org.apache.hadoop.hive.shims.Jetty20Shims");
JETTY_SHIM_CLASSES.put("0.20S", "org.apache.hadoop.hive.shims.Jetty20SShims");
+ JETTY_SHIM_CLASSES.put("1.0", "org.apache.hadoop.hive.shims.Jetty20SShims");
JETTY_SHIM_CLASSES.put("0.23", "org.apache.hadoop.hive.shims.Jetty23Shims");
}