From b4b3f949ff8a2581a9ffaaaa810dba22d64fd57a Mon Sep 17 00:00:00 2001
From: Jaroslaw Grabowski <jaroslaw.grabowski@datastax.com>
Date: Tue, 17 Apr 2018 11:16:11 +0200
Subject: [PATCH] 6.0.0 support - note extra exclusion

Note org.apache.directory.api exclusion
---
 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       | 7 +++----
 scala/sbt/oss/build.sbt       | 2 +-
 12 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/java/gradle/dse/build.gradle b/java/gradle/dse/build.gradle
index f1fb9df..d6aaebe 100644
--- a/java/gradle/dse/build.gradle
+++ b/java/gradle/dse/build.gradle
@@ -14,7 +14,7 @@ repositories {
     }
 }
 
-def dseVersion = "5.1.8"
+def dseVersion = "6.0.0"
 
 // The assembly configuration will cause jar to be included in assembled fat-jar
 configurations {
@@ -32,7 +32,9 @@ 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"
+    provided("com.datastax.dse:dse-spark-dependencies:$dseVersion") {
+        exclude group: 'org.apache.directory.api'
+    }
 //    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 bdb316a..6fed3bf 100644
--- a/java/gradle/oss/build.gradle
+++ b/java/gradle/oss/build.gradle
@@ -10,7 +10,7 @@ repositories {
     mavenCentral()
 }
 
-def sparkVersion = "2.0.2"
+def sparkVersion = "2.2.0"
 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 cd76349..805a535 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>5.1.8</dse.version>
+    <dse.version>6.0.0</dse.version>
   </properties>
 
   <dependencies>
@@ -18,6 +18,12 @@
       <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 25ea067..5aa1695 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.0.2</spark.version>
+    <spark.version>2.2.0</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 4f707f0..ec5e426 100644
--- a/java/sbt/dse/build.sbt
+++ b/java/sbt/dse/build.sbt
@@ -11,11 +11,12 @@ scalaVersion := "2.11.8"
 resolvers += Resolver.mavenLocal // for testing
 resolvers += "DataStax Repo" at "https://repo.datastax.com/public-repos/"
 
-val dseVersion = "5.1.8"
+val dseVersion = "6.0.0"
 
 // 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"
+libraryDependencies += "com.datastax.dse" % "dse-spark-dependencies" % dseVersion % "provided" exclude(
+  "org.apache.directory.api", "*")
 
 //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 9d13a51..fa421c6 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.0.2"
+val sparkVersion = "2.2.0"
 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 02bd46a..9d959b1 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 = "5.1.8"
+def dseVersion = "6.0.0"
 
 def scalaVersion = "2.11"
 def scalaTestVersion = "3.0.0"
@@ -39,7 +39,9 @@ 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")
+    provided("com.datastax.dse:dse-spark-dependencies:$dseVersion") {
+        exclude group: 'org.apache.directory.api'
+    }
 //  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 47dbf1e..747acdc 100644
--- a/scala/gradle/oss/build.gradle
+++ b/scala/gradle/oss/build.gradle
@@ -10,7 +10,7 @@ repositories {
     mavenCentral()
 }
 
-def sparkVersion = "2.0.2"
+def sparkVersion = "2.2.0"
 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 98b9fd1..eeef316 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>5.1.8</dse.version>
+    <dse.version>6.0.0</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,6 +24,12 @@
       <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 e163294..11ed623 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.0.2</spark.version>
+    <spark.version>2.2.0</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 6d52238..6e7a39a 100644
--- a/scala/sbt/dse/build.sbt
+++ b/scala/sbt/dse/build.sbt
@@ -8,14 +8,13 @@ scalaVersion := "2.11.8"
 resolvers += Resolver.mavenLocal // for testing
 resolvers += "DataStax Repo" at "https://repo.datastax.com/public-repos/"
 
-val dseVersion = "5.1.8"
+val dseVersion = "6.0.0"
 
 // 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"
-)
+libraryDependencies += "com.datastax.dse" % "dse-spark-dependencies" % dseVersion % "provided" exclude(
+    "org.apache.directory.api", "*")
 
 // 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 b1a2729..263ce5b 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.0.2"
+val sparkVersion = "2.2.0"
 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.