diff --git build-common.xml build-common.xml
index f5a2e53..a4671ad 100644
--- build-common.xml
+++ build-common.xml
@@ -65,6 +65,7 @@
+
@@ -72,17 +73,21 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
@@ -125,47 +130,69 @@
-
-
-
+
-
-
-
+
-
+
-
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
@@ -178,10 +205,9 @@
-
-
+
+
@@ -251,6 +277,9 @@
+
@@ -366,7 +395,7 @@
-
+
@@ -391,6 +420,7 @@
+
diff --git build.properties build.properties
index 989dce0..ad753a0 100644
--- build.properties
+++ build.properties
@@ -17,6 +17,7 @@ hadoop.version=${hadoop-0.20.version}
hadoop.security.version=${hadoop-0.20S.version}
hadoop.mirror=http://mirror.facebook.net/facebook/hive-deps
hadoop.mirror2=http://archive.cloudera.com/hive-deps
+hadoop.mr.rev=20
build.dir.hive=${hive.root}/build
build.dir.hadoop=${build.dir.hive}/hadoopcore
@@ -60,6 +61,7 @@ build.ivy.maven.dir=${build.ivy.dir}/maven
ivy.conf.dir=${hive.root}/ivy
ivy.version=2.1.0
ivy.jar=${build.ivy.lib.dir}/ivy-${ivy.version}.jar
+ivy.changingPattern=.*SNAPSHOT
ivysettings.xml=${ivy.conf.dir}/ivysettings.xml
ivyresolvelog=download-only
ivy.mvn.repo=http://repo2.maven.org/maven2
diff --git build.xml build.xml
index 72264cf..91210fd 100644
--- build.xml
+++ build.xml
@@ -684,10 +684,6 @@
-
-
-
-
diff --git builtins/build.xml builtins/build.xml
index 83531af..c033da4 100644
--- builtins/build.xml
+++ builtins/build.xml
@@ -22,7 +22,7 @@
-
+
@@ -32,7 +32,7 @@
-
+
@@ -40,7 +40,7 @@
-
+
diff --git builtins/ivy.xml builtins/ivy.xml
index 05800fe..85ce9bc 100644
--- builtins/ivy.xml
+++ builtins/ivy.xml
@@ -23,6 +23,28 @@
https://cwiki.apache.org/confluence/display/Hive/Home
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git cli/ivy.xml cli/ivy.xml
index b8b27fb..b9ae848 100644
--- cli/ivy.xml
+++ cli/ivy.xml
@@ -28,9 +28,30 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ conf="compile->default" transitive="false" />
+ conf="compile->default" transitive="false" />
+ conf="compile->default" transitive="false" />
+ conf="compile->default" transitive="false" />
+ conf="compile->default" transitive="false" />
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ conf="compile->default" transitive="false" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git contrib/ivy.xml contrib/ivy.xml
index 0c0ff90..7785a3a 100644
--- contrib/ivy.xml
+++ contrib/ivy.xml
@@ -26,19 +26,39 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ conf="compile->default" transitive="false" />
+ conf="compile->default" transitive="false" />
+ conf="compile->default" transitive="false" />
+ conf="compile->default" transitive="false" />
+ conf="compile->default" transitive="false" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git hbase-handler/ivy.xml hbase-handler/ivy.xml
index 0a8ab23..7cf85e8 100644
--- hbase-handler/ivy.xml
+++ hbase-handler/ivy.xml
@@ -26,17 +26,37 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ conf="compile->default" transitive="false" />
+ conf="compile->default" transitive="false" />
+ conf="compile->default" transitive="false" />
+ conf="compile->default" transitive="false" />
-
+
@@ -78,7 +78,7 @@
debug="${javac.debug}"
deprecation="${javac.deprecation}">
-
+
diff --git hwi/ivy.xml hwi/ivy.xml
index fd39778..9a844fb 100644
--- hwi/ivy.xml
+++ hwi/ivy.xml
@@ -26,17 +26,37 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ conf="compile->default" transitive="false" />
+ conf="compile->default" transitive="false" />
+ conf="compile->default" transitive="false" />
+ conf="compile->default" transitive="false" />
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git ivy/ivysettings.xml ivy/ivysettings.xml
index ec4eab3..6caaf86 100644
--- ivy/ivysettings.xml
+++ ivy/ivysettings.xml
@@ -32,10 +32,12 @@
-
+
+
+
@@ -62,8 +64,9 @@
+
@@ -72,6 +75,7 @@
+
@@ -86,7 +90,8 @@
-
+
+
-
-
@@ -37,15 +30,7 @@
-
-
-
-
-
-
-
-
-
+
diff --git jdbc/ivy.xml jdbc/ivy.xml
index 5c95c71..c184860 100644
--- jdbc/ivy.xml
+++ jdbc/ivy.xml
@@ -27,14 +27,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ conf="compile->default" transitive="false" />
+ conf="compile->default" transitive="false" />
+ conf="compile->default" transitive="false" />
+ conf="compile->default" transitive="false" />
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ conf="compile->default" transitive="false" />
+ conf="compile->default" transitive="false" />
+ conf="compile->default" transitive="false" />
@@ -62,10 +82,10 @@
-
-
+
+
+
+
diff --git pdk/ivy.xml pdk/ivy.xml
index 9fc165f..0947353 100644
--- pdk/ivy.xml
+++ pdk/ivy.xml
@@ -27,5 +27,7 @@
+
diff --git pdk/scripts/build-plugin.xml pdk/scripts/build-plugin.xml
index e916c4e..dbf68d9 100644
--- pdk/scripts/build-plugin.xml
+++ pdk/scripts/build-plugin.xml
@@ -33,18 +33,19 @@
-
-
-
-
-
+
+
+
+
+
-
-
+
+
+
diff --git ql/build.xml ql/build.xml
index 7dee894..0bb2750 100644
--- ql/build.xml
+++ ql/build.xml
@@ -18,7 +18,7 @@
-->
-
+
@@ -32,37 +32,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
You must set the 'thrift.home' property!
@@ -245,6 +214,9 @@
+
diff --git ql/ivy.xml ql/ivy.xml
index 2725d94..9663494 100644
--- ql/ivy.xml
+++ ql/ivy.xml
@@ -26,21 +26,42 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ conf="compile->default" transitive="false" />
+ conf="compile->default" transitive="false" />
+ conf="compile->default" transitive="false" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git serde/ivy.xml serde/ivy.xml
index c2c75b7..201fa85 100644
--- serde/ivy.xml
+++ serde/ivy.xml
@@ -26,13 +26,33 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ conf="compile->default" transitive="false" />
+ conf="compile->default" transitive="false" />
diff --git service/build.xml service/build.xml
index d837091..19bdb9f 100644
--- service/build.xml
+++ service/build.xml
@@ -22,23 +22,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
You must set the 'thrift.home' property!
diff --git service/ivy.xml service/ivy.xml
index dd30158..0ce8939 100644
--- service/ivy.xml
+++ service/ivy.xml
@@ -27,12 +27,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ conf="compile->default" transitive="false" />
+ conf="compile->default" transitive="false" />
+ conf="compile->default" transitive="false" />
-
+
-
+
@@ -51,6 +51,11 @@ to call at top-level: ant deploy-contrib compile-core-test
+
+
+
+
+
@@ -62,11 +67,53 @@ to call at top-level: ant deploy-contrib compile-core-test
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
- Building shims @{shimName}
-
-
-
-
-
-
+
+
+
+ Building shims @{shimName}
+
+
+
+
+
+
+
+
-
@@ -129,7 +178,7 @@ to call at top-level: ant deploy-contrib compile-core-test
-
+
diff --git shims/ivy.xml shims/ivy.xml
index e056b80..fc78bfd 100644
--- shims/ivy.xml
+++ shims/ivy.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
+
@@ -27,13 +27,92 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+