diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c53e35ec718..e18ea1b88a2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -68,7 +68,8 @@ Here are some things you will need to build and test Zeppelin. ### Software Configuration Management (SCM) -Zeppelin uses Git for its SCM system. Hosted by github.com. `https://github.com/apache/incubator-zeppelin` you'll need git client installed in your development machine. +Zeppelin uses Git for its SCM system. `http://git.apache.org/incubator-zeppelin.git` you'll need git client installed in your development machine. +For write access, `https://git-wip-us.apache.org/repos/asf/incubator-zeppelin.git` ### Integrated Development Environment (IDE) @@ -114,26 +115,31 @@ To build the code, install * Apache Maven ## Getting the source code -First of all, you need the Zeppelin source code. The official location for Zeppelin is [https://github.com/apache/incubator-zeppelin](https://github.com/apache/incubator-zeppelin) +First of all, you need the Zeppelin source code. The official location for Zeppelin is [http://git.apache.org/incubator-zeppelin.git](http://git.apache.org/incubator-zeppelin.git). ### git access Get the source code on your development machine using git. ``` -git clone git@github.com:apache/incubator-zeppelin.git zeppelin +git clone http://git.apache.org/incubator-zeppelin.git zeppelin ``` You may also want to develop against a specific release. For example, for branch-0.1 ``` -git clone -b branch-0.1 git@github.com:apache/incubator-zeppelin.git zeppelin +git clone -b branch-0.1 http://git.apache.org/incubator-zeppelin.git zeppelin ``` +or with write access + +``` +git clone https://git-wip-us.apache.org/repos/asf/incubator-zeppelin.git +``` ### Fork repository -If you want not only build Zeppelin but also make change, then you need fork Zeppelin repository and make pull request. +If you want not only build Zeppelin but also make change, then you need fork Zeppelin github mirror repository (https://github.com/apache/incubator-zeppelin) and make pull request. ## Build diff --git a/angular/pom.xml b/angular/pom.xml index 7aad95d20d6..f3af2e55b58 100644 --- a/angular/pom.xml +++ b/angular/pom.xml @@ -22,14 +22,14 @@ zeppelin org.apache.zeppelin - 0.6.0-incubating-SNAPSHOT + 0.5.7-incubating-SNAPSHOT .. org.apache.zeppelin zeppelin-angular jar - 0.6.0-incubating-SNAPSHOT + 0.5.7-incubating-SNAPSHOT Zeppelin: Angular interpreter http://zeppelin.incubator.apache.org diff --git a/cassandra/pom.xml b/cassandra/pom.xml index 57b501a7a69..8c3e30bea42 100644 --- a/cassandra/pom.xml +++ b/cassandra/pom.xml @@ -15,21 +15,19 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 zeppelin org.apache.zeppelin - 0.6.0-incubating-SNAPSHOT + 0.5.7-incubating-SNAPSHOT .. org.apache.zeppelin zeppelin-cassandra jar - 0.6.0-incubating-SNAPSHOT + 0.5.7-incubating-SNAPSHOT Zeppelin: Cassandra Zeppelin cassandra support http://zeppelin.incubator.apache.org diff --git a/dev/create_release.sh b/dev/create_release.sh index ac1a33a4996..bc5cd731156 100755 --- a/dev/create_release.sh +++ b/dev/create_release.sh @@ -125,7 +125,7 @@ function make_binary_release() { rm -rf ${WORKING_DIR}/zeppelin-${RELEASE_NAME}-bin-${BIN_RELEASE_NAME} } -make_binary_release all "-Pspark-1.5 -Phadoop-2.4 -Pyarn -Ppyspark" +make_binary_release all "-Pspark-1.6 -Phadoop-2.4 -Pyarn -Ppyspark" # remove non release files and dirs rm -rf ${WORKING_DIR}/zeppelin diff --git a/docs/index.md b/docs/index.md index 6919c5dcee5..1648f450830 100644 --- a/docs/index.md +++ b/docs/index.md @@ -117,7 +117,7 @@ This way, you can easily embed it as an iframe inside of your website.


### 100% Opensource -Apache Zeppelin (incubating) is Apache2 Licensed software. Please check out the [source repository](https://github.com/apache/incubator-zeppelin) and [How to contribute](./development/howtocontribute.html) +Apache Zeppelin (incubating) is Apache2 Licensed software. Please check out the [source repository](http://git.apache.org/incubator-zeppelin.git) and [How to contribute](./development/howtocontribute.html) Zeppelin has a very active development community. Join the [Mailing list](./community.html) and report issues on our [Issue tracker](https://issues.apache.org/jira/browse/ZEPPELIN). diff --git a/elasticsearch/pom.xml b/elasticsearch/pom.xml index 3da44418f87..d3625e09104 100644 --- a/elasticsearch/pom.xml +++ b/elasticsearch/pom.xml @@ -22,14 +22,14 @@ zeppelin org.apache.zeppelin - 0.6.0-incubating-SNAPSHOT + 0.5.7-incubating-SNAPSHOT .. org.apache.zeppelin zeppelin-elasticsearch jar - 0.6.0-incubating-SNAPSHOT + 0.5.7-incubating-SNAPSHOT Zeppelin: Elasticsearch interpreter http://www.apache.org diff --git a/flink/pom.xml b/flink/pom.xml index 3a8c36c4f87..db35cba660f 100644 --- a/flink/pom.xml +++ b/flink/pom.xml @@ -22,14 +22,14 @@ zeppelin org.apache.zeppelin - 0.6.0-incubating-SNAPSHOT + 0.5.7-incubating-SNAPSHOT .. org.apache.zeppelin zeppelin-flink jar - 0.6.0-incubating-SNAPSHOT + 0.5.7-incubating-SNAPSHOT Zeppelin: Flink Zeppelin flink support http://zeppelin.incubator.apache.org diff --git a/hive/pom.xml b/hive/pom.xml index 7dc3cd70883..9360d882de2 100644 --- a/hive/pom.xml +++ b/hive/pom.xml @@ -22,14 +22,14 @@ zeppelin org.apache.zeppelin - 0.6.0-incubating-SNAPSHOT + 0.5.7-incubating-SNAPSHOT .. org.apache.zeppelin zeppelin-hive jar - 0.6.0-incubating-SNAPSHOT + 0.5.7-incubating-SNAPSHOT Zeppelin: Hive interpreter http://www.apache.org - + zeppelin org.apache.zeppelin - 0.6.0-incubating-SNAPSHOT + 0.5.7-incubating-SNAPSHOT 4.0.0 org.apache.zeppelin zeppelin-kylin jar - 0.6.0-incubating-SNAPSHOT + 0.5.7-incubating-SNAPSHOT Zeppelin: Kylin interpreter http://zeppelin.incubator.apache.org diff --git a/lens/pom.xml b/lens/pom.xml index bb45ac2f938..fdedf7897fb 100644 --- a/lens/pom.xml +++ b/lens/pom.xml @@ -22,14 +22,14 @@ zeppelin org.apache.zeppelin - 0.6.0-incubating-SNAPSHOT + 0.5.7-incubating-SNAPSHOT .. org.apache.zeppelin zeppelin-lens jar - 0.6.0-incubating-SNAPSHOT + 0.5.7-incubating-SNAPSHOT Zeppelin: Lens interpreter http://www.apache.org diff --git a/markdown/pom.xml b/markdown/pom.xml index 6004f16f3af..0cb9c26c95f 100644 --- a/markdown/pom.xml +++ b/markdown/pom.xml @@ -22,14 +22,14 @@ zeppelin org.apache.zeppelin - 0.6.0-incubating-SNAPSHOT + 0.5.7-incubating-SNAPSHOT .. org.apache.zeppelin zeppelin-markdown jar - 0.6.0-incubating-SNAPSHOT + 0.5.7-incubating-SNAPSHOT Zeppelin: Markdown interpreter http://zeppelin.incubator.apache.org diff --git a/phoenix/pom.xml b/phoenix/pom.xml index 3cca32d7c8f..79b225e5bec 100644 --- a/phoenix/pom.xml +++ b/phoenix/pom.xml @@ -22,13 +22,13 @@ zeppelin org.apache.zeppelin - 0.6.0-incubating-SNAPSHOT + 0.5.7-incubating-SNAPSHOT org.apache.zeppelin zeppelin-phoenix jar - 0.6.0-incubating-SNAPSHOT + 0.5.7-incubating-SNAPSHOT Zeppelin: Apache Phoenix Interpreter Zeppelin interprter for Apache Phoenix http://zeppelin.incubator.apache.org diff --git a/pom.xml b/pom.xml index 9d5b572aef5..c3f554fee5d 100755 --- a/pom.xml +++ b/pom.xml @@ -16,8 +16,7 @@ ~ limitations under the License. --> - + - + 4.0.0 zeppelin org.apache.zeppelin - 0.6.0-incubating-SNAPSHOT + 0.5.7-incubating-SNAPSHOT org.apache.zeppelin zeppelin-postgresql jar - 0.6.0-incubating-SNAPSHOT + 0.5.7-incubating-SNAPSHOT Zeppelin: PostgreSQL interpreter http://www.apache.org diff --git a/shell/pom.xml b/shell/pom.xml index 6379bea9732..a74364986da 100644 --- a/shell/pom.xml +++ b/shell/pom.xml @@ -22,14 +22,14 @@ zeppelin org.apache.zeppelin - 0.6.0-incubating-SNAPSHOT + 0.5.7-incubating-SNAPSHOT .. org.apache.zeppelin zeppelin-shell jar - 0.6.0-incubating-SNAPSHOT + 0.5.7-incubating-SNAPSHOT Zeppelin: Shell interpreter http://zeppelin.incubator.apache.org diff --git a/spark-dependencies/pom.xml b/spark-dependencies/pom.xml index cb8bfc42fc1..b8204f90199 100644 --- a/spark-dependencies/pom.xml +++ b/spark-dependencies/pom.xml @@ -22,14 +22,14 @@ zeppelin org.apache.zeppelin - 0.6.0-incubating-SNAPSHOT + 0.5.7-incubating-SNAPSHOT .. org.apache.zeppelin zeppelin-spark-dependencies jar - 0.6.0-incubating-SNAPSHOT + 0.5.7-incubating-SNAPSHOT Zeppelin: Spark dependencies Zeppelin spark support http://zeppelin.incubator.apache.org @@ -43,7 +43,7 @@ 2.3.0 ${hadoop.version} 1.7.7 - + 0.7.1 2.4.1 @@ -483,7 +483,7 @@ 1.5.2 com.typesafe.akka 2.3.11 - 2.5.0 + 2.5.0.al @@ -496,7 +496,7 @@ 1.5.1 com.typesafe.akka 2.3.11 - 2.5.0 + 2.5.0.al @@ -521,7 +521,7 @@ 0.9 com.typesafe.akka 2.3.11 - 2.5.0 + 2.5.0.al @@ -557,7 +557,7 @@ hadoop-2.2 2.2.0 - 2.5.0 + 2.5.0.al hadoop2 @@ -566,7 +566,7 @@ hadoop-2.3 2.3.0 - 2.5.0 + 2.5.0.al 0.9.3 hadoop2 @@ -576,7 +576,7 @@ hadoop-2.4 2.4.0 - 2.5.0 + 2.5.0.al 0.9.3 hadoop2 @@ -586,7 +586,7 @@ hadoop-2.6 2.6.0 - 2.5.0 + 2.5.0.al 0.9.3 hadoop2 @@ -792,12 +792,9 @@ - - - + + + @@ -878,7 +875,7 @@ - + reference.conf @@ -938,4 +935,22 @@ + + + + applovin + http://maven.dev-opscfd.com/nexus/content/repositories/applovin + + always + + + + thirdparty + http://maven.dev-opscfd.com/nexus/content/repositories/thirdparty + + always + + + + diff --git a/spark/pom.xml b/spark/pom.xml index 2bc1d6dddb7..a55bf5bcd59 100644 --- a/spark/pom.xml +++ b/spark/pom.xml @@ -22,14 +22,14 @@ zeppelin org.apache.zeppelin - 0.6.0-incubating-SNAPSHOT + 0.5.7-incubating-SNAPSHOT .. org.apache.zeppelin zeppelin-spark jar - 0.6.0-incubating-SNAPSHOT + 0.5.7-incubating-SNAPSHOT Zeppelin: Spark Zeppelin spark support http://zeppelin.incubator.apache.org @@ -408,7 +408,7 @@ - + reference.conf diff --git a/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java b/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java index 2f2829ea302..b967c29b6ef 100644 --- a/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java +++ b/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java @@ -335,6 +335,10 @@ public SparkContext createSparkContext() { conf.set("spark.submit.pyArchives", Joiner.on(":").join(pythonLibs)); } + // Distributes needed libraries to workers. + if (getProperty("master").equals("yarn-client")) { + conf.set("spark.yarn.isPython", "true"); + } SparkContext sparkContext = new SparkContext(conf); return sparkContext; diff --git a/tajo/pom.xml b/tajo/pom.xml index cf4311f3e34..1dba26db9a1 100644 --- a/tajo/pom.xml +++ b/tajo/pom.xml @@ -21,14 +21,14 @@ zeppelin org.apache.zeppelin - 0.6.0-incubating-SNAPSHOT + 0.5.7-incubating-SNAPSHOT .. org.apache.zeppelin zeppelin-tajo jar - 0.6.0-incubating-SNAPSHOT + 0.5.7-incubating-SNAPSHOT Zeppelin: Tajo interpreter http://www.apache.org diff --git a/zeppelin-distribution/pom.xml b/zeppelin-distribution/pom.xml index df448983ec0..4845b1012ef 100644 --- a/zeppelin-distribution/pom.xml +++ b/zeppelin-distribution/pom.xml @@ -16,14 +16,13 @@ ~ limitations under the License. --> - + 4.0.0 zeppelin org.apache.zeppelin - 0.6.0-incubating-SNAPSHOT + 0.5.7-incubating-SNAPSHOT .. diff --git a/zeppelin-interpreter/pom.xml b/zeppelin-interpreter/pom.xml index 59d2cd0d439..40302034529 100644 --- a/zeppelin-interpreter/pom.xml +++ b/zeppelin-interpreter/pom.xml @@ -16,22 +16,21 @@ ~ limitations under the License. --> - + 4.0.0 zeppelin org.apache.zeppelin - 0.6.0-incubating-SNAPSHOT + 0.5.7-incubating-SNAPSHOT .. org.apache.zeppelin zeppelin-interpreter jar - 0.6.0-incubating-SNAPSHOT + 0.5.7-incubating-SNAPSHOT Zeppelin: Interpreter Zeppelin Interpreter http://zeppelin.incubator.apache.org diff --git a/zeppelin-server/pom.xml b/zeppelin-server/pom.xml index e77ee6ca38d..6c9c2452dd5 100644 --- a/zeppelin-server/pom.xml +++ b/zeppelin-server/pom.xml @@ -22,14 +22,14 @@ zeppelin org.apache.zeppelin - 0.6.0-incubating-SNAPSHOT + 0.5.7-incubating-SNAPSHOT .. org.apache.zeppelin zeppelin-server jar - 0.6.0-incubating-SNAPSHOT + 0.5.7-incubating-SNAPSHOT Zeppelin: Server http://www.nflabs.com @@ -337,7 +337,7 @@ scalatest-maven-plugin 1.0 - + 1 diff --git a/zeppelin-web/pom.xml b/zeppelin-web/pom.xml index 6b278af71b7..86f10b46692 100644 --- a/zeppelin-web/pom.xml +++ b/zeppelin-web/pom.xml @@ -22,14 +22,14 @@ zeppelin org.apache.zeppelin - 0.6.0-incubating-SNAPSHOT + 0.5.7-incubating-SNAPSHOT .. org.apache.zeppelin zeppelin-web war - 0.6.0-incubating-SNAPSHOT + 0.5.7-incubating-SNAPSHOT Zeppelin: web Application diff --git a/zeppelin-web/src/app/notebook/notebook.html b/zeppelin-web/src/app/notebook/notebook.html index 227f8cdaafc..41d1e1ced7f 100644 --- a/zeppelin-web/src/app/notebook/notebook.html +++ b/zeppelin-web/src/app/notebook/notebook.html @@ -66,7 +66,7 @@
Interpreter binding
ng-Init="init(currentParagraph)" ng-class="columnWidthClass(currentParagraph.config.colWidth)" class="paragraph-col"> -
+

+

+ 'lastEmptyParagraph': !paragraph.text && !paragraph.result}" ng-hide="currentParagraph.config.tableHide && viewOnly">
-
+

+

diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js index ed275f4931e..6a70f48ee3c 100644 --- a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js +++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js @@ -960,7 +960,7 @@ angular.module('zeppelinWebApp') clearUnknownColsFromGraphOption(); // set graph height var height = $scope.paragraph.config.graph.height; - angular.element('#p' + $scope.paragraph.id + '_resize').height(height); + angular.element('#p' + $scope.paragraph.id + '_graph').height(height); if (!type || type === 'table') { setTable($scope.paragraph.result, refresh); diff --git a/zeppelin-zengine/pom.xml b/zeppelin-zengine/pom.xml index 0ef60bf3a69..5c726097c8e 100644 --- a/zeppelin-zengine/pom.xml +++ b/zeppelin-zengine/pom.xml @@ -23,14 +23,14 @@ zeppelin org.apache.zeppelin - 0.6.0-incubating-SNAPSHOT + 0.5.7-incubating-SNAPSHOT .. org.apache.zeppelin zeppelin-zengine jar - 0.6.0-incubating-SNAPSHOT + 0.5.7-incubating-SNAPSHOT Zeppelin: Zengine Zeppelin Zengine http://zeppelin.incubator.apache.org