Skip Bokeh in Scala 2.11 build until they fix their dependencies.

Author: jpivarski

bokeh/deploy-scala-2.10.xml

@@ -82,7 +82,6 @@
       <groupId>io.continuum.bokeh</groupId>
       <artifactId>bokeh_2.10</artifactId>
       <version>0.7</version>
-      <scope>provided</scope>
     </dependency>
 
   </dependencies>

bokeh/deploy-scala-2.11.xml

@@ -82,7 +82,6 @@
       <groupId>io.continuum.bokeh</groupId>
       <artifactId>bokeh_2.11</artifactId>
       <version>0.7</version>
-      <scope>provided</scope>
     </dependency>
 
   </dependencies>

bokeh/pom.xml

@@ -111,7 +111,6 @@
       <groupId>io.continuum.bokeh</groupId>
       <artifactId>bokeh_${scala.binary.version}</artifactId>
       <version>0.7</version>
-      <scope>provided</scope>
     </dependency>
 
   </dependencies>

make-poms.py

@@ -534,7 +534,6 @@
       <groupId>io.continuum.bokeh</groupId>
       <artifactId>bokeh_${{scala.binary.version}}</artifactId>
       <version>0.7</version>
-      <scope>provided</scope>
     </dependency>
 
   </dependencies>
@@ -573,7 +572,6 @@
       <groupId>io.continuum.bokeh</groupId>
       <artifactId>bokeh_2.10</artifactId>
       <version>0.7</version>
-      <scope>provided</scope>
     </dependency>
 
   </dependencies>
@@ -612,7 +610,6 @@
       <groupId>io.continuum.bokeh</groupId>
       <artifactId>bokeh_2.11</artifactId>
       <version>0.7</version>
-      <scope>provided</scope>
     </dependency>
 
   </dependencies>

pom.xml

@@ -30,12 +30,31 @@
       <organizationUrl>http://diana-hep.org</organizationUrl>
     </developer>
   </developers>
-  
-  <modules>
-    <module>core</module>
-    <module>sparksql</module>
-    <module>bokeh</module>
-  </modules>
+
+  <profiles>
+    <profile>
+      <id>scala-2.10</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <modules>
+        <module>core</module>
+        <module>sparksql</module>
+        <module>bokeh</module>
+      </modules>
+    </profile>
+    <profile>
+      <id>scala-2.11</id>
+      <activation>
+        <property><name>scala-2.11</name></property>
+      </activation>
+      <modules>
+        <module>core</module>
+        <module>sparksql</module>
+        <!-- <module>bokeh</module> -->    <!-- Not supported until they fix their dependencies. -->
+      </modules>
+    </profile>
+  </profiles>
 
   <distributionManagement>
     <snapshotRepository>