From e89d44e4f693f6537c6e0691e355dd58aa18acd1 Mon Sep 17 00:00:00 2001
From: Jaroslaw Grabowski <jaroslaw.grabowski@datastax.com>
Date: Thu, 7 Jun 2018 12:44:07 +0200
Subject: [PATCH] 6.0.1 support

---
 java/gradle/dse/build.gradle  | 6 ++----
 java/gradle/oss/build.gradle  | 2 +-
 java/maven/dse/pom.xml        | 8 +-------
 java/maven/oss/pom.xml        | 2 +-
 java/sbt/dse/build.sbt        | 5 ++---
 java/sbt/oss/build.sbt        | 2 +-
 scala/gradle/dse/build.gradle | 6 ++----
 scala/gradle/oss/build.gradle | 2 +-
 scala/maven/dse/pom.xml       | 8 +-------
 scala/maven/oss/pom.xml       | 2 +-
 scala/sbt/dse/build.sbt       | 4 ++--
 scala/sbt/oss/build.sbt       | 2 +-
 12 files changed, 16 insertions(+), 33 deletions(-)

diff --git a/java/gradle/dse/build.gradle b/java/gradle/dse/build.gradle
index d6aaebe..deebcb5 100644
--- a/java/gradle/dse/build.gradle
+++ b/java/gradle/dse/build.gradle
@@ -14,7 +14,7 @@ repositories {
     }
 }
 
-def dseVersion = "6.0.0"
+def dseVersion = "6.0.1"
 
 // The assembly configuration will cause jar to be included in assembled fat-jar
 configurations {
@@ -32,9 +32,7 @@ configurations {
 // Please make sure that following dependencies have versions corresponding to the ones in your cluster.
 // Note that spark-cassandra-connector should be provided with '--packages' flag to spark-submit command.
 dependencies {
-    provided("com.datastax.dse:dse-spark-dependencies:$dseVersion") {
-        exclude group: 'org.apache.directory.api'
-    }
+    provided "com.datastax.dse:dse-spark-dependencies:$dseVersion"
 //    assembly "org.apache.commons:commons-math3:3.6.1"
 //    assembly "org.apache.commons:commons-csv:1.0"
 }
diff --git a/java/gradle/oss/build.gradle b/java/gradle/oss/build.gradle
index 6fed3bf..ff69b30 100644
--- a/java/gradle/oss/build.gradle
+++ b/java/gradle/oss/build.gradle
@@ -10,7 +10,7 @@ repositories {
     mavenCentral()
 }
 
-def sparkVersion = "2.2.0"
+def sparkVersion = "2.2.1"
 def connectorVersion = "2.0.7"
 
 // The assembly configuration will cause jar to be included in assembled fat-jar
diff --git a/java/maven/dse/pom.xml b/java/maven/dse/pom.xml
index 805a535..254cc4f 100644
--- a/java/maven/dse/pom.xml
+++ b/java/maven/dse/pom.xml
@@ -9,7 +9,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <dse.version>6.0.0</dse.version>
+    <dse.version>6.0.1</dse.version>
   </properties>
 
   <dependencies>
@@ -18,12 +18,6 @@
       <artifactId>dse-spark-dependencies</artifactId>
       <version>${dse.version}</version>
       <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.directory.api</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <!-- Your dependencies, 'provided' are not included in jar -->
     <!--<dependency>-->
diff --git a/java/maven/oss/pom.xml b/java/maven/oss/pom.xml
index 5aa1695..5dc930f 100644
--- a/java/maven/oss/pom.xml
+++ b/java/maven/oss/pom.xml
@@ -9,7 +9,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <spark.version>2.2.0</spark.version>
+    <spark.version>2.2.1</spark.version>
     <connector.version>2.0.7</connector.version>
   </properties>
 
diff --git a/java/sbt/dse/build.sbt b/java/sbt/dse/build.sbt
index ec5e426..24e538a 100644
--- a/java/sbt/dse/build.sbt
+++ b/java/sbt/dse/build.sbt
@@ -11,12 +11,11 @@ scalaVersion := "2.11.8"
 resolvers += Resolver.mavenLocal // for testing
 resolvers += "DataStax Repo" at "https://repo.datastax.com/public-repos/"
 
-val dseVersion = "6.0.0"
+val dseVersion = "6.0.1"
 
 // Please make sure that following DSE version matches your DSE cluster version.
 // SBT 0.13.13 or greater required because of a dependency resolution bug
-libraryDependencies += "com.datastax.dse" % "dse-spark-dependencies" % dseVersion % "provided" exclude(
-  "org.apache.directory.api", "*")
+libraryDependencies += "com.datastax.dse" % "dse-spark-dependencies" % dseVersion % "provided"
 
 //Your dependencies
 //libraryDependencies += "org.apache.commons" % "commons-math3" % "3.6.1"
diff --git a/java/sbt/oss/build.sbt b/java/sbt/oss/build.sbt
index fa421c6..6ef9357 100644
--- a/java/sbt/oss/build.sbt
+++ b/java/sbt/oss/build.sbt
@@ -8,7 +8,7 @@ autoScalaLibrary := false
 
 scalaVersion := "2.11.8"
 
-val sparkVersion = "2.2.0"
+val sparkVersion = "2.2.1"
 val connectorVersion = "2.0.7"
 
 // Please make sure that following dependencies have versions corresponding to the ones in your cluster.
diff --git a/scala/gradle/dse/build.gradle b/scala/gradle/dse/build.gradle
index 9d959b1..0aab1e7 100644
--- a/scala/gradle/dse/build.gradle
+++ b/scala/gradle/dse/build.gradle
@@ -29,7 +29,7 @@ configurations {
     testCompile.exclude group: 'org.slf4j', module: 'log4j-over-slf4j'
 }
 
-def dseVersion = "6.0.0"
+def dseVersion = "6.0.1"
 
 def scalaVersion = "2.11"
 def scalaTestVersion = "3.0.0"
@@ -39,9 +39,7 @@ def jUnitVersion = "4.12"
 
 // Please make sure that following DSE version matches your DSE cluster version.
 dependencies {
-    provided("com.datastax.dse:dse-spark-dependencies:$dseVersion") {
-        exclude group: 'org.apache.directory.api'
-    }
+    provided("com.datastax.dse:dse-spark-dependencies:$dseVersion")
 //  assembly "org.apache.commons:commons-math3:3.6.1"
 //  assembly "org.apache.commons:commons-csv:1.0"
 
diff --git a/scala/gradle/oss/build.gradle b/scala/gradle/oss/build.gradle
index 747acdc..8e281fc 100644
--- a/scala/gradle/oss/build.gradle
+++ b/scala/gradle/oss/build.gradle
@@ -10,7 +10,7 @@ repositories {
     mavenCentral()
 }
 
-def sparkVersion = "2.2.0"
+def sparkVersion = "2.2.1"
 def connectorVersion = "2.0.7"
 def scalaVersion = "2.11"
 def scalaTestVersion = "3.0.0"
diff --git a/scala/maven/dse/pom.xml b/scala/maven/dse/pom.xml
index eeef316..72ea826 100644
--- a/scala/maven/dse/pom.xml
+++ b/scala/maven/dse/pom.xml
@@ -9,7 +9,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <dse.version>6.0.0</dse.version>
+    <dse.version>6.0.1</dse.version>
     <scala.version>2.11.8</scala.version>
     <scala.main.version>2.11</scala.main.version>
     <scalatest.version>3.0.0</scalatest.version>
@@ -24,12 +24,6 @@
       <artifactId>dse-spark-dependencies</artifactId>
       <version>${dse.version}</version>
       <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.directory.api</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <!-- Your dependencies, 'provided' are not included in jar -->
     <!--<dependency>-->
diff --git a/scala/maven/oss/pom.xml b/scala/maven/oss/pom.xml
index 11ed623..5a60cac 100644
--- a/scala/maven/oss/pom.xml
+++ b/scala/maven/oss/pom.xml
@@ -11,7 +11,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <scala.version>2.11.8</scala.version>
     <scala.main.version>2.11</scala.main.version>
-    <spark.version>2.2.0</spark.version>
+    <spark.version>2.2.1</spark.version>
     <scalatest.version>3.0.0</scalatest.version>
     <connector.version>2.0.7</connector.version>
     <cassandra.version>3.2</cassandra.version>
diff --git a/scala/sbt/dse/build.sbt b/scala/sbt/dse/build.sbt
index 6e7a39a..e1523d6 100644
--- a/scala/sbt/dse/build.sbt
+++ b/scala/sbt/dse/build.sbt
@@ -8,13 +8,13 @@ scalaVersion := "2.11.8"
 resolvers += Resolver.mavenLocal // for testing
 resolvers += "DataStax Repo" at "https://repo.datastax.com/public-repos/"
 
-val dseVersion = "6.0.0"
+val dseVersion = "6.0.1"
 
 // Please make sure that following DSE version matches your DSE cluster version.
 // Exclusions are solely for running integrated testing
 // Warning Sbt 0.13.13 or greater is required due to a bug with dependency resolution
 libraryDependencies += "com.datastax.dse" % "dse-spark-dependencies" % dseVersion % "provided" exclude(
-    "org.apache.directory.api", "*")
+    "org.slf4j", "log4j-over-slf4j")
 
 // Test Dependencies
 // The 'test/resources' Directory in should match the resources directory in the `it` directory
diff --git a/scala/sbt/oss/build.sbt b/scala/sbt/oss/build.sbt
index 263ce5b..27efcb9 100644
--- a/scala/sbt/oss/build.sbt
+++ b/scala/sbt/oss/build.sbt
@@ -4,7 +4,7 @@ version := "0.1"
 
 scalaVersion := "2.11.8"
 
-val sparkVersion = "2.2.0"
+val sparkVersion = "2.2.1"
 val connectorVersion = "2.0.7"
 //The 'test/resources' Directory in  should match the resources directory in the `it` directory
 //for the version of the Spark Cassandra Connector in use.