diff --git a/pom.xml b/pom.xml index 6ef2879ec00..3bd11c6a928 100644 --- a/pom.xml +++ b/pom.xml @@ -79,7 +79,7 @@ <checkstyle.conf.dir>${basedir}/${hive.path.to.root}/checkstyle</checkstyle.conf.dir> <!-- Test Properties --> - <test.extra.path></test.extra.path> + <test.extra.path/> <test.hive.hadoop.classpath>${maven.test.classpath}</test.hive.hadoop.classpath> <test.log4j.scheme>file://</test.log4j.scheme> <test.tmp.dir>${project.build.directory}/tmp</test.tmp.dir> @@ -91,8 +91,8 @@ <test.warehouse.scheme>pfile://</test.warehouse.scheme> <!-- To add additional exclude patterns set this property --> - <test.excludes.additional></test.excludes.additional> - <skip.spark.files></skip.spark.files> + <test.excludes.additional/> + <skip.spark.files/> <!-- Plugin and Plugin Dependency Versions --> <ant.contrib.version>1.0b3</ant.contrib.version> @@ -148,7 +148,7 @@ <guava.version>19.0</guava.version> <groovy.version>2.4.11</groovy.version> <h2database.version>1.3.166</h2database.version> - <hadoop.version>3.1.1.3.0.1.0-187</hadoop.version> + <hadoop.version>3.3.3</hadoop.version> <hadoop.bin.path>${basedir}/${hive.path.to.root}/testutils/hadoop</hadoop.bin.path> <hamcrest.version>1.3</hamcrest.version> <hbase.version>2.0.0.3.0.1.0-187</hbase.version> @@ -1151,12 +1151,12 @@ </goals> <configuration> <target> - <delete dir="${test.tmp.dir}" /> - <delete dir="${test.conf.dir}" /> - <delete dir="${test.warehouse.dir}" /> - <mkdir dir="${test.tmp.dir}" /> - <mkdir dir="${test.warehouse.dir}" /> - <mkdir dir="${test.conf.dir}" /> + <delete dir="${test.tmp.dir}"/> + <delete dir="${test.conf.dir}"/> + <delete dir="${test.warehouse.dir}"/> + <mkdir dir="${test.tmp.dir}"/> + <mkdir dir="${test.warehouse.dir}"/> + <mkdir dir="${test.conf.dir}"/> <!-- copies hive-site.xml so it can be modified --> <copy todir="${test.conf.dir}"> <fileset dir="${basedir}/${hive.path.to.root}/data/conf/"/> @@ -1382,20 +1382,19 @@ <phase>generate-sources</phase> <configuration> <target> - <taskdef name="for" classname="net.sf.antcontrib.logic.ForTask" - classpathref="maven.plugin.classpath" /> + <taskdef name="for" classname="net.sf.antcontrib.logic.ForTask" classpathref="maven.plugin.classpath"/> <property name="thrift.args" value="-I ${thrift.home} --gen java:beans,hashcode,generated_annotations=undated --gen cpp --gen php --gen py --gen rb"/> <property name="thrift.gen.dir" value="${basedir}/src/gen/thrift"/> <delete dir="${thrift.gen.dir}"/> <mkdir dir="${thrift.gen.dir}"/> <for param="thrift.file"> <path> - <fileset dir="." includes="if/*.thrift,if/test/*.thrift,src/main/thrift/*.thrift" /> + <fileset dir="." includes="if/*.thrift,if/test/*.thrift,src/main/thrift/*.thrift"/> </path> <sequential> <echo message="Generating Thrift code for @{thrift.file}"/> - <exec executable="${thrift.home}/bin/thrift" failonerror="true" dir="."> - <arg line="${thrift.args} -I ${basedir}/include -I ${basedir}/.. -o ${thrift.gen.dir} @{thrift.file} " /> + <exec executable="${thrift.home}/bin/thrift" failonerror="true" dir="."> + <arg line="${thrift.args} -I ${basedir}/include -I ${basedir}/.. -o ${thrift.gen.dir} @{thrift.file} "/> </exec> </sequential> </for>