diff --git ant/deploy.xml ant/deploy.xml
index e0f5ea3..160e46f 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..7376256 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..0fd500b
--- /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.hadoop.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'
+run_cmd
+
diff --git build.properties build.properties
index d75f5de..6fce0d7 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
@@ -78,3 +75,5 @@ mvn.deploy.repo.id=apache.snapshots.https
mvn.deploy.repo.url=https://repository.apache.org/content/repositories/snapshots
maven-ant-tasks.version=2.1.3
mvn.local.repo=${user.home}/.m2/repository
+mvn.hadoop.profile=hadoop20
+
diff --git build.xml build.xml
index 61ff391..624f2cc 100644
--- build.xml
+++ build.xml
@@ -60,12 +60,24 @@
================================================================================
-->
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -78,13 +143,6 @@
-
- org.apache.hadoop
- hadoop-test
- ${hadoop20.version}
- test
-
-
diff --git shims/build.xml shims/build.xml
index b13c7bd..89a8f5c 100644
--- shims/build.xml
+++ shims/build.xml
@@ -19,14 +19,14 @@
-
+
-
+
<_javac srcDir="${basedir}/src/${hadoopversion}/java"
destDir="${path.to.basedir}/core/build/classes"
classPathRef="compile.class.path"/>
diff --git webhcat/svr/pom.xml webhcat/svr/pom.xml
index 3ae03e7..9e7997b 100644
--- webhcat/svr/pom.xml
+++ webhcat/svr/pom.xml
@@ -54,6 +54,12 @@
compile
+ org.codehaus.jackson
+ jackson-mapper-asl
+ ${jackson.version}
+ compile
+
+
org.eclipse.jetty.aggregate
jetty-all-server
${jetty.webhcat.version}