You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by br...@apache.org on 2013/10/03 18:47:07 UTC
svn commit: r1528930 - in /hive/branches/maven: ./ beeline/ hcatalog/core/
hcatalog/hcatalog-pig-adapter/ hcatalog/storage-handlers/hbase/
hcatalog/webhcat/java-client/ hcatalog/webhcat/svr/ itests/ service/ shims/
shims/common-secure/
Author: brock
Date: Thu Oct 3 16:47:06 2013
New Revision: 1528930
URL: http://svn.apache.org/r1528930
Log:
HIVE-5333 - Milestone 2: Generate tests under maven
Modified:
hive/branches/maven/beeline/pom.xml
hive/branches/maven/hcatalog/core/pom-new.xml
hive/branches/maven/hcatalog/hcatalog-pig-adapter/pom-new.xml
hive/branches/maven/hcatalog/storage-handlers/hbase/pom-new.xml
hive/branches/maven/hcatalog/webhcat/java-client/pom-new.xml
hive/branches/maven/hcatalog/webhcat/svr/pom-new.xml
hive/branches/maven/itests/pom.xml
hive/branches/maven/maven-rollback.sh
hive/branches/maven/maven-rollforward.sh
hive/branches/maven/pom.xml
hive/branches/maven/service/pom.xml
hive/branches/maven/shims/common-secure/pom.xml
hive/branches/maven/shims/pom.xml
Modified: hive/branches/maven/beeline/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/maven/beeline/pom.xml?rev=1528930&r1=1528929&r2=1528930&view=diff
==============================================================================
--- hive/branches/maven/beeline/pom.xml (original)
+++ hive/branches/maven/beeline/pom.xml Thu Oct 3 16:47:06 2013
@@ -36,6 +36,11 @@
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
+ <artifactId>hive-metastore</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hive</groupId>
<artifactId>hive-shims</artifactId>
<version>${project.version}</version>
<classifier>uberjar</classifier>
Modified: hive/branches/maven/hcatalog/core/pom-new.xml
URL: http://svn.apache.org/viewvc/hive/branches/maven/hcatalog/core/pom-new.xml?rev=1528930&r1=1528929&r2=1528930&view=diff
==============================================================================
--- hive/branches/maven/hcatalog/core/pom-new.xml (original)
+++ hive/branches/maven/hcatalog/core/pom-new.xml Thu Oct 3 16:47:06 2013
@@ -66,11 +66,6 @@
<artifactId>jackson-mapper-asl</artifactId>
<version>${jackson.version}</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
</dependencies>
<profiles>
Modified: hive/branches/maven/hcatalog/hcatalog-pig-adapter/pom-new.xml
URL: http://svn.apache.org/viewvc/hive/branches/maven/hcatalog/hcatalog-pig-adapter/pom-new.xml?rev=1528930&r1=1528929&r2=1528930&view=diff
==============================================================================
--- hive/branches/maven/hcatalog/hcatalog-pig-adapter/pom-new.xml (original)
+++ hive/branches/maven/hcatalog/hcatalog-pig-adapter/pom-new.xml Thu Oct 3 16:47:06 2013
@@ -40,12 +40,6 @@
<artifactId>hcatalog-core</artifactId>
<version>${project.version}</version>
</dependency>
- <!-- inter-project -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
<!-- test intra-project -->
<dependency>
<groupId>org.apache.hive.hcatalog</groupId>
Modified: hive/branches/maven/hcatalog/storage-handlers/hbase/pom-new.xml
URL: http://svn.apache.org/viewvc/hive/branches/maven/hcatalog/storage-handlers/hbase/pom-new.xml?rev=1528930&r1=1528929&r2=1528930&view=diff
==============================================================================
--- hive/branches/maven/hcatalog/storage-handlers/hbase/pom-new.xml (original)
+++ hive/branches/maven/hcatalog/storage-handlers/hbase/pom-new.xml Thu Oct 3 16:47:06 2013
@@ -61,11 +61,6 @@
<artifactId>zookeeper</artifactId>
<version>${zookeeper.version}</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
<!-- test inter-project -->
<dependency>
<groupId>commons-io</groupId>
Modified: hive/branches/maven/hcatalog/webhcat/java-client/pom-new.xml
URL: http://svn.apache.org/viewvc/hive/branches/maven/hcatalog/webhcat/java-client/pom-new.xml?rev=1528930&r1=1528929&r2=1528930&view=diff
==============================================================================
--- hive/branches/maven/hcatalog/webhcat/java-client/pom-new.xml (original)
+++ hive/branches/maven/hcatalog/webhcat/java-client/pom-new.xml Thu Oct 3 16:47:06 2013
@@ -40,12 +40,6 @@
<artifactId>hcatalog-core</artifactId>
<version>${project.version}</version>
</dependency>
- <!-- inter-project -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
<!-- test intra-project -->
<dependency>
<groupId>org.apache.hive.hcatalog</groupId>
Modified: hive/branches/maven/hcatalog/webhcat/svr/pom-new.xml
URL: http://svn.apache.org/viewvc/hive/branches/maven/hcatalog/webhcat/svr/pom-new.xml?rev=1528930&r1=1528929&r2=1528930&view=diff
==============================================================================
--- hive/branches/maven/hcatalog/webhcat/svr/pom-new.xml (original)
+++ hive/branches/maven/hcatalog/webhcat/svr/pom-new.xml Thu Oct 3 16:47:06 2013
@@ -88,11 +88,6 @@
<artifactId>jul-to-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
</dependencies>
<profiles>
Modified: hive/branches/maven/itests/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/maven/itests/pom.xml?rev=1528930&r1=1528929&r2=1528930&view=diff
==============================================================================
--- hive/branches/maven/itests/pom.xml (original)
+++ hive/branches/maven/itests/pom.xml Thu Oct 3 16:47:06 2013
@@ -27,10 +27,27 @@
<packaging>jar</packaging>
<name>Hive Integration Tests</name>
+ <properties>
+ <qfile></qfile>
+ <qfile_regex></qfile_regex>
+ <run_disabled>false</run_disabled>
+ <clustermode></clustermode>
+ <execute.beeline.tests>false</execute.beeline.tests>
+ <minimr.query.files>list_bucket_dml_10.q,input16_cc.q,scriptfile1.q,scriptfile1_win.q,bucket4.q,bucketmapjoin6.q,disable_merge_for_bucketing.q,reduce_deduplicate.q,smb_mapjoin_8.q,join1.q,groupby2.q,bucketizedhiveinputformat.q,bucketmapjoin7.q,optrstat_groupby.q,bucket_num_reducers.q,bucket5.q,load_fs2.q,bucket_num_reducers2.q,infer_bucket_sort_merge.q,infer_bucket_sort_reducers_power_two.q,infer_bucket_sort_dyn_part.q,infer_bucket_sort_bucketed_table.q,infer_bucket_sort_map_operators.q,infer_bucket_sort_num_buckets.q,leftsemijoin_mr.q,schemeAuthority.q,schemeAuthority2.q,truncate_column_buckets.q,remote_script.q,,load_hdfs_file_with_space_in_the_name.q,parallel_orderby.q</minimr.query.files>
+ <minimr.query.negative.files>cluster_tasklog_retrieval.q,minimr_broken_pipe.q,mapreduce_stack_trace.q,mapreduce_stack_trace_turnoff.q,mapreduce_stack_trace_hadoop20.q,mapreduce_stack_trace_turnoff_hadoop20.q</minimr.query.negative.files>
+ <beeline.positive.exclude>add_part_exist.q,alter1.q,alter2.q,alter4.q,alter5.q,alter_rename_partition.q,alter_rename_partition_authorization.q,archive.q,archive_corrupt.q,archive_multi.q,archive_mr_1806.q,archive_multi_mr_1806.q,authorization_1.q,authorization_2.q,authorization_4.q,authorization_5.q,authorization_6.q,authorization_7.q,ba_table1.q,ba_table2.q,ba_table3.q,ba_table_udfs.q,binary_table_bincolserde.q,binary_table_colserde.q,cluster.q,columnarserde_create_shortcut.q,combine2.q,constant_prop.q,create_nested_type.q,create_or_replace_view.q,create_struct_table.q,create_union_table.q,database.q,database_location.q,database_properties.q,ddltime.q,describe_database_json.q,drop_database_removes_partition_dirs.q,escape1.q,escape2.q,exim_00_nonpart_empty.q,exim_01_nonpart.q,exim_02_00_part_empty.q,exim_02_part.q,exim_03_nonpart_over_compat.q,exim_04_all_part.q,exim_04_evolved_parts.q,exim_05_some_part.q,exim_06_one_part.q,exim_07_all_part_over_nonoverlap.q,exim_08_nonpart_rena
me.q,exim_09_part_spec_nonoverlap.q,exim_10_external_managed.q,exim_11_managed_external.q,exim_12_external_location.q,exim_13_managed_location.q,exim_14_managed_location_over_existing.q,exim_15_external_part.q,exim_16_part_external.q,exim_17_part_managed.q,exim_18_part_external.q,exim_19_00_part_external_location.q,exim_19_part_external_location.q,exim_20_part_managed_location.q,exim_21_export_authsuccess.q,exim_22_import_exist_authsuccess.q,exim_23_import_part_authsuccess.q,exim_24_import_nonexist_authsuccess.q,global_limit.q,groupby_complex_types.q,groupby_complex_types_multi_single_reducer.q,index_auth.q,index_auto.q,index_auto_empty.q,index_bitmap.q,index_bitmap1.q,index_bitmap2.q,index_bitmap3.q,index_bitmap_auto.q,index_bitmap_rc.q,index_compact.q,index_compact_1.q,index_compact_2.q,index_compact_3.q,index_stale_partitioned.q,init_file.q,input16.q,input16_cc.q,input46.q,input_columnarserde.q,input_dynamicserde.q,input_lazyserde.q,input_testxpath3.q,input_testxpath4.q,insert2_o
verwrite_partitions.q,insertexternal1.q,join_thrift.q,lateral_view.q,load_binary_data.q,load_exist_part_authsuccess.q,load_nonpart_authsuccess.q,load_part_authsuccess.q,loadpart_err.q,lock1.q,lock2.q,lock3.q,lock4.q,merge_dynamic_partition.q,multi_insert.q,multi_insert_move_tasks_share_dependencies.q,null_column.q,ppd_clusterby.q,query_with_semi.q,rename_column.q,sample6.q,sample_islocalmode_hook.q,set_processor_namespaces.q,show_tables.q,source.q,split_sample.q,str_to_map.q,transform1.q,udaf_collect_set.q,udaf_context_ngrams.q,udaf_histogram_numeric.q,udaf_ngrams.q,udaf_percentile_approx.q,udf_array.q,udf_bitmap_and.q,udf_bitmap_or.q,udf_explode.q,udf_format_number.q,udf_map.q,udf_map_keys.q,udf_map_values.q,udf_max.q,udf_min.q,udf_named_struct.q,udf_percentile.q,udf_printf.q,udf_sentences.q,udf_sort_array.q,udf_split.q,udf_struct.q,udf_substr.q,udf_translate.q,udf_union.q,udf_xpath.q,udtf_stack.q,view.q,virtual_column.q</beeline.positive.exclude>
+ </properties>
+
<dependencies>
<!-- test intra-project -->
<dependency>
<groupId>org.apache.hive</groupId>
+ <artifactId>hive-ant</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hive</groupId>
<artifactId>hive-cli</artifactId>
<version>${project.version}</version>
<scope>test</scope>
@@ -49,6 +66,12 @@
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
+ <artifactId>hive-jdbc</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hive</groupId>
<artifactId>hive-metastore</artifactId>
<version>${project.version}</version>
<scope>test</scope>
@@ -74,6 +97,13 @@
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
+ <artifactId>hive-service</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ <classifier>tests</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hive</groupId>
<artifactId>hive-ql</artifactId>
<version>${project.version}</version>
<scope>test</scope>
@@ -167,4 +197,201 @@
</profile>
</profiles>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-test-sources</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>add-test-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>target/generated-test-sources/java</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-tests-sources</id>
+ <phase>generate-test-sources</phase>
+ <configuration>
+ <target>
+ <property name="test.classpath" refid="maven.test.classpath"/>
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties"
+ classpathref="maven.plugin.classpath" />
+ <taskdef name="qtestgen" classname="org.apache.hadoop.hive.ant.QTestGenTask"
+ classpath="${test.classpath}" />
+ <mkdir dir="${project.build.directory}/qfile-results/clientpositive/" />
+ <mkdir dir="${project.build.directory}/qfile-results/clientnegative/" />
+ <mkdir dir="${project.build.directory}/qfile-results/positive/" />
+ <mkdir dir="${project.build.directory}/qfile-results/negative/" />
+ <mkdir dir="${project.build.directory}/qfile-results/hbase-handler/positive/" />
+ <mkdir dir="${project.build.directory}/qfile-results/hbase-handler/negative/" />
+ <mkdir dir="${project.build.directory}/qfile-results/hbase-handler/minimrpositive/" />
+
+ <!-- Parse -->
+ <qtestgen hiveRootDirectory="${basedir}/../"
+ outputDirectory="${project.build.directory}/generated-test-sources/java/org/apache/hadoop/hive/ql/parse/"
+ templatePath="${basedir}/../ql/src/test/templates/" template="TestParse.vm"
+ queryDirectory="${basedir}/../ql/src/test/queries/positive/"
+ queryFile="${qfile}"
+ queryFileRegex="${qfile_regex}"
+ runDisabled="${run_disabled}"
+ resultsDirectory="${basedir}/../ql/src/test/results/compiler/" className="TestParse"
+ logFile="${project.build.directory}/testparsegen.log"
+ hadoopVersion="${active.hadoop.version}"
+ logDirectory="${project.build.directory}/qfile-results/positive/"/>
+
+ <!-- Negative Parse -->
+ <qtestgen hiveRootDirectory="${basedir}/../"
+ outputDirectory="${project.build.directory}/generated-test-sources/java/org/apache/hadoop/hive/ql/parse/"
+ templatePath="${basedir}/../ql/src/test/templates/" template="TestParseNegative.vm"
+ queryDirectory="${basedir}/../ql/src/test/queries/negative/"
+ queryFile="${qfile}"
+ queryFileRegex="${qfile_regex}"
+ runDisabled="${run_disabled}"
+ resultsDirectory="${basedir}/../ql/src/test/results/compiler/errors/" className="TestParseNegative"
+ logFile="${project.build.directory}/testparseneggen.log"
+ hadoopVersion="${active.hadoop.version}"
+ logDirectory="${project.build.directory}/qfile-results/negative/"/>
+
+ <!-- Cli -->
+ <qtestgen hiveRootDirectory="${basedir}/../"
+ outputDirectory="${project.build.directory}/generated-test-sources/java/org/apache/hadoop/hive/cli/"
+ templatePath="${basedir}/../ql/src/test/templates/" template="TestCliDriver.vm"
+ queryDirectory="${basedir}/../ql/src/test/queries/clientpositive/"
+ queryFile="${qfile}"
+ excludeQueryFile="${minimr.query.files}"
+ queryFileRegex="${qfile_regex}"
+ clusterMode="${clustermode}"
+ runDisabled="${run_disabled}"
+ resultsDirectory="${basedir}/../ql/src/test/queries/clientpositive/" className="TestCliDriver"
+ logFile="${project.build.directory}/testclidrivergen.log"
+ logDirectory="${project.build.directory}/qfile-results/clientpositive/"
+ hadoopVersion="${active.hadoop.version}"/>
+
+ <!-- Negative Cli -->
+ <qtestgen hiveRootDirectory="${basedir}/../"
+ outputDirectory="${project.build.directory}/generated-test-sources/java/org/apache/hadoop/hive/cli/"
+ templatePath="${basedir}/../ql/src/test/templates/" template="TestNegativeCliDriver.vm"
+ queryDirectory="${basedir}/../ql/src/test/queries/clientnegative/"
+ queryFile="${qfile}"
+ excludeQueryFile="${minimr.query.negative.files}"
+ queryFileRegex="${qfile_regex}"
+ clusterMode="${clustermode}"
+ runDisabled="${run_disabled}"
+ resultsDirectory="${basedir}/../ql/src/test/queries/clientnegative/" className="TestNegativeCliDriver"
+ logFile="${project.build.directory}/testnegativeclidrivergen.log"
+ logDirectory="${project.build.directory}/qfile-results/clientnegative/"
+ hadoopVersion="${active.hadoop.version}"/>
+
+ <!-- Minimr -->
+ <qtestgen hiveRootDirectory="${basedir}/../"
+ outputDirectory="${project.build.directory}/generated-test-sources/java/org/apache/hadoop/hive/cli/"
+ templatePath="${basedir}/../ql/src/test/templates/" template="TestCliDriver.vm"
+ queryDirectory="${basedir}/../ql/src/test/queries/clientpositive/"
+ queryFile="${qfile}"
+ includeQueryFile="${minimr.query.files}"
+ queryFileRegex="${qfile_regex}"
+ clusterMode="miniMR"
+ runDisabled="${run_disabled}"
+ resultsDirectory="${basedir}/../ql/src/test/queries/clientpositive/" className="TestMinimrCliDriver"
+ logFile="${project.build.directory}/testminimrclidrivergen.log"
+ logDirectory="${project.build.directory}/qfile-results/clientpositive/"
+ hadoopVersion="${hadoopVersion}"
+ />
+
+ <!-- Negative Minimr -->
+ <qtestgen hiveRootDirectory="${basedir}/../"
+ outputDirectory="${project.build.directory}/generated-test-sources/java/org/apache/hadoop/hive/cli/"
+ templatePath="${basedir}/../ql/src/test/templates/" template="TestNegativeCliDriver.vm"
+ queryDirectory="${basedir}/../ql/src/test/queries/clientnegative/"
+ queryFile="${qfile}"
+ includeQueryFile="${minimr.query.negative.files}"
+ queryFileRegex="${qfile_regex}"
+ clusterMode="miniMR"
+ runDisabled="${run_disabled}"
+ resultsDirectory="${basedir}/../ql/src/test/queries/clientnegative/" className="TestNegativeMinimrCliDriver"
+ logFile="${project.build.directory}/testnegativeminimrclidrivergen.log"
+ logDirectory="${project.build.directory}/qfile-results/clientnegative/"
+ hadoopVersion="${hadoopVersion}"
+ />
+
+ <!-- HBase Positive -->
+ <qtestgen hiveRootDirectory="${basedir}/../"
+ outputDirectory="${project.build.directory}/generated-test-sources/java/org/apache/hadoop/hive/cli/"
+ templatePath="${basedir}/../hbase-handler/src/test/templates/" template="TestHBaseCliDriver.vm"
+ queryDirectory="${basedir}/../hbase-handler/src/test/queries/positive/"
+ queryFile="${qfile}"
+ runDisabled="${run_disabled}"
+ clusterMode="${clustermode}"
+ resultsDirectory="${basedir}/../hbase-handler/src/test/results/positive/" className="TestHBaseCliDriver"
+ logFile="${project.build.directory}/testhbaseclidrivergen.log"
+ logDirectory="${project.build.directory}/qfile-results/hbase-handler/positive/"/>
+
+ <!-- HBase Minimr -->
+ <qtestgen hiveRootDirectory="${basedir}/../"
+ outputDirectory="${project.build.directory}/generated-test-sources/java/org/apache/hadoop/hive/cli/"
+ templatePath="${basedir}/../hbase-handler/src/test/templates/" template="TestHBaseCliDriver.vm"
+ queryDirectory="${basedir}/../hbase-handler/src/test/queries/positive/"
+ queryFile="hbase_bulk.m"
+ runDisabled="${run_disabled}"
+ clusterMode="miniMR"
+ resultsDirectory="${basedir}/../hbase-handler/src/test/results/positive/" className="TestHBaseMinimrCliDriver"
+ logFile="${project.build.directory}/testhbaseminimrclidrivergen.log"
+ logDirectory="${project.build.directory}/qfile-results/hbase-handler/minimrpositive/"/>
+
+ <!-- HBase Negative -->
+ <qtestgen hiveRootDirectory="${basedir}/../"
+ outputDirectory="${project.build.directory}/generated-test-sources/java/org/apache/hadoop/hive/cli/"
+ templatePath="${basedir}/../hbase-handler/src/test/templates/" template="TestHBaseNegativeCliDriver.vm"
+ queryDirectory="${basedir}/../hbase-handler/src/test/queries/negative/"
+ queryFile="${qfile}"
+ runDisabled="${run_disabled}"
+ clusterMode="${clustermode}"
+ resultsDirectory="${basedir}/../hbase-handler/src/test/results/negative/" className="TestHBaseNegativeCliDriver"
+ logFile="${project.build.directory}/testhbasenegativeclidrivergen.log"
+ logDirectory="${project.build.directory}/qfile-results/hbase-handler/negative"/>
+
+
+ <!-- Beeline -->
+ <if>
+ <equals arg1="${execute.beeline.tests}" arg2="true" />
+ <then>
+ <qtestgen hiveRootDirectory="${basedir}/../"
+ outputDirectory="${project.build.directory}/generated-test-sources/java/org/apache/hive/beeline/util/"
+ templatePath="${ql.test.template.dir}" template="TestBeeLineDriver.vm"
+ queryDirectory="${basedir}/../ql/src/test/queries/clientpositive/"
+ queryFile="${qfile}"
+ excludeQueryFile="${beeline.positive.exclude}"
+ queryFileRegex="${qfile_regex}"
+ clusterMode="${clustermode}"
+ runDisabled="${run_disabled}"
+ resultsDirectory="${basedir}/../ql/src/test/queries/clientpositive/" className="TestBeeLineDriver"
+ logFile="${project.build.directory}/testbeelinedrivergen.log"
+ logDirectory="${project.build.directory}/qfile-results/beelinepositive/"
+ hadoopVersion="${hadoopVersion}" />
+ </then>
+ </if>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: hive/branches/maven/maven-rollback.sh
URL: http://svn.apache.org/viewvc/hive/branches/maven/maven-rollback.sh?rev=1528930&r1=1528929&r2=1528930&view=diff
==============================================================================
--- hive/branches/maven/maven-rollback.sh (original)
+++ hive/branches/maven/maven-rollback.sh Thu Oct 3 16:47:06 2013
@@ -11,6 +11,8 @@ move_source() {
# Then reversing order of hcatalog pom moves
move_source itests/src/test/java/org/apache/hadoop/hive/serde2/TestSerdeWithFieldComments.java serde/src/test/org/apache/hadoop/hive/serde2/TestSerdeWithFieldComments.java
move_source itests/src/test/java/org/apache/hadoop/hive/serde2/dynamic_type/TestDynamicSerDe.java serde/src/test/org/apache/hadoop/hive/serde2/dynamic_type/TestDynamicSerDe.java
+move_source itests/src/test/java/org/apache/hive/service/cli/thrift/TestThriftHttpCLIService.java service/src/test/org/apache/hive/service/cli/thrift/TestThriftHttpCLIService.java
+move_source itests/src/test/java/org/apache/hive/service/auth/TestCustomAuthentication.java service/src/test/org/apache/hive/service/auth/TestCustomAuthentication.java
move_source itests/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerOnlyOnCommit.java metastore/src/test/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerOnlyOnCommit.java
move_source itests/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEndFunctionListener.java metastore/src/test/org/apache/hadoop/hive/metastore/TestMetaStoreEndFunctionListener.java
move_source itests/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java metastore/src/test/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java
Modified: hive/branches/maven/maven-rollforward.sh
URL: http://svn.apache.org/viewvc/hive/branches/maven/maven-rollforward.sh?rev=1528930&r1=1528929&r2=1528930&view=diff
==============================================================================
--- hive/branches/maven/maven-rollforward.sh (original)
+++ hive/branches/maven/maven-rollforward.sh Thu Oct 3 16:47:06 2013
@@ -7,6 +7,8 @@ move_source() {
}
move_source serde/src/test/org/apache/hadoop/hive/serde2/TestSerdeWithFieldComments.java itests/src/test/java/org/apache/hadoop/hive/serde2/TestSerdeWithFieldComments.java
move_source serde/src/test/org/apache/hadoop/hive/serde2/dynamic_type/TestDynamicSerDe.java itests/src/test/java/org/apache/hadoop/hive/serde2/dynamic_type/TestDynamicSerDe.java
+move_source service/src/test/org/apache/hive/service/cli/thrift/TestThriftHttpCLIService.java itests/src/test/java/org/apache/hive/service/cli/thrift/TestThriftHttpCLIService.java
+move_source service/src/test/org/apache/hive/service/auth/TestCustomAuthentication.java itests/src/test/java/org/apache/hive/service/auth/TestCustomAuthentication.java
move_source metastore/src/test/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerOnlyOnCommit.java itests/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerOnlyOnCommit.java
move_source metastore/src/test/org/apache/hadoop/hive/metastore/TestMetaStoreEndFunctionListener.java itests/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEndFunctionListener.java
move_source metastore/src/test/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java itests/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java
Modified: hive/branches/maven/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/maven/pom.xml?rev=1528930&r1=1528929&r2=1528930&view=diff
==============================================================================
--- hive/branches/maven/pom.xml (original)
+++ hive/branches/maven/pom.xml Thu Oct 3 16:47:06 2013
@@ -149,6 +149,39 @@
</repository>
</repositories>
+ <profiles>
+ <profile>
+ <id>hadoop-1</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <active.hadoop.version>${hadoop-20S.version}</active.hadoop.version>
+ </properties>
+ </profile>
+ <profile>
+ <id>hadoop-2</id>
+ <properties>
+ <active.hadoop.version>${hadoop-23.version}</active.hadoop.version>
+ </properties>
+ </profile>
+ </profiles>
+
+
+ <dependencies>
+ <!-- global dependencies -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ </dependencies>
+
<build>
<pluginManagement>
<plugins>
@@ -166,7 +199,19 @@
<target>1.6</target>
</configuration>
</plugin>
- <plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
+ <dependencies>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>20020829</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>2.4</version>
@@ -183,12 +228,17 @@
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<reuseForks>false</reuseForks>
- <systemProperties>
- <property>
- <name>test.build.resources</name>
- <value>${project.build.directory}/test-classes</value>
- </property>
- </systemProperties>
+ <failIfNoTests>false</failIfNoTests>
+ <systemProperties>
+ <property>
+ <name>test.build.resources</name>
+ <value>${project.build.directory}/test-classes</value>
+ </property>
+ <property>
+ <name>test.warehouse.dir</name>
+ <value>${project.build.directory}/test/data/warehouse/</value>
+ </property>
+ </systemProperties>
</configuration>
</plugin>
<plugin>
Modified: hive/branches/maven/service/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/maven/service/pom.xml?rev=1528930&r1=1528929&r2=1528930&view=diff
==============================================================================
--- hive/branches/maven/service/pom.xml (original)
+++ hive/branches/maven/service/pom.xml Thu Oct 3 16:47:06 2013
@@ -60,11 +60,6 @@
<artifactId>libthrift</artifactId>
<version>${libthrift.version}</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
<!-- intra-project -->
<dependency>
<groupId>org.apache.hive</groupId>
@@ -145,6 +140,17 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Modified: hive/branches/maven/shims/common-secure/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/maven/shims/common-secure/pom.xml?rev=1528930&r1=1528929&r2=1528930&view=diff
==============================================================================
--- hive/branches/maven/shims/common-secure/pom.xml (original)
+++ hive/branches/maven/shims/common-secure/pom.xml Thu Oct 3 16:47:06 2013
@@ -80,11 +80,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
</dependencies>
<build>
<sourceDirectory>${basedir}/../src/common-secure/java</sourceDirectory>
Modified: hive/branches/maven/shims/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/maven/shims/pom.xml?rev=1528930&r1=1528929&r2=1528930&view=diff
==============================================================================
--- hive/branches/maven/shims/pom.xml (original)
+++ hive/branches/maven/shims/pom.xml Thu Oct 3 16:47:06 2013
@@ -95,7 +95,7 @@
<configuration>
<artifacts>
<artifact>
- <file>hive-shims-${project.version}-uberjar.jar</file>
+ <file>target/hive-shims-${project.version}-uberjar.jar</file>
<type>jar</type>
</artifact>
</artifacts>