[jvm-packages] Declared Spark as provided in the POM (#3093)

* [jvm-packages] Explicitly declared Spark dependencies as provided

* Removed noop spark-2.x profile
This commit is contained in:
Sergei Lebedev 2018-02-05 19:06:06 +01:00 committed by Nan Zhu
parent 86bf930497
commit 7c99e90ecd
2 changed files with 13 additions and 16 deletions

View File

@ -13,9 +13,8 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>1.7</maven.compiler.source> <maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target> <maven.compiler.target>1.7</maven.compiler.target>
<maven.version>3.3.9</maven.version>
<flink.version>0.10.2</flink.version> <flink.version>0.10.2</flink.version>
<spark.version>2.1.0</spark.version> <spark.version>2.2.1</spark.version>
<scala.version>2.11.8</scala.version> <scala.version>2.11.8</scala.version>
<scala.binary.version>2.11</scala.binary.version> <scala.binary.version>2.11</scala.binary.version>
</properties> </properties>
@ -32,20 +31,6 @@
<module>xgboost4j-spark</module> <module>xgboost4j-spark</module>
<module>xgboost4j-flink</module> <module>xgboost4j-flink</module>
</modules> </modules>
<profiles>
<profile>
<id>spark-2.x</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<!--<properties>-->
<!--<flink.version>0.10.2</flink.version> -->
<!--<spark.version>2.0.1</spark.version>-->
<!--<scala.version>2.11.8</scala.version>-->
<!--<scala.binary.version>2.11</scala.binary.version>-->
<!--</properties>-->
</profile>
</profiles>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>

View File

@ -26,6 +26,18 @@
<artifactId>xgboost4j</artifactId> <artifactId>xgboost4j</artifactId>
<version>0.8-SNAPSHOT</version> <version>0.8-SNAPSHOT</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-core_${scala.binary.version}</artifactId>
<version>${spark.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-sql_${scala.binary.version}</artifactId>
<version>${spark.version}</version>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-mllib_${scala.binary.version}</artifactId> <artifactId>spark-mllib_${scala.binary.version}</artifactId>