You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by se...@apache.org on 2020/05/15 14:53:15 UTC

[bigtop] branch master updated: BIGTOP-3327: Fix Zeppelin build issue after upgrading Spark-2.4.5 (#631)

This is an automated email from the ASF dual-hosted git repository.

sekikn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git


The following commit(s) were added to refs/heads/master by this push:
     new 2e16540  BIGTOP-3327: Fix Zeppelin build issue after upgrading Spark-2.4.5 (#631)
2e16540 is described below

commit 2e1654037f944d207edb7a0f0b37b1cf3a6a3fcc
Author: Yuqi <yu...@arm.com>
AuthorDate: Fri May 15 22:53:07 2020 +0800

    BIGTOP-3327: Fix Zeppelin build issue after upgrading Spark-2.4.5 (#631)
    
    When upgrading Spark-2.4.5, Zepplin-0.7.3 is not compatible with Spark-2.4.5.
    The patch is to bump Zeppelin to 0.8.2 which is the latest and stable release,
    and to fix the zeppelin build issues.
    
    Change-Id: I1e4ff8a18f80bcd99896b68a37a7206002adfd0d
    Signed-off-by: Yuqi Gu <yu...@arm.com>
---
 .../src/common/zeppelin/do-component-build         |   5 -
 .../zeppelin/patch0-spark-2.2.3-compatibility.diff |  49 ----
 .../zeppelin/patch0-spark-2.4.5-compatibility.diff |  69 +++++
 .../src/common/zeppelin/patch1-arm64-build.diff    | 310 +++++++++++++++++++++
 .../zeppelin/patch2-maven-code-coverage.diff       | 102 +++++++
 bigtop.bom                                         |   2 +-
 6 files changed, 482 insertions(+), 55 deletions(-)

diff --git a/bigtop-packages/src/common/zeppelin/do-component-build b/bigtop-packages/src/common/zeppelin/do-component-build
index 311deeb..9ac0ed8 100644
--- a/bigtop-packages/src/common/zeppelin/do-component-build
+++ b/bigtop-packages/src/common/zeppelin/do-component-build
@@ -30,10 +30,7 @@ BUILD_OPTS="-Dscala.version=${SCALA_VERSION} \
             -Dignite.version=${IGNITE_HADOOP_VERSION} \
             -Dflink.version=${FLINK_VERSION} \
             -Pspark-${SPARK_VERSION%.*} \
-            -Phadoop-2.7 \
             -Pscala-${SCALA_VERSION%.*} \
-            -Ppyspark \
-            -Psparkr \
             -Pr \
             -Pbuild-distr"
 
@@ -45,8 +42,6 @@ fi
 
 export MAVEN_OPTS="-Xmx1500m -Xms1500m"
 
-# change spark src download url to apache
-sed -i "s/http\:\/\/d3kbcqa49mib13\.cloudfront\.net/https\:\/\/archive\.apache\.org\/dist\/spark\/spark-\$\{spark\.version\}/g" spark-dependencies/pom.xml
 mvn $BUILD_OPTS clean package
 
 mkdir -p build/dist
diff --git a/bigtop-packages/src/common/zeppelin/patch0-spark-2.2.3-compatibility.diff b/bigtop-packages/src/common/zeppelin/patch0-spark-2.2.3-compatibility.diff
deleted file mode 100644
index af81574..0000000
--- a/bigtop-packages/src/common/zeppelin/patch0-spark-2.2.3-compatibility.diff
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/spark-dependencies/pom.xml b/spark-dependencies/pom.xml
-index 6e7da6dc6..298e0b1ca 100644
---- a/spark-dependencies/pom.xml
-+++ b/spark-dependencies/pom.xml
-@@ -546,9 +546,9 @@
-         <activeByDefault>true</activeByDefault>
-       </activation>
-       <properties>
--        <spark.version>2.2.0</spark.version>
-+        <spark.version>2.2.3</spark.version>
-         <protobuf.version>2.5.0</protobuf.version>
--        <py4j.version>0.10.4</py4j.version>
-+        <py4j.version>0.10.7</py4j.version>
-       </properties>
-     </profile>
-
-diff --git a/r/src/main/scala/org/apache/spark/api/r/RBackendHelper.scala b/r/src/main/scala/org/apache/spark/api/r/RBackendHelper.scala
-index 9c1eb38d5..155f645dc 100644
---- a/r/src/main/scala/org/apache/spark/api/r/RBackendHelper.scala
-+++ b/r/src/main/scala/org/apache/spark/api/r/RBackendHelper.scala
-@@ -30,7 +30,7 @@ class RBackendHelper(val backend : RBackend) {
-   var port : Int = 0
-
-   def init() : Int = {
--    port = backend.init()
-+    port = backend.init()._1
-     port
-   }
-
-@@ -81,4 +81,4 @@ Its for testing purposes and should never be called
-
-   def apply() : RBackendHelper = new RBackendHelper(new RBackend())
-
--}
-\ No newline at end of file
-+}
-diff --git a/spark/src/main/scala/org/apache/spark/SparkRBackend.scala b/spark/src/main/scala/org/apache/spark/SparkRBackend.scala
-index 05f1ac0e3..500e43f3f 100644
---- a/spark/src/main/scala/org/apache/spark/SparkRBackend.scala
-+++ b/spark/src/main/scala/org/apache/spark/SparkRBackend.scala
-@@ -30,7 +30,7 @@ object SparkRBackend {
-   }
-
-   def init() : Int = {
--    portNumber = backend.init()
-+    portNumber = backend.init()._1
-     portNumber
-   }
-
diff --git a/bigtop-packages/src/common/zeppelin/patch0-spark-2.4.5-compatibility.diff b/bigtop-packages/src/common/zeppelin/patch0-spark-2.4.5-compatibility.diff
new file mode 100644
index 0000000..7770667
--- /dev/null
+++ b/bigtop-packages/src/common/zeppelin/patch0-spark-2.4.5-compatibility.diff
@@ -0,0 +1,69 @@
+diff --git a/r/src/main/scala/org/apache/spark/api/r/RBackendHelper.scala b/r/src/main/scala/org/apache/spark/api/r/RBackendHelper.scala
+index 9c1eb38d5..155f645dc 100644
+--- a/r/src/main/scala/org/apache/spark/api/r/RBackendHelper.scala
++++ b/r/src/main/scala/org/apache/spark/api/r/RBackendHelper.scala
+@@ -30,7 +30,7 @@ class RBackendHelper(val backend : RBackend) {
+   var port : Int = 0
+ 
+   def init() : Int = {
+-    port = backend.init()
++    port = backend.init()._1
+     port
+   }
+ 
+@@ -81,4 +81,4 @@ Its for testing purposes and should never be called
+ 
+   def apply() : RBackendHelper = new RBackendHelper(new RBackend())
+ 
+-}
+\ No newline at end of file
++}
+diff --git a/spark/pom.xml b/spark/pom.xml
+index 2211efd87..db5b58cf4 100644
+--- a/spark/pom.xml
++++ b/spark/pom.xml
+@@ -45,8 +45,8 @@
+         <plugin.shade.version>2.4.1</plugin.shade.version>
+         <plugin.scala.version>2.15.2</plugin.scala.version>
+         <!-- spark versions -->
+-        <spark.version>2.2.0</spark.version>
+-        <py4j.version>0.10.4</py4j.version>
++        <spark.version>2.4.5</spark.version>
++        <py4j.version>0.10.7</py4j.version>
+ 
+         <spark.archive>spark-${spark.version}</spark.archive>
+         <spark.src.download.url>
+diff --git a/spark/scala-2.10/src/main/scala/org/apache/zeppelin/spark/SparkScala210Interpreter.scala b/spark/scala-2.10/src/main/scala/org/apache/zeppelin/spark/SparkScala210Interpreter.scala
+index 995ee1539..e712c7d73 100644
+--- a/spark/scala-2.10/src/main/scala/org/apache/zeppelin/spark/SparkScala210Interpreter.scala
++++ b/spark/scala-2.10/src/main/scala/org/apache/zeppelin/spark/SparkScala210Interpreter.scala
+@@ -67,7 +67,8 @@ class SparkScala210Interpreter(override val conf: SparkConf,
+     settings.embeddedDefaults(Thread.currentThread().getContextClassLoader())
+     settings.usejavacp.value = true
+     settings.classpath.value = getUserJars.mkString(File.pathSeparator)
+-    sparkILoop = new SparkILoop(null, new JPrintWriter(Console.out, true))
++    // ZEPPELIN-3324: Fix ambiguous reference to overloaded definition
++    sparkILoop = new SparkILoop()
+     if (printReplOutput) {
+       Console.setOut(interpreterOutput)
+     }
+diff --git a/spark/spark1-shims/pom.xml b/spark/spark1-shims/pom.xml
+index 797c461e4..6bc18e6e2 100644
+--- a/spark/spark1-shims/pom.xml
++++ b/spark/spark1-shims/pom.xml
+@@ -50,7 +50,7 @@
+     <dependency>
+       <groupId>org.apache.spark</groupId>
+       <artifactId>spark-core_${scala.binary.version}</artifactId>
+-      <version>${spark.version}</version>
++      <version>2.2.3</version>
+       <scope>provided</scope>
+     </dependency>
+ 
+@@ -79,4 +79,4 @@
+     </plugins>
+   </build>
+ 
+-</project>
+\ No newline at end of file
++</project>
diff --git a/bigtop-packages/src/common/zeppelin/patch1-arm64-build.diff b/bigtop-packages/src/common/zeppelin/patch1-arm64-build.diff
new file mode 100644
index 0000000..1d8ad33
--- /dev/null
+++ b/bigtop-packages/src/common/zeppelin/patch1-arm64-build.diff
@@ -0,0 +1,310 @@
+diff --git a/python/pom.xml b/python/pom.xml
+index 3f55c92f1..bc50512f4 100644
+--- a/python/pom.xml
++++ b/python/pom.xml
+@@ -84,7 +84,7 @@
+     <dependency>
+       <groupId>io.grpc</groupId>
+       <artifactId>grpc-stub</artifactId>
+-      <version>${grpc.version}</version>
++      <version>1.28.0</version>
+     </dependency>
+ 
+     <!-- test libraries -->
+@@ -118,9 +118,11 @@
+         <artifactId>protobuf-maven-plugin</artifactId>
+         <version>0.5.0</version>
+         <configuration>
+-          <protocArtifact>com.google.protobuf:protoc:3.3.0:exe:${os.detected.classifier}</protocArtifact>
++          <!-- Protoc-3.3.0 doesn't Support Arm64, upgrading to 3.5.0 -->
++          <protocArtifact>com.google.protobuf:protoc:3.5.0:exe:${os.detected.classifier}</protocArtifact>
+           <pluginId>grpc-java</pluginId>
+-          <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.4.0:exe:${os.detected.classifier}</pluginArtifact>
++          <!-- protoc-gen-grpc-java-1.4.0 doesn't Support Arm64, upgrading to 1.28.0 -->
++          <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.28.0:exe:${os.detected.classifier}</pluginArtifact>
+         </configuration>
+         <executions>
+           <execution>
+diff --git a/zeppelin-web/Gruntfile.js b/zeppelin-web/Gruntfile.js
+index c25b56070..58a75f24e 100644
+--- a/zeppelin-web/Gruntfile.js
++++ b/zeppelin-web/Gruntfile.js
+@@ -373,7 +373,7 @@ module.exports = function(grunt) {
+     karma: {
+       unit: {
+         configFile: 'karma.conf.js',
+-        singleRun: true
++        singleRun: false
+       }
+     }
+   });
+diff --git a/zeppelin-web/package-lock.json b/zeppelin-web/package-lock.json
+index 443c7b770..5ff7f08e8 100644
+--- a/zeppelin-web/package-lock.json
++++ b/zeppelin-web/package-lock.json
+@@ -6857,193 +6857,6 @@
+         }
+       }
+     },
+-    "karma": {
+-      "version": "1.3.0",
+-      "resolved": "https://registry.npmjs.org/karma/-/karma-1.3.0.tgz",
+-      "integrity": "sha1-srlOj0mfrdAGnVT5rvSk1I7FzB8=",
+-      "dev": true,
+-      "requires": {
+-        "bluebird": "3.5.1",
+-        "body-parser": "1.18.2",
+-        "chokidar": "1.7.0",
+-        "colors": "1.1.2",
+-        "combine-lists": "1.0.1",
+-        "connect": "3.6.5",
+-        "core-js": "2.5.2",
+-        "di": "0.0.1",
+-        "dom-serialize": "2.2.1",
+-        "expand-braces": "0.1.2",
+-        "glob": "7.1.2",
+-        "graceful-fs": "4.1.11",
+-        "http-proxy": "1.16.2",
+-        "isbinaryfile": "3.0.2",
+-        "lodash": "3.10.1",
+-        "log4js": "0.6.38",
+-        "mime": "1.4.1",
+-        "minimatch": "3.0.4",
+-        "optimist": "0.6.1",
+-        "qjobs": "1.1.5",
+-        "range-parser": "1.2.0",
+-        "rimraf": "2.6.2",
+-        "socket.io": "1.4.7",
+-        "source-map": "0.5.7",
+-        "tmp": "0.0.28",
+-        "useragent": "2.2.1"
+-      },
+-      "dependencies": {
+-        "glob": {
+-          "version": "7.1.2",
+-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+-          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+-          "dev": true,
+-          "requires": {
+-            "fs.realpath": "1.0.0",
+-            "inflight": "1.0.6",
+-            "inherits": "2.0.3",
+-            "minimatch": "3.0.4",
+-            "once": "1.4.0",
+-            "path-is-absolute": "1.0.1"
+-          }
+-        },
+-        "lodash": {
+-          "version": "3.10.1",
+-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+-          "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
+-          "dev": true
+-        },
+-        "minimatch": {
+-          "version": "3.0.4",
+-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+-          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+-          "dev": true,
+-          "requires": {
+-            "brace-expansion": "1.1.8"
+-          }
+-        },
+-        "source-map": {
+-          "version": "0.5.7",
+-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+-          "dev": true
+-        }
+-      }
+-    },
+-    "karma-coverage": {
+-      "version": "1.1.1",
+-      "resolved": "https://registry.npmjs.org/karma-coverage/-/karma-coverage-1.1.1.tgz",
+-      "integrity": "sha1-Wv+LOc9plNwi3kyENix2ABtjfPY=",
+-      "dev": true,
+-      "requires": {
+-        "dateformat": "1.0.12",
+-        "istanbul": "0.4.5",
+-        "lodash": "3.10.1",
+-        "minimatch": "3.0.4",
+-        "source-map": "0.5.7"
+-      },
+-      "dependencies": {
+-        "dateformat": {
+-          "version": "1.0.12",
+-          "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
+-          "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=",
+-          "dev": true,
+-          "requires": {
+-            "get-stdin": "4.0.1",
+-            "meow": "3.7.0"
+-          }
+-        },
+-        "lodash": {
+-          "version": "3.10.1",
+-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+-          "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
+-          "dev": true
+-        },
+-        "minimatch": {
+-          "version": "3.0.4",
+-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+-          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+-          "dev": true,
+-          "requires": {
+-            "brace-expansion": "1.1.8"
+-          }
+-        },
+-        "source-map": {
+-          "version": "0.5.7",
+-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+-          "dev": true
+-        }
+-      }
+-    },
+-    "karma-jasmine": {
+-      "version": "1.0.2",
+-      "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-1.0.2.tgz",
+-      "integrity": "sha1-wLOrMnvyB9tg4X+ifbN8/e9djmw=",
+-      "dev": true
+-    },
+-    "karma-phantomjs-launcher": {
+-      "version": "1.0.4",
+-      "resolved": "https://registry.npmjs.org/karma-phantomjs-launcher/-/karma-phantomjs-launcher-1.0.4.tgz",
+-      "integrity": "sha1-0jyjSAG9qYY60xjju0vUBisTrNI=",
+-      "dev": true,
+-      "requires": {
+-        "lodash": "4.17.4",
+-        "phantomjs-prebuilt": "2.1.16"
+-      }
+-    },
+-    "karma-sourcemap-loader": {
+-      "version": "0.3.7",
+-      "resolved": "https://registry.npmjs.org/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.7.tgz",
+-      "integrity": "sha1-kTIsd/jxPUb+0GKwQuEAnUxFBdg=",
+-      "dev": true,
+-      "requires": {
+-        "graceful-fs": "4.1.11"
+-      }
+-    },
+-    "karma-spec-reporter": {
+-      "version": "0.0.31",
+-      "resolved": "https://registry.npmjs.org/karma-spec-reporter/-/karma-spec-reporter-0.0.31.tgz",
+-      "integrity": "sha1-SDDccUihVcfXoYbmMjOaDYD63sM=",
+-      "dev": true,
+-      "requires": {
+-        "colors": "1.1.2"
+-      }
+-    },
+-    "karma-webpack": {
+-      "version": "1.8.1",
+-      "resolved": "https://registry.npmjs.org/karma-webpack/-/karma-webpack-1.8.1.tgz",
+-      "integrity": "sha1-OdX9Lt7qPMPvW0BZibN9Ww5qO04=",
+-      "dev": true,
+-      "requires": {
+-        "async": "0.9.2",
+-        "loader-utils": "0.2.17",
+-        "lodash": "3.10.1",
+-        "source-map": "0.1.43",
+-        "webpack-dev-middleware": "1.12.2"
+-      },
+-      "dependencies": {
+-        "async": {
+-          "version": "0.9.2",
+-          "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
+-          "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
+-          "dev": true
+-        },
+-        "lodash": {
+-          "version": "3.10.1",
+-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+-          "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
+-          "dev": true
+-        },
+-        "source-map": {
+-          "version": "0.1.43",
+-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+-          "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
+-          "dev": true,
+-          "requires": {
+-            "amdefine": "1.0.1"
+-          }
+-        }
+-      }
+-    },
+     "kew": {
+       "version": "0.7.0",
+       "resolved": "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz",
+@@ -8392,40 +8205,6 @@
+       "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+       "dev": true
+     },
+-    "phantomjs-prebuilt": {
+-      "version": "2.1.16",
+-      "resolved": "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.16.tgz",
+-      "integrity": "sha1-79ISpKOWbTZHaE6ouniFSb4q7+8=",
+-      "dev": true,
+-      "requires": {
+-        "es6-promise": "4.1.1",
+-        "extract-zip": "1.6.6",
+-        "fs-extra": "1.0.0",
+-        "hasha": "2.2.0",
+-        "kew": "0.7.0",
+-        "progress": "1.1.8",
+-        "request": "2.83.0",
+-        "request-progress": "2.0.1",
+-        "which": "1.3.0"
+-      },
+-      "dependencies": {
+-        "es6-promise": {
+-          "version": "4.1.1",
+-          "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.1.1.tgz",
+-          "integrity": "sha512-OaU1hHjgJf+b0NzsxCg7NdIYERD6Hy/PEmFLTjw+b65scuisG3Kt4QoTvJ66BBkPZ581gr0kpoVzKnxniM8nng==",
+-          "dev": true
+-        },
+-        "which": {
+-          "version": "1.3.0",
+-          "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz",
+-          "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==",
+-          "dev": true,
+-          "requires": {
+-            "isexe": "2.0.0"
+-          }
+-        }
+-      }
+-    },
+     "pify": {
+       "version": "2.3.0",
+       "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+diff --git a/zeppelin-web/package.json b/zeppelin-web/package.json
+index 0c54eeac0..6db67fe9c 100644
+--- a/zeppelin-web/package.json
++++ b/zeppelin-web/package.json
+@@ -18,11 +18,8 @@
+     "dev:helium": "HELIUM_BUNDLE_DEV=true webpack-dev-server --hot",
+     "dev:watch": "grunt watch-webpack-dev",
+     "dev": "npm-run-all --parallel dev:server lint:watch dev:watch",
+-    "test:watch": "karma start karma.conf.js --single-run=false",
+     "pree2e": "webdriver-manager update --gecko false --versions.chrome=2.35",
+-    "e2e": "protractor protractor.conf.js",
+-    "pretest": "npm rebuild phantomjs-prebuilt",
+-    "test": "karma start karma.conf.js"
++    "e2e": "protractor protractor.conf.js"
+   },
+   "dependencies": {
+     "angular-ui-grid": "4.4.6",
+@@ -80,13 +77,6 @@
+     "istanbul-instrumenter-loader": "^0.2.0",
+     "jasmine-core": "^2.5.2",
+     "jasmine-spec-reporter": "^4.1.1",
+-    "karma": "~1.3.0",
+-    "karma-coverage": "^1.1.1",
+-    "karma-jasmine": "~1.0.2",
+-    "karma-phantomjs-launcher": "^1.0.4",
+-    "karma-sourcemap-loader": "^0.3.7",
+-    "karma-spec-reporter": "0.0.31",
+-    "karma-webpack": "^1.8.1",
+     "load-grunt-tasks": "^0.4.0",
+     "ng-annotate-loader": "^0.2.0",
+     "npm-run-all": "^3.1.2",
diff --git a/bigtop-packages/src/common/zeppelin/patch2-maven-code-coverage.diff b/bigtop-packages/src/common/zeppelin/patch2-maven-code-coverage.diff
new file mode 100644
index 0000000..c0653ca
--- /dev/null
+++ b/bigtop-packages/src/common/zeppelin/patch2-maven-code-coverage.diff
@@ -0,0 +1,102 @@
+diff --git a/zeppelin-server/pom.xml b/zeppelin-server/pom.xml
+index 79ea56e5b..81356e862 100644
+--- a/zeppelin-server/pom.xml
++++ b/zeppelin-server/pom.xml
+@@ -105,6 +105,10 @@
+           <groupId>com.sun.jersey</groupId>
+           <artifactId>jersey-server</artifactId>
+         </exclusion>
++        <exclusion>
++          <groupId>com.nimbusds</groupId>
++          <artifactId>nimbus-jose-jwt</artifactId>
++        </exclusion>
+       </exclusions>
+     </dependency>
+ 
+@@ -189,7 +193,7 @@
+     <dependency>
+       <groupId>commons-beanutils</groupId>
+       <artifactId>commons-beanutils</artifactId>
+-      <version>1.9.2</version>
++      <version>1.9.4</version>
+     </dependency>
+ 
+     <dependency>
+diff --git a/zeppelin-zengine/pom.xml b/zeppelin-zengine/pom.xml
+index 59332af4d..ecd678fbc 100644
+--- a/zeppelin-zengine/pom.xml
++++ b/zeppelin-zengine/pom.xml
+@@ -193,6 +193,10 @@
+           <groupId>joda-time</groupId>
+           <artifactId>joda-time</artifactId>
+         </exclusion>
++        <exclusion>
++          <groupId>com.fasterxml.jackson.core</groupId>
++          <artifactId>jackson-core</artifactId>
++        </exclusion>
+       </exclusions>
+     </dependency>
+ 
+@@ -488,6 +492,14 @@
+               <groupId>com.google.guava</groupId>
+               <artifactId>guava</artifactId>
+             </exclusion>
++            <exclusion>
++              <groupId>org.apache.commons</groupId>
++              <artifactId>commons-lang3</artifactId>
++            </exclusion>
++            <exclusion>
++              <groupId>org.apache.zookeeper</groupId>
++              <artifactId>zookeeper</artifactId>
++            </exclusion>
+           </exclusions>
+         </dependency>
+ 
+@@ -566,6 +578,14 @@
+               <groupId>com.google.guava</groupId>
+               <artifactId>guava</artifactId>
+             </exclusion>
++            <exclusion>
++              <groupId>org.apache.commons</groupId>
++              <artifactId>commons-lang3</artifactId>
++            </exclusion>
++            <exclusion>
++              <groupId>org.apache.zookeeper</groupId>
++              <artifactId>zookeeper</artifactId>
++            </exclusion>
+           </exclusions>
+         </dependency>
+ 
+@@ -710,6 +730,10 @@
+               <groupId>com.google.guava</groupId>
+               <artifactId>guava</artifactId>
+             </exclusion>
++            <exclusion>
++              <groupId>jline</groupId>
++              <artifactId>jline</artifactId>
++            </exclusion>
+           </exclusions>
+         </dependency>
+ 
+@@ -776,6 +800,10 @@
+               <groupId>joda-time</groupId>
+               <artifactId>joda-time</artifactId>
+             </exclusion>
++            <exclusion>
++              <groupId>org.apache.commons</groupId>
++              <artifactId>commons-lang3</artifactId>
++            </exclusion>
+           </exclusions>
+         </dependency>
+         
+@@ -900,6 +928,10 @@
+               <groupId>joda-time</groupId>
+               <artifactId>joda-time</artifactId>
+             </exclusion>
++            <exclusion>
++              <groupId>org.apache.commons</groupId>
++              <artifactId>commons-lang3</artifactId>
++            </exclusion>
+           </exclusions>
+         </dependency>
+       </dependencies>
diff --git a/bigtop.bom b/bigtop.bom
index 56dda41..fc669cc 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -386,7 +386,7 @@ bigtop {
     'zeppelin' {
       name    = 'zeppelin'
       relNotes = 'Apache Zeppelin'
-      version { base = '0.7.3'; pkg = base; release = 1 }
+      version { base = '0.8.2'; pkg = base; release = 1 }
       tarball { source      = "$name-${version.base}.tgz"
                 destination = "$name-${version.base}.tar.gz" }
       url     { download_path = "/$name/$name-${version.base}/"