You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by fe...@apache.org on 2016/09/08 19:36:01 UTC
zeppelin git commit: [ZEPPELIN-1407] Fix Scala 2.11 build
Repository: zeppelin
Updated Branches:
refs/heads/master c88010fd0 -> 724ef6ff0
[ZEPPELIN-1407] Fix Scala 2.11 build
### What is this PR for?
Avoid activating the Scala 2.10 profile when building for Scala 2.11
### What type of PR is it?
[Bug Fix]
### What is the Jira issue?
* (https://issues.apache.org/jira/browse/ZEPPELIN-1407)[https://issues.apache.org/jira/browse/ZEPPELIN-1407]
### How should this be tested?
Perform Scala 2.10 and 2.11 builds starting from a maven repository that does not have org.apache.zeppelin artifacts.
Author: Luciano Resende <lr...@apache.org>
Closes #1400 from lresende/scala-profile and squashes the following commits:
3fa489b [Luciano Resende] [ZEPPELIN-1407] Fix Scala 2.11 build
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/724ef6ff
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/724ef6ff
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/724ef6ff
Branch: refs/heads/master
Commit: 724ef6ff065404705fdd44ae64bf51bb077b8417
Parents: c88010f
Author: Luciano Resende <lr...@apache.org>
Authored: Thu Sep 1 22:35:20 2016 -0700
Committer: Felix Cheung <fe...@apache.org>
Committed: Thu Sep 8 12:35:46 2016 -0700
----------------------------------------------------------------------
pom.xml | 6 +++++-
zeppelin-display/pom.xml | 3 +++
zeppelin-distribution/pom.xml | 3 +++
zeppelin-server/pom.xml | 3 +++
4 files changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/724ef6ff/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2ac72cf..1aef2ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -531,7 +531,7 @@
<profile>
<id>scala-2.10</id>
<activation>
- <activeByDefault>true</activeByDefault>
+ <property><name>!scala-2.11</name></property>
</activation>
<properties>
<scala.version>2.10.5</scala.version>
@@ -541,6 +541,9 @@
<profile>
<id>scala-2.11</id>
+ <activation>
+ <property><name>scala-2.11</name></property>
+ </activation>
<properties>
<scala.version>2.11.7</scala.version>
<scala.binary.version>2.11</scala.binary.version>
@@ -827,4 +830,5 @@
</profile>
</profiles>
+
</project>
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/724ef6ff/zeppelin-display/pom.xml
----------------------------------------------------------------------
diff --git a/zeppelin-display/pom.xml b/zeppelin-display/pom.xml
index d33038e..87df7b0 100644
--- a/zeppelin-display/pom.xml
+++ b/zeppelin-display/pom.xml
@@ -95,6 +95,9 @@
<profiles>
<profile>
<id>scala-2.11</id>
+ <activation>
+ <property><name>scala-2.11</name></property>
+ </activation>
<dependencies>
<dependency>
<groupId>org.scala-lang.modules</groupId>
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/724ef6ff/zeppelin-distribution/pom.xml
----------------------------------------------------------------------
diff --git a/zeppelin-distribution/pom.xml b/zeppelin-distribution/pom.xml
index 378c980..e6905db 100644
--- a/zeppelin-distribution/pom.xml
+++ b/zeppelin-distribution/pom.xml
@@ -114,6 +114,9 @@
<profiles>
<profile>
<id>scala-2.11</id>
+ <activation>
+ <property><name>scala-2.11</name></property>
+ </activation>
<dependencyManagement>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/724ef6ff/zeppelin-server/pom.xml
----------------------------------------------------------------------
diff --git a/zeppelin-server/pom.xml b/zeppelin-server/pom.xml
index 862fc30..62b6903 100644
--- a/zeppelin-server/pom.xml
+++ b/zeppelin-server/pom.xml
@@ -448,6 +448,9 @@
<profiles>
<profile>
<id>scala-2.11</id>
+ <activation>
+ <property><name>scala-2.11</name></property>
+ </activation>
<dependencyManagement>
<dependencies>
<dependency>