diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE index 322b69121e6..09c1b3bfd52 100644 --- a/.github/PULL_REQUEST_TEMPLATE +++ b/.github/PULL_REQUEST_TEMPLATE @@ -1,6 +1,6 @@ ### What is this PR for? A few sentences describing the overall goals of the pull request's commits. -First time? Check out the contributing guide - https://github.com/apache/incubator-zeppelin/blob/master/CONTRIBUTING.md +First time? Check out the contributing guide - https://github.com/apache/zeppelin/blob/master/CONTRIBUTING.md ### What type of PR is it? diff --git a/.travis.yml b/.travis.yml index f7ff08b03f1..9ba565b8586 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,7 @@ sudo: false cache: directories: - .spark-dist + - ${HOME}/.m2/repository/.cache/maven-download-plugin addons: apt: @@ -61,7 +62,7 @@ matrix: env: TEST_SELENIUM="true" SPARK_VER="1.6.1" HADOOP_VER="2.3" PROFILE="-Pspark-1.6 -Phadoop-2.3 -Ppyspark" BUILD_FLAG="package -DskipTests" TEST_FLAG="verify" TEST_PROJECTS="-pl zeppelin-interpreter,zeppelin-zengine,zeppelin-server,zeppelin-display,spark-dependencies,spark -Dtest=org.apache.zeppelin.AbstractFunctionalSuite -DfailIfNoTests=false" before_install: - - "ls -la .spark-dist" + - "ls -la .spark-dist ${HOME}/.m2/repository/.cache/maven-download-plugin" - mkdir -p ~/R - echo 'R_LIBS=~/R' > ~/.Renviron - R -e "install.packages('knitr', repos = 'http://cran.us.r-project.org', lib='~/R')" @@ -95,4 +96,3 @@ after_failure: after_script: - ./testing/stopSparkCluster.sh $SPARK_VER $HADOOP_VER - diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ed2849eaaf0..2c87aad5af1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ # How to contribute -**Zeppelin** is [Apache2 License](https://github.com/apache/incubator-zeppelin/blob/master/CONTRIBUTING.md) Software. +**Zeppelin** is [Apache2 License](https://github.com/apache/zeppelin/blob/master/CONTRIBUTING.md) Software. Contributing to Zeppelin (Source code, Documents, Image, Website) means you agree to the Apache2 License. 1. Make sure your issue is not already in the [Jira issue tracker](https://issues.apache.org/jira/browse/ZEPPELIN) @@ -17,7 +17,7 @@ In order to make the review process easier, please follow this template when mak ``` ### What is this PR for? A few sentences describing the overall goals of the pull request's commits. -First time? Check out the contributing guide - https://github.com/apache/incubator-zeppelin/blob/master/CONTRIBUTING.md +First time? Check out the contributing guide - https://github.com/apache/zeppelin/blob/master/CONTRIBUTING.md ### What type of PR is it? [Bug Fix | Improvement | Feature | Documentation | Hot Fix | Refactoring] @@ -58,7 +58,7 @@ You can also test and review a particular Pull Request. Here are two useful ways * Another way is using [github/hub](https://github.com/github/hub). ``` - hub checkout https://github.com/apache/incubator-zeppelin/pull/[# of PR] + hub checkout https://github.com/apache/zeppelin/pull/[# of PR] ``` The above two methods will help you test and review Pull Requests. @@ -91,8 +91,8 @@ Here are some things you will need to build and test Zeppelin. ### Software Configuration Management (SCM) -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` +Zeppelin uses Git for its SCM system. `http://git.apache.org/zeppelin.git` you'll need git client installed in your development machine. +For write access, `https://git-wip-us.apache.org/repos/asf/zeppelin.git` ### Integrated Development Environment (IDE) @@ -109,8 +109,6 @@ The top-level pom.xml describes the basic project structure. Currently Zeppelin markdown angular shell - hive - tajo flink ignite lens @@ -121,7 +119,7 @@ The top-level pom.xml describes the basic project structure. Currently Zeppelin ### Web Project Contribution Guidelines If you plan on making a contribution to Zeppelin's WebApplication, -please check [its own contribution guidelines](https://github.com/apache/incubator-zeppelin/blob/master/zeppelin-web/CONTRIBUTING.md) +please check [its own contribution guidelines](https://github.com/apache/zeppelin/blob/master/zeppelin-web/CONTRIBUTING.md) ### Code convention We are following Google Code style: @@ -138,31 +136,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 [http://git.apache.org/incubator-zeppelin.git](http://git.apache.org/incubator-zeppelin.git). +First of all, you need the Zeppelin source code. The official location for Zeppelin is [http://git.apache.org/zeppelin.git](http://git.apache.org/zeppelin.git). ### git access Get the source code on your development machine using git. ``` -git clone git://git.apache.org/incubator-zeppelin.git zeppelin +git clone git://git.apache.org/zeppelin.git zeppelin ``` You may also want to develop against a specific branch. For example, for branch-0.5.6 ``` -git clone -b branch-0.5.6 git://git.apache.org/incubator-zeppelin.git zeppelin +git clone -b branch-0.5.6 git://git.apache.org/zeppelin.git zeppelin ``` or with write access ``` -git clone https://git-wip-us.apache.org/repos/asf/incubator-zeppelin.git +git clone https://git-wip-us.apache.org/repos/asf/zeppelin.git ``` ### Fork repository -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. +If you want not only build Zeppelin but also make change, then you need fork Zeppelin github mirror repository (https://github.com/apache/zeppelin) and make pull request. ## Build @@ -193,11 +191,11 @@ Zeppelin has 3 types of tests: 2. Integration Tests: The integration tests run after all modules are build. The integration tests launch an instance of Zeppelin server. ZeppelinRestApiTest is an example integration test. 3. GUI integration tests: These tests validate the Zeppelin UI elements. These tests require a running Zeppelin server and launches a web browser to validate Notebook UI elements like Notes and their execution. See ZeppelinIT as an example. -Currently the GUI integration tests are not run in the Maven and are only run in the CI environment when the pull request is submitted to github. Make sure to watch the [CI results] (https://travis-ci.org/apache/incubator-zeppelin/pull_requests) for your pull request. +Currently the GUI integration tests are not run in the Maven and are only run in the CI environment when the pull request is submitted to github. Make sure to watch the [CI results] (https://travis-ci.org/apache/zeppelin/pull_requests) for your pull request. ## Continuous Integration -Zeppelin uses Travis for CI. In the project root there is .travis.yml that configures CI and [publishes CI results] (https://travis-ci.org/apache/incubator-zeppelin/builds) +Zeppelin uses Travis for CI. In the project root there is .travis.yml that configures CI and [publishes CI results] (https://travis-ci.org/apache/zeppelin/builds) ## Run Zeppelin server in development mode @@ -225,6 +223,6 @@ You can find issues for [beginner](https://issues.apache.org/jira/browse/ZEPPELI ## Stay involved Everyone is welcome to join our mailing list: - * [users@zeppelin.apache.org](http://mail-archives.apache.org/mod_mbox/incubator-zeppelin-users/) is for usage questions, help, and announcements [ [subscribe](mailto:users-subscribe@zeppelin.apache.org?subject=send%20this%20email%20to%20subscribe), [unsubscribe](mailto:users-unsubscribe@zeppelin.apache.org?subject=send%20this%20email%20to%20unsubscribe), [archive](http://mail-archives.apache.org/mod_mbox/incubator-zeppelin-users/) ] - * [dev@zeppelin.apache.org](http://mail-archives.apache.org/mod_mbox/incubator-zeppelin-users/) is for people who want to contribute code to Zeppelin.[ [subscribe](mailto:dev-subscribe@zeppelin.apache.org?subject=send%20this%20email%20to%20subscribe), [unsubscribe](mailto:dev-unsubscribe@zeppelin.apache.org?subject=send%20this%20email%20to%20unsubscribe), [archive](http://mail-archives.apache.org/mod_mbox/incubator-zeppelin-dev/) ] - * [commits@zeppelin.apache.org](http://mail-archives.apache.org/mod_mbox/incubator-zeppelin-commits/) is for commit messages and patches to Zeppelin. [ [subscribe](mailto:commits-subscribe@zeppelin.apache.org?subject=send%20this%20email%20to%20subscribe), [unsubscribe](mailto:commits-unsubscribe@zeppelin.apache.org?subject=send%20this%20email%20to%20unsubscribe), [archive](http://mail-archives.apache.org/mod_mbox/incubator-zeppelin-commits/) ] + * [users@zeppelin.apache.org](http://mail-archives.apache.org/mod_mbox/zeppelin-users/) is for usage questions, help, and announcements [ [subscribe](mailto:users-subscribe@zeppelin.apache.org?subject=send%20this%20email%20to%20subscribe), [unsubscribe](mailto:users-unsubscribe@zeppelin.apache.org?subject=send%20this%20email%20to%20unsubscribe), [archive](http://mail-archives.apache.org/mod_mbox/zeppelin-users/) ] + * [dev@zeppelin.apache.org](http://mail-archives.apache.org/mod_mbox/zeppelin-users/) is for people who want to contribute code to Zeppelin.[ [subscribe](mailto:dev-subscribe@zeppelin.apache.org?subject=send%20this%20email%20to%20subscribe), [unsubscribe](mailto:dev-unsubscribe@zeppelin.apache.org?subject=send%20this%20email%20to%20unsubscribe), [archive](http://mail-archives.apache.org/mod_mbox/zeppelin-dev/) ] + * [commits@zeppelin.apache.org](http://mail-archives.apache.org/mod_mbox/zeppelin-commits/) is for commit messages and patches to Zeppelin. [ [subscribe](mailto:commits-subscribe@zeppelin.apache.org?subject=send%20this%20email%20to%20subscribe), [unsubscribe](mailto:commits-unsubscribe@zeppelin.apache.org?subject=send%20this%20email%20to%20unsubscribe), [archive](http://mail-archives.apache.org/mod_mbox/zeppelin-commits/) ] diff --git a/LICENSE b/LICENSE index db076c66d99..67a5b7934ae 100644 --- a/LICENSE +++ b/LICENSE @@ -256,4 +256,12 @@ The following components are provided under the BSD 3-Clause license. See file r/src/main/scala/org/apache/zeppelin/rinterpreter/rscala/{Package.scala, RClient.scala} (BSD 3 Clause) portions of Scala (http://www.scala-lang.org/download) - http://www.scala-lang.org/download/#License - r/src/main/scala/scala/Console.scala \ No newline at end of file + r/src/main/scala/scala/Console.scala + +======================================================================== +BSD 2-Clause licenses +======================================================================== +The following components are provided under the BSD 3-Clause license. See file headers and project links for details. + + (BSD 2 Clause) portions of SQLLine (http://sqlline.sourceforge.net/) - http://sqlline.sourceforge.net/#license + jdbc/src/main/java/org/apache/zeppelin/jdbc/SqlCompleter.java \ No newline at end of file diff --git a/NOTICE b/NOTICE index 3b130300f72..bfbb6271795 100644 --- a/NOTICE +++ b/NOTICE @@ -1,4 +1,4 @@ -Apache Zeppelin (incubating) +Apache Zeppelin Copyright 2015 - 2016 The Apache Software Foundation This product includes software developed at diff --git a/README.md b/README.md index 465fd697679..131463bd5ba 100644 --- a/README.md +++ b/README.md @@ -2,10 +2,10 @@ **Documentation:** [User Guide](http://zeppelin.apache.org/docs/latest/index.html)
**Mailing Lists:** [User and Dev mailing list](http://zeppelin.apache.org/community.html)
-**Continuous Integration:** [![Build Status](https://secure.travis-ci.org/apache/incubator-zeppelin.png?branch=master)](https://travis-ci.org/apache/incubator-zeppelin)
-**Contributing:** [Contribution Guide](https://github.com/apache/incubator-zeppelin/blob/master/CONTRIBUTING.md)
+**Continuous Integration:** [![Build Status](https://secure.travis-ci.org/apache/zeppelin.png?branch=master)](https://travis-ci.org/apache/zeppelin)
+**Contributing:** [Contribution Guide](https://github.com/apache/zeppelin/blob/master/CONTRIBUTING.md)
**Issue Tracker:** [Jira](https://issues.apache.org/jira/browse/ZEPPELIN)
-**License:** [Apache 2.0](https://github.com/apache/incubator-zeppelin/blob/master/LICENSE) +**License:** [Apache 2.0](https://github.com/apache/zeppelin/blob/master/LICENSE) **Zeppelin**, a web-based notebook that enables interactive data analytics. You can make beautiful data-driven, interactive and collaborative documents with SQL, Scala and more. @@ -162,8 +162,7 @@ enable 3rd party vendor repository (cloudera) ##### `-Pmapr[version]` (optional) For the MapR Hadoop Distribution, these profiles will handle the Hadoop version. As MapR allows different versions of Spark to be installed, you should specify which version of Spark is installed on the cluster by adding a Spark profile (`-Pspark-1.2`, `-Pspark-1.3`, etc.) as needed. -For Hive, check the hive/pom.xml and adjust the version installed as well. The correct Maven -artifacts can be found for every version of MapR at http://doc.mapr.com +The correct Maven artifacts can be found for every version of MapR at http://doc.mapr.com Available profiles are @@ -196,7 +195,7 @@ mvn clean package -Pspark-1.5 -Pmapr50 -DskipTests #### Ignite Interpreter ```sh -mvn clean package -Dignite.version=1.1.0-incubating -DskipTests +mvn clean package -Dignite.version=1.6.0 -DskipTests ``` #### Scalding Interpreter @@ -288,4 +287,4 @@ mvn verify mvn verify -P using-packaged-distr ``` -[![Analytics](https://ga-beacon.appspot.com/UA-45176241-4/apache/incubator-zeppelin/README.md?pixel)](https://github.com/igrigorik/ga-beacon) +[![Analytics](https://ga-beacon.appspot.com/UA-45176241-4/apache/zeppelin/README.md?pixel)](https://github.com/igrigorik/ga-beacon) diff --git a/SECURITY-README.md b/SECURITY-README.md index a34b4a24820..f9f6645ff5b 100644 --- a/SECURITY-README.md +++ b/SECURITY-README.md @@ -14,7 +14,7 @@ limitations under the License. # Shiro Authentication To connect to Zeppelin, users will be asked to enter their credentials. Once logged, a user has access to all notes including other users notes. -This a a first step toward full security as implemented by this pull request (https://github.com/apache/incubator-zeppelin/pull/53). +This a a first step toward full security as implemented by this pull request (https://github.com/apache/zeppelin/pull/53). # Security setup 1. Secure the HTTP channel: Comment the line "/** = anon" and uncomment the line "/** = authcBasic" in the file conf/shiro.ini. Read more about he shiro.ini file format at the following URL http://shiro.apache.org/configuration.html#Configuration-INISections. diff --git a/cassandra/pom.xml b/cassandra/pom.xml index d5731933b77..46d2530d462 100644 --- a/cassandra/pom.xml +++ b/cassandra/pom.xml @@ -30,12 +30,12 @@ zeppelin-cassandra jar 0.6.0-SNAPSHOT - Zeppelin: Cassandra + Zeppelin: Apache Cassandra interpreter Zeppelin cassandra support http://zeppelin.apache.org - 3.0.0-rc1 + 3.0.1 1.0.5.4 1.3.0 2.10.4 diff --git a/cassandra/src/main/java/org/apache/zeppelin/cassandra/CassandraInterpreter.java b/cassandra/src/main/java/org/apache/zeppelin/cassandra/CassandraInterpreter.java index cc4520d2101..ca77aba2991 100644 --- a/cassandra/src/main/java/org/apache/zeppelin/cassandra/CassandraInterpreter.java +++ b/cassandra/src/main/java/org/apache/zeppelin/cassandra/CassandraInterpreter.java @@ -110,7 +110,7 @@ public class CassandraInterpreter extends Interpreter { public static final String DEFAULT_PORT = "9042"; public static final String DEFAULT_CLUSTER = "Test Cluster"; public static final String DEFAULT_KEYSPACE = "system"; - public static final String DEFAULT_PROTOCOL_VERSION = "3"; + public static final String DEFAULT_PROTOCOL_VERSION = "4"; public static final String DEFAULT_COMPRESSION = "NONE"; public static final String DEFAULT_CREDENTIAL = "none"; public static final String DEFAULT_POLICY = "DEFAULT"; @@ -159,7 +159,7 @@ public CassandraInterpreter(Properties properties) { "IP address). Default = localhost. Ex: '192.168.0.12,node2,node3'") .add(CASSANDRA_PORT, DEFAULT_PORT, "Cassandra native port. Default = 9042") .add(CASSANDRA_PROTOCOL_VERSION, DEFAULT_PROTOCOL_VERSION, - "Cassandra protocol version. Default = 3") + "Cassandra protocol version. Default = 4") .add(CASSANDRA_CLUSTER_NAME, DEFAULT_CLUSTER, "Cassandra cluster name. " + "Default = 'Test Cluster'") .add(CASSANDRA_KEYSPACE_NAME, DEFAULT_KEYSPACE, "Cassandra keyspace name. " + @@ -311,7 +311,7 @@ public void cancel(InterpreterContext context) { @Override public FormType getFormType() { - return FormType.NATIVE; + return FormType.SIMPLE; } @Override diff --git a/cassandra/src/main/resources/scalate/helpMenu.ssp b/cassandra/src/main/resources/scalate/helpMenu.ssp index 26ff1171abd..c61a68f7e31 100644 --- a/cassandra/src/main/resources/scalate/helpMenu.ssp +++ b/cassandra/src/main/resources/scalate/helpMenu.ssp @@ -103,12 +103,12 @@