Skip to content

Commit 4f532aa

Browse files
Muhammad-msMuhammad-ms
authored
Merge pull request #1 from apache/master
Catch up with the apache/zeppelin repository master branch
2 parents e1ba413 + ceff31a commit 4f532aa

File tree

487 files changed

+44067
-334
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

487 files changed

+44067
-334
lines changed

‎.travis.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,17 @@ matrix:
7979
packages:
8080
- google-chrome-stable
8181

82+
# Run tests (in zeppelin-web-angular)
83+
- os: linux
84+
sudo: false
85+
dist: xenial
86+
jdk: "openjdk8"
87+
env: CI="true" BUILD_FLAG="clean -DskipTests -DskipRat" TEST_FLAG="package -DskipRat" MODULES="-pl ${INTERPRETERS}" TEST_MODULES="-pl zeppelin-web-angular"
88+
addons:
89+
apt:
90+
packages:
91+
- google-chrome-stable
92+
8293
# Test core modules
8394
# Several tests were excluded from this configuration due to the following issues:
8495
# HeliumApplicationFactoryTest - https://issues.apache.org/jira/browse/ZEPPELIN-2470

‎LICENSE‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,16 +236,19 @@ The text of each license is also included at licenses/LICENSE-[project]-[version
236236
(The MIT License) jekyll-bootstrap 0.3.0 (https://github.com/plusjade/jekyll-bootstrap) - https://github.com/plusjade/jekyll-bootstrap
237237
(The MIT License) jekyll 1.3.0 (http://jekyllrb.com/) - https://github.com/jekyll/jekyll/blob/v1.3.0/LICENSE
238238
(The MIT License) ngInfiniteScroll 1.3.4 (https://github.com/sroze/ngInfiniteScroll) - https://github.com/sroze/ngInfiniteScroll/blob/master/LICENSE
239+
(The MIT License) @antv/G2 3.5 (https://github.com/antvis/g2) - https://github.com/antvis/g2/blob/master/LICENSE
240+
(The MIT License) Lodash (https://lodash.com) - https://github.com/lodash/lodash/blob/master/LICENSE
241+
(The MIT License) Monaco Editor (https://github.com/microsoft/monaco-editor) - https://github.com/microsoft/monaco-editor/blob/master/LICENSE.md
239242

240243
========================================================================
241244
MIT-style licenses
242245
========================================================================
243246
The following components are provided under the MIT-style license. See project link for details.
244247
The text of each license is also included at licenses/LICENSE-[project]-[version].txt.
245-
248+
246249
(MIT Style) jekyll-table-of-contents (https://github.com/ghiculescu/jekyll-table-of-contents) - https://github.com/ghiculescu/jekyll-table-of-contents/blob/master/LICENSE.txt
247250
(MIT Style) lunr.js (https://github.com/olivernn/lunr.js) - https://github.com/olivernn/lunr.js/blob/v0.7.1/LICENSE
248-
251+
249252
========================================================================
250253
Apache licenses
251254
========================================================================

‎angular/src/main/resources/interpreter-setting.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,16 @@
99
"editOnDblClick": true,
1010
"completionSupport": false
1111
}
12+
},
13+
{
14+
"group": "angular",
15+
"name": "ng",
16+
"className": "org.apache.zeppelin.angular.AngularInterpreter",
17+
"properties": {
18+
},
19+
"editor": {
20+
"editOnDblClick": true,
21+
"completionSupport": false
22+
}
1223
}
1324
]

‎bin/common.sh‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,15 @@ if [[ -z "${ZEPPELIN_WAR}" ]]; then
4444
if [[ -d "${ZEPPELIN_HOME}/zeppelin-web/dist" ]]; then
4545
export ZEPPELIN_WAR="${ZEPPELIN_HOME}/zeppelin-web/dist"
4646
else
47-
export ZEPPELIN_WAR=$(find -L "${ZEPPELIN_HOME}" -name "zeppelin-web*.war")
47+
export ZEPPELIN_WAR=$(find -L "${ZEPPELIN_HOME}" -name "zeppelin-web-[0-9]*.war")
48+
fi
49+
fi
50+
51+
if [[ -z "${ZEPPELIN_ANGULAR_WAR}" ]]; then
52+
if [[ -d "${ZEPPELIN_HOME}/zeppelin-web/dist" ]]; then
53+
export ZEPPELIN_ANGULAR_WAR="${ZEPPELIN_HOME}/zeppelin-web-angular/dist/zeppelin"
54+
else
55+
export ZEPPELIN_ANGULAR_WAR=$(find -L "${ZEPPELIN_HOME}" -name "zeppelin-web-angular*.war")
4856
fi
4957
fi
5058

@@ -102,7 +110,7 @@ function getZeppelinVersion(){
102110
exit 0
103111
}
104112

105-
# Text encoding for
113+
# Text encoding for
106114
# read/write job into files,
107115
# receiving/displaying query/result.
108116
if [[ -z "${ZEPPELIN_ENCODING}" ]]; then

‎bin/zeppelin-daemon.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ addJarInDir "${ZEPPELIN_HOME}/zeppelin-interpreter/target/lib"
8181
addJarInDir "${ZEPPELIN_HOME}/zeppelin-zengine/target/lib"
8282
addJarInDir "${ZEPPELIN_HOME}/zeppelin-server/target/lib"
8383
addJarInDir "${ZEPPELIN_HOME}/zeppelin-web/target/lib"
84+
addJarInDir "${ZEPPELIN_HOME}/zeppelin-web-angular/target/lib"
8485

8586
CLASSPATH+=":${ZEPPELIN_CLASSPATH}"
8687

‎bin/zeppelin.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ addJarInDir "${ZEPPELIN_HOME}/zeppelin-interpreter/target/lib"
7070
addJarInDir "${ZEPPELIN_HOME}/zeppelin-zengine/target/lib"
7171
addJarInDir "${ZEPPELIN_HOME}/zeppelin-server/target/lib"
7272
addJarInDir "${ZEPPELIN_HOME}/zeppelin-web/target/lib"
73+
addJarInDir "${ZEPPELIN_HOME}/zeppelin-web-angular/target/lib"
7374

7475
ZEPPELIN_CLASSPATH="$CLASSPATH:$ZEPPELIN_CLASSPATH"
7576

‎dev/create_release.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ function make_binary_release() {
9898

9999
git_clone
100100
make_source_package
101-
make_binary_release all "-Pspark-2.3 -Phadoop-2.6 -Pscala-${SCALA_VERSION}"
102-
make_binary_release netinst "-Pspark-2.3 -Phadoop-2.6 -Pscala-${SCALA_VERSION} -pl zeppelin-interpreter,zeppelin-zengine,:zeppelin-display_${SCALA_VERSION},:zeppelin-spark-dependencies_${SCALA_VERSION},:zeppelin-spark_${SCALA_VERSION},zeppelin-web,zeppelin-server,zeppelin-distribution -am"
101+
make_binary_release all "-Phadoop-2.6 -Pscala-${SCALA_VERSION}"
102+
make_binary_release netinst "-Phadoop-2.6 -Pscala-${SCALA_VERSION} -pl zeppelin-interpreter,zeppelin-zengine,:zeppelin-display_${SCALA_VERSION},:zeppelin-spark-dependencies_${SCALA_VERSION},:zeppelin-spark_${SCALA_VERSION},zeppelin-web,zeppelin-server,zeppelin-distribution -am"
103103

104104
# remove non release files and dirs
105105
rm -rf "${WORKING_DIR}/zeppelin"

‎dev/publish_release.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ if [[ $RELEASE_VERSION == *"SNAPSHOT"* ]]; then
4646
DO_SNAPSHOT="yes"
4747
fi
4848

49-
PUBLISH_PROFILES="-Ppublish-distr -Pspark-2.1 -Phadoop-2.6 -Pr"
49+
PUBLISH_PROFILES="-Ppublish-distr -Phadoop-2.6 -Pr"
5050
PROJECT_OPTIONS="-pl !zeppelin-distribution"
5151
NEXUS_STAGING="https://repository.apache.org/service/local/staging"
5252
NEXUS_PROFILE="153446d1ac37c4"

‎docs/_includes/themes/zeppelin/_navigation.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@
142142
<li><a href="{{BASE_PATH}}/interpreter/hive.html">Hive</a></li>
143143
<li><a href="{{BASE_PATH}}/interpreter/ignite.html">Ignite</a></li>
144144
<li><a href="{{BASE_PATH}}/interpreter/java.html">Java</a></li>
145+
<li><a href="{{BASE_PATH}}/interpreter/jupyter.html">Jupyter</a></li>
145146
<li><a href="{{BASE_PATH}}/interpreter/kotlin.html">Kotlin</a></li>
146147
<li><a href="{{BASE_PATH}}/interpreter/kylin.html">Kylin</a></li>
147148
<li><a href="{{BASE_PATH}}/interpreter/lens.html">Lens</a></li>

‎docs/assets/themes/zeppelin/img/docs-img/ipython_kernel.png‎

131 KB
Loading

0 commit comments

Comments
 (0)