From d6a0dc7fd7eb265f1844f8ec3b5cdf9f795b5269 Mon Sep 17 00:00:00 2001
From: shijinkui <shijinkui666@163.com>
Date: Thu, 19 May 2016 21:31:50 +0800
Subject: [PATCH 1/3] change pom for compile success

---
 pom.xml                    |  35 +++++++--
 r/pom.xml                  |   4 +-
 spark-dependencies/pom.xml | 149 +++++++++++++++++++++++++------------
 spark/pom.xml              |   3 +-
 zeppelin-display/pom.xml   |   3 +-
 zeppelin-server/pom.xml    |   3 +-
 zeppelin-web/pom.xml       |   9 ++-
 7 files changed, 138 insertions(+), 68 deletions(-)

diff --git a/pom.xml b/pom.xml
index 77f36675862..84c285ebba1 100755
--- a/pom.xml
+++ b/pom.xml
@@ -118,7 +118,9 @@
     <libthrift.version>0.9.2</libthrift.version>
     <gson.version>2.2</gson.version>
     <guava.version>15.0</guava.version>
-
+    <jdk.version>1.7</jdk.version>
+    <scala.version>2.10.4</scala.version>
+    <scala.binary.version>2.10</scala.binary.version>
     <PermGen>64m</PermGen>
     <MaxPermGen>512m</MaxPermGen>
   </properties>
@@ -195,7 +197,6 @@
         <version>2.4</version>
       </dependency>
 
-
       <dependency>
         <groupId>commons-collections</groupId>
         <artifactId>commons-collections</artifactId>
@@ -214,6 +215,13 @@
         <version>${guava.version}</version>
       </dependency>
 
+      <!--test dependencies-->
+      <dependency>
+        <groupId>org.scalatest</groupId>
+        <artifactId>scalatest_${scala.binary.version}</artifactId>
+        <version>2.2.6</version>
+        <scope>test</scope>
+      </dependency>
 
       <dependency>
         <groupId>junit</groupId>
@@ -222,6 +230,12 @@
         <scope>test</scope>
       </dependency>
 
+      <dependency>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-utils</artifactId>
+        <version>3.0.24</version>
+      </dependency>
+
       <!-- Apache Shiro -->
       <dependency>
         <groupId>org.apache.shiro</groupId>
@@ -245,10 +259,10 @@
 
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.1</version>
+        <version>3.5.1</version>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>${jdk.version}</source>
+          <target>${jdk.version}</target>
         </configuration>
       </plugin>
 
@@ -382,7 +396,8 @@
                 <!-- Will generate META-INF/DEPENDENCIES META-INF/LICENSE META-INF/NOTICE -->
                 <resourceBundle>org.apache.apache.resources:apache-jar-resource-bundle:1.5-SNAPSHOT</resourceBundle>
                 <!-- Will generate META-INF/DISCLAIMER  -->
-                <resourceBundle>org.apache.apache.resources:apache-incubator-disclaimer-resource-bundle:1.2-SNAPSHOT</resourceBundle>
+                <resourceBundle>org.apache.apache.resources:apache-incubator-disclaimer-resource-bundle:1.2-SNAPSHOT
+                </resourceBundle>
               </resourceBundles>
             </configuration>
           </execution>
@@ -460,7 +475,7 @@
               <exclude>.github/*</exclude>
               <exclude>.gitignore</exclude>
               <exclude>.repository/</exclude>
-  	      <exclude>.Rhistory</exclude>
+              <exclude>.Rhistory</exclude>
               <exclude>**/*.diff</exclude>
               <exclude>**/*.patch</exclude>
               <exclude>**/*.avsc</exclude>
@@ -670,6 +685,12 @@
           <version>1.7</version>
         </plugin>
 
+        <plugin>
+          <groupId>com.googlecode.maven-download-plugin</groupId>
+          <artifactId>download-maven-plugin</artifactId>
+          <version>1.3.0</version>
+        </plugin>
+
       </plugins>
     </pluginManagement>
   </build>
diff --git a/r/pom.xml b/r/pom.xml
index 911db101558..9659b7951cd 100644
--- a/r/pom.xml
+++ b/r/pom.xml
@@ -35,7 +35,7 @@
   <properties>
     <script.extension>.sh</script.extension>
     <path.separator>/</path.separator>
-    <spark.version>1.4.1</spark.version>
+    <spark.version>1.6.1</spark.version>
     <scala.version>2.10.4</scala.version>
     <scala.binary.version>2.10</scala.binary.version>
   </properties>
@@ -126,7 +126,7 @@
     <dependency>
       <groupId>org.scalatest</groupId>
       <artifactId>scalatest_${scala.binary.version}</artifactId>
-      <version>2.2.4</version>
+      <version>2.2.6</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/spark-dependencies/pom.xml b/spark-dependencies/pom.xml
index 8e23f22e3e8..3e3244d5b2e 100644
--- a/spark-dependencies/pom.xml
+++ b/spark-dependencies/pom.xml
@@ -16,7 +16,8 @@
   ~ 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">
+<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>
@@ -36,7 +37,7 @@
 
 
   <properties>
-    <spark.version>1.4.1</spark.version>
+    <spark.version>1.6.1</spark.version>
     <scala.version>2.10.4</scala.version>
     <scala.binary.version>2.10</scala.binary.version>
 
@@ -50,11 +51,14 @@
     <akka.group>org.spark-project.akka</akka.group>
     <akka.version>2.3.4-spark</akka.version>
 
+    <spark.iscached>validate</spark.iscached>
     <spark.archive>spark-${spark.version}</spark.archive>
     <spark.download.url>
       http://archive.apache.org/dist/spark/${spark.archive}/${spark.archive}.tgz
     </spark.download.url>
-    <spark.bin.download.url>http://archive.apache.org/dist/spark/spark-${spark.version}/spark-${spark.version}-bin-without-hadoop.tgz</spark.bin.download.url>
+    <spark.bin.download.url>
+      http://archive.apache.org/dist/spark/spark-${spark.version}/spark-${spark.version}-bin-without-hadoop.tgz
+    </spark.bin.download.url>
     <spark.dist.cache>${project.build.directory}/../../.spark-dist</spark.dist.cache>
     <py4j.version>0.8.2.1</py4j.version>
   </properties>
@@ -249,7 +253,7 @@
     <!-- Spark -->
     <dependency>
       <groupId>org.apache.spark</groupId>
-      <artifactId>spark-core_2.10</artifactId>
+      <artifactId>spark-core_2.11</artifactId>
       <version>${spark.version}</version>
       <exclusions>
         <exclusion>
@@ -261,31 +265,31 @@
 
     <dependency>
       <groupId>org.apache.spark</groupId>
-      <artifactId>spark-repl_2.10</artifactId>
+      <artifactId>spark-repl_2.11</artifactId>
       <version>${spark.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.spark</groupId>
-      <artifactId>spark-sql_2.10</artifactId>
+      <artifactId>spark-sql_2.11</artifactId>
       <version>${spark.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.spark</groupId>
-      <artifactId>spark-hive_2.10</artifactId>
+      <artifactId>spark-hive_2.11</artifactId>
       <version>${spark.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.spark</groupId>
-      <artifactId>spark-streaming_2.10</artifactId>
+      <artifactId>spark-streaming_2.11</artifactId>
       <version>${spark.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.spark</groupId>
-      <artifactId>spark-streaming-twitter_2.10</artifactId>
+      <artifactId>spark-streaming-twitter_2.11</artifactId>
       <version>${spark.version}</version>
     </dependency>
 
@@ -438,7 +442,7 @@
       </dependencies>
     </profile>
 
-   <profile>
+    <profile>
       <id>spark-1.4</id>
       <properties>
         <spark.version>1.4.1</spark.version>
@@ -516,9 +520,17 @@
         <akka.version>2.3.11</akka.version>
         <protobuf.version>2.5.0</protobuf.version>
       </properties>
+    </profile>
 
-      <dependencies>
-      </dependencies>
+    <profile>
+      <id>spark-2.0</id>
+      <properties>
+        <spark.version>2.0.0</spark.version>
+        <py4j.version>0.10.1</py4j.version>
+        <akka.group>com.typesafe.akka</akka.group>
+        <akka.version>2.3.11</akka.version>
+        <protobuf.version>2.5.0</protobuf.version>
+      </properties>
     </profile>
 
     <profile>
@@ -585,6 +597,16 @@
       </properties>
     </profile>
 
+    <profile>
+      <id>hadoop-2.7</id>
+      <properties>
+        <hadoop.version>2.7.2</hadoop.version>
+        <protobuf.version>2.5.0</protobuf.version>
+        <jets3t.version>0.9.0</jets3t.version>
+        <avro.mapred.classifier>hadoop2</avro.mapred.classifier>
+      </properties>
+    </profile>
+
     <profile>
       <id>mapr3</id>
       <activation>
@@ -596,12 +618,16 @@
         <jets3t.version>0.7.1</jets3t.version>
       </properties>
       <repositories>
-         <repository>
-           <id>mapr-releases</id>
-           <url>http://repository.mapr.com/maven/</url>
-           <snapshots><enabled>false</enabled></snapshots>
-           <releases><enabled>true</enabled></releases>
-         </repository>
+        <repository>
+          <id>mapr-releases</id>
+          <url>http://repository.mapr.com/maven/</url>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+        </repository>
       </repositories>
     </profile>
 
@@ -634,12 +660,16 @@
         </dependency>
       </dependencies>
       <repositories>
-         <repository>
-           <id>mapr-releases</id>
-           <url>http://repository.mapr.com/maven/</url>
-           <snapshots><enabled>false</enabled></snapshots>
-           <releases><enabled>true</enabled></releases>
-         </repository>
+        <repository>
+          <id>mapr-releases</id>
+          <url>http://repository.mapr.com/maven/</url>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+        </repository>
       </repositories>
     </profile>
 
@@ -672,12 +702,16 @@
         </dependency>
       </dependencies>
       <repositories>
-         <repository>
-           <id>mapr-releases</id>
-           <url>http://repository.mapr.com/maven/</url>
-           <snapshots><enabled>false</enabled></snapshots>
-           <releases><enabled>true</enabled></releases>
-         </repository>
+        <repository>
+          <id>mapr-releases</id>
+          <url>http://repository.mapr.com/maven/</url>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+        </repository>
       </repositories>
     </profile>
 
@@ -710,12 +744,16 @@
         </dependency>
       </dependencies>
       <repositories>
-         <repository>
-           <id>mapr-releases</id>
-           <url>http://repository.mapr.com/maven/</url>
-           <snapshots><enabled>false</enabled></snapshots>
-           <releases><enabled>true</enabled></releases>
-         </repository>
+        <repository>
+          <id>mapr-releases</id>
+          <url>http://repository.mapr.com/maven/</url>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+        </repository>
       </repositories>
     </profile>
 
@@ -748,12 +786,16 @@
         </dependency>
       </dependencies>
       <repositories>
-         <repository>
-           <id>mapr-releases</id>
-           <url>http://repository.mapr.com/maven/</url>
-           <snapshots><enabled>false</enabled></snapshots>
-           <releases><enabled>true</enabled></releases>
-         </repository>
+        <repository>
+          <id>mapr-releases</id>
+          <url>http://repository.mapr.com/maven/</url>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+        </repository>
       </repositories>
     </profile>
 
@@ -763,7 +805,7 @@
       <dependencies>
         <dependency>
           <groupId>org.apache.spark</groupId>
-          <artifactId>spark-yarn_2.10</artifactId>
+          <artifactId>spark-yarn_2.11</artifactId>
           <version>${spark.version}</version>
         </dependency>
 
@@ -775,6 +817,14 @@
       </dependencies>
     </profile>
 
+    <profile>
+      <!--only used for pyspark/sparkR needed spark dist is downloaded, no need to download auto-->
+      <id>spark-dist-cached</id>
+      <properties>
+        <spark.iscached>deploy</spark.iscached>
+      </properties>
+    </profile>
+
     <profile>
       <id>pyspark</id>
       <build>
@@ -786,7 +836,7 @@
             <executions>
               <execution>
                 <id>download-pyspark-files</id>
-                <phase>validate</phase>
+                <phase>${spark.iscached}</phase>
                 <goals>
                   <goal>wget</goal>
                 </goals>
@@ -845,7 +895,7 @@
                     <zip destfile="${project.build.directory}/../../interpreter/spark/pyspark/pyspark.zip"
                          basedir="${project.build.directory}/spark-dist/${spark.archive}/python"
                          includes="pyspark/*.py,pyspark/**/*.py"/>
-                  </target>                
+                  </target>
                 </configuration>
               </execution>
             </executions>
@@ -865,7 +915,7 @@
             <executions>
               <execution>
                 <id>download-sparkr-files</id>
-                <phase>validate</phase>
+                <phase>${spark.iscached}</phase>
                 <goals>
                   <goal>wget</goal>
                 </goals>
@@ -889,7 +939,6 @@
           </plugin>
           <plugin>
             <artifactId>maven-resources-plugin</artifactId>
-            <version>2.7</version>
             <executions>
               <execution>
                 <id>copy-sparkr-files</id>
@@ -901,7 +950,9 @@
                   <outputDirectory>${project.build.directory}/../../interpreter/spark/R/lib</outputDirectory>
                   <resources>
                     <resource>
-                      <directory>${project.build.directory}/spark-bin-dist/spark-${spark.version}-bin-without-hadoop/R/lib</directory>
+                      <directory>
+                        ${project.build.directory}/spark-bin-dist/spark-${spark.version}-bin-without-hadoop/R/lib
+                      </directory>
                     </resource>
                   </resources>
                 </configuration>
@@ -911,7 +962,7 @@
         </plugins>
       </build>
     </profile>
-    
+
   </profiles>
 
   <build>
diff --git a/spark/pom.xml b/spark/pom.xml
index 3b88f3b82a8..cec00753cdc 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -38,7 +38,7 @@
     <jsoup.version>1.8.2</jsoup.version>
     <mockito.version>1.10.19</mockito.version>
     <powermock.version>1.6.4</powermock.version>
-    <spark.version>1.4.1</spark.version>
+    <spark.version>1.6.1</spark.version>
     <scala.version>2.10.4</scala.version>
     <scala.binary.version>2.10</scala.binary.version>
   </properties>
@@ -243,7 +243,6 @@
     <dependency>
       <groupId>org.scalatest</groupId>
       <artifactId>scalatest_${scala.binary.version}</artifactId>
-      <version>2.2.4</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/zeppelin-display/pom.xml b/zeppelin-display/pom.xml
index 1a8328ec277..a85f97936a9 100644
--- a/zeppelin-display/pom.xml
+++ b/zeppelin-display/pom.xml
@@ -90,8 +90,7 @@
 
     <dependency>
       <groupId>org.scalatest</groupId>
-      <artifactId>scalatest_2.10</artifactId>
-      <version>2.1.1</version>
+      <artifactId>scalatest_${scala.binary.version}</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/zeppelin-server/pom.xml b/zeppelin-server/pom.xml
index b1c0cef6314..6083d4d3784 100644
--- a/zeppelin-server/pom.xml
+++ b/zeppelin-server/pom.xml
@@ -272,8 +272,7 @@
 
     <dependency>
       <groupId>org.scalatest</groupId>
-      <artifactId>scalatest_2.10</artifactId>
-      <version>2.1.1</version>
+      <artifactId>scalatest_${scala.binary.version}</artifactId>
       <scope>test</scope>
     </dependency>
 
diff --git a/zeppelin-web/pom.xml b/zeppelin-web/pom.xml
index 0e54d657363..f5d92a127f5 100644
--- a/zeppelin-web/pom.xml
+++ b/zeppelin-web/pom.xml
@@ -33,9 +33,9 @@
   <name>Zeppelin: web Application</name>
 
   <!-- See https://github.com/eirslett/frontend-maven-plugin/issues/229 -->
-  <prerequisites>
-    <maven>3.1.0</maven>
-  </prerequisites>
+  <!--<prerequisites>-->
+    <!--<maven>3.1.0</maven>-->
+  <!--</prerequisites>-->
 
   <build>
     <plugins>
@@ -86,7 +86,8 @@
       <plugin>
         <groupId>com.github.eirslett</groupId>
         <artifactId>frontend-maven-plugin</artifactId>
-        <version>0.0.25</version>
+        <version>1.0</version>
+        <!-- optional -->
         <executions>
 
           <execution>

From 127cb8ae376d81f89b6233d79f840f607f8b7bc1 Mon Sep 17 00:00:00 2001
From: shijinkui <shijinkui666@163.com>
Date: Thu, 19 May 2016 21:55:28 +0800
Subject: [PATCH 2/3] add scala version varible properties

---
 spark-dependencies/pom.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/spark-dependencies/pom.xml b/spark-dependencies/pom.xml
index 3e3244d5b2e..077b7404cb3 100644
--- a/spark-dependencies/pom.xml
+++ b/spark-dependencies/pom.xml
@@ -253,7 +253,7 @@
     <!-- Spark -->
     <dependency>
       <groupId>org.apache.spark</groupId>
-      <artifactId>spark-core_2.11</artifactId>
+      <artifactId>spark-core_${scala.binary.version}</artifactId>
       <version>${spark.version}</version>
       <exclusions>
         <exclusion>
@@ -265,31 +265,31 @@
 
     <dependency>
       <groupId>org.apache.spark</groupId>
-      <artifactId>spark-repl_2.11</artifactId>
+      <artifactId>spark-repl_${scala.binary.version}</artifactId>
       <version>${spark.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.spark</groupId>
-      <artifactId>spark-sql_2.11</artifactId>
+      <artifactId>spark-sql_${scala.binary.version}</artifactId>
       <version>${spark.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.spark</groupId>
-      <artifactId>spark-hive_2.11</artifactId>
+      <artifactId>spark-hive_${scala.binary.version}</artifactId>
       <version>${spark.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.spark</groupId>
-      <artifactId>spark-streaming_2.11</artifactId>
+      <artifactId>spark-streaming_${scala.binary.version}</artifactId>
       <version>${spark.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.spark</groupId>
-      <artifactId>spark-streaming-twitter_2.11</artifactId>
+      <artifactId>spark-streaming-twitter_${scala.binary.version}</artifactId>
       <version>${spark.version}</version>
     </dependency>
 
@@ -805,7 +805,7 @@
       <dependencies>
         <dependency>
           <groupId>org.apache.spark</groupId>
-          <artifactId>spark-yarn_2.11</artifactId>
+          <artifactId>spark-yarn_${scala.binary.version}</artifactId>
           <version>${spark.version}</version>
         </dependency>
 

From 82f05477dad61df3a16f74ef5f56c31f16487ac3 Mon Sep 17 00:00:00 2001
From: shijinkui <shijinkui666@163.com>
Date: Tue, 24 May 2016 16:37:12 +0800
Subject: [PATCH 3/3] [ZEPPELIN-870] Improvement build and pom normalized:
 spark-1.6 profile activeByDefault

---
 pom.xml                    | 7 ++++---
 spark-dependencies/pom.xml | 7 +++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 84c285ebba1..5e3050fdf8a 100755
--- a/pom.xml
+++ b/pom.xml
@@ -118,6 +118,7 @@
     <libthrift.version>0.9.2</libthrift.version>
     <gson.version>2.2</gson.version>
     <guava.version>15.0</guava.version>
+    <shiro.version>1.2.4</shiro.version>
     <jdk.version>1.7</jdk.version>
     <scala.version>2.10.4</scala.version>
     <scala.binary.version>2.10</scala.binary.version>
@@ -240,12 +241,12 @@
       <dependency>
         <groupId>org.apache.shiro</groupId>
         <artifactId>shiro-core</artifactId>
-        <version>1.2.3</version>
+        <version>${shiro.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.shiro</groupId>
         <artifactId>shiro-web</artifactId>
-        <version>1.2.3</version>
+        <version>${shiro.version}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -671,7 +672,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore></ignore>
+                    <ignore/>
                   </action>
                 </pluginExecution>
               </pluginExecutions>
diff --git a/spark-dependencies/pom.xml b/spark-dependencies/pom.xml
index 077b7404cb3..2ff70bd0b11 100644
--- a/spark-dependencies/pom.xml
+++ b/spark-dependencies/pom.xml
@@ -37,7 +37,7 @@
 
 
   <properties>
-    <spark.version>1.6.1</spark.version>
+    <spark.version>1.4.1</spark.version>
     <scala.version>2.10.4</scala.version>
     <scala.binary.version>2.10</scala.binary.version>
 
@@ -513,6 +513,9 @@
 
     <profile>
       <id>spark-1.6</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
       <properties>
         <spark.version>1.6.1</spark.version>
         <py4j.version>0.9</py4j.version>
@@ -821,7 +824,7 @@
       <!--only used for pyspark/sparkR needed spark dist is downloaded, no need to download auto-->
       <id>spark-dist-cached</id>
       <properties>
-        <spark.iscached>deploy</spark.iscached>
+        <spark.iscached>validate</spark.iscached>
       </properties>
     </profile>