diff options
| author | Sandy Ryza <sandy@cloudera.com> | 2014-11-14 14:21:57 -0800 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-11-14 14:22:13 -0800 |
| commit | d90ddf12b6bea2162e982e800c96d2c94f66b347 (patch) | |
| tree | e89c6462d663ce83625df68115e7596294bddd70 /pom.xml | |
| parent | 4bdeeb7d25453b9b50c7dc23a5c7f588754f0e52 (diff) | |
| download | spark-d90ddf12b6bea2162e982e800c96d2c94f66b347.tar.gz spark-d90ddf12b6bea2162e982e800c96d2c94f66b347.tar.bz2 spark-d90ddf12b6bea2162e982e800c96d2c94f66b347.zip | |
SPARK-4375. no longer require -Pscala-2.10
It seems like the winds might have moved away from this approach, but wanted to post the PR anyway because I got it working and to show what it would look like.
Author: Sandy Ryza <sandy@cloudera.com>
Closes #3239 from sryza/sandy-spark-4375 and squashes the following commits:
0ffbe95 [Sandy Ryza] Enable -Dscala-2.11 in sbt
cd42d94 [Sandy Ryza] Update doc
f6644c3 [Sandy Ryza] SPARK-4375 take 2
(cherry picked from commit f5f757e4ed80759dc5668c63d5663651689f8da8)
Signed-off-by: Patrick Wendell <pwendell@gmail.com>
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 22 |
1 files changed, 2 insertions, 20 deletions
@@ -1296,9 +1296,6 @@ <profile> <id>mapr3</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> <properties> <hadoop.version>1.0.3-mapr-3.0.3</hadoop.version> <yarn.version>2.3.0-mapr-4.0.0-FCS</yarn.version> @@ -1309,9 +1306,6 @@ <profile> <id>mapr4</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> <properties> <hadoop.version>2.3.0-mapr-4.0.0-FCS</hadoop.version> <yarn.version>2.3.0-mapr-4.0.0-FCS</yarn.version> @@ -1341,9 +1335,6 @@ <!-- Build without Hadoop dependencies that are included in some runtime environments. --> <profile> <id>hadoop-provided</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> @@ -1390,18 +1381,12 @@ </profile> <profile> <id>hive-thriftserver</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> <modules> <module>sql/hive-thriftserver</module> </modules> </profile> <profile> <id>hive-0.12.0</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> <properties> <hive.version>0.12.0-protobuf-2.5</hive.version> <hive.version.short>0.12.0</hive.version.short> @@ -1410,9 +1395,6 @@ </profile> <profile> <id>hive-0.13.1</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> <properties> <hive.version>0.13.1a</hive.version> <hive.version.short>0.13.1</hive.version.short> @@ -1423,7 +1405,7 @@ <profile> <id>scala-2.10</id> <activation> - <activeByDefault>true</activeByDefault> + <property><name>!scala-2.11</name></property> </activation> <properties> <scala.version>2.10.4</scala.version> @@ -1439,7 +1421,7 @@ <profile> <id>scala-2.11</id> <activation> - <activeByDefault>false</activeByDefault> + <property><name>scala-2.11</name></property> </activation> <properties> <scala.version>2.11.2</scala.version> |