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/07 17:08:56 UTC
svn commit: r1539698 - in /hive/trunk: ./ beeline/ cli/ common/ contrib/
hbase-handler/ hcatalog/webhcat/svr/ hwi/ itests/qtest/ metastore/ ql/
serde/ shims/ shims/assembly/ shims/assembly/src/
shims/assembly/src/assemble/ shims/src/assembly/
Author: brock
Date: Thu Nov 7 16:08:55 2013
New Revision: 1539698
URL: http://svn.apache.org/r1539698
Log:
HIVE-5711 - Fix eclipse:eclipse maven goal (Carl Steinbach via Brock Noland)
Added:
hive/trunk/shims/assembly/
hive/trunk/shims/assembly/pom.xml
hive/trunk/shims/assembly/src/
hive/trunk/shims/assembly/src/assemble/
hive/trunk/shims/assembly/src/assemble/uberjar.xml
Removed:
hive/trunk/shims/src/assembly/uberjar.xml
Modified:
hive/trunk/beeline/pom.xml
hive/trunk/cli/pom.xml
hive/trunk/common/pom.xml
hive/trunk/contrib/pom.xml
hive/trunk/hbase-handler/pom.xml
hive/trunk/hcatalog/webhcat/svr/pom.xml
hive/trunk/hwi/pom.xml
hive/trunk/itests/qtest/pom.xml
hive/trunk/metastore/pom.xml
hive/trunk/pom.xml
hive/trunk/ql/pom.xml
hive/trunk/serde/pom.xml
hive/trunk/shims/pom.xml
Modified: hive/trunk/beeline/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/beeline/pom.xml?rev=1539698&r1=1539697&r2=1539698&view=diff
==============================================================================
--- hive/trunk/beeline/pom.xml (original)
+++ hive/trunk/beeline/pom.xml Thu Nov 7 16:08:55 2013
@@ -47,7 +47,6 @@
<groupId>org.apache.hive</groupId>
<artifactId>hive-shims</artifactId>
<version>${project.version}</version>
- <classifier>uberjar</classifier>
<scope>runtime</scope>
</dependency>
<!-- inter-project -->
Modified: hive/trunk/cli/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/cli/pom.xml?rev=1539698&r1=1539697&r2=1539698&view=diff
==============================================================================
--- hive/trunk/cli/pom.xml (original)
+++ hive/trunk/cli/pom.xml Thu Nov 7 16:08:55 2013
@@ -57,7 +57,6 @@
<groupId>org.apache.hive</groupId>
<artifactId>hive-shims</artifactId>
<version>${project.version}</version>
- <classifier>uberjar</classifier>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
Modified: hive/trunk/common/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/common/pom.xml?rev=1539698&r1=1539697&r2=1539698&view=diff
==============================================================================
--- hive/trunk/common/pom.xml (original)
+++ hive/trunk/common/pom.xml Thu Nov 7 16:08:55 2013
@@ -37,7 +37,6 @@
<groupId>org.apache.hive</groupId>
<artifactId>hive-shims</artifactId>
<version>${project.version}</version>
- <classifier>uberjar</classifier>
</dependency>
<!-- inter-project -->
<dependency>
Modified: hive/trunk/contrib/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/contrib/pom.xml?rev=1539698&r1=1539697&r2=1539698&view=diff
==============================================================================
--- hive/trunk/contrib/pom.xml (original)
+++ hive/trunk/contrib/pom.xml Thu Nov 7 16:08:55 2013
@@ -47,7 +47,6 @@
<groupId>org.apache.hive</groupId>
<artifactId>hive-shims</artifactId>
<version>${project.version}</version>
- <classifier>uberjar</classifier>
</dependency>
<!-- inter-project -->
<dependency>
Modified: hive/trunk/hbase-handler/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/hbase-handler/pom.xml?rev=1539698&r1=1539697&r2=1539698&view=diff
==============================================================================
--- hive/trunk/hbase-handler/pom.xml (original)
+++ hive/trunk/hbase-handler/pom.xml Thu Nov 7 16:08:55 2013
@@ -62,7 +62,6 @@
<groupId>org.apache.hive</groupId>
<artifactId>hive-shims</artifactId>
<version>${project.version}</version>
- <classifier>uberjar</classifier>
</dependency>
<!-- inter-project -->
<dependency>
Modified: hive/trunk/hcatalog/webhcat/svr/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/webhcat/svr/pom.xml?rev=1539698&r1=1539697&r2=1539698&view=diff
==============================================================================
--- hive/trunk/hcatalog/webhcat/svr/pom.xml (original)
+++ hive/trunk/hcatalog/webhcat/svr/pom.xml Thu Nov 7 16:08:55 2013
@@ -148,7 +148,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>${maven-javadoc-plugin.version}</version>
+ <version>${maven.javadoc.plugin.version}</version>
<executions>
<execution>
<id>resourcesdoc.xml</id>
Modified: hive/trunk/hwi/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/hwi/pom.xml?rev=1539698&r1=1539697&r2=1539698&view=diff
==============================================================================
--- hive/trunk/hwi/pom.xml (original)
+++ hive/trunk/hwi/pom.xml Thu Nov 7 16:08:55 2013
@@ -47,7 +47,6 @@
<groupId>org.apache.hive</groupId>
<artifactId>hive-shims</artifactId>
<version>${project.version}</version>
- <classifier>uberjar</classifier>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
Modified: hive/trunk/itests/qtest/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/itests/qtest/pom.xml?rev=1539698&r1=1539697&r2=1539698&view=diff
==============================================================================
--- hive/trunk/itests/qtest/pom.xml (original)
+++ hive/trunk/itests/qtest/pom.xml Thu Nov 7 16:08:55 2013
@@ -409,7 +409,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
+ <version>${build.helper.maven.plugin.version}</version>
<executions>
<execution>
<id>add-test-sources</id>
Modified: hive/trunk/metastore/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/pom.xml?rev=1539698&r1=1539697&r2=1539698&view=diff
==============================================================================
--- hive/trunk/metastore/pom.xml (original)
+++ hive/trunk/metastore/pom.xml Thu Nov 7 16:08:55 2013
@@ -42,7 +42,6 @@
<groupId>org.apache.hive</groupId>
<artifactId>hive-shims</artifactId>
<version>${project.version}</version>
- <classifier>uberjar</classifier>
</dependency>
<!-- inter-project -->
<dependency>
Modified: hive/trunk/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/pom.xml?rev=1539698&r1=1539697&r2=1539698&view=diff
==============================================================================
--- hive/trunk/pom.xml (original)
+++ hive/trunk/pom.xml Thu Nov 7 16:08:55 2013
@@ -49,14 +49,33 @@
<properties>
<hive.version.shortname>0.13.0</hive.version.shortname>
+ <!-- Build Properties -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.compiler.useIncrementalCompilation>false</maven.compiler.useIncrementalCompilation>
<maven.repo.local>${user.home}/.m2/repository</maven.repo.local>
<hive.path.to.root>.</hive.path.to.root>
+
+ <!-- Test Properties -->
<test.tmp.dir>${project.build.directory}/tmp</test.tmp.dir>
<test.warehouse.dir>${project.build.directory}/warehouse</test.warehouse.dir>
<test.warehouse.scheme>pfile://</test.warehouse.scheme>
- <!-- the versions of libraries that we use -->
+ <!-- Plugin and Plugin Dependency Versions -->
+ <ant.contrib.version>1.0b3</ant.contrib.version>
+ <build.helper.maven.plugin.version>1.8</build.helper.maven.plugin.version>
+ <datanucleus.maven.plugin.version>3.3.0-release</datanucleus.maven.plugin.version>
+ <maven.antrun.plugin.version>1.7</maven.antrun.plugin.version>
+ <maven.assembly.plugin.version>2.3</maven.assembly.plugin.version>
+ <maven.compiler.plugin.version>3.1</maven.compiler.plugin.version>
+ <maven.enforcer.plugin.version>1.3.1</maven.enforcer.plugin.version>
+ <maven.install.plugin.version>2.4</maven.install.plugin.version>
+ <maven.jar.plugin.version>2.2</maven.jar.plugin.version>
+ <maven.javadoc.plugin.version>2.4</maven.javadoc.plugin.version>
+ <maven.shade.plugin.version>2.1</maven.shade.plugin.version>
+ <maven.surefire.plugin.version>2.16</maven.surefire.plugin.version>
+ <maven.war.plugin.version>2.4</maven.war.plugin.version>
+
+ <!-- Library Dependency Versions -->
<activemq.version>5.5.0</activemq.version>
<ant.version>1.9.1</ant.version>
<antlr.version>3.4</antlr.version>
@@ -102,7 +121,6 @@
<libfb303.version>0.9.0</libfb303.version>
<libthrift.version>0.9.0</libthrift.version>
<log4j.version>1.2.16</log4j.version>
- <maven-javadoc-plugin.version>2.4</maven-javadoc-plugin.version>
<mockito-all.version>1.8.2</mockito-all.version>
<mina.version>2.0.0-M5</mina.version>
<pig.version>0.10.1</pig.version>
@@ -117,7 +135,6 @@
<velocity.version>1.5</velocity.version>
<xerces.version>2.9.1</xerces.version>
<zookeeper.version>3.4.3</zookeeper.version>
- <maven.compiler.useIncrementalCompilation>false</maven.compiler.useIncrementalCompilation>
</properties>
<repositories>
@@ -191,7 +208,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
+ <version>${maven.compiler.plugin.version}</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
@@ -200,12 +217,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
+ <version>${maven.antrun.plugin.version}</version>
<dependencies>
<dependency>
<groupId>ant-contrib</groupId>
<artifactId>ant-contrib</artifactId>
- <version>1.0b3</version>
+ <version>${ant.contrib.version}</version>
<exclusions>
<exclusion>
<groupId>ant</groupId>
@@ -218,47 +235,47 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
+ <version>${maven.assembly.plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.3.1</version>
+ <version>${maven.enforcer.plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <version>2.4</version>
+ <version>${maven.install.plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>2.1</version>
+ <version>${maven.shade.plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.16</version>
+ <version>${maven.surefire.plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
+ <version>${maven.jar.plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.4</version>
+ <version>${maven.war.plugin.version}</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
+ <version>${build.helper.maven.plugin.version}</version>
</plugin>
<plugin>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-maven-plugin</artifactId>
- <version>3.3.0-release</version>
+ <version>${datanucleus.maven.plugin.version}</version>
<dependencies>
<dependency>
<groupId>org.datanucleus</groupId>
Modified: hive/trunk/ql/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/pom.xml?rev=1539698&r1=1539697&r2=1539698&view=diff
==============================================================================
--- hive/trunk/ql/pom.xml (original)
+++ hive/trunk/ql/pom.xml Thu Nov 7 16:08:55 2013
@@ -364,7 +364,7 @@
<include>commons-lang:commons-lang</include>
<include>org.json:json</include>
<include>org.apache.avro:arvro-mapred</include>
- <include>org.apache.hive:hive-shims:*:uberjar</include>
+ <include>org.apache.hive:hive-shims</include>
<include>com.googlecode.javaewah:JavaEWAH</include>
<include>javolution:javolution</include>
<include>com.google.protobuf:protobuf-java</include>
Modified: hive/trunk/serde/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/serde/pom.xml?rev=1539698&r1=1539697&r2=1539698&view=diff
==============================================================================
--- hive/trunk/serde/pom.xml (original)
+++ hive/trunk/serde/pom.xml Thu Nov 7 16:08:55 2013
@@ -42,7 +42,6 @@
<groupId>org.apache.hive</groupId>
<artifactId>hive-shims</artifactId>
<version>${project.version}</version>
- <classifier>uberjar</classifier>
</dependency>
<!-- inter-project -->
<dependency>
Added: hive/trunk/shims/assembly/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/shims/assembly/pom.xml?rev=1539698&view=auto
==============================================================================
--- hive/trunk/shims/assembly/pom.xml (added)
+++ hive/trunk/shims/assembly/pom.xml Thu Nov 7 16:08:55 2013
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive</artifactId>
+ <version>0.13.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>hive-shims</artifactId>
+ <packaging>jar</packaging>
+ <name>Hive Shims</name>
+
+ <properties>
+ <hive.path.to.root>../..</hive.path.to.root>
+ </properties>
+
+ <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>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>src/assemble/uberjar.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>uberjar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added: hive/trunk/shims/assembly/src/assemble/uberjar.xml
URL: http://svn.apache.org/viewvc/hive/trunk/shims/assembly/src/assemble/uberjar.xml?rev=1539698&view=auto
==============================================================================
--- hive/trunk/shims/assembly/src/assemble/uberjar.xml (added)
+++ hive/trunk/shims/assembly/src/assemble/uberjar.xml Thu Nov 7 16:08:55 2013
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed 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>
+ <id>uberjar</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <unpack>true</unpack>
+ <scope>runtime</scope>
+ <useProjectArtifact>true</useProjectArtifact>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <excludes>
+ <exclude>org.slf4j:slf4j-api</exclude>
+ <exclude>org.slf4j:slf4j-log4j12</exclude>
+ </excludes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Modified: hive/trunk/shims/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/shims/pom.xml?rev=1539698&r1=1539697&r2=1539698&view=diff
==============================================================================
--- hive/trunk/shims/pom.xml (original)
+++ hive/trunk/shims/pom.xml Thu Nov 7 16:08:55 2013
@@ -23,9 +23,9 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>hive-shims</artifactId>
+ <artifactId>hive-shims-aggregator</artifactId>
<packaging>pom</packaging>
- <name>Hive Shims</name>
+ <name>Hive Shims Aggregator</name>
<properties>
<hive.path.to.root>..</hive.path.to.root>
@@ -37,76 +37,6 @@
<module>common-secure</module>
<module>0.20S</module>
<module>0.23</module>
+ <module>assembly</module>
</modules>
-
- <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>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/uberjar.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <phase>compile</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-artifacts</id>
- <phase>package</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>target/hive-shims-${project.version}-uberjar.jar</file>
- <type>jar</type>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>