You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by mi...@apache.org on 2016/09/12 16:06:22 UTC
zeppelin git commit: Revert "[ZEPPELIN-1407] Fix Scala 2.11 build"
Repository: zeppelin
Updated Branches:
refs/heads/branch-0.6 1dda83b42 -> 366766fb4
Revert "[ZEPPELIN-1407] Fix Scala 2.11 build"
This reverts commit 5a270d43b75dca935c40979206f3dc3b92c20327.
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/366766fb
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/366766fb
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/366766fb
Branch: refs/heads/branch-0.6
Commit: 366766fb4c2a5233b46f60c9c5ae37f421602c2f
Parents: 1dda83b
Author: Mina Lee <mi...@apache.org>
Authored: Mon Sep 12 18:05:53 2016 +0200
Committer: Mina Lee <mi...@apache.org>
Committed: Mon Sep 12 18:05:53 2016 +0200
----------------------------------------------------------------------
pom.xml | 6 +-----
zeppelin-display/pom.xml | 3 ---
zeppelin-distribution/pom.xml | 3 ---
zeppelin-server/pom.xml | 3 ---
4 files changed, 1 insertion(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/366766fb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 612dc87..f23b0a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -652,7 +652,7 @@
<profile>
<id>scala-2.10</id>
<activation>
- <property><name>!scala-2.11</name></property>
+ <activeByDefault>true</activeByDefault>
</activation>
<properties>
<scala.version>2.10.5</scala.version>
@@ -662,9 +662,6 @@
<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>
@@ -807,5 +804,4 @@
</profile>
</profiles>
-
</project>
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/366766fb/zeppelin-display/pom.xml
----------------------------------------------------------------------
diff --git a/zeppelin-display/pom.xml b/zeppelin-display/pom.xml
index 894cd6d..e9f3c7c 100644
--- a/zeppelin-display/pom.xml
+++ b/zeppelin-display/pom.xml
@@ -95,9 +95,6 @@
<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/366766fb/zeppelin-distribution/pom.xml
----------------------------------------------------------------------
diff --git a/zeppelin-distribution/pom.xml b/zeppelin-distribution/pom.xml
index 7734eba..04eae91 100644
--- a/zeppelin-distribution/pom.xml
+++ b/zeppelin-distribution/pom.xml
@@ -114,9 +114,6 @@
<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/366766fb/zeppelin-server/pom.xml
----------------------------------------------------------------------
diff --git a/zeppelin-server/pom.xml b/zeppelin-server/pom.xml
index b662926..81d9ed6 100644
--- a/zeppelin-server/pom.xml
+++ b/zeppelin-server/pom.xml
@@ -469,9 +469,6 @@
<profiles>
<profile>
<id>scala-2.11</id>
- <activation>
- <property><name>scala-2.11</name></property>
- </activation>
<dependencyManagement>
<dependencies>
<dependency>