Author: hashutosh
Date: Wed Dec 11 16:29:44 2013
New Revision: 1550184
URL: http://svn.apache.org/r1550184
Log:
HIVE-5897 : Fix hadoop2 execution environment Milestone 2 (Vikram Dixit via
Brock Noland)
Modified:
hive/trunk/beeline/pom.xml
hive/trunk/hcatalog/core/pom.xml
hive/trunk/hcatalog/hcatalog-pig-adapter/pom.xml
hive/trunk/hcatalog/server-extensions/pom.xml
hive/trunk/hcatalog/storage-handlers/hbase/pom.xml
hive/trunk/hcatalog/webhcat/java-client/pom.xml
hive/trunk/hcatalog/webhcat/svr/pom.xml
hive/trunk/itests/hcatalog-unit/pom.xml
hive/trunk/itests/hive-unit/pom.xml
hive/trunk/itests/qtest/pom.xml
hive/trunk/packaging/src/main/assembly/bin.xml
hive/trunk/pom.xml
Modified: hive/trunk/beeline/pom.xml
URL:
http://svn.apache.org/viewvc/hive/trunk/beeline/pom.xml?rev=1550184&r1=1550183&r2=1550184&view=diff
==============================================================================
--- hive/trunk/beeline/pom.xml (original)
+++ hive/trunk/beeline/pom.xml Wed Dec 11 16:29:44 2013
@@ -118,7 +118,7 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
<version>${hadoop-20S.version}</version>
- <optional>true</optional>
+ <optional>true</optional>
</dependency>
</dependencies>
</profile>
@@ -131,6 +131,13 @@
<version>${hadoop-23.version}</version>
<optional>true</optional>
</dependency>
+ <!-- test inter-project -->
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-core</artifactId>
+ <version>${hadoop-23.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</profile>
</profiles>
Modified: hive/trunk/hcatalog/core/pom.xml
URL:
http://svn.apache.org/viewvc/hive/trunk/hcatalog/core/pom.xml?rev=1550184&r1=1550183&r2=1550184&view=diff
==============================================================================
--- hive/trunk/hcatalog/core/pom.xml (original)
+++ hive/trunk/hcatalog/core/pom.xml Wed Dec 11 16:29:44 2013
@@ -76,9 +76,6 @@
<profiles>
<profile>
<id>hadoop-1</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -130,6 +127,19 @@
</dependency>
<!-- test -->
<dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-servlet</artifactId>
+ <version>${jersey.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <version>${hadoop-23.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
<version>${hadoop-23.version}</version>
@@ -144,12 +154,31 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-hs</artifactId>
+ <version>${hadoop-23.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
+ <version>${hadoop-23.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-jobclient</artifactId>
<version>${hadoop-23.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-yarn-server-tests</artifactId>
+ <version>${hadoop-23.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.pig</groupId>
<artifactId>pig</artifactId>
<version>${pig.version}</version>
Modified: hive/trunk/hcatalog/hcatalog-pig-adapter/pom.xml
URL:
http://svn.apache.org/viewvc/hive/trunk/hcatalog/hcatalog-pig-adapter/pom.xml?rev=1550184&r1=1550183&r2=1550184&view=diff
==============================================================================
--- hive/trunk/hcatalog/hcatalog-pig-adapter/pom.xml (original)
+++ hive/trunk/hcatalog/hcatalog-pig-adapter/pom.xml Wed Dec 11 16:29:44 2013
@@ -59,9 +59,6 @@
<profiles>
<profile>
<id>hadoop-1</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
Modified: hive/trunk/hcatalog/server-extensions/pom.xml
URL:
http://svn.apache.org/viewvc/hive/trunk/hcatalog/server-extensions/pom.xml?rev=1550184&r1=1550183&r2=1550184&view=diff
==============================================================================
--- hive/trunk/hcatalog/server-extensions/pom.xml (original)
+++ hive/trunk/hcatalog/server-extensions/pom.xml Wed Dec 11 16:29:44 2013
@@ -100,9 +100,6 @@
<profiles>
<profile>
<id>hadoop-1</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
Modified: hive/trunk/hcatalog/storage-handlers/hbase/pom.xml
URL:
http://svn.apache.org/viewvc/hive/trunk/hcatalog/storage-handlers/hbase/pom.xml?rev=1550184&r1=1550183&r2=1550184&view=diff
==============================================================================
--- hive/trunk/hcatalog/storage-handlers/hbase/pom.xml (original)
+++ hive/trunk/hcatalog/storage-handlers/hbase/pom.xml Wed Dec 11 16:29:44 2013
@@ -91,9 +91,6 @@
<profiles>
<profile>
<id>hadoop-1</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -170,6 +167,12 @@
<version>${hadoop-23.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <version>${hadoop-23.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-client</artifactId>
<version>${hbase.hadoop2.version}</version>
@@ -197,28 +200,41 @@
<!-- test -->
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
+ <artifactId>hadoop-common</artifactId>
<version>${hadoop-23.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-hs</artifactId>
+ <version>${hadoop-23.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
<version>${hadoop-23.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-common</artifactId>
- <version>${hbase.hadoop2.version}</version>
- <type>test-jar</type>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
+ <version>${hadoop-23.version}</version>
+ <classifier>tests</classifier>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-yarn-server-tests</artifactId>
+ <version>${hadoop-23.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
- <artifactId>hbase-server</artifactId>
+ <artifactId>hbase-common</artifactId>
<version>${hbase.hadoop2.version}</version>
<type>test-jar</type>
<scope>test</scope>
@@ -237,6 +253,13 @@
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-server</artifactId>
+ <version>${hbase.hadoop2.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</profile>
</profiles>
Modified: hive/trunk/hcatalog/webhcat/java-client/pom.xml
URL:
http://svn.apache.org/viewvc/hive/trunk/hcatalog/webhcat/java-client/pom.xml?rev=1550184&r1=1550183&r2=1550184&view=diff
==============================================================================
--- hive/trunk/hcatalog/webhcat/java-client/pom.xml (original)
+++ hive/trunk/hcatalog/webhcat/java-client/pom.xml Wed Dec 11 16:29:44 2013
@@ -58,9 +58,6 @@
<profiles>
<profile>
<id>hadoop-1</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
Modified: hive/trunk/hcatalog/webhcat/svr/pom.xml
URL:
http://svn.apache.org/viewvc/hive/trunk/hcatalog/webhcat/svr/pom.xml?rev=1550184&r1=1550183&r2=1550184&view=diff
==============================================================================
--- hive/trunk/hcatalog/webhcat/svr/pom.xml (original)
+++ hive/trunk/hcatalog/webhcat/svr/pom.xml Wed Dec 11 16:29:44 2013
@@ -105,9 +105,6 @@
<profiles>
<profile>
<id>hadoop-1</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
Modified: hive/trunk/itests/hcatalog-unit/pom.xml
URL:
http://svn.apache.org/viewvc/hive/trunk/itests/hcatalog-unit/pom.xml?rev=1550184&r1=1550183&r2=1550184&view=diff
==============================================================================
--- hive/trunk/itests/hcatalog-unit/pom.xml (original)
+++ hive/trunk/itests/hcatalog-unit/pom.xml Wed Dec 11 16:29:44 2013
@@ -218,8 +218,9 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client-core</artifactId>
+ <artifactId>hadoop-common</artifactId>
<version>${hadoop-23.version}</version>
+ <classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
@@ -237,12 +238,36 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-core</artifactId>
+ <version>${hadoop-23.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-jobclient</artifactId>
<version>${hadoop-23.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-yarn-server-tests</artifactId>
+ <version>${hadoop-23.version}</version>
+ <scope>test</scope>
+ <classifier>tests</classifier>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-servlet</artifactId>
+ <version>${jersey.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-hs</artifactId>
+ <version>${hadoop-23.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-client</artifactId>
<version>${hbase.hadoop2.version}</version>
Modified: hive/trunk/itests/hive-unit/pom.xml
URL:
http://svn.apache.org/viewvc/hive/trunk/itests/hive-unit/pom.xml?rev=1550184&r1=1550183&r2=1550184&view=diff
==============================================================================
--- hive/trunk/itests/hive-unit/pom.xml (original)
+++ hive/trunk/itests/hive-unit/pom.xml Wed Dec 11 16:29:44 2013
@@ -127,9 +127,6 @@
<profiles>
<profile>
<id>hadoop-1</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
Modified: hive/trunk/itests/qtest/pom.xml
URL:
http://svn.apache.org/viewvc/hive/trunk/itests/qtest/pom.xml?rev=1550184&r1=1550183&r2=1550184&view=diff
==============================================================================
--- hive/trunk/itests/qtest/pom.xml (original)
+++ hive/trunk/itests/qtest/pom.xml Wed Dec 11 16:29:44 2013
@@ -210,6 +210,12 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-archives</artifactId>
+ <version>${hadoop-23.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>${hadoop-23.version}</version>
<scope>test</scope>
@@ -309,12 +315,6 @@
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-server</artifactId>
<version>${hbase.hadoop2.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-server</artifactId>
- <version>${hbase.hadoop2.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
Modified: hive/trunk/packaging/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/hive/trunk/packaging/src/main/assembly/bin.xml?rev=1550184&r1=1550183&r2=1550184&view=diff
==============================================================================
--- hive/trunk/packaging/src/main/assembly/bin.xml (original)
+++ hive/trunk/packaging/src/main/assembly/bin.xml Wed Dec 11 16:29:44 2013
@@ -39,8 +39,6 @@
<useStrictFiltering>true</useStrictFiltering>
<useTransitiveFiltering>true</useTransitiveFiltering>
<excludes>
- <exclude>org.apache.hadoop:*</exclude>
- <exclude>org.apache.hbase:*</exclude>
<exclude>org.apache.hive.hcatalog:*</exclude>
</excludes>
</dependencySet>
Modified: hive/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/hive/trunk/pom.xml?rev=1550184&r1=1550183&r2=1550184&view=diff
==============================================================================
--- hive/trunk/pom.xml (original)
+++ hive/trunk/pom.xml Wed Dec 11 16:29:44 2013
@@ -837,9 +837,6 @@
<!-- hadoop profiles in the root pom are only used for dependency
management -->
<profile>
<id>hadoop-1</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<dependencyManagement>
<dependencies>
<dependency>
