Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use 3.11.6 for EmbeddedCassandra with enforced Guava 18 #52

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion scala/maven/dse/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<scala.main.version>2.11</scala.main.version>
<scalatest.version>3.0.0</scalatest.version>
<connector.version>2.0.10</connector.version>
<cassandra.version>3.2</cassandra.version>
<cassandra.version>3.11.10</cassandra.version>
<junit.version>4.12</junit.version>
</properties>

Expand Down Expand Up @@ -62,6 +62,13 @@
<version>${cassandra.version}</version>
<scope>test</scope>
</dependency>
<!-- Force Guava 18 on Test CP, Required for Cassandra -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>18.0</version>
<scope>test</scope>
</dependency>
</dependencies>

<repositories>
Expand Down Expand Up @@ -130,6 +137,9 @@
<reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
<junitxml>.</junitxml>
<filereports>WDF TestSuite.txt</filereports>
<systemProperties>
<test.cassandra.version>${cassandra.version}</test.cassandra.version>
</systemProperties>
</configuration>
<executions>
<execution>
Expand Down
5 changes: 4 additions & 1 deletion scala/maven/oss/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<spark.version>2.2.2</spark.version>
<scalatest.version>3.0.0</scalatest.version>
<connector.version>2.0.10</connector.version>
<cassandra.version>3.2</cassandra.version>
<cassandra.version>3.11.10</cassandra.version>
<junit.version>4.12</junit.version>
</properties>

Expand Down Expand Up @@ -171,6 +171,9 @@
<reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
<junitxml>.</junitxml>
<filereports>WDF TestSuite.txt</filereports>
<systemProperties>
Copy link
Contributor Author

@tlasica tlasica Nov 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Required so that proper template file is picked up.

<test.cassandra.version>${cassandra.version}</test.cassandra.version>
</systemProperties>
</configuration>
<executions>
<execution>
Expand Down
37 changes: 19 additions & 18 deletions scala/sbt/dse/build.sbt
Original file line number Diff line number Diff line change
@@ -1,49 +1,50 @@

name := "writeRead"

version := "0.1"

scalaVersion := "2.11.8"

resolvers += Resolver.mavenLocal // for testing
resolvers += "DataStax Repo" at "https://repo.datastax.com/public-repos/"

val dseVersion = "6.8.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
val dseVersion = "6.8.1"

libraryDependencies += "com.datastax.dse" % "dse-spark-dependencies" % dseVersion % "provided" exclude(
"org.slf4j", "log4j-over-slf4j")

// Test Dependencies
// The 'test/resources' Directory in should match the resources directory in the `it` directory
// for the version of the Spark Cassandra Connector in use.
val scalaTestVersion = "3.0.0"
val connectorVersion = "2.0.10"
val cassandraVersion = "3.11.10"
val guavaVersion = "18.0" // required for EmbeddedCassandra based on Cassandra 3.11.x
val scalaTestVersion = "3.0.0"
val jUnitVersion = "4.12"
val cassandraVersion = "3.2"

libraryDependencies ++= Seq(
"com.datastax.spark" %% "spark-cassandra-connector-embedded" % connectorVersion % "test" exclude(
"com.datastax.cassandra", "*"),
"com.datastax.spark" %% "spark-cassandra-connector-embedded" % connectorVersion % "test"
exclude("com.datastax.cassandra", "*"),
"org.apache.cassandra" % "cassandra-all" % cassandraVersion % "test",
"org.scalatest" %% "scalatest" % scalaTestVersion % "test",
"junit" % "junit" % "4.12" % "test"
"junit" % "junit" % jUnitVersion % "test"
).map(_.excludeAll(
ExclusionRule("org.slf4j","log4j-over-slf4j"),
ExclusionRule("org.slf4j","slf4j-log4j12"))
) // Excluded to allow for Cassandra to run embedded

//Forking is required for the Embedded Cassandra
fork in Test := true
// Need to enforce certain guava version to run embedded cassandra in test
dependencyOverrides += "com.google.guava" % "guava" % guavaVersion % "test"

// Forking is required for the Embedded Cassandra
javaOptions in Test += s"-Dtest.cassandra.version=$cassandraVersion"
fork in Test := true

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

assemblyOption in assembly := (assemblyOption in assembly).value.copy(includeScala = false)
//assemblyShadeRules in assembly := Seq(
// ShadeRule.rename("org.apache.commons.csv.**" -> "shaded.org.apache.commons.csv.@1").inAll
//)
// assemblyShadeRules in assembly := Seq(
// ShadeRule.rename("org.apache.commons.csv.**" -> "shaded.org.apache.commons.csv.@1").inAll
// )
Loading