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/11/04 16:58:48 UTC

svn commit: r1538654 - in /hive/trunk/packaging: pom.xml src/ src/main/ src/main/assembly/ src/main/assembly/bin.xml src/main/assembly/src.xml

Author: brock
Date: Mon Nov  4 15:58:48 2013
New Revision: 1538654

URL: http://svn.apache.org/r1538654
Log:
HIVE-5611: Add assembly (i.e.) tar creation to pom (Szehon Ho via Brock Noland)

Added:
    hive/trunk/packaging/src/
    hive/trunk/packaging/src/main/
    hive/trunk/packaging/src/main/assembly/
    hive/trunk/packaging/src/main/assembly/bin.xml
    hive/trunk/packaging/src/main/assembly/src.xml
Modified:
    hive/trunk/packaging/pom.xml

Modified: hive/trunk/packaging/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/packaging/pom.xml?rev=1538654&r1=1538653&r2=1538654&view=diff
==============================================================================
--- hive/trunk/packaging/pom.xml (original)
+++ hive/trunk/packaging/pom.xml Mon Nov  4 15:58:48 2013
@@ -31,7 +31,124 @@
     <hive.path.to.root>..</hive.path.to.root>
   </properties>
 
-  <modules>
-  </modules>
+  <profiles>
+    <profile>
+      <id>dist</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>assemble</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+                <configuration>
+                  <finalName>hive-${project.version}</finalName>
+                  <descriptors>
+                    <descriptor>src/main/assembly/bin.xml</descriptor>
+                    <descriptor>src/main/assembly/src.xml</descriptor>
+                  </descriptors>
+                  <tarLongFileMode>gnu</tarLongFileMode>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.hive.shims</groupId>
+      <artifactId>hive-shims-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hive.shims</groupId>
+      <artifactId>hive-shims-0.20</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hive.shims</groupId>
+      <artifactId>hive-shims-common-secure</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hive.shims</groupId>
+      <artifactId>hive-shims-0.20S</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hive.shims</groupId>
+      <artifactId>hive-shims-0.23</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hive</groupId>
+      <artifactId>hive-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hive</groupId>
+      <artifactId>hive-serde</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hive</groupId>
+      <artifactId>hive-metastore</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hive</groupId>
+      <artifactId>hive-testutils</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hive</groupId>
+      <artifactId>hive-exec</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hive</groupId>
+      <artifactId>hive-service</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hive</groupId>
+      <artifactId>hive-jdbc</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hive</groupId>
+      <artifactId>hive-beeline</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hive</groupId>
+      <artifactId>hive-cli</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hive</groupId>
+      <artifactId>hive-contrib</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hive</groupId>
+      <artifactId>hive-hbase-handler</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hive</groupId>
+      <artifactId>hive-hwi</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+  </dependencies>
 
 </project>

Added: hive/trunk/packaging/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/hive/trunk/packaging/src/main/assembly/bin.xml?rev=1538654&view=auto
==============================================================================
--- hive/trunk/packaging/src/main/assembly/bin.xml (added)
+++ hive/trunk/packaging/src/main/assembly/bin.xml Mon Nov  4 15:58:48 2013
@@ -0,0 +1,221 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<assembly
+  xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+
+  <id>bin</id>
+
+  <formats>
+    <format>dir</format>
+    <format>tar.gz</format>
+  </formats>
+
+  <dependencySets>
+    <dependencySet>
+    <outputDirectory>lib</outputDirectory>
+    <unpack>false</unpack>
+    <useProjectArtifact>false</useProjectArtifact>
+    </dependencySet>
+  </dependencySets>
+
+  <fileSets>
+    <fileSet>
+      <directory>${project.parent.basedir}</directory>
+      <excludes>
+        <exclude>**/target/**</exclude>
+        <exclude>**/.classpath</exclude>
+        <exclude>**/.project</exclude>
+        <exclude>**/.settings/**</exclude>
+        <exclude>lib/**</exclude>
+      </excludes>
+
+      <includes>
+        <include>DEVNOTES</include>
+        <include>README.txt</include>
+        <include>LICENSE</include>
+        <include>NOTICE</include>
+        <include>CHANGELOG</include>
+        <include>RELEASE_NOTES.txt</include>
+      </includes>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+
+    <fileSet>
+      <directory>${project.parent.basedir}/data/files</directory>
+      <includes>
+        <include>/*.*</include>
+      </includes>
+      <outputDirectory>examples/files</outputDirectory>
+    </fileSet>
+
+    <fileSet>
+      <directory>${project.parent.basedir}/ql/src/test/queries/positive</directory>
+      <includes>
+        <include>*.q</include>
+      </includes>
+      <outputDirectory>examples/queries</outputDirectory>
+    </fileSet>
+
+    <fileSet>
+      <fileMode>755</fileMode>
+      <directory>${project.parent.basedir}/bin</directory>
+      <includes>
+        <include>hive</include>
+        <include>metatool</include>
+        <include>schematool</include>
+        <include>beeline</include>
+        <include>hiveserver2</include>
+        <include>hive-config.sh</include>
+        <include>ext/**/*</include>
+      </includes>
+      <outputDirectory>bin</outputDirectory>
+    </fileSet>
+
+    <fileSet>
+      <directory>${project.parent.basedir}/metastore/scripts/upgrade</directory>
+      <includes>
+        <include>**/*</include>
+      </includes>
+      <outputDirectory>scripts/metastore/upgrade</outputDirectory>
+    </fileSet>
+
+    <fileSet>
+      <directory>${project.parent.basedir}/conf</directory>
+      <includes>
+        <include>*.template</include>
+      </includes>
+      <outputDirectory>conf</outputDirectory>
+    </fileSet>
+
+    <fileSet>
+      <directory>${project.parent.basedir}/service/lib/php</directory>
+      <includes>
+        <include>**/*</include>
+      </includes>
+      <outputDirectory>lib/php</outputDirectory>
+    </fileSet>
+
+    <fileSet>
+      <directory>${project.parent.basedir}/serde/src/gen/thrift/gen-php</directory>
+      <includes>
+        <include>**/*</include>
+      </includes>
+      <outputDirectory>lib/php/packages/serde</outputDirectory>
+    </fileSet>
+
+    <fileSet>
+      <directory>${project.parent.basedir}/metastore/src/gen/thrift/gen-php</directory>
+      <includes>
+        <include>**/*</include>
+      </includes>
+      <outputDirectory>lib/php/packages/hive_metastore</outputDirectory>
+    </fileSet>
+
+    <fileSet>
+      <directory>${project.parent.basedir}/service/src/gen/thrift/gen-php</directory>
+      <includes>
+        <include>**/*</include>
+      </includes>
+      <outputDirectory>lib/php/packages/hive_service</outputDirectory>
+    </fileSet>
+
+    <fileSet>
+      <directory>${project.parent.basedir}/ql/src/gen/thrift/gen-php</directory>
+      <includes>
+        <include>**/*</include>
+      </includes>
+      <outputDirectory>lib/php/packages/queryplan</outputDirectory>
+    </fileSet>
+
+    <fileSet>
+      <directory>${project.parent.basedir}/service/lib/py</directory>
+      <fileMode>755</fileMode>
+      <includes>
+        <include>**/*</include>
+      </includes>
+      <outputDirectory>lib/py</outputDirectory>
+    </fileSet>
+
+    <fileSet>
+      <directory>${project.parent.basedir}/serde/src/gen/thrift/gen-py/org_apache_hadoop_hive_serde</directory>
+      <fileMode>755</fileMode>
+      <includes>
+        <include>**/*</include>
+      </includes>
+      <outputDirectory>lib/py/hive_serde</outputDirectory>
+    </fileSet>
+
+    <fileSet>
+      <directory>${project.parent.basedir}/metastore/src/gen/thrift/gen-py/hive_metastore</directory>
+      <fileMode>755</fileMode>
+       <includes>
+        <include>**/*</include>
+      </includes>
+      <outputDirectory>lib/py/hive_metastore</outputDirectory>
+    </fileSet>
+
+    <fileSet>
+      <directory>${project.parent.basedir}/service/src/gen/thrift/gen-py/TCLIService</directory>
+      <fileMode>755</fileMode>
+      <includes>
+        <include>**/*</include>
+      </includes>
+      <outputDirectory>lib/py/TCLIService</outputDirectory>
+    </fileSet>
+
+    <fileSet>
+      <directory>${project.parent.basedir}/service/src/gen/thrift/gen-py/hive_service</directory>
+      <fileMode>755</fileMode>
+      <includes>
+        <include>**/*</include>
+      </includes>
+      <outputDirectory>lib/py/hive_service</outputDirectory>
+    </fileSet>
+
+    <fileSet>
+      <directory>${project.parent.basedir}/ql/src/gen/thrift/gen-py/queryplan</directory>
+      <fileMode>755</fileMode>
+      <includes>
+        <include>**/*</include>
+      </includes>
+      <outputDirectory>lib/py/queryplan</outputDirectory>
+    </fileSet>
+
+
+  </fileSets>
+
+  <files>
+    <file>
+      <source>${project.parent.basedir}/common/src/main/resources/hive-log4j.properties</source>
+      <outputDirectory>conf</outputDirectory>
+      <destName>hive-log4j.properties.template</destName>
+    </file>
+
+    <file>
+      <source>${project.parent.basedir}/ql/src/main/resources/hive-exec-log4j.properties</source>
+      <outputDirectory>conf</outputDirectory>
+      <destName>hive-exec-log4j.properties.template</destName>
+    </file>
+  </files>
+
+</assembly>
+

Added: hive/trunk/packaging/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/hive/trunk/packaging/src/main/assembly/src.xml?rev=1538654&view=auto
==============================================================================
--- hive/trunk/packaging/src/main/assembly/src.xml (added)
+++ hive/trunk/packaging/src/main/assembly/src.xml Mon Nov  4 15:58:48 2013
@@ -0,0 +1,76 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<assembly
+  xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+
+  <id>src</id>
+
+  <formats>
+    <format>tar.gz</format>
+  </formats>
+
+  <fileSets>
+    <fileSet>
+      <directory>${project.parent.basedir}</directory>
+
+      <excludes>
+        <exclude>**/target/**</exclude>
+        <exclude>**/.classpath</exclude>
+        <exclude>**/.project</exclude>
+        <exclude>**/.settings/**</exclude>
+      </excludes>
+
+      <includes>
+        <include>DEVNOTES</include>
+        <include>README.txt</include>
+        <include>LICENSE</include>
+        <include>NOTICE</include>
+        <include>CHANGELOG</include>
+        <include>RELEASE_NOTES.txt</include>
+        <include>ant/**/*</include>
+        <include>beeline/**/*</include>
+        <include>bin/**/*</include>
+        <include>checkstyle/**/*</include>
+        <include>cli/**/*</include>
+        <include>common/**/*</include>
+        <include>conf/**/*</include>
+        <include>contrib/**/*</include>
+        <include>data/**/*</include>
+        <include>docs/**/*</include>
+        <include>hbase-handler/**/*</include>
+        <include>hcatalog/**/*</include>
+        <include>hwi/**/*</include>
+        <include>itests/**/*</include>
+        <include>jdbc/**/*</include>
+        <include>contrib/**/*</include>
+        <include>metastore/**/*</include>
+        <include>odbc/**/*</include>
+        <include>ql/**/*</include>
+        <include>serde/**/*</include>
+        <include>service/**/*</include>
+        <include>shims/**/*</include>
+        <include>testutils/**/*</include>
+      </includes>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+  </fileSets>
+</assembly>