diff --git ant/checkstyle.xml ant/checkstyle.xml
deleted file mode 100644
index 1f15b44..0000000
--- ant/checkstyle.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git ant/deploy.xml ant/deploy.xml
deleted file mode 100644
index 160e46f..0000000
--- ant/deploy.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-
-
-
-
-
-
-
-
-
- Signing @{inputFile}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <_sign inputFile="${build.dir}/${ant.project.name}-${hcatalog.version}.jar"/>
- <_sign inputFile="${pom.file}"/>
-
-
-
-
-
-
-
-
diff --git ant/findbugs.xml ant/findbugs.xml
deleted file mode 100644
index f2b8f3c..0000000
--- ant/findbugs.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git ant/test.xml ant/test.xml
deleted file mode 100644
index e3aaf1a..0000000
--- ant/test.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Tests failed!
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git build-common.xml build-common.xml
deleted file mode 100644
index 7376256..0000000
--- build-common.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <_javac srcDir="${basedir}/src/main/java"
- destDir="${build.classes}"
- classPathRef="compile.class.path"/>
-
-
-
-
- <_javac srcDir="${basedir}/src/test/java"
- destDir="${test.classes}"
- classPathRef="test.class.path"/>
-
-
-
-
-
- <_junit srcDir="${basedir}/src/test/java"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <_findbugs outputDir="${findbugs.out.dir}"
- outputFile="${findbugs.report.xmlfile}"
- excludeFilter="${findbugs.exclude.file}"
- findbugsReportXmlFile="${findbugs.report.xmlfile}"
- findbugsReportHtmlFile="${findbugs.report.htmlfile}"
- sourceDir="${basedir}/src/main/java"
- jarDir="${build.dir}"
- classPathRef="findbugs.class.path"/>
-
-
diff --git build-support/ant/build-common.xml build-support/ant/build-common.xml
new file mode 100644
index 0000000..28b5f51
--- /dev/null
+++ build-support/ant/build-common.xml
@@ -0,0 +1,104 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_javac srcDir="${basedir}/src/main/java"
+ destDir="${build.classes}"
+ classPathRef="compile.class.path"/>
+
+
+
+
+ <_javac srcDir="${basedir}/src/test/java"
+ destDir="${test.classes}"
+ classPathRef="test.class.path"/>
+
+
+
+
+
+ <_junit srcDir="${basedir}/src/test/java"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_findbugs outputDir="${findbugs.out.dir}"
+ outputFile="${findbugs.report.xmlfile}"
+ excludeFilter="${findbugs.exclude.file}"
+ findbugsReportXmlFile="${findbugs.report.xmlfile}"
+ findbugsReportHtmlFile="${findbugs.report.htmlfile}"
+ sourceDir="${basedir}/src/main/java"
+ jarDir="${build.dir}"
+ classPathRef="findbugs.class.path"/>
+
+
diff --git build-support/ant/checkstyle.xml build-support/ant/checkstyle.xml
new file mode 100644
index 0000000..1f15b44
--- /dev/null
+++ build-support/ant/checkstyle.xml
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git build-support/ant/deploy.xml build-support/ant/deploy.xml
new file mode 100644
index 0000000..160e46f
--- /dev/null
+++ build-support/ant/deploy.xml
@@ -0,0 +1,106 @@
+
+
+
+
+
+
+
+
+
+ Signing @{inputFile}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_sign inputFile="${build.dir}/${ant.project.name}-${hcatalog.version}.jar"/>
+ <_sign inputFile="${pom.file}"/>
+
+
+
+
+
+
+
+
diff --git build-support/ant/findbugs.xml build-support/ant/findbugs.xml
new file mode 100644
index 0000000..f2b8f3c
--- /dev/null
+++ build-support/ant/findbugs.xml
@@ -0,0 +1,64 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git build-support/ant/test.xml build-support/ant/test.xml
new file mode 100644
index 0000000..e3aaf1a
--- /dev/null
+++ build-support/ant/test.xml
@@ -0,0 +1,96 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Tests failed!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git build-support/scripts/test.sh build-support/scripts/test.sh
index 0fd500b..d55080e 100755
--- build-support/scripts/test.sh
+++ build-support/scripts/test.sh
@@ -11,6 +11,14 @@ function run_cmd() {
umask 0022
+cmd='ant clean src-release'
+run_cmd
+
+cd build
+tar -xzvf hcatalog-src-*.tar.gz
+cd hcatalog-src-*
+echo "Running tests from $(pwd)"
+
# Build with hadoop23, but do not run tests as they do not pass.
cmd='ant clean package -Dmvn.hadoop.profile=hadoop23'
run_cmd
diff --git build.xml build.xml
index 624f2cc..42c5140 100644
--- build.xml
+++ build.xml
@@ -366,9 +366,12 @@
-
+
+
+
+
@@ -378,15 +381,18 @@
+
-
-
+
+
+
+
@@ -424,8 +430,8 @@
-
-
-
+
+
+
diff --git core/build.xml core/build.xml
index 6cd7441..66303cf 100644
--- core/build.xml
+++ core/build.xml
@@ -21,7 +21,7 @@
-
+
diff --git hcatalog-pig-adapter/build.xml hcatalog-pig-adapter/build.xml
index bdd9605..3d0d86f 100644
--- hcatalog-pig-adapter/build.xml
+++ hcatalog-pig-adapter/build.xml
@@ -21,7 +21,7 @@
-
+
diff --git server-extensions/build.xml server-extensions/build.xml
index 8351f27..c929ddf 100644
--- server-extensions/build.xml
+++ server-extensions/build.xml
@@ -21,7 +21,7 @@
-
+
diff --git shims/build.xml shims/build.xml
index 89a8f5c..8978949 100644
--- shims/build.xml
+++ shims/build.xml
@@ -19,7 +19,7 @@
-
+
diff --git storage-handlers/hbase/build.xml storage-handlers/hbase/build.xml
index 558e9c8..fa2f508 100644
--- storage-handlers/hbase/build.xml
+++ storage-handlers/hbase/build.xml
@@ -217,6 +217,6 @@
-
+
diff --git webhcat/java-client/build.xml webhcat/java-client/build.xml
index 7c12468..a8db670 100644
--- webhcat/java-client/build.xml
+++ webhcat/java-client/build.xml
@@ -20,7 +20,7 @@
-
+
diff --git webhcat/svr/build.xml webhcat/svr/build.xml
index 070d9be..b1ceba4 100644
--- webhcat/svr/build.xml
+++ webhcat/svr/build.xml
@@ -20,7 +20,7 @@
-
+