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:21:57 -0800 |
| commit | f5f757e4ed80759dc5668c63d5663651689f8da8 (patch) | |
| tree | 148a4f9284c41d3ee8bce0a339d6c66e52aeac9a /sql/catalyst/pom.xml | |
| parent | bbd8f5bee81d5788c356977c173dd1edc42c77a3 (diff) | |
| download | spark-f5f757e4ed80759dc5668c63d5663651689f8da8.tar.gz spark-f5f757e4ed80759dc5668c63d5663651689f8da8.tar.bz2 spark-f5f757e4ed80759dc5668c63d5663651689f8da8.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
Diffstat (limited to 'sql/catalyst/pom.xml')
| -rw-r--r-- | sql/catalyst/pom.xml | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/sql/catalyst/pom.xml b/sql/catalyst/pom.xml index 0cc3175b6a..686d189d81 100644 --- a/sql/catalyst/pom.xml +++ b/sql/catalyst/pom.xml @@ -100,10 +100,11 @@ </plugins> </build> <profiles> + <!-- Quasiquotes are merged into scala reflect from scala 2.11 onwards. --> <profile> <id>scala-2.10</id> <activation> - <activeByDefault>true</activeByDefault> + <property><name>!scala-2.11</name></property> </activation> <dependencies> <dependency> @@ -113,13 +114,5 @@ </dependency> </dependencies> </profile> - <profile> - <id>scala-2.11</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <!-- Quasiquotes are merged into scala reflect from scala 2.11 onwards. --> - </profile> - </profiles> </project> |