diff --git a/itests/hive-unit/pom.xml b/itests/hive-unit/pom.xml
index 8b9f5cf..7feea0a 100644
--- a/itests/hive-unit/pom.xml
+++ b/itests/hive-unit/pom.xml
@@ -110,13 +110,7 @@
tests
-
- org.apache.spark
- spark-core_${scala.binary.version}
- ${spark.version}
- test
-
-
+
junit
junit
${junit.version}
@@ -323,6 +317,46 @@
+
+ spark-test
+
+
+ !skipSparkTests
+
+
+
+
+ org.apache.spark
+ spark-core_${scala.binary.version}
+ ${spark.version}
+ test
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-antrun-plugin
+
+
+ download-spark
+ generate-sources
+
+ run
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -332,20 +366,6 @@
maven-antrun-plugin
- download-spark
- generate-sources
-
- run
-
-
-
-
-
-
-
-
-
-
setup-metastore-scripts
process-test-resources
diff --git a/itests/pom.xml b/itests/pom.xml
index 6f6cf74..3275667 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -45,63 +45,67 @@
hadoop-2
- qtest-spark
hive-unit-hadoop2
hive-minikdc
- hadoop-1
+ spark-test
+
+
+ !skipSparkTests
+
+
qtest-spark
+
+
+
+ org.apache.maven.plugins
+ maven-antrun-plugin
+
+
+ download-spark
+ generate-sources
+
+ run
+
+
+
+
+ set -x
+ /bin/pwd
+ BASE_DIR=./target
+ HIVE_ROOT=$BASE_DIR/../../../
+ DOWNLOAD_DIR=./../thirdparty
+ download() {
+ url=$1;
+ finalName=$2
+ tarName=$(basename $url)
+ rm -rf $BASE_DIR/$finalName
+ if [[ ! -f $DOWNLOAD_DIR/$tarName ]]
+ then
+ curl -Sso $DOWNLOAD_DIR/$tarName $url
+ fi
+ tar -zxf $DOWNLOAD_DIR/$tarName -C $BASE_DIR
+ mv $BASE_DIR/spark-${spark.version}-bin-hadoop2-without-hive $BASE_DIR/$finalName
+ }
+ mkdir -p $DOWNLOAD_DIR
+ download "http://d3jw87u4immizc.cloudfront.net/spark-tarball/spark-${spark.version}-bin-hadoop2-without-hive.tgz" "spark"
+ cp -f $HIVE_ROOT/data/conf/spark/log4j.properties $BASE_DIR/spark/conf/
+ sed '/package /d' ${basedir}/${hive.path.to.root}/contrib/src/java/org/apache/hadoop/hive/contrib/udf/example/UDFExampleAdd.java > /tmp/UDFExampleAdd.java
+ javac -cp ${settings.localRepository}/org/apache/hive/hive-exec/${project.version}/hive-exec-${project.version}.jar /tmp/UDFExampleAdd.java -d /tmp
+ jar -cf /tmp/udfexampleadd-1.0.jar -C /tmp UDFExampleAdd.class
+
+
+
+
+
+
+
+
-
-
-
- org.apache.maven.plugins
- maven-antrun-plugin
-
-
- download-spark
- generate-sources
-
- run
-
-
-
-
- set -x
- /bin/pwd
- BASE_DIR=./target
- HIVE_ROOT=$BASE_DIR/../../../
- DOWNLOAD_DIR=./../thirdparty
- download() {
- url=$1;
- finalName=$2
- tarName=$(basename $url)
- rm -rf $BASE_DIR/$finalName
- if [[ ! -f $DOWNLOAD_DIR/$tarName ]]
- then
- curl -Sso $DOWNLOAD_DIR/$tarName $url
- fi
- tar -zxf $DOWNLOAD_DIR/$tarName -C $BASE_DIR
- mv $BASE_DIR/spark-${spark.version}-bin-hadoop2-without-hive $BASE_DIR/$finalName
- }
- mkdir -p $DOWNLOAD_DIR
- download "http://d3jw87u4immizc.cloudfront.net/spark-tarball/spark-${spark.version}-bin-hadoop2-without-hive.tgz" "spark"
- cp -f $HIVE_ROOT/data/conf/spark/log4j.properties $BASE_DIR/spark/conf/
- sed '/package /d' ${basedir}/${hive.path.to.root}/contrib/src/java/org/apache/hadoop/hive/contrib/udf/example/UDFExampleAdd.java > /tmp/UDFExampleAdd.java
- javac -cp ${settings.localRepository}/org/apache/hive/hive-exec/${project.version}/hive-exec-${project.version}.jar /tmp/UDFExampleAdd.java -d /tmp
- jar -cf /tmp/udfexampleadd-1.0.jar -C /tmp UDFExampleAdd.class
-
-
-
-
-
-
-
-