You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by th...@apache.org on 2014/02/18 22:07:37 UTC
svn commit: r1569527 [1/5] - in /hive/trunk: common/
common/src/java/org/apache/hadoop/hive/ant/
common/src/java/org/apache/hadoop/hive/conf/
common/src/java/org/apache/hive/common/util/
common/src/test/org/apache/hadoop/hive/conf/ conf/ itests/hive-un...
Author: thejas
Date: Tue Feb 18 21:07:36 2014
New Revision: 1569527
URL: http://svn.apache.org/r1569527
Log:
Reverting HIVE-6037
Removed:
hive/trunk/common/src/java/org/apache/hadoop/hive/ant/
hive/trunk/common/src/java/org/apache/hadoop/hive/conf/Validator.java
hive/trunk/common/src/java/org/apache/hive/common/util/SystemVariables.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowConfDesc.java
hive/trunk/ql/src/test/queries/clientpositive/show_conf.q
hive/trunk/ql/src/test/results/clientpositive/show_conf.q.out
Modified:
hive/trunk/common/pom.xml
hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
hive/trunk/common/src/test/org/apache/hadoop/hive/conf/TestHiveConf.java
hive/trunk/common/src/test/org/apache/hadoop/hive/conf/TestHiveConfRestrictList.java
hive/trunk/common/src/test/org/apache/hadoop/hive/conf/TestHiveLogging.java
hive/trunk/conf/hive-default.xml.template
hive/trunk/itests/hive-unit/src/test/java/org/apache/hadoop/hive/jdbc/TestJdbcDriver.java
hive/trunk/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcDriver2.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcFile.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveUtils.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveLexer.g
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzerFactory.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/VariableSubstitution.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/DDLWork.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/HiveOperation.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/processors/SetProcessor.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/HiveOperationType.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/Operation2Privilege.java
Modified: hive/trunk/common/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/common/pom.xml?rev=1569527&r1=1569526&r2=1569527&view=diff
==============================================================================
--- hive/trunk/common/pom.xml (original)
+++ hive/trunk/common/pom.xml Tue Feb 18 21:07:36 2014
@@ -65,11 +65,6 @@
<artifactId>commons-compress</artifactId>
<version>${commons-compress.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <version>${ant.version}</version>
- </dependency>
<!-- test inter-project -->
<dependency>
<groupId>junit</groupId>
@@ -111,12 +106,6 @@
</profiles>
<build>
- <resources>
- <resource>
- <directory>../conf/</directory>
- <includes><include>hive-default.xml.template</include></includes>
- </resource>
- </resources>
<sourceDirectory>${basedir}/src/java</sourceDirectory>
<testSourceDirectory>${basedir}/src/test</testSourceDirectory>
<scriptSourceDirectory>${basedir}/src/scripts</scriptSourceDirectory>
@@ -147,21 +136,6 @@
<goal>run</goal>
</goals>
</execution>
- <execution>
- <id>generate-template</id>
- <phase>package</phase>
- <configuration>
- <target>
- <property name="compile.classpath" refid="maven.runtime.classpath"/>
- <taskdef name="templategen" classname="org.apache.hadoop.hive.ant.GenHiveTemplate"
- classpath="${compile.classpath}"/>
- <templategen templateFile="${basedir}/../conf/hive-default.xml.template"/>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
</executions>
</plugin>
<plugin>