diff --git a/gradle.properties b/gradle.properties
index 9dfd08a..33015e2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,8 +2,9 @@ group = 'org.xbib.gradle.plugin'
 name = 'gradle-plugins'
 version = 0.0.1
 
+org.gradle.warning.mode = ALL
 gradle.wrapper.version = 7.3
-groovy-git.version = 2.0.1
+groovy-git.version = 2.1.0
 rpm.version = 2.1.0
 spock.version = 2.0-groovy-3.0
 junit4.version = 4.13.2
diff --git a/gradle/compile/groovy.gradle b/gradle/compile/groovy.gradle
index 1abf883..c70f6b9 100644
--- a/gradle/compile/groovy.gradle
+++ b/gradle/compile/groovy.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'groovy'
 
 dependencies {
-    implementation "org.codehaus.groovy:groovy:${project.property('groovy.version')}:indy"
+    implementation "org.codehaus.groovy:groovy:${project.property('groovy.version')}"
 }
 
 compileGroovy {
@@ -19,16 +19,9 @@ tasks.withType(GroovyCompile) {
     if (!options.compilerArgs.contains("-processor")) {
         options.compilerArgs << '-proc:none'
     }
-    groovyOptions.optimizationOptions.indy = true
 }
 
 task groovydocJar(type: Jar, dependsOn: 'groovydoc') {
     from groovydoc.destinationDir
     archiveClassifier.set('javadoc')
 }
-
-configurations.all {
-    resolutionStrategy {
-        force "org.codehaus.groovy:groovy:${project.property('groovy.version')}:indy"
-    }
-}