Skip to content

Commit 2586651

Browse files
author
Fouad
committed
Merge pull request #2 from apache/master
update from original
2 parents 5bed779 + 8cde5c9 commit 2586651

File tree

319 files changed

+20850
-2377
lines changed

Some content is hidden

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

319 files changed

+20850
-2377
lines changed

‎.gitignore‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,20 @@
1212
spark/derby.log
1313
spark/metastore_db
1414
spark-1.*-bin-hadoop*
15+
.spark-dist
16+
zeppelin-server/derby.log
1517

1618
lens/lens-cli-hist.log
1719

1820
# conf file
1921
conf/zeppelin-env.sh
22+
conf/zeppelin-env.cmd
2023
conf/zeppelin-site.xml
2124
conf/keystore
2225
conf/truststore
2326
conf/interpreter.json
27+
conf/notebook-authorization.json
28+
conf/shiro.ini
2429

2530
# other generated files
2631
spark/dependency-reduced-pom.xml
@@ -35,6 +40,8 @@ zeppelin-web/bower_components
3540
**nbproject/
3641
**node/
3742

43+
#R
44+
/r/lib/
3845

3946
# project level
4047
/logs/
@@ -80,6 +87,9 @@ Thumbs.db
8087
target/
8188
**/target/
8289

90+
# Generated by Jekyll
91+
docs/_site/
92+
8393
*~
8494
\#*\#
8595
/.emacs.desktop

‎.travis.yml‎

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,34 @@
1515

1616
language: java
1717

18+
sudo: false
19+
20+
cache:
21+
directories:
22+
- .spark-dist
23+
24+
addons:
25+
apt:
26+
sources:
27+
- r-packages-precise
28+
packages:
29+
- r-base-dev
30+
- r-cran-evaluate
31+
- r-cran-base64enc
32+
1833
matrix:
1934
include:
2035
# Test all modules
2136
- jdk: "oraclejdk7"
22-
env: SPARK_VER="1.6.0" HADOOP_VER="2.3" PROFILE="-Pspark-1.6 -Phadoop-2.3 -Ppyspark -Pscalding" BUILD_FLAG="package -Pbuild-distr" TEST_FLAG="verify -Pusing-packaged-distr" TEST_PROJECTS=""
37+
env: SPARK_VER="1.6.1" HADOOP_VER="2.3" PROFILE="-Pspark-1.6 -Pr -Phadoop-2.3 -Ppyspark -Psparkr -Pscalding" BUILD_FLAG="package -Pbuild-distr" TEST_FLAG="verify -Pusing-packaged-distr" TEST_PROJECTS=""
2338

2439
# Test spark module for 1.5.2
2540
- jdk: "oraclejdk7"
26-
env: SPARK_VER="1.5.2" HADOOP_VER="2.3" PROFILE="-Pspark-1.5 -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.rest.*Test,org.apache.zeppelin.spark* -DfailIfNoTests=false"
41+
env: SPARK_VER="1.5.2" HADOOP_VER="2.3" PROFILE="-Pspark-1.5 -Pr -Phadoop-2.3 -Ppyspark -Psparkr" BUILD_FLAG="package -DskipTests" TEST_FLAG="verify" TEST_PROJECTS="-pl zeppelin-interpreter,zeppelin-zengine,zeppelin-server,zeppelin-display,spark-dependencies,spark,r -Dtest=org.apache.zeppelin.rest.*Test,org.apache.zeppelin.spark* -DfailIfNoTests=false"
2742

2843
# Test spark module for 1.4.1
2944
- jdk: "oraclejdk7"
30-
env: SPARK_VER="1.4.1" HADOOP_VER="2.3" PROFILE="-Pspark-1.4 -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.rest.*Test,org.apache.zeppelin.spark* -DfailIfNoTests=false"
45+
env: SPARK_VER="1.4.1" HADOOP_VER="2.3" PROFILE="-Pspark-1.4 -Pr -Phadoop-2.3 -Ppyspark -Psparkr" BUILD_FLAG="package -DskipTests" TEST_FLAG="verify" TEST_PROJECTS="-pl zeppelin-interpreter,zeppelin-zengine,zeppelin-server,zeppelin-display,spark-dependencies,spark,r -Dtest=org.apache.zeppelin.rest.*Test,org.apache.zeppelin.spark* -DfailIfNoTests=false"
3146

3247
# Test spark module for 1.3.1
3348
- jdk: "oraclejdk7"
@@ -41,11 +56,16 @@ matrix:
4156
- jdk: "oraclejdk7"
4257
env: SPARK_VER="1.1.1" HADOOP_VER="2.3" PROFILE="-Pspark-1.1 -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.rest.*Test,org.apache.zeppelin.spark* -DfailIfNoTests=false"
4358

44-
# Test selenium with spark module for 1.6.0
59+
# Test selenium with spark module for 1.6.1
4560
- jdk: "oraclejdk7"
46-
env: TEST_SELENIUM="true" SPARK_VER="1.6.0" 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"
61+
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"
4762

4863
before_install:
64+
- "ls -la .spark-dist"
65+
- mkdir -p ~/R
66+
- echo 'R_LIBS=~/R' > ~/.Renviron
67+
- R -e "install.packages('knitr', repos = 'http://cran.us.r-project.org', lib='~/R')"
68+
- export R_LIBS='~/R'
4969
- "export DISPLAY=:99.0"
5070
- "sh -e /etc/init.d/xvfb start"
5171

@@ -56,19 +76,23 @@ before_script:
5676
- travis_retry ./testing/downloadSpark.sh $SPARK_VER $HADOOP_VER
5777
- ./testing/startSparkCluster.sh $SPARK_VER $HADOOP_VER
5878
- echo "export SPARK_HOME=`pwd`/spark-$SPARK_VER-bin-hadoop$HADOOP_VER" > conf/zeppelin-env.sh
79+
- tail conf/zeppelin-env.sh
5980

6081
script:
6182
- mvn $TEST_FLAG $PROFILE -B $TEST_PROJECTS
6283

84+
85+
after_success:
86+
- echo "Travis exited with ${TRAVIS_TEST_RESULT}"
87+
6388
after_failure:
89+
- echo "Travis exited with ${TRAVIS_TEST_RESULT}"
6490
- cat target/rat.txt
6591
- cat zeppelin-server/target/rat.txt
6692
- cat zeppelin-distribution/target/zeppelin-*-SNAPSHOT/zeppelin-*-SNAPSHOT/logs/zeppelin*.log
6793
- cat zeppelin-distribution/target/zeppelin-*-SNAPSHOT/zeppelin-*-SNAPSHOT/logs/zeppelin*.out
94+
- cat zeppelin-web/npm-debug.log
6895

6996
after_script:
7097
- ./testing/stopSparkCluster.sh $SPARK_VER $HADOOP_VER
7198

72-
notifications:
73-
slack:
74-
secure: dtIkPwlf5uTun19p9TtPEAFmrLOMK2COE8TL9m8LXX/N2WzJaKYvAnovMObEV6KEgK2oZ+72Cke7eBI+Hp4FmHZ2B7mQI/PNCfRZthI3cc3zVmMd25yvLH9AlCRa2bC6R885z2copvzaoZtLBkHnPa8bUrUkbmRp40qkDPQpgO4=

‎LICENSE‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,4 +244,16 @@ Apache licenses
244244
The following components are provided under the Apache License. See project link for details.
245245
The text of each license is also included at licenses/LICENSE-[project]-[version].txt.
246246

247-
(Apache 2.0) Bootstrap v3.0.2 (http://getbootstrap.com/) - https://github.com/twbs/bootstrap/blob/v3.0.2/LICENSE
247+
(Apache 2.0) Bootstrap v3.0.2 (http://getbootstrap.com/) - https://github.com/twbs/bootstrap/blob/v3.0.2/LICENSE
248+
249+
========================================================================
250+
BSD 3-Clause licenses
251+
========================================================================
252+
The following components are provided under the BSD 3-Clause license. See file headers and project links for details.
253+
254+
(BSD 3 Clause) portions of rscala 1.0.6 (https://dahl.byu.edu/software/rscala/) - https://cran.r-project.org/web/packages/rscala/index.html
255+
r/R/rzeppelin/R/{common.R, globals.R,protocol.R,rServer.R,scalaInterpreter.R,zzz.R }
256+
r/src/main/scala/org/apache/zeppelin/rinterpreter/rscala/{Package.scala, RClient.scala}
257+
258+
(BSD 3 Clause) portions of Scala (http://www.scala-lang.org/download) - http://www.scala-lang.org/download/#License
259+
r/src/main/scala/scala/Console.scala

0 commit comments

Comments
 (0)