mirror of
https://github.com/apache/zeppelin
synced 2026-05-24 09:38:26 +00:00
Remove unnecessary spark.version property
This commit is contained in:
parent
e3141bd061
commit
8017e8b3dc
2 changed files with 9 additions and 11 deletions
|
|
@ -383,7 +383,6 @@
|
|||
<property><name>!scala-2.11</name></property>
|
||||
</activation>
|
||||
<properties>
|
||||
<spark.version>1.6.1</spark.version>
|
||||
<extra.source.dir>src/main/scala-2.10</extra.source.dir>
|
||||
<extra.testsource.dir>src/test/scala-2.10</extra.testsource.dir>
|
||||
</properties>
|
||||
|
|
@ -395,7 +394,6 @@
|
|||
<property><name>scala-2.11</name></property>
|
||||
</activation>
|
||||
<properties>
|
||||
<spark.version>1.6.1</spark.version>
|
||||
<extra.source.dir>src/main/scala-2.11</extra.source.dir>
|
||||
<extra.testsource.dir>src/test/scala/scala-2.11</extra.testsource.dir>
|
||||
</properties>
|
||||
|
|
|
|||
|
|
@ -36,8 +36,16 @@
|
|||
<url>http://zeppelin.apache.org</url>
|
||||
|
||||
<properties>
|
||||
<spark.version>1.4.1</spark.version>
|
||||
<!-- library version defined in this section brought from spark 1.4.1 and it's dependency.
|
||||
Therefore changing only spark.version is not going to be enough when this module
|
||||
support new version of spark to make the new version as default supported version.
|
||||
|
||||
Each profile (spark-2.0, spark-1.6, etc) will overrides necessary dependency version.
|
||||
So we'll make one of those profile 'activateByDefault' to make it default supported version
|
||||
instead of changing spark.version in this section.
|
||||
-->
|
||||
|
||||
<spark.version>1.4.1</spark.version>
|
||||
<hadoop.version>2.3.0</hadoop.version>
|
||||
<yarn.version>${hadoop.version}</yarn.version>
|
||||
<avro.version>1.7.7</avro.version>
|
||||
|
|
@ -338,14 +346,6 @@
|
|||
</dependencies>
|
||||
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>scala-2.11</id>
|
||||
<properties>
|
||||
<spark.version>1.6.1</spark.version>
|
||||
<spark.download.url>http://archive.apache.org/dist/spark/spark-${spark.version}/spark-${spark.version}.tgz</spark.download.url>
|
||||
</properties>
|
||||
</profile>
|
||||
|
||||
<profile>
|
||||
<id>spark-1.1</id>
|
||||
<dependencies>
|
||||
|
|
|
|||
Loading…
Reference in a new issue