zeppelin git commit: [ZEPPELIN-1409] Refactor RAT build on Travis.CI configuration
Repository: zeppelin Updated Branches: refs/heads/master 9eeaf49f0 -> f9bc7a9fc [ZEPPELIN-1409] Refactor RAT build on Travis.CI configuration ### What is this PR for? Create a specific build for checking license compliance with RAT and avoid running these checks on every build that compose the PR build. As for normal development builds, this follows the same pattern used for maven tests, RAT is enabled to run by default, but now there is support disabling it with -DskipRat. Travis CI will run RAT once, on the RAT build, and disable RAT checks on all other build profiles. ### What type of PR is it? [Enhancement] ### What is the Jira issue? * [ZEPPELIN-1409](https://issues.apache.org/jira/browse/ZEPPELIN-1409) Author: Luciano Resende Closes #1401 from lresende/build and squashes the following commits: f755979 [Luciano Resende] [[ZEPPELIN-1409]] Add support for skipping RAT check with -DskipRat 0189991 [Luciano Resende] [ZEPPELIN-1409] Refactor RAT build on Travis.CI configuration Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/f9bc7a9f Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/f9bc7a9f Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/f9bc7a9f Branch: refs/heads/master Commit: f9bc7a9fccffa81f32eb43cbcbe04ce928793b24 Parents: 9eeaf49 Author: Luciano Resende Authored: Mon Sep 5 12:05:10 2016 -0700 Committer: Alexander Bezzubov Committed: Tue Sep 6 17:12:37 2016 +0900 -- .travis.yml | 22 +- flink/pom.xml | 18 -- pom.xml | 265 ++- spark-dependencies/pom.xml | 20 -- spark/pom.xml | 21 -- zeppelin-display/pom.xml| 18 -- .../zeppelin-example-horizontalbar/pom.xml | 10 - zeppelin-interpreter/pom.xml| 18 -- zeppelin-server/pom.xml | 21 -- 9 files changed, 150 insertions(+), 263 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/f9bc7a9f/.travis.yml -- diff --git a/.travis.yml b/.travis.yml index 89c90a5..27a0e39 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,41 +34,45 @@ addons: matrix: include: +# Test License compliance using RAT tool +- jdk: "oraclejdk7" + env: SCALA_VER="2.11" SPARK_VER="2.0.0" HADOOP_VER="2.3" PROFILE="-Prat" BUILD_FLAG="clean" TEST_FLAG="org.apache.rat:apache-rat-plugin:check" TEST_PROJECTS="" + # Test all modules with spark 2.0.0 and scala 2.11 - jdk: "oraclejdk7" - env: SCALA_VER="2.11" SPARK_VER="2.0.0" HADOOP_VER="2.3" PROFILE="-Pspark-2.0 -Phadoop-2.3 -Ppyspark -Psparkr -Pscalding -Pexamples -Pscala-2.11" BUILD_FLAG="package -Pbuild-distr" TEST_FLAG="verify -Pusing-packaged-distr" TEST_PROJECTS="" + env: SCALA_VER="2.11" SPARK_VER="2.0.0" HADOOP_VER="2.3" PROFILE="-Pspark-2.0 -Phadoop-2.3 -Ppyspark -Psparkr -Pscalding -Pexamples -Pscala-2.11" BUILD_FLAG="package -Pbuild-distr -DskipRat" TEST_FLAG="verify -Pusing-packaged-distr -DskipRat" TEST_PROJECTS="" # Test all modules with scala 2.10 - jdk: "oraclejdk7" - env: SCALA_VER="2.10" SPARK_VER="1.6.1" HADOOP_VER="2.3" PROFILE="-Pspark-1.6 -Pr -Phadoop-2.3 -Ppyspark -Psparkr -Pscalding -Pexamples -Pscala-2.10" BUILD_FLAG="package -Pbuild-distr" TEST_FLAG="verify -Pusing-packaged-distr" TEST_PROJECTS="" + env: SCALA_VER="2.10" SPARK_VER="1.6.1" HADOOP_VER="2.3" PROFILE="-Pspark-1.6 -Pr -Phadoop-2.3 -Ppyspark -Psparkr -Pscalding -Pexamples -Pscala-2.10" BUILD_FLAG="package -Pbuild-distr -DskipRat" TEST_FLAG="verify -Pusing-packaged-distr -DskipRat" TEST_PROJECTS="" # Test all modules with scala 2.11 - jdk: "oraclejdk7" - env: SCALA_VER="2.11" SPARK_VER="1.6.1" HADOOP_VER="2.3" PROFILE="-Pspark-1.6 -Pr -Phadoop-2.3 -Ppyspark -Psparkr -Pscalding -Pexamples -Pscala-2.11" BUILD_FLAG="package -Pbuild-distr" TEST_FLAG="verify -Pusing-packaged-distr" TEST_PROJECTS="" + env: SCALA_VER="2.11" SPARK_VER="1.6.1" HADOOP_VER="2.3" PROFILE="-Pspark-1.6 -Pr -Phadoop-2.3 -Ppyspark -Psparkr -Pscalding -Pexamples -Pscala-2.11" BUILD_FLAG="package -Pbuild-distr -DskipRat" TEST_FLAG="verify -Pusing-packaged-distr -DskipRat" TEST_PROJECTS="" # Test spark module for 1.5.2 - jdk: "oraclejdk7" - env: SCALA_VER="2.10" 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.spar
zeppelin git commit: [ZEPPELIN-1398] Use relative path for search_data.json
Repository: zeppelin
Updated Branches:
refs/heads/master f9bc7a9fc -> 20f0e5bac
[ZEPPELIN-1398] Use relative path for search_data.json
### What is this PR for?
Use relative path for search_data.json
### What type of PR is it?
[Bug Fix]
### What is the Jira issue?
* [ZEPPELIN-1398](https://issues.apache.org/jira/browse/ZEPPELIN-1398)
Author: AhyoungRyu
Author: Luciano Resende
Closes #1387 from lresende/search and squashes the following commits:
005f8dc [AhyoungRyu] [ZEPPELIN-1398] Fix wrong path in searched docs link
f081b87 [AhyoungRyu] [ZEPPELIN-1398] Make screenshots.md not searchable
84b1b2b [Luciano Resende] [ZEPPELIN-1398] Use relative path for search_data.json
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/20f0e5ba
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/20f0e5ba
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/20f0e5ba
Branch: refs/heads/master
Commit: 20f0e5bacb9cfce98162dcf4e37602db24ae3331
Parents: f9bc7a9
Author: AhyoungRyu
Authored: Thu Sep 1 17:22:04 2016 +0900
Committer: AhyoungRyu
Committed: Tue Sep 6 18:22:57 2016 +0900
--
docs/assets/themes/zeppelin/js/search.js | 6 --
docs/screenshots.md | 4 ++--
2 files changed, 6 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/20f0e5ba/docs/assets/themes/zeppelin/js/search.js
--
diff --git a/docs/assets/themes/zeppelin/js/search.js
b/docs/assets/themes/zeppelin/js/search.js
index 469b66e..407c1f9 100644
--- a/docs/assets/themes/zeppelin/js/search.js
+++ b/docs/assets/themes/zeppelin/js/search.js
@@ -25,7 +25,7 @@ jQuery(function() {
this.field('group');
});
- window.data = $.getJSON('/search_data.json');
+ window.data = $.getJSON('search_data.json');
window.data.then(function(loaded_data){
$.each(loaded_data, function(index, value){
window.idx.add(
@@ -51,6 +51,8 @@ jQuery(function() {
function display_search_results(results) {
var $search_results = $("#search_results");
var zeppelin_version = {{site.ZEPPELIN_VERSION | jsonify}};
+var base_url = {{site.JB.BASE_PATH | jsonify}};
+var prod_url = {{site.production_url | jsonify}};
window.data.then(function(loaded_data) {
if (results.length) {
@@ -59,7 +61,7 @@ jQuery(function() {
results.forEach(function(result) {
var item = loaded_data[result.ref];
- var appendString = ''+item.title+''+'https://zeppelin.apache.org/docs/'+zeppelin_version+item.url+''+item.excerpt+'';
+ var appendString = ''+item.title+''+prod_url+base_url+item.url.trim()+''+item.excerpt+'';
$search_results.append(appendString);
});
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/20f0e5ba/docs/screenshots.md
--
diff --git a/docs/screenshots.md b/docs/screenshots.md
index 2cad21b..e7af542 100644
--- a/docs/screenshots.md
+++ b/docs/screenshots.md
@@ -1,7 +1,7 @@
---
layout: page
-title: "Screenshots"
-description: ""
+title:
+description:
---
zeppelin git commit: [ZEPPELIN-1116]send out more exception msg
Repository: zeppelin
Updated Branches:
refs/heads/master 20f0e5bac -> 09870cc6c
[ZEPPELIN-1116]send out more exception msg
### What is this PR for?
better jdbc error msg make people know the true error clearly.
### What type of PR is it?
Improvement
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-1116
### How should this be tested?
Outline the steps to test the PR here.
### Screenshots (if appropriate)
### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no
in sql case, the real error exception stack is hide in e.getCause.getCause. use
printStackTrace to receive all the stack trace make people know true reason.
Author: passionke
Closes #1379 from passionke/passionke-jdbc-better-errortips and squashes the
following commits:
a1735ed [passionke] Update JDBCInterpreter.java
3d56183 [passionke] import java.io
0e2010d [passionke] send out more exception msg
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/09870cc6
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/09870cc6
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/09870cc6
Branch: refs/heads/master
Commit: 09870cc6cf0f34581166fe4d70852d0a2f6b8c16
Parents: 20f0e5b
Author: passionke
Authored: Tue Aug 30 03:13:26 2016 +0800
Committer: Jongyoul Lee
Committed: Wed Sep 7 00:41:03 2016 +0900
--
.../java/org/apache/zeppelin/jdbc/JDBCInterpreter.java | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/09870cc6/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
--
diff --git a/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
b/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
index 0eb0dff..68a1ce4 100644
--- a/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
+++ b/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
@@ -15,7 +15,8 @@
package org.apache.zeppelin.jdbc;
import static org.apache.commons.lang.StringUtils.containsIgnoreCase;
-
+import java.io.*;
+import java.nio.charset.StandardCharsets;
import java.io.IOException;
import java.security.PrivilegedExceptionAction;
import java.sql.Connection;
@@ -418,11 +419,11 @@ public class JDBCInterpreter extends Interpreter {
} catch (Exception e) {
logger.error("Cannot run " + sql, e);
- StringBuilder stringBuilder = new StringBuilder();
- stringBuilder.append(e.getMessage()).append("\n");
- stringBuilder.append(e.getClass().toString()).append("\n");
- stringBuilder.append(StringUtils.join(e.getStackTrace(), "\n"));
- return new InterpreterResult(Code.ERROR, stringBuilder.toString());
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ PrintStream ps = new PrintStream(baos);
+ e.printStackTrace(ps);
+ String errorMsg = new String(baos.toByteArray(), StandardCharsets.UTF_8);
+ return new InterpreterResult(Code.ERROR, errorMsg);
}
}
zeppelin git commit: [MINOR] Remove duplicated dependency declaration
Repository: zeppelin
Updated Branches:
refs/heads/master 09870cc6c -> b8051970a
[MINOR] Remove duplicated dependency declaration
### What is this PR for?
Remove duplicated declaration of maven dependency
### What type of PR is it?
[Bug Fix]
Author: Luciano Resende
Closes #1402 from lresende/maven-artifact-duplicated and squashes the following
commits:
cd18347 [Luciano Resende] [MINOR] Remove duplicated dependency declaration
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/b8051970
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/b8051970
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/b8051970
Branch: refs/heads/master
Commit: b8051970adcb651449d15e407febf9ebebd1a4a6
Parents: 09870cc
Author: Luciano Resende
Authored: Sun Sep 4 22:10:12 2016 -0700
Committer: Felix Cheung
Committed: Tue Sep 6 16:52:58 2016 -0700
--
zeppelin-zengine/pom.xml | 6 --
1 file changed, 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/b8051970/zeppelin-zengine/pom.xml
--
diff --git a/zeppelin-zengine/pom.xml b/zeppelin-zengine/pom.xml
index b7e1938..2c56b4d 100644
--- a/zeppelin-zengine/pom.xml
+++ b/zeppelin-zengine/pom.xml
@@ -129,12 +129,6 @@
- org.eclipse.jetty.websocket
- websocket-client
- ${jetty.version}
-
-
-
org.quartz-scheduler
quartz
2.2.1
