This is an automated email from the ASF dual-hosted git repository. zjffdu pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/zeppelin.git
The following commit(s) were added to refs/heads/master by this push: new 874513d [ZEPPELIN-4479]. Don't use helium url in s3 by default 874513d is described below commit 874513d95f580fd5089b74a351fd6b7d543a53c8 Author: Jeff Zhang <zjf...@apache.org> AuthorDate: Fri Mar 6 10:58:04 2020 +0800 [ZEPPELIN-4479]. Don't use helium url in s3 by default ### What is this PR for? Trivial PR which just remove helium s3 url by default. This could solve zeppelin starting issue when users don't have internet access. ### What type of PR is it? [ Improvement ] ### Todos * [ ] - Task ### What is the Jira issue? * https://issues.apache.org/jira/browse/ZEPPELIN-4479 ### How should this be tested? * CI pass ### Screenshots (if appropriate) ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Jeff Zhang <zjf...@apache.org> Closes #3678 from zjffdu/ZEPPELIN-4479 and squashes the following commits: 8ba4c0ae4 [Jeff Zhang] [ZEPPELIN-4479]. Don't use helium url in s3 by default --- docs/development/helium/overview.md | 4 ++++ .../src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/development/helium/overview.md b/docs/development/helium/overview.md index adb74dc..08a401a 100644 --- a/docs/development/helium/overview.md +++ b/docs/development/helium/overview.md @@ -37,3 +37,7 @@ Currently, Helium supports 4 types of package. - [Helium Interpreter](../writing_zeppelin_interpreter.html): Adding a new custom interpreter +## Configuration + +Zeppelin ships with several builtin helium plugins which is located in $ZEPPELIN_HOME/heliums. If you want to try more types of heliums plugins, +you can configure `zeppelin.helium.registry` to be `helium,https://s3.amazonaws.com/helium-package/helium.json` in zeppelin-site.xml. `https://s3.amazonaws.com/helium-package/helium.json` will be updated regularly. diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java index a72ace8..a57f133 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java @@ -920,7 +920,7 @@ public class ZeppelinConfiguration extends XMLConfiguration { ZEPPELIN_CONFIG_STORAGE_CLASS("zeppelin.config.storage.class", "org.apache.zeppelin.storage.LocalConfigStorage"), ZEPPELIN_DEP_LOCALREPO("zeppelin.dep.localrepo", "local-repo"), - ZEPPELIN_HELIUM_REGISTRY("zeppelin.helium.registry", "helium," + HELIUM_PACKAGE_DEFAULT_URL), + ZEPPELIN_HELIUM_REGISTRY("zeppelin.helium.registry", "helium"), ZEPPELIN_HELIUM_NODE_INSTALLER_URL("zeppelin.helium.node.installer.url", "https://nodejs.org/dist/"), ZEPPELIN_HELIUM_NPM_INSTALLER_URL("zeppelin.helium.npm.installer.url",