From 7c99e90ecd3a031a99a61ef3606ca6b873f87e8c Mon Sep 17 00:00:00 2001
From: Sergei Lebedev <superbobry@gmail.com>
Date: Mon, 5 Feb 2018 19:06:06 +0100
Subject: [PATCH] [jvm-packages] Declared Spark as provided in the POM (#3093)

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

* Removed noop spark-2.x profile
---
 jvm-packages/pom.xml                 | 17 +----------------
 jvm-packages/xgboost4j-spark/pom.xml | 12 ++++++++++++
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/jvm-packages/pom.xml b/jvm-packages/pom.xml
index 3050bfc9a..f52fb5b65 100644
--- a/jvm-packages/pom.xml
+++ b/jvm-packages/pom.xml
@@ -13,9 +13,8 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.compiler.source>1.7</maven.compiler.source>
         <maven.compiler.target>1.7</maven.compiler.target>
-        <maven.version>3.3.9</maven.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.binary.version>2.11</scala.binary.version>
     </properties>
@@ -32,20 +31,6 @@
         <module>xgboost4j-spark</module>
         <module>xgboost4j-flink</module>
     </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>
         <plugins>
             <plugin>
diff --git a/jvm-packages/xgboost4j-spark/pom.xml b/jvm-packages/xgboost4j-spark/pom.xml
index c5f4b3e89..151921a9d 100644
--- a/jvm-packages/xgboost4j-spark/pom.xml
+++ b/jvm-packages/xgboost4j-spark/pom.xml
@@ -26,6 +26,18 @@
             <artifactId>xgboost4j</artifactId>
             <version>0.8-SNAPSHOT</version>
         </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>
             <groupId>org.apache.spark</groupId>
             <artifactId>spark-mllib_${scala.binary.version}</artifactId>