Skip to content

Commit 9735f9f

Browse files
jtgrabowskijtgrabowski
committed
DSP-13218 DSE 5.1.1 support
1 parent 70eaaf6 commit 9735f9f

File tree

12 files changed

+31
-99
lines changed

12 files changed

+31
-99
lines changed

‎java/gradle/dse/build.gradle‎

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

16-
def dseVersion = "5.1.0"
16+
def dseVersion = "5.1.1"
1717

1818
// The assembly configuration will cause jar to be included in assembled fat-jar
1919
configurations {
@@ -31,14 +31,9 @@ configurations {
3131
// Please make sure that following dependencies have versions corresponding to the ones in your cluster.
3232
// Note that spark-cassandra-connector should be provided with '--packages' flag to spark-submit command.
3333
dependencies {
34-
provided("com.datastax.dse:dse-spark-dependencies:$dseVersion") {
35-
exclude group: 'com.datastax.dse', module: 'dse-java-driver-core'
36-
exclude group: 'org.apache.solr', module: 'solr-solrj'
37-
}
34+
provided "com.datastax.dse:dse-spark-dependencies:$dseVersion"
3835
// assembly "org.apache.commons:commons-math3:3.6.1"
3936
// assembly "org.apache.commons:commons-csv:1.0"
40-
provided "com.datastax.dse:dse-java-driver-core:1.2.3"
41-
provided "org.apache.solr:solr-solrj:6.0.1"
4237
}
4338

4439
shadowJar {

‎java/gradle/oss/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ repositories {
1010
mavenCentral()
1111
}
1212

13-
def sparkVersion = "2.0.0"
14-
def connectorVersion = "2.0.1"
13+
def sparkVersion = "2.0.2"
14+
def connectorVersion = "2.0.2"
1515

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

‎java/maven/dse/pom.xml‎

Lines changed: 1 addition & 23 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>5.1.0</dse.version>
12+
<dse.version>5.1.1</dse.version>
1313
</properties>
1414

1515
<dependencies>
@@ -18,16 +18,6 @@
1818
<artifactId>dse-spark-dependencies</artifactId>
1919
<version>${dse.version}</version>
2020
<scope>provided</scope>
21-
<exclusions>
22-
<exclusion>
23-
<groupId>com.datastax.dse</groupId>
24-
<artifactId>dse-java-driver-core</artifactId>
25-
</exclusion>
26-
<exclusion>
27-
<groupId>org.apache.solr</groupId>
28-
<artifactId>solr-solrj</artifactId>
29-
</exclusion>
30-
</exclusions>
3121
</dependency>
3222
<!-- Your dependencies, 'provided' are not included in jar -->
3323
<!--<dependency>-->
@@ -40,18 +30,6 @@
4030
<!--<artifactId>commons-csv</artifactId>-->
4131
<!--<version>1.0</version>-->
4232
<!--</dependency>-->
43-
<dependency>
44-
<groupId>com.datastax.dse</groupId>
45-
<artifactId>dse-java-driver-core</artifactId>
46-
<version>1.2.3</version>
47-
<scope>provided</scope>
48-
</dependency>
49-
<dependency>
50-
<groupId>org.apache.solr</groupId>
51-
<artifactId>solr-solrj</artifactId>
52-
<version>6.0.1</version>
53-
<scope>provided</scope>
54-
</dependency>
5533
</dependencies>
5634

5735
<repositories>

‎java/maven/oss/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
<properties>
1111
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
12-
<spark.version>2.0.0</spark.version>
13-
<connector.version>2.0.1</connector.version>
12+
<spark.version>2.0.2</spark.version>
13+
<connector.version>2.0.2</connector.version>
1414
</properties>
1515

1616
<!--

‎java/sbt/dse/build.sbt‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,16 @@ scalaVersion := "2.11.8"
1010

1111
resolvers += "DataStax Repo" at "https://repo.datastax.com/public-repos/"
1212

13-
val dseVersion = "5.1.0"
13+
val dseVersion = "5.1.1"
1414

1515
// Please make sure that following DSE version matches your DSE cluster version.
1616
// SBT 0.13.13 or greater required because of a dependency resolution bug
17-
libraryDependencies ++= Seq(
18-
"com.datastax.dse" % "dse-spark-dependencies" % dseVersion % "provided" excludeAll (
19-
ExclusionRule("com.datastax.dse", "dse-java-driver-core"),
20-
ExclusionRule("org.apache.solr", "solr-solrj")
21-
),
22-
"com.datastax.dse" % "dse-java-driver-core" % "1.2.3" % "provided",
23-
"org.apache.solr" % "solr-solrj" % "6.0.1" % "provided"
24-
)
17+
libraryDependencies += "com.datastax.dse" % "dse-spark-dependencies" % dseVersion % "provided"
2518

2619
//Your dependencies
2720
//libraryDependencies += "org.apache.commons" % "commons-math3" % "3.6.1"
2821
//libraryDependencies += "org.apache.commons" % "commons-csv" % "1.0"
2922

30-
assemblyMergeStrategy in assembly := {
31-
case "META-INF/io.netty.versions.properties" => MergeStrategy.discard
32-
case x => (assemblyMergeStrategy in assembly).value(x)
33-
}
34-
3523
assemblyOption in assembly := (assemblyOption in assembly).value.copy(includeScala = false)
3624
//assemblyShadeRules in assembly := Seq(
3725
// ShadeRule.rename("org.apache.commons.csv.**" -> "shaded.org.apache.commons.csv.@1").inAll

‎java/sbt/oss/build.sbt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ autoScalaLibrary := false
88

99
scalaVersion := "2.11.8"
1010

11-
val sparkVersion = "2.0.0"
12-
val connectorVersion = "2.0.1"
11+
val sparkVersion = "2.0.2"
12+
val connectorVersion = "2.0.2"
1313

1414
// Please make sure that following dependencies have versions corresponding to the ones in your cluster.
1515
// Note that spark-cassandra-connector should be provided with '--packages' flag to spark-submit command.

‎scala/gradle/dse/build.gradle‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ configurations {
2828
testCompile.exclude group: 'org.slf4j', module: 'log4j-over-slf4j'
2929
}
3030

31-
def dseVersion = "5.1.0"
31+
def dseVersion = "5.1.1"
3232

3333
def scalaVersion = "2.11"
3434
def scalaTestVersion = "3.0.0"
35-
def connectorVersion = "2.0.1"
35+
def connectorVersion = "2.0.2"
3636
def cassandraVersion = "3.2"
3737
def jUnitVersion = "4.12"
3838

@@ -41,13 +41,9 @@ dependencies {
4141
provided("com.datastax.dse:dse-spark-dependencies:$dseVersion") {
4242
exclude group: 'org.slf4j', module: 'slf4j-log4j12'
4343
exclude group: 'org.apache.cassandra'
44-
exclude group: 'com.datastax.dse', module: 'dse-java-driver-core'
45-
exclude group: 'org.apache.solr', module: 'solr-solrj'
4644
}
4745
// assembly "org.apache.commons:commons-math3:3.6.1"
4846
// assembly "org.apache.commons:commons-csv:1.0"
49-
provided "com.datastax.dse:dse-java-driver-core:1.2.3"
50-
provided "org.apache.solr:solr-solrj:6.0.1"
5147

5248
// Test Dependencies
5349
testCompile "com.datastax.spark:spark-cassandra-connector-embedded_$scalaVersion:$connectorVersion"

‎scala/gradle/oss/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ repositories {
1010
mavenCentral()
1111
}
1212

13-
def sparkVersion = "2.0.0"
14-
def connectorVersion = "2.0.1"
13+
def sparkVersion = "2.0.2"
14+
def connectorVersion = "2.0.2"
1515
def scalaVersion = "2.11"
1616
def scalaTestVersion = "3.0.0"
1717
def cassandraVersion = "3.2"

‎scala/maven/dse/pom.xml‎

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99

1010
<properties>
1111
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
12-
<dse.version>5.1.0</dse.version>
12+
<dse.version>5.1.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>
16-
<connector.version>2.0.1</connector.version>
16+
<connector.version>2.0.2</connector.version>
1717
<cassandra.version>3.2</cassandra.version>
1818
<junit.version>4.12</junit.version>
1919
</properties>
@@ -33,14 +33,6 @@
3333
<groupId>org.apache.cassandra</groupId>
3434
<artifactId>*</artifactId>
3535
</exclusion>
36-
<exclusion>
37-
<groupId>com.datastax.dse</groupId>
38-
<artifactId>dse-java-driver-core</artifactId>
39-
</exclusion>
40-
<exclusion>
41-
<groupId>org.apache.solr</groupId>
42-
<artifactId>solr-solrj</artifactId>
43-
</exclusion>
4436
</exclusions>
4537
</dependency>
4638
<!-- Your dependencies, 'provided' are not included in jar -->
@@ -54,18 +46,7 @@
5446
<!--<artifactId>commons-csv</artifactId>-->
5547
<!--<version>1.0</version>-->
5648
<!--</dependency>-->
57-
<dependency>
58-
<groupId>com.datastax.dse</groupId>
59-
<artifactId>dse-java-driver-core</artifactId>
60-
<version>1.2.3</version>
61-
<scope>provided</scope>
62-
</dependency>
63-
<dependency>
64-
<groupId>org.apache.solr</groupId>
65-
<artifactId>solr-solrj</artifactId>
66-
<version>6.0.1</version>
67-
<scope>provided</scope>
68-
</dependency>
49+
6950
<!-- Test Dependencies -->
7051
<dependency>
7152
<groupId>com.datastax.spark</groupId>

‎scala/maven/oss/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
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.0.0</spark.version>
14+
<spark.version>2.0.2</spark.version>
1515
<scalatest.version>3.0.0</scalatest.version>
16-
<connector.version>2.0.1</connector.version>
16+
<connector.version>2.0.2</connector.version>
1717
<cassandra.version>3.2</cassandra.version>
1818
<junit.version>4.12</junit.version>
1919
</properties>

0 commit comments

Comments
 (0)