Author: navis
Date: Mon Jul 28 05:12:09 2014
New Revision: 1613873
URL: http://svn.apache.org/r1613873
Log:
HIVE-7496 : Exclude conf/hive-default.xml.template from version control and
include it dist profile (Navis reviewed by Szehon Ho)
Removed:
hive/trunk/conf/hive-default.xml.template
Modified:
hive/trunk/.gitignore
hive/trunk/common/pom.xml
Modified: hive/trunk/.gitignore
URL:
http://svn.apache.org/viewvc/hive/trunk/.gitignore?rev=1613873&r1=1613872&r2=1613873&view=diff
==============================================================================
--- hive/trunk/.gitignore (original)
+++ hive/trunk/.gitignore Mon Jul 28 05:12:09 2014
@@ -25,3 +25,4 @@ hcatalog/core/target
hcatalog/webhcat/java-client/target
hcatalog/storage-handlers/hbase/target
hcatalog/webhcat/svr/target
+conf/hive-default.xml.template
Modified: hive/trunk/common/pom.xml
URL:
http://svn.apache.org/viewvc/hive/trunk/common/pom.xml?rev=1613873&r1=1613872&r2=1613873&view=diff
==============================================================================
--- hive/trunk/common/pom.xml (original)
+++ hive/trunk/common/pom.xml Mon Jul 28 05:12:09 2014
@@ -108,6 +108,35 @@
</dependency>
</dependencies>
</profile>
+
+ <profile>
+ <id>dist</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <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>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<build>
@@ -149,21 +178,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>
