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 b4ca282 [ZEPPELIN-4633]. Disable web-angular profile by default
b4ca282 is described below
commit b4ca28284878166309a583a4cbcebd026972fb27
Author: Jeff Zhang <zjf...@apache.org>
AuthorDate: Fri Feb 21 14:59:33 2020 +0800
[ZEPPELIN-4633]. Disable web-angular profile by default
### What is this PR for?
Minor PR which just make disable web-angular profile by default in both
root `pom.xml `and `zeppelin-distribution/pom.xml`
### What type of PR is it?
[ Improvement]
### Todos
* [ ] - Task
### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-4633
### 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 #3657 from zjffdu/ZEPPELIN-4633 and squashes the following commits:
f0cb7ad2b [Jeff Zhang] [ZEPPELIN-4633]. Disable web-angular profile by
default
---
.travis.yml | 4 ++--
pom.xml | 3 ---
zeppelin-distribution/pom.xml | 3 ---
3 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 2311bf2..26295ba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -84,7 +84,7 @@ matrix:
sudo: false
dist: xenial
jdk: "openjdk8"
- env: CI="true" BUILD_FLAG="clean -DskipTests -DskipRat"
TEST_FLAG="package -DskipRat" MODULES="-pl ${INTERPRETERS}" TEST_MODULES="-pl
zeppelin-web-angular"
+ env: CI="true" BUILD_FLAG="clean -DskipTests -DskipRat"
TEST_FLAG="package -DskipRat" MODULES="-pl ${INTERPRETERS}" TEST_MODULES="-pl
zeppelin-web-angular -Pweb-angular"
addons:
apt:
packages:
@@ -104,7 +104,7 @@ matrix:
dist: xenial
addons:
firefox: "31.0"
- env: BUILD_PLUGINS="true" CI="true" PYTHON="2" R="true" SCALA_VER="2.11"
SPARK_VER="2.3.2" HADOOP_VER="2.6" PROFILE="-Pspark-2.3 -Phadoop2 -Phelium-dev
-Pexamples -Pintegration -Pspark-scala-2.11 -P!web-angular" BUILD_FLAG="clean
install -DskipTests -DskipRat -pl ${INTERPRETERS}" TEST_FLAG="verify -DskipRat"
TEST_PROJECTS="-pl zeppelin-integration -DfailIfNoTests=false"
+ env: BUILD_PLUGINS="true" CI="true" PYTHON="2" R="true" SCALA_VER="2.11"
SPARK_VER="2.3.2" HADOOP_VER="2.6" PROFILE="-Pspark-2.3 -Phadoop2 -Phelium-dev
-Pexamples -Pintegration -Pspark-scala-2.11" BUILD_FLAG="clean install
-DskipTests -DskipRat -pl ${INTERPRETERS}" TEST_FLAG="verify -DskipRat"
TEST_PROJECTS="-pl zeppelin-integration -DfailIfNoTests=false"
# Test interpreter modules
- jdk: "openjdk8"
diff --git a/pom.xml b/pom.xml
index 4308bf2..58ecd09 100644
--- a/pom.xml
+++ b/pom.xml
@@ -789,9 +789,6 @@
<profile>
<id>web-angular</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<modules>
<module>zeppelin-web-angular</module>
</modules>
diff --git a/zeppelin-distribution/pom.xml b/zeppelin-distribution/pom.xml
index 208bbae..831680c 100644
--- a/zeppelin-distribution/pom.xml
+++ b/zeppelin-distribution/pom.xml
@@ -145,9 +145,6 @@
<profile>
<id>web-angular</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
