Author: brock
Date: Thu Dec 19 16:24:18 2013
New Revision: 1552339
URL: http://svn.apache.org/r1552339
Log:
HIVE-5966 - Fix eclipse:eclipse post shim aggregation changes (Szehon Ho via
Brock Noland)
Added:
hive/trunk/shims/aggregator/
hive/trunk/shims/aggregator/pom.xml
Removed:
hive/trunk/shims/assembly/pom.xml
hive/trunk/shims/assembly/src/assemble/uberjar.xml
Modified:
hive/trunk/ql/pom.xml
hive/trunk/shims/pom.xml
Modified: hive/trunk/ql/pom.xml
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/pom.xml?rev=1552339&r1=1552338&r2=1552339&view=diff
==============================================================================
--- hive/trunk/ql/pom.xml (original)
+++ hive/trunk/ql/pom.xml Thu Dec 19 16:24:18 2013
@@ -356,7 +356,12 @@
<include>commons-lang:commons-lang</include>
<include>org.json:json</include>
<include>org.apache.avro:arvro-mapred</include>
- <include>org.apache.hive:hive-shims</include>
+ <include>org.apache.hive.shims:hive-shims-0.20</include>
+ <include>org.apache.hive.shims:hive-shims-0.20S</include>
+ <include>org.apache.hive.shims:hive-shims-0.23</include>
+ <include>org.apache.hive.shims:hive-shims-0.23</include>
+ <include>org.apache.hive.shims:hive-shims-common</include>
+
<include>org.apache.hive.shims:hive-shims-common-secure</include>
<include>com.googlecode.javaewah:JavaEWAH</include>
<include>javolution:javolution</include>
<include>com.google.protobuf:protobuf-java</include>
Added: hive/trunk/shims/aggregator/pom.xml
URL:
http://svn.apache.org/viewvc/hive/trunk/shims/aggregator/pom.xml?rev=1552339&view=auto
==============================================================================
--- hive/trunk/shims/aggregator/pom.xml (added)
+++ hive/trunk/shims/aggregator/pom.xml Thu Dec 19 16:24:18 2013
@@ -0,0 +1,67 @@
+<?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>
+ <!-- dependencies are always listed in sorted order by groupId, artifectId
-->
+ <dependency>
+ <groupId>org.apache.hive.shims</groupId>
+ <artifactId>hive-shims-common</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hive.shims</groupId>
+ <artifactId>hive-shims-0.20</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hive.shims</groupId>
+ <artifactId>hive-shims-common-secure</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hive.shims</groupId>
+ <artifactId>hive-shims-0.20S</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hive.shims</groupId>
+ <artifactId>hive-shims-0.23</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+</project>
Modified: hive/trunk/shims/pom.xml
URL:
http://svn.apache.org/viewvc/hive/trunk/shims/pom.xml?rev=1552339&r1=1552338&r2=1552339&view=diff
==============================================================================
--- hive/trunk/shims/pom.xml (original)
+++ hive/trunk/shims/pom.xml Thu Dec 19 16:24:18 2013
@@ -37,6 +37,6 @@
<module>common-secure</module>
<module>0.20S</module>
<module>0.23</module>
- <module>assembly</module>
+ <module>aggregator</module>
</modules>
</project>
