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:04:59 UTC
svn commit: r1539695 - in /hive/trunk: ./ beeline/
hcatalog/storage-handlers/hbase/ hcatalog/webhcat/svr/ hwi/ jdbc/
metastore/ ql/
ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/ serde/
service/
Author: brock
Date: Thu Nov 7 16:04:58 2013
New Revision: 1539695
URL: http://svn.apache.org/r1539695
Log:
HIVE-5713 - Verify versions of libraries post maven merge (Brock Noland reviewed by Gunther Hagleitner)
Modified:
hive/trunk/beeline/pom.xml
hive/trunk/hcatalog/storage-handlers/hbase/pom.xml
hive/trunk/hcatalog/webhcat/svr/pom.xml
hive/trunk/hwi/pom.xml
hive/trunk/jdbc/pom.xml
hive/trunk/metastore/pom.xml
hive/trunk/pom.xml
hive/trunk/ql/pom.xml
hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorTypeCasts.java
hive/trunk/serde/pom.xml
hive/trunk/service/pom.xml
Modified: hive/trunk/beeline/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/beeline/pom.xml?rev=1539695&r1=1539694&r2=1539695&view=diff
==============================================================================
--- hive/trunk/beeline/pom.xml (original)
+++ hive/trunk/beeline/pom.xml Thu Nov 7 16:04:58 2013
@@ -52,6 +52,11 @@
</dependency>
<!-- inter-project -->
<dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>${commons-cli.version}</version>
+ </dependency>
+ <dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>${commons-lang.version}</version>
Modified: hive/trunk/hcatalog/storage-handlers/hbase/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/storage-handlers/hbase/pom.xml?rev=1539695&r1=1539694&r2=1539695&view=diff
==============================================================================
--- hive/trunk/hcatalog/storage-handlers/hbase/pom.xml (original)
+++ hive/trunk/hcatalog/storage-handlers/hbase/pom.xml Thu Nov 7 16:04:58 2013
@@ -84,6 +84,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase</artifactId>
<version>${hbase.version}</version>
Modified: hive/trunk/hcatalog/webhcat/svr/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/webhcat/svr/pom.xml?rev=1539695&r1=1539694&r2=1539695&view=diff
==============================================================================
--- hive/trunk/hcatalog/webhcat/svr/pom.xml (original)
+++ hive/trunk/hcatalog/webhcat/svr/pom.xml Thu Nov 7 16:04:58 2013
@@ -92,8 +92,16 @@
<artifactId>jul-to-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
+ <!-- test inter-project -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
+
<profiles>
<profile>
<id>hadoop-1</id>
Modified: hive/trunk/hwi/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/hwi/pom.xml?rev=1539695&r1=1539694&r2=1539695&view=diff
==============================================================================
--- hive/trunk/hwi/pom.xml (original)
+++ hive/trunk/hwi/pom.xml Thu Nov 7 16:04:58 2013
@@ -65,6 +65,11 @@
<artifactId>jetty</artifactId>
<version>${jetty.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
<!-- test intra-project -->
<dependency>
<groupId>org.apache.hive</groupId>
Modified: hive/trunk/jdbc/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/jdbc/pom.xml?rev=1539695&r1=1539694&r2=1539695&view=diff
==============================================================================
--- hive/trunk/jdbc/pom.xml (original)
+++ hive/trunk/jdbc/pom.xml Thu Nov 7 16:04:58 2013
@@ -65,6 +65,16 @@
<version>${commons-logging.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>${httpcomponents.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>${httpcomponents.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
<version>${libthrift.version}</version>
Modified: hive/trunk/metastore/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/pom.xml?rev=1539695&r1=1539694&r2=1539695&view=diff
==============================================================================
--- hive/trunk/metastore/pom.xml (original)
+++ hive/trunk/metastore/pom.xml Thu Nov 7 16:04:58 2013
@@ -46,6 +46,11 @@
</dependency>
<!-- inter-project -->
<dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ </dependency>
+ <dependency>
<groupId>com.jolbox</groupId>
<artifactId>bonecp</artifactId>
<version>${bonecp.version}</version>
Modified: hive/trunk/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/pom.xml?rev=1539695&r1=1539694&r2=1539695&view=diff
==============================================================================
--- hive/trunk/pom.xml (original)
+++ hive/trunk/pom.xml Thu Nov 7 16:04:58 2013
@@ -76,15 +76,16 @@
<commons-httpclient.version>3.0.1</commons-httpclient.version>
<commons-io.version>2.4</commons-io.version>
<commons-lang.version>2.4</commons-lang.version>
- <commons-logging.version>1.0.4</commons-logging.version>
+ <commons-logging.version>1.1.3</commons-logging.version>
<commons-pool.version>1.5.4</commons-pool.version>
<derby.version>10.4.2.0</derby.version>
<guava.version>11.0.2</guava.version>
<groovy.version>2.1.6</groovy.version>
<hadoop-20.version>0.20.2</hadoop-20.version>
- <hadoop-20S.version>1.1.2</hadoop-20S.version>
- <hadoop-23.version>2.0.5-alpha</hadoop-23.version>
+ <hadoop-20S.version>1.2.1</hadoop-20S.version>
+ <hadoop-23.version>2.2.0</hadoop-23.version>
<hbase.version>0.94.6.1</hbase.version>
+ <httpcomponents.version>4.1.3</httpcomponents.version>
<jackson.version>1.9.2</jackson.version>
<javaewah.version>0.3.2</javaewah.version>
<javolution.version>5.5.1</javolution.version>
@@ -107,6 +108,7 @@
<pig.version>0.10.1</pig.version>
<protobuf.version>2.5.0</protobuf.version>
<rat.version>0.8</rat.version>
+ <stax.version>1.0.1</stax.version>
<slf4j.version>1.6.1</slf4j.version>
<ST4.version>4.0.4</ST4.version>
<tempus-fugit.version>1.1</tempus-fugit.version>
Modified: hive/trunk/ql/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/pom.xml?rev=1539695&r1=1539694&r2=1539695&view=diff
==============================================================================
--- hive/trunk/ql/pom.xml (original)
+++ hive/trunk/ql/pom.xml Thu Nov 7 16:04:58 2013
@@ -33,6 +33,17 @@
<dependencies>
<!-- intra-project -->
+ <!-- used for vector code-gen -->
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-ant</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-metastore</artifactId>
@@ -40,8 +51,14 @@
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
- <artifactId>hive-ant</artifactId>
+ <artifactId>hive-serde</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-shims</artifactId>
<version>${project.version}</version>
+ <classifier>uberjar</classifier>
</dependency>
<!-- inter-project -->
<dependency>
@@ -55,14 +72,9 @@
<version>${commons-codec.version}</version>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>${commons-collections.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- <version>${commons-configuration.version}</version>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>${commons-httpclient.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -70,6 +82,11 @@
<version>${commons-io.version}</version>
</dependency>
<dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>${commons-lang.version}</version>
+ </dependency>
+ <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>${commons-logging.version}</version>
@@ -96,6 +113,11 @@
</dependency>
<dependency>
<groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ <version>${avro.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.avro</groupId>
<artifactId>avro-mapred</artifactId>
<version>${avro.version}</version>
</dependency>
@@ -105,6 +127,11 @@
<version>${ant.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ <version>${commons-compress.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libfb303</artifactId>
<version>${libfb303.version}</version>
@@ -125,6 +152,16 @@
<version>${groovy.version}</version>
</dependency>
<dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-core</artifactId>
<version>${datanucleus-core.version}</version>
@@ -154,13 +191,12 @@
<artifactId>json</artifactId>
<version>${json.version}</version>
</dependency>
- <!-- test intra-project -->
<dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-testutils</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>${stax.version}</version>
</dependency>
+ <!-- test intra-project -->
<!-- test inter-project -->
<dependency>
<groupId>junit</groupId>
@@ -169,12 +205,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase</artifactId>
- <version>${hbase.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
<version>${mina.version}</version>
Modified: hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorTypeCasts.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorTypeCasts.java?rev=1539695&r1=1539694&r2=1539695&view=diff
==============================================================================
--- hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorTypeCasts.java (original)
+++ hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorTypeCasts.java Thu Nov 7 16:04:58 2013
@@ -27,7 +27,6 @@ import java.util.Arrays;
import junit.framework.Assert;
-import org.apache.hadoop.hbase.client.coprocessor.Batch;
import org.apache.hadoop.hive.ql.exec.vector.BytesColumnVector;
import org.apache.hadoop.hive.ql.exec.vector.DoubleColumnVector;
import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector;
Modified: hive/trunk/serde/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/serde/pom.xml?rev=1539695&r1=1539694&r2=1539695&view=diff
==============================================================================
--- hive/trunk/serde/pom.xml (original)
+++ hive/trunk/serde/pom.xml Thu Nov 7 16:04:58 2013
@@ -51,6 +51,11 @@
<version>${commons-codec.version}</version>
</dependency>
<dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>${commons-lang.version}</version>
+ </dependency>
+ <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>${commons-logging.version}</version>
Modified: hive/trunk/service/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/service/pom.xml?rev=1539695&r1=1539694&r2=1539695&view=diff
==============================================================================
--- hive/trunk/service/pom.xml (original)
+++ hive/trunk/service/pom.xml Thu Nov 7 16:04:58 2013
@@ -38,21 +38,42 @@
<artifactId>hive-exec</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-metastore</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<!-- inter-project -->
<dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>${commons-codec.version}</version>
+ </dependency>
+ <dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>${commons-cli.version}</version>
</dependency>
+ <!-- used by thrift generated code -->
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>${commons-lang.version}</version>
+ </dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>${commons-logging.version}</version>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons-io.version}</version>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.apache.thrift</groupId>
@@ -79,12 +100,6 @@
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>${mockito-all.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<profiles>