Skip to content

Commit f8dd64b

Browse files
committed
Use 3.11.6 for EmbeddedCassandra with enforced Guava 18
Use Cassandra 3.11. Force Guava18 With DSE switched to Guava 31 we had test failures caused by Guava 31 on the path which caused EmbeddedCassandra failures (Access, DIGIT) as Cassandra 3.0 and 3.11 are not ready for new Guava. This change: * forces Cassandra 3.11 for the EmbeddedCassandra test * forces Guava 18 for "dse" flavor (same as "oss" already did).
1 parent 962ad32 commit f8dd64b

File tree

3 files changed

+962
-2
lines changed

3 files changed

+962
-2
lines changed

scala/maven/dse/pom.xml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<scala.main.version>2.11</scala.main.version>
1515
<scalatest.version>3.0.0</scalatest.version>
1616
<connector.version>2.0.10</connector.version>
17-
<cassandra.version>3.2</cassandra.version>
17+
<cassandra.version>3.11.10</cassandra.version>
1818
<junit.version>4.12</junit.version>
1919
</properties>
2020

@@ -62,6 +62,13 @@
6262
<version>${cassandra.version}</version>
6363
<scope>test</scope>
6464
</dependency>
65+
<!-- Force Guava 18 on Test CP, Required for Cassandra -->
66+
<dependency>
67+
<groupId>com.google.guava</groupId>
68+
<artifactId>guava</artifactId>
69+
<version>18.0</version>
70+
<scope>test</scope>
71+
</dependency>
6572
</dependencies>
6673

6774
<repositories>
@@ -130,6 +137,9 @@
130137
<reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
131138
<junitxml>.</junitxml>
132139
<filereports>WDF TestSuite.txt</filereports>
140+
<systemProperties>
141+
<test.cassandra.version>${cassandra.version}</test.cassandra.version>
142+
</systemProperties>
133143
</configuration>
134144
<executions>
135145
<execution>

scala/maven/oss/pom.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<spark.version>2.2.2</spark.version>
1515
<scalatest.version>3.0.0</scalatest.version>
1616
<connector.version>2.0.10</connector.version>
17-
<cassandra.version>3.2</cassandra.version>
17+
<cassandra.version>3.11.10</cassandra.version>
1818
<junit.version>4.12</junit.version>
1919
</properties>
2020

@@ -171,6 +171,9 @@
171171
<reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
172172
<junitxml>.</junitxml>
173173
<filereports>WDF TestSuite.txt</filereports>
174+
<systemProperties>
175+
<test.cassandra.version>${cassandra.version}</test.cassandra.version>
176+
</systemProperties>
174177
</configuration>
175178
<executions>
176179
<execution>

0 commit comments

Comments
 (0)