diff --git ant/deploy.xml ant/deploy.xml
index e0f5ea3..3d82982 100644
--- ant/deploy.xml
+++ ant/deploy.xml
@@ -45,6 +45,9 @@
+
+
+
@@ -58,18 +61,18 @@
unless="mvn-dependencies.complete">
-
+
-
-
+
-
@@ -81,8 +84,8 @@
-
-
+
@@ -92,8 +95,8 @@
<_sign inputFile="${build.dir}/${ant.project.name}-${hcatalog.version}.jar"/>
<_sign inputFile="${pom.file}"/>
-
-
+
diff --git build-common.xml build-common.xml
index 0e0af1c..6525647 100644
--- build-common.xml
+++ build-common.xml
@@ -22,6 +22,13 @@
+
+
+
+
+
+
+
diff --git build-support/scripts/test.sh build-support/scripts/test.sh
new file mode 100755
index 0000000..3f239dc
--- /dev/null
+++ build-support/scripts/test.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+function run_cmd() {
+ echo "Running command: ${cmd}"
+ ${cmd}
+ if [ $? != 0 ]; then
+ echo "Failed!"
+ exit 1
+ fi
+}
+
+umask 0022
+
+# Build with hadoop23, but do not run tests as they do not pass.
+cmd='ant clean package -Dmvn.profile=hadoop23'
+run_cmd
+
+# Build and run tests with hadoop20. This must happen afterwards so test results
+# are available for CI to publish.
+cmd='ant clean package test -Dtest.junit.output.format=xml -Dmvn.profile=hadoop20'
+run_cmd
+
diff --git build.properties build.properties
index d75f5de..6e1fdd5 100644
--- build.properties
+++ build.properties
@@ -47,9 +47,6 @@ javac.version=1.6
javac.args=
javac.args.warnings=
-#Set to 20 to build against hadoop 1.0.2 or 23 to build against hadoop 0.23.1
-hadoopversion=20
-
# hive properties
#shims.name=20
shims.20S.hive.shims.include=0.20,0.20S
diff --git build.xml build.xml
index 61ff391..5b46dd7 100644
--- build.xml
+++ build.xml
@@ -51,6 +51,7 @@
+
@@ -60,12 +61,24 @@
================================================================================
-->
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ hadoop20
+
+
org.apache.hadoop
hadoop-tools
${hadoop20.version}
compile
-
+
+
+ org.apache.hadoop
+ hadoop-test
+ ${hadoop20.version}
+ test
+
+
+
+
+ hadoop23
+
+
+ org.apache.hadoop
+ hadoop-archives
+ ${hadoop23.version}
+ compile
+
+
+ org.apache.hadoop
+ hadoop-common
+ ${hadoop23.version}
+ compile
+
+
+ org.apache.hadoop
+ hadoop-hdfs
+ ${hadoop23.version}
+ compile
+
+
+ org.apache.hadoop
+ hadoop-mapreduce-client-core
+ ${hadoop23.version}
+ compile
+
+
+
+
+
+
org.apache.hive
hive-builtins
diff --git hcatalog-pig-adapter/pom.xml hcatalog-pig-adapter/pom.xml
index 04d28b7..890c99d 100644
--- hcatalog-pig-adapter/pom.xml
+++ hcatalog-pig-adapter/pom.xml
@@ -34,6 +34,56 @@
hcatalog-pig-adapter
http://maven.apache.org
+
+
+
+ hadoop20
+
+
+ org.apache.hadoop
+ hadoop-tools
+ ${hadoop20.version}
+ compile
+
+
+ org.apache.hadoop
+ hadoop-test
+ ${hadoop20.version}
+ test
+
+
+
+
+ hadoop23
+
+
+ org.apache.hadoop
+ hadoop-archives
+ ${hadoop23.version}
+ compile
+
+
+ org.apache.hadoop
+ hadoop-common
+ ${hadoop23.version}
+ compile
+
+
+ org.apache.hadoop
+ hadoop-hdfs
+ ${hadoop23.version}
+ compile
+
+
+ org.apache.hadoop
+ hadoop-mapreduce-client-core
+ ${hadoop23.version}
+ compile
+
+
+
+
+
org.apache.hcatalog
diff --git pom.xml pom.xml
index 6ade4a6..a265f7e 100644
--- pom.xml
+++ pom.xml
@@ -7,9 +7,11 @@
1.1
2.4
1.0.3
+ 0.23.3
0.92.0
0.5.0-SNAPSHOT
0.10.0-SNAPSHOT
+ 1.8.8
1.14
7.6.0.v20120127
1.1
@@ -30,6 +32,20 @@
0.5.0-SNAPSHOT
pom
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 2.5.1
+
+ 1.6
+ 1.6
+
+
+
+
+
@@ -78,13 +94,6 @@
-
- org.apache.hadoop
- hadoop-test
- ${hadoop20.version}
- test
-
-
diff --git server-extensions/pom.xml server-extensions/pom.xml
index eaac449..b17cbc2 100644
--- server-extensions/pom.xml
+++ server-extensions/pom.xml
@@ -34,6 +34,56 @@
server-extensions
http://maven.apache.org
+
+
+
+ hadoop20
+
+
+ org.apache.hadoop
+ hadoop-tools
+ ${hadoop20.version}
+ compile
+
+
+ org.apache.hadoop
+ hadoop-test
+ ${hadoop20.version}
+ test
+
+
+
+
+ hadoop23
+
+
+ org.apache.hadoop
+ hadoop-archives
+ ${hadoop23.version}
+ compile
+
+
+ org.apache.hadoop
+ hadoop-common
+ ${hadoop23.version}
+ compile
+
+
+ org.apache.hadoop
+ hadoop-hdfs
+ ${hadoop23.version}
+ compile
+
+
+ org.apache.hadoop
+ hadoop-mapreduce-client-core
+ ${hadoop23.version}
+ compile
+
+
+
+
+
javax.jms
diff --git storage-handlers/hbase/pom.xml storage-handlers/hbase/pom.xml
index 6066b4b..156c333 100644
--- storage-handlers/hbase/pom.xml
+++ storage-handlers/hbase/pom.xml
@@ -19,6 +19,18 @@
+ org.apache.hadoop
+ hadoop-tools
+ ${hadoop20.version}
+ compile
+
+
+ org.apache.hadoop
+ hadoop-test
+ ${hadoop20.version}
+ test
+
+
org.apache.hive
hive-hbase-handler
${hive.version}
diff --git webhcat/java-client/pom.xml webhcat/java-client/pom.xml
index 882abd7..d8760fc 100644
--- webhcat/java-client/pom.xml
+++ webhcat/java-client/pom.xml
@@ -26,6 +26,56 @@
../../pom.xml
+
+
+
+ hadoop20
+
+
+ org.apache.hadoop
+ hadoop-tools
+ ${hadoop20.version}
+ compile
+
+
+ org.apache.hadoop
+ hadoop-test
+ ${hadoop20.version}
+ test
+
+
+
+
+ hadoop23
+
+
+ org.apache.hadoop
+ hadoop-archives
+ ${hadoop23.version}
+ compile
+
+
+ org.apache.hadoop
+ hadoop-common
+ ${hadoop23.version}
+ compile
+
+
+ org.apache.hadoop
+ hadoop-hdfs
+ ${hadoop23.version}
+ compile
+
+
+ org.apache.hadoop
+ hadoop-mapreduce-client-core
+ ${hadoop23.version}
+ compile
+
+
+
+
+
4.0.0
org.apache.hcatalog
webhcat-java-client
diff --git webhcat/svr/pom.xml webhcat/svr/pom.xml
index 3ae03e7..40072a1 100644
--- webhcat/svr/pom.xml
+++ webhcat/svr/pom.xml
@@ -48,12 +48,30 @@
compile
+ org.apache.hadoop
+ hadoop-tools
+ ${hadoop20.version}
+ compile
+
+
+ org.apache.hadoop
+ hadoop-test
+ ${hadoop20.version}
+ test
+
+
org.apache.hcatalog
hcatalog-core
${hcatalog.version}
compile
+ org.codehaus.jackson
+ jackson-mapper-asl
+ ${jackson.version}
+ compile
+
+
org.eclipse.jetty.aggregate
jetty-all-server
${jetty.webhcat.version}