diff --git a/build.gradle b/build.gradle
index 1fbb259f..90ad1557 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
     dependencies {
         classpath "org.codehaus.groovy.modules.http-builder:http-builder:0.7.2"
         classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion"
-        classpath 'org.asciidoctor:asciidoctor-gradle-jvm:4.0.1'
+        classpath 'org.asciidoctor:asciidoctor-gradle-jvm:4.0.2'
         classpath "com.github.erdi:webdriver-binaries-gradle-plugin:3.2"
         classpath "org.grails.plugins:views-gradle:3.1.2"
         classpath "io.github.gradle-nexus:publish-plugin:1.3.0"
diff --git a/gradle.properties b/gradle.properties
index ce222cdf..09afdc02 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ datastoreVersion=8.0.4
 gebVersion=2.3
 grailsVersion=6.0.0
 grailsGradlePluginVersion=6.1.1
-groovyVersion=3.0.11
+groovyVersion=3.0.20
 h2Version=1.4.200
 hibernateCoreVersion=5.5.7.Final
 hibernatePluginVersion=8.0.2
@@ -18,7 +18,7 @@ pluginGrailsVersion=6.1.1
 projectVersion=8.2.0-SNAPSHOT
 seleniumSafariDriverVersion=3.14.0
 seleniumVersion=3.14.0
-spockVersion=2.1-groovy-3.0
+spockVersion=2.3-groovy-4.0
 springBootVersion=2.7.18
 springVersion=5.3.31
 webdriverBinariesVersion=1.4
diff --git a/grails-datastore-gorm-mongodb/src/main/groovy/org/grails/datastore/mapping/mongo/engine/codecs/PersistentEntityCodec.groovy b/grails-datastore-gorm-mongodb/src/main/groovy/org/grails/datastore/mapping/mongo/engine/codecs/PersistentEntityCodec.groovy
index ce294b15..2d047a61 100644
--- a/grails-datastore-gorm-mongodb/src/main/groovy/org/grails/datastore/mapping/mongo/engine/codecs/PersistentEntityCodec.groovy
+++ b/grails-datastore-gorm-mongodb/src/main/groovy/org/grails/datastore/mapping/mongo/engine/codecs/PersistentEntityCodec.groovy
@@ -360,11 +360,11 @@ class PersistentEntityCodec extends BsonPersistentEntityCodec {
         return MongoConstants.MONGO_CLASS_FIELD
     }
 
-    protected void encodeEmbeddedCollectionUpdate(EntityAccess parentAccess, BsonDocument sets, Document unsets, Association association, v) {
+    protected void encodeEmbeddedCollectionUpdate(EntityAccess parentAccess, BsonDocument sets, Document unsets, Association association, Object v) {
         if(v instanceof Collection) {
             if((v instanceof DirtyCheckableCollection) && !((DirtyCheckableCollection)v).hasChangedSize()) {
                 int i = 0
-                for(o in v) {
+                for(o in (v as Collection)) {
                     def embeddedUpdate = encodeUpdate(o, createEntityAccess(o), EncoderContext.builder().build(), true)
                     def embeddedSets = embeddedUpdate.get(MONGO_SET_OPERATOR)
                     if(embeddedSets != null) {