diff --git build.properties build.properties index fdb0f93..fc32be1 100644 --- build.properties +++ build.properties @@ -73,12 +73,30 @@ jsp.test.jar=${hadoop.root}/lib/jetty-ext/jsp-api.jar common.jar=${hadoop.root}/lib/commons-httpclient-3.0.1.jar # module names needed for build process -iterate.hive.all=ant,shims,common,serde,metastore,ql,contrib,service,cli,jdbc,beeline,hwi,hbase-handler,testutils,hcatalog -iterate.hive.modules=shims,common,serde,metastore,ql,contrib,service,cli,jdbc,beeline,hwi,hbase-handler,testutils,hcatalog -iterate.hive.tests=ql,contrib,hbase-handler,hwi,jdbc,beeline,metastore,odbc,serde,service,hcatalog -iterate.hive.thrift=ql,service,metastore,serde -iterate.hive.protobuf=ql -iterate.hive.cpp=odbc + +# full profile +iterate.hive.full.all=ant,shims,common,serde,metastore,ql,contrib,service,cli,jdbc,beeline,hwi,hbase-handler,testutils,hcatalog +iterate.hive.full.modules=shims,common,serde,metastore,ql,contrib,service,cli,jdbc,beeline,hwi,hbase-handler,testutils,hcatalog +iterate.hive.full.tests=ql,contrib,hbase-handler,hwi,jdbc,beeline,metastore,odbc,serde,service,hcatalog +iterate.hive.full.thrift=ql,service,metastore,serde +iterate.hive.full.protobuf=ql +iterate.hive.full.cpp=odbc + +# no hcatalog profile +iterate.hive.nohcat.all=ant,shims,common,serde,metastore,ql,contrib,service,cli,jdbc,beeline,hwi,hbase-handler,testutils +iterate.hive.nohcat.modules=shims,common,serde,metastore,ql,contrib,service,cli,jdbc,beeline,hwi,hbase-handler,testutils +iterate.hive.nohcat.tests=ql,contrib,hbase-handler,hwi,jdbc,beeline,metastore,odbc,serde,service +iterate.hive.nohcat.thrift=ql,service,metastore,serde +iterate.hive.nohcat.protobuf=ql +iterate.hive.nohcat.cpp=odbc + +# core profile +iterate.hive.core.all=ant,shims,common,serde,metastore,ql,cli +iterate.hive.core.modules=shims,common,serde,metastore,ql,cli +iterate.hive.core.tests=ql +iterate.hive.core.thrift=ql +iterate.hive.core.protobuf=ql +iterate.hive.core.cpp= # # Test Properties diff --git build.xml build.xml index c819445..d8a6fbc 100644 --- build.xml +++ build.xml @@ -59,6 +59,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -477,18 +522,18 @@ - - - - - - - + + + + + + + - + @@ -516,12 +561,17 @@ - - - - - + + + + + + + + + + diff --git ql/build.xml ql/build.xml index a34a079..d185e51 100644 --- ql/build.xml +++ ql/build.xml @@ -82,19 +82,24 @@ logDirectory="${test.log.dir}/clientpositive" hadoopVersion="${hadoopVersion}"/> - + + + + + + diff --git ql/ivy.xml ql/ivy.xml index ddd55b1..bfb3116 100644 --- ql/ivy.xml +++ ql/ivy.xml @@ -34,6 +34,12 @@ conf="test->default" transitive="false"/> + + + +