Repository: zeppelin Updated Branches: refs/heads/branch-0.6 fbaa6c73a -> 5a270d43b
[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 <lrese...@apache.org> Closes #1400 from lresende/scala-profile and squashes the following commits: 3fa489b [Luciano Resende] [ZEPPELIN-1407] Fix Scala 2.11 build (cherry picked from commit 724ef6ff065404705fdd44ae64bf51bb077b8417) Signed-off-by: Felix Cheung <felixche...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/5a270d43 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/5a270d43 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/5a270d43 Branch: refs/heads/branch-0.6 Commit: 5a270d43b75dca935c40979206f3dc3b92c20327 Parents: fbaa6c7 Author: Luciano Resende <lrese...@apache.org> Authored: Thu Sep 1 22:35:20 2016 -0700 Committer: Felix Cheung <felixche...@apache.org> Committed: Thu Sep 8 12:36:24 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/5a270d43/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index f23b0a4..612dc87 100644 --- a/pom.xml +++ b/pom.xml @@ -652,7 +652,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> @@ -662,6 +662,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> @@ -804,4 +807,5 @@ </profile> </profiles> + </project> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/5a270d43/zeppelin-display/pom.xml ---------------------------------------------------------------------- diff --git a/zeppelin-display/pom.xml b/zeppelin-display/pom.xml index e9f3c7c..894cd6d 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/5a270d43/zeppelin-distribution/pom.xml ---------------------------------------------------------------------- diff --git a/zeppelin-distribution/pom.xml b/zeppelin-distribution/pom.xml index 04eae91..7734eba 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/5a270d43/zeppelin-server/pom.xml ---------------------------------------------------------------------- diff --git a/zeppelin-server/pom.xml b/zeppelin-server/pom.xml index 81d9ed6..b662926 100644 --- a/zeppelin-server/pom.xml +++ b/zeppelin-server/pom.xml @@ -469,6 +469,9 @@ <profiles> <profile> <id>scala-2.11</id> + <activation> + <property><name>scala-2.11</name></property> + </activation> <dependencyManagement> <dependencies> <dependency>
