zeppelin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mina...@apache.org
Subject zeppelin git commit: Revert "[ZEPPELIN-1407] Fix Scala 2.11 build"
Date Mon, 12 Sep 2016 16:06:40 GMT
Repository: zeppelin
Updated Branches:
  refs/heads/master 3e863a67c -> 802bf5041


Revert "[ZEPPELIN-1407] Fix Scala 2.11 build"

This reverts commit 724ef6ff065404705fdd44ae64bf51bb077b8417.


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

Branch: refs/heads/master
Commit: 802bf5041434d2b47b8e76b104790f1551be8eb1
Parents: 3e863a6
Author: Mina Lee <minalee@apache.org>
Authored: Mon Sep 12 18:04:23 2016 +0200
Committer: Mina Lee <minalee@apache.org>
Committed: Mon Sep 12 18:04:23 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/802bf504/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 364c203..d0f4388 100644
--- a/pom.xml
+++ b/pom.xml
@@ -531,7 +531,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>
@@ -541,9 +541,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>
@@ -828,5 +825,4 @@
     </profile>
   </profiles>
 
-
 </project>

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/802bf504/zeppelin-display/pom.xml
----------------------------------------------------------------------
diff --git a/zeppelin-display/pom.xml b/zeppelin-display/pom.xml
index 87df7b0..d33038e 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/802bf504/zeppelin-distribution/pom.xml
----------------------------------------------------------------------
diff --git a/zeppelin-distribution/pom.xml b/zeppelin-distribution/pom.xml
index e6905db..378c980 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/802bf504/zeppelin-server/pom.xml
----------------------------------------------------------------------
diff --git a/zeppelin-server/pom.xml b/zeppelin-server/pom.xml
index 62b6903..862fc30 100644
--- a/zeppelin-server/pom.xml
+++ b/zeppelin-server/pom.xml
@@ -448,9 +448,6 @@
   <profiles>
     <profile>
       <id>scala-2.11</id>
-      <activation>
-        <property><name>scala-2.11</name></property>
-      </activation>
       <dependencyManagement>
         <dependencies>
           <dependency>


Mime
View raw message