Skip to content

Commit e89d44e

Browse files
jtgrabowskijtgrabowski
committed
6.0.1 support
1 parent bd610d1 commit e89d44e

File tree

12 files changed

+16
-33
lines changed

12 files changed

+16
-33
lines changed

‎java/gradle/dse/build.gradle‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ repositories {
1414
}
1515
}
1616

17-
def dseVersion = "6.0.0"
17+
def dseVersion = "6.0.1"
1818

1919
// The assembly configuration will cause jar to be included in assembled fat-jar
2020
configurations {
@@ -32,9 +32,7 @@ configurations {
3232
// Please make sure that following dependencies have versions corresponding to the ones in your cluster.
3333
// Note that spark-cassandra-connector should be provided with '--packages' flag to spark-submit command.
3434
dependencies {
35-
provided("com.datastax.dse:dse-spark-dependencies:$dseVersion") {
36-
exclude group: 'org.apache.directory.api'
37-
}
35+
provided "com.datastax.dse:dse-spark-dependencies:$dseVersion"
3836
// assembly "org.apache.commons:commons-math3:3.6.1"
3937
// assembly "org.apache.commons:commons-csv:1.0"
4038
}

‎java/gradle/oss/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ repositories {
1010
mavenCentral()
1111
}
1212

13-
def sparkVersion = "2.2.0"
13+
def sparkVersion = "2.2.1"
1414
def connectorVersion = "2.0.7"
1515

1616
// The assembly configuration will cause jar to be included in assembled fat-jar

‎java/maven/dse/pom.xml‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<properties>
1111
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
12-
<dse.version>6.0.0</dse.version>
12+
<dse.version>6.0.1</dse.version>
1313
</properties>
1414

1515
<dependencies>
@@ -18,12 +18,6 @@
1818
<artifactId>dse-spark-dependencies</artifactId>
1919
<version>${dse.version}</version>
2020
<scope>provided</scope>
21-
<exclusions>
22-
<exclusion>
23-
<groupId>org.apache.directory.api</groupId>
24-
<artifactId>*</artifactId>
25-
</exclusion>
26-
</exclusions>
2721
</dependency>
2822
<!-- Your dependencies, 'provided' are not included in jar -->
2923
<!--<dependency>-->

‎java/maven/oss/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<properties>
1111
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
12-
<spark.version>2.2.0</spark.version>
12+
<spark.version>2.2.1</spark.version>
1313
<connector.version>2.0.7</connector.version>
1414
</properties>
1515

‎java/sbt/dse/build.sbt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,11 @@ scalaVersion := "2.11.8"
1111
resolvers += Resolver.mavenLocal // for testing
1212
resolvers += "DataStax Repo" at "https://repo.datastax.com/public-repos/"
1313

14-
val dseVersion = "6.0.0"
14+
val dseVersion = "6.0.1"
1515

1616
// Please make sure that following DSE version matches your DSE cluster version.
1717
// SBT 0.13.13 or greater required because of a dependency resolution bug
18-
libraryDependencies += "com.datastax.dse" % "dse-spark-dependencies" % dseVersion % "provided" exclude(
19-
"org.apache.directory.api", "*")
18+
libraryDependencies += "com.datastax.dse" % "dse-spark-dependencies" % dseVersion % "provided"
2019

2120
//Your dependencies
2221
//libraryDependencies += "org.apache.commons" % "commons-math3" % "3.6.1"

‎java/sbt/oss/build.sbt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ autoScalaLibrary := false
88

99
scalaVersion := "2.11.8"
1010

11-
val sparkVersion = "2.2.0"
11+
val sparkVersion = "2.2.1"
1212
val connectorVersion = "2.0.7"
1313

1414
// Please make sure that following dependencies have versions corresponding to the ones in your cluster.

‎scala/gradle/dse/build.gradle‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ configurations {
2929
testCompile.exclude group: 'org.slf4j', module: 'log4j-over-slf4j'
3030
}
3131

32-
def dseVersion = "6.0.0"
32+
def dseVersion = "6.0.1"
3333

3434
def scalaVersion = "2.11"
3535
def scalaTestVersion = "3.0.0"
@@ -39,9 +39,7 @@ def jUnitVersion = "4.12"
3939

4040
// Please make sure that following DSE version matches your DSE cluster version.
4141
dependencies {
42-
provided("com.datastax.dse:dse-spark-dependencies:$dseVersion") {
43-
exclude group: 'org.apache.directory.api'
44-
}
42+
provided("com.datastax.dse:dse-spark-dependencies:$dseVersion")
4543
// assembly "org.apache.commons:commons-math3:3.6.1"
4644
// assembly "org.apache.commons:commons-csv:1.0"
4745

‎scala/gradle/oss/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ repositories {
1010
mavenCentral()
1111
}
1212

13-
def sparkVersion = "2.2.0"
13+
def sparkVersion = "2.2.1"
1414
def connectorVersion = "2.0.7"
1515
def scalaVersion = "2.11"
1616
def scalaTestVersion = "3.0.0"

‎scala/maven/dse/pom.xml‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<properties>
1111
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
12-
<dse.version>6.0.0</dse.version>
12+
<dse.version>6.0.1</dse.version>
1313
<scala.version>2.11.8</scala.version>
1414
<scala.main.version>2.11</scala.main.version>
1515
<scalatest.version>3.0.0</scalatest.version>
@@ -24,12 +24,6 @@
2424
<artifactId>dse-spark-dependencies</artifactId>
2525
<version>${dse.version}</version>
2626
<scope>provided</scope>
27-
<exclusions>
28-
<exclusion>
29-
<groupId>org.apache.directory.api</groupId>
30-
<artifactId>*</artifactId>
31-
</exclusion>
32-
</exclusions>
3327
</dependency>
3428
<!-- Your dependencies, 'provided' are not included in jar -->
3529
<!--<dependency>-->

‎scala/maven/oss/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1212
<scala.version>2.11.8</scala.version>
1313
<scala.main.version>2.11</scala.main.version>
14-
<spark.version>2.2.0</spark.version>
14+
<spark.version>2.2.1</spark.version>
1515
<scalatest.version>3.0.0</scalatest.version>
1616
<connector.version>2.0.7</connector.version>
1717
<cassandra.version>3.2</cassandra.version>

0 commit comments

Comments
 (0)