diff --git build-common.xml build-common.xml
index 23eac41..f80db85 100644
--- build-common.xml
+++ build-common.xml
@@ -79,12 +79,12 @@
-
+
-
-
+
+
-
+
diff --git build.properties build.properties
index 3f87a4b..b9b8929 100644
--- build.properties
+++ build.properties
@@ -9,10 +9,12 @@ hadoop.mirror=http://archive.apache.org/dist
build.dir.hive=${hive.root}/build
build.dir.hadoop=${build.dir.hive}/hadoopcore
-hadoop.root.default=${build.dir.hadoop}/hadoop-${hadoop.version}
+
+hadoop.version.ant-internal=${hadoop.version}
+hadoop.root.default=${build.dir.hadoop}/hadoop-${hadoop.version.ant-internal}
hadoop.root=${hadoop.root.default}
-hadoop.jar=${hadoop.root}/hadoop-${hadoop.version}-core.jar
-hadoop.test.jar=${hadoop.root}/hadoop-${hadoop.version}-test.jar
+hadoop.jar=${hadoop.root}/hadoop-${hadoop.version.ant-internal}-core.jar
+hadoop.test.jar=${hadoop.root}/hadoop-${hadoop.version.ant-internal}-test.jar
jetty.test.jar=${hadoop.root}/lib/jetty-5.1.4.jar
servlet.test.jar=${hadoop.root}/lib/servlet-api.jar
jasper.test.jar=${hadoop.root}/lib/jetty-ext/jasper-runtime.jar
diff --git build.xml build.xml
index c53baf8..ca1d999 100644
--- build.xml
+++ build.xml
@@ -40,7 +40,7 @@
-
+
@@ -210,17 +210,17 @@
-
+
-
+
-
+
-
+
@@ -233,8 +233,8 @@
-
-
+
+
diff --git cli/ivy.xml cli/ivy.xml
index 5d55dc9..86ad1ee 100644
--- cli/ivy.xml
+++ cli/ivy.xml
@@ -1,7 +1,7 @@
-
+
diff --git common/ivy.xml common/ivy.xml
index da26c2f..7c8cb75 100644
--- common/ivy.xml
+++ common/ivy.xml
@@ -1,7 +1,7 @@
-
+
diff --git contrib/ivy.xml contrib/ivy.xml
index 025375e..899ca70 100644
--- contrib/ivy.xml
+++ contrib/ivy.xml
@@ -1,7 +1,7 @@
-
+
diff --git metastore/ivy.xml metastore/ivy.xml
index aa44502..c9b302b 100644
--- metastore/ivy.xml
+++ metastore/ivy.xml
@@ -1,7 +1,7 @@
-
+
diff --git ql/ivy.xml ql/ivy.xml
index eaefe4b..e72a450 100644
--- ql/ivy.xml
+++ ql/ivy.xml
@@ -1,7 +1,7 @@
-
+
diff --git serde/ivy.xml serde/ivy.xml
index e1e6e4d..da69342 100644
--- serde/ivy.xml
+++ serde/ivy.xml
@@ -1,7 +1,7 @@
-
+
diff --git shims/build.xml shims/build.xml
index 5eb5a12..f5aa122 100644
--- shims/build.xml
+++ shims/build.xml
@@ -35,8 +35,8 @@ to call at top-level: ant deploy-contrib compile-core-test
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+