Merge branch 'master' into 6.0.0

# Conflicts: # .github/workflows/central-sync.yml # .github/workflows/publish-snapshot.yml # .github/workflows/release.yml # .github/workflows/sonarqube.yml # gradle.properties # gradle/libs.versions.toml # settings.gradle
micronaut-projects · Nov 15, 2022 · a764a71 · a764a71
2 parents 228c4fb + afdea23
commit a764a71
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/gradle.properties b/gradle.properties
@@ -4,6 +4,7 @@ projectGroup=io.micronaut.cassandra
 micronautDocsVersion=2.0.0
 micronautVersion=4.0.0-SNAPSHOT
 micronautTestVersion=4.0.0-SNAPSHOT
+
 groovyVersion=4.0.6
 spockVersion=2.3-groovy-4.0
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,11 +2,13 @@
 managed-datastax-cassandra-driver = "4.15.0"
 
 testcontainers = "1.17.5"
-spock = "2.3-groovy-4.0"
+spock = "2.1-groovy-3.0"
 
 [libraries]
 managed-datastax-cassandra-driver-core = { module = "com.datastax.oss:java-driver-core", version.ref = "managed-datastax-cassandra-driver" }
 managed-datastax-cassandra-driver-mapper-processor = { module = "com.datastax.oss:java-driver-mapper-processor", version.ref = "managed-datastax-cassandra-driver" }
 
+reactor-core = { module = "io.projectreactor:reactor-core" }
+
 testcontainers-cassandra = { module = "org.testcontainers:cassandra", version.ref = "testcontainers" }
 testcontainers-spock = { module = "org.testcontainers:spock", version.ref = "testcontainers" }