zeppelin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zjf...@apache.org
Subject zeppelin git commit: [HOTFIX] Fix zeppelin-display build
Date Fri, 09 Feb 2018 01:58:05 GMT
Repository: zeppelin
Updated Branches:
  refs/heads/master ad6e69181 -> f8d3488cb


[HOTFIX] Fix zeppelin-display build

### What is this PR for?
This is for  fix the build of zeppelin-display module

### What type of PR is it?
[ Hot Fix ]

### Todos
* [ ] - Task

### How should this be tested?
* Travis 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 <zjffdu@apache.org>

Closes #2781 from zjffdu/HOTFIX_BUILD and squashes the following commits:

dd2c36d [Jeff Zhang] [HOTFIX] Fix zeppelin-display build


Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/f8d3488c
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/f8d3488c
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/f8d3488c

Branch: refs/heads/master
Commit: f8d3488cbbb3a2d20c5736a8587ef0c41ae1eebc
Parents: ad6e691
Author: Jeff Zhang <zjffdu@apache.org>
Authored: Thu Feb 8 23:00:55 2018 +0800
Committer: Jeff Zhang <zjffdu@apache.org>
Committed: Fri Feb 9 09:57:57 2018 +0800

----------------------------------------------------------------------
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/f8d3488c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2c230cb..4cda650 100644
--- a/pom.xml
+++ b/pom.xml
@@ -742,6 +742,9 @@
   <profiles>
     <profile>
       <id>scala-2.10</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
       <properties>
         <scala.version>2.10.5</scala.version>
         <scala.binary.version>2.10</scala.binary.version>
@@ -750,9 +753,6 @@
 
     <profile>
       <id>scala-2.11</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
       <properties>
         <scala.version>2.11.8</scala.version>
         <scala.binary.version>2.11</scala.binary.version>


Mime
View raw message