change the pom file and make hive-0.13.1 as the default

Author: zhzhan

assembly/pom.xml

@@ -210,21 +210,6 @@
         </dependency>
       </dependencies>
     </profile>
-    <profile>
-      <id>hive-versions</id>
-      <activation>
-        <property>
-          <name>hive.version</name>
-        </property>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>org.apache.spark</groupId>
-          <artifactId>spark-hive_${scala.binary.version}</artifactId>
-          <version>${project.version}</version>
-        </dependency>
-      </dependencies>
-    </profile>
     <profile>
       <id>spark-ganglia-lgpl</id>
       <dependencies>

docs/building-spark.md

@@ -102,15 +102,15 @@ mvn -Pyarn-alpha -Phadoop-2.3 -Dhadoop.version=2.3.0 -Dyarn.version=0.23.7 -Dski
 # Building With Hive and JDBC Support
 To enable Hive integration for Spark SQL along with its JDBC server and CLI,
 add the `-Phive` profile to your existing build options. By default Spark
-will build with Hive 0.12.0 bindings. You can also build for Hive 0.13.1 using
-the `-Phive-0.13.1` profile. NOTE: currently the JDBC server is only
-supported for Hive 12.
+will build with Hive 0.13.1 bindings. You can also build for Hive 0.12.0 using
+the `-Phive-0.12.0` profile. NOTE: currently the JDBC server is only
+supported for Hive 0.12.0.
 {% highlight bash %}
-# Apache Hadoop 2.4.X with Hive 12 support
+# Apache Hadoop 2.4.X with Hive 13 support
 mvn -Pyarn -Phadoop-2.4 -Dhadoop.version=2.4.0 -Phive -DskipTests clean package
 
-# Apache Hadoop 2.4.X with Hive 13 support
-mvn -Pyarn -Phive-0.13.1 -Phadoop-2.4 -Dhadoop.version=2.4.0 -Phive -DskipTests clean package
+# Apache Hadoop 2.4.X with Hive 12 support
+mvn -Pyarn -Phive-0.12.0 -Phadoop-2.4 -Dhadoop.version=2.4.0 -Phive -DskipTests clean package
 {% endhighlight %}
 
 # Spark Tests in Maven
@@ -119,8 +119,8 @@ Tests are run by default via the [ScalaTest Maven plugin](http://www.scalatest.o
 
 Some of the tests require Spark to be packaged first, so always run `mvn package` with `-DskipTests` the first time.  The following is an example of a correct (build, test) sequence:
 
-    mvn -Pyarn -Phadoop-2.3 -DskipTests -Phive clean package
-    mvn -Pyarn -Phadoop-2.3 -Phive test
+    mvn -Pyarn -Phadoop-2.3 -DskipTests -Phive -Phive-0.12.0 clean package
+    mvn -Pyarn -Phadoop-2.3 -Phive -Phive-0.12.0 test
 
 The ScalaTest plugin also supports running only a specific test suite as follows:
 
@@ -183,16 +183,16 @@ can be set to control the SBT build. For example:
 
 Some of the tests require Spark to be packaged first, so always run `sbt/sbt assembly` the first time.  The following is an example of a correct (build, test) sequence:
 
-    sbt/sbt -Pyarn -Phadoop-2.3 -Phive assembly
-    sbt/sbt -Pyarn -Phadoop-2.3 -Phive test
+    sbt/sbt -Pyarn -Phadoop-2.3 -Phive -Phive-0.12.0 assembly
+    sbt/sbt -Pyarn -Phadoop-2.3 -Phive -Phive-0.12.0 test
 
 To run only a specific test suite as follows:
 
-    sbt/sbt -Pyarn -Phadoop-2.3 -Phive "test-only org.apache.spark.repl.ReplSuite"
+    sbt/sbt -Pyarn -Phadoop-2.3 -Phive -Phive-0.12.0 "test-only org.apache.spark.repl.ReplSuite"
 
 To run test suites of a specific sub project as follows:
 
-    sbt/sbt -Pyarn -Phadoop-2.3 -Phive core/test
+    sbt/sbt -Pyarn -Phadoop-2.3 -Phive -Phive-0.12.0 core/test
 
 # Speeding up Compilation with Zinc
 

pom.xml

@@ -128,10 +128,10 @@
     <flume.version>1.4.0</flume.version>
     <zookeeper.version>3.4.5</zookeeper.version>
     <!-- Version used in Maven Hive dependency -->
-    <hive.version>0.12.0-protobuf-2.5</hive.version>
+    <hive.version>0.13.1</hive.version>
     <!-- Version used for internal directory structure -->
-    <hive.version.short>0.12.0</hive.version.short>
-    <derby.version>10.4.2.0</derby.version>
+    <hive.version.short>0.13.1</hive.version.short>
+    <derby.version>10.10.1.1</derby.version>
     <parquet.version>1.4.3</parquet.version>
     <jblas.version>1.2.3</jblas.version>
     <jetty.version>8.1.14.v20131031</jetty.version>
@@ -1287,7 +1287,7 @@
       </modules>
       <properties>
         <hive.version>0.12.0-protobuf-2.5</hive.version>
-        <hive.version.short>0.12.0-protobuf-2.5</hive.version.short>
+        <hive.version.short>0.12.0</hive.version.short>
         <derby.version>10.4.2.0</derby.version>
       </properties>
     </profile>

sql/hive/pom.xml

@@ -36,11 +36,6 @@
   </properties>
 
   <dependencies>
-    <dependency>
-      <groupId>com.twitter</groupId>
-      <artifactId>parquet-hive-bundle</artifactId>
-      <version>1.5.0</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.spark</groupId>
       <artifactId>spark-core_${scala.binary.version}</artifactId>
@@ -143,6 +138,19 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>hive-0.12.0</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <dependencies>
+         <dependency>
+           <groupId>com.twitter</groupId>
+           <artifactId>parquet-hive-bundle</artifactId>
+           <version>1.5.0</version>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 
   <build>