From d57299ce45182faa8136983291b02a192531cc5b Mon Sep 17 00:00:00 2001
From: jetoile <kmx.petals@gmail.com>
Date: Wed, 3 Feb 2016 12:13:05 +0100
Subject: [PATCH] update for SolR + TI Solr/Spark

---
 pom.xml                                       | 25 ++++++++++++-------
 .../SparkSolrIntegrationTest.java             |  8 +-----
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/pom.xml b/pom.xml
index 445e6603..2100eb7b 100755
--- a/pom.xml
+++ b/pom.xml
@@ -226,21 +226,13 @@
             <groupId>org.apache.spark</groupId>
             <artifactId>spark-core_2.10</artifactId>
             <version>1.6.0</version>
-            <!--<version>1.5.2</version>-->
             <scope>test</scope>
-            <!--<exclusions>-->
-                <!--<exclusion>-->
-                    <!--<groupId>org.scala-lang</groupId>-->
-                    <!--<artifactId>scala-library</artifactId>-->
-                <!--</exclusion>-->
-            <!--</exclusions>-->
         </dependency>
 
         <dependency>
             <groupId>org.apache.spark</groupId>
             <artifactId>spark-sql_2.10</artifactId>
             <version>1.6.0</version>
-            <!--<version>1.5.2</version>-->
             <scope>test</scope>
         </dependency>
 
@@ -248,7 +240,6 @@
             <groupId>org.apache.spark</groupId>
             <artifactId>spark-hive_2.10</artifactId>
             <version>1.6.0</version>
-            <!--<version>1.5.2</version>-->
             <scope>test</scope>
         </dependency>
 
@@ -265,6 +256,22 @@
             <version>1.1.2</version>
             <scope>test</scope>
             <exclusions>
+                <exclusion>
+                    <groupId>org.ow2.asm</groupId>
+                    <artifactId>asm</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.ow2.asm</groupId>
+                    <artifactId>asm-commons</artifactId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>spark-mllib_2.10</artifactId>
+                    <groupId>org.apache.spark</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>spark-streaming-twitter_2.10</artifactId>
+                    <groupId>org.apache.spark</groupId>
+                </exclusion>
                 <exclusion>
                     <groupId>org.scala-lang</groupId>
                     <artifactId>scala-library</artifactId>
diff --git a/src/test/java/fr/jetoile/sample/integrationtest/SparkSolrIntegrationTest.java b/src/test/java/fr/jetoile/sample/integrationtest/SparkSolrIntegrationTest.java
index d26982ff..e2491fef 100644
--- a/src/test/java/fr/jetoile/sample/integrationtest/SparkSolrIntegrationTest.java
+++ b/src/test/java/fr/jetoile/sample/integrationtest/SparkSolrIntegrationTest.java
@@ -24,7 +24,7 @@
 package fr.jetoile.sample.integrationtest;
 
 import com.github.sakserv.minicluster.config.ConfigVars;
-import com.lucidworks.spark.SchemaPreservingSolrRDD;
+//import com.lucidworks.spark.SolrSupport;
 import com.lucidworks.spark.SolrSupport;
 import com.ninja_squad.dbsetup.Operations;
 import com.ninja_squad.dbsetup.operation.Operation;
@@ -35,7 +35,6 @@
 import fr.jetoile.sample.HadoopBootstrap;
 import fr.jetoile.sample.component.SolrCloudBootstrap;
 import fr.jetoile.sample.exception.BootstrapException;
-import org.apache.commons.collections.map.HashedMap;
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.PropertiesConfiguration;
@@ -48,21 +47,16 @@
 import org.apache.spark.SparkConf;
 import org.apache.spark.api.java.JavaRDD;
 import org.apache.spark.api.java.JavaSparkContext;
-import org.apache.spark.api.java.function.Function;
-import org.apache.spark.rdd.RDD;
 import org.apache.spark.sql.DataFrame;
-import org.apache.spark.sql.Row;
 import org.apache.spark.sql.SQLContext;
 import org.apache.spark.sql.hive.HiveContext;
 import org.junit.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import scala.Function1;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.sql.SQLException;
-import java.util.HashMap;
 
 import static com.ninja_squad.dbsetup.Operations.sequenceOf;
 import static com.ninja_squad.dbsetup.Operations.sql;