java9-modularity
diff --git a/test-project-groovy/build.gradle b/test-project-groovy/build.gradle
@@ -26,12 +26,12 @@ subprojects {
     }
 
     dependencies {
-        implementation 'org.codehaus.groovy:groovy:3.0.25'
+        implementation 'org.apache.groovy:groovy:5.0.3'
         testImplementation "org.junit.jupiter:junit-jupiter-api:$jUnitVersion"
         testImplementation "org.junit.jupiter:junit-jupiter-params:$jUnitVersion"
         testImplementation "org.junit.jupiter:junit-jupiter-engine:$jUnitVersion"
         testRuntimeOnly "org.junit.platform:junit-platform-launcher:$jUnitPlatformVersion"
-        testImplementation("org.spockframework:spock-core:2.4-M1-groovy-3.0") {
+        testImplementation("org.spockframework:spock-core:2.4-groovy-5.0") {
             exclude module: 'groovy-nio'
             exclude module: 'groovy-test'
             exclude module: 'groovy-xml'

diff --git a/test-project-groovy/greeter.api/src/main/java/module-info.java b/test-project-groovy/greeter.api/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 module greeter.api {
     exports examples.greeter.api;
 
-    requires org.codehaus.groovy;
+    requires org.apache.groovy;
 }
diff --git a/test-project-groovy/greeter.javaexec/src/main/java/module-info.java b/test-project-groovy/greeter.javaexec/src/main/java/module-info.java
@@ -2,7 +2,7 @@
 
 module greeter.javaexec {
     requires greeter.api;
-    requires org.codehaus.groovy;
+    requires org.apache.groovy;
 
     exports demo;
     uses Greeter;

diff --git a/test-project-groovy/greeter.provider.test/src/main/java/module-info.java b/test-project-groovy/greeter.provider.test/src/main/java/module-info.java
@@ -2,7 +2,7 @@
 
 module greeter.provider.test {
     requires greeter.api;
-    requires org.codehaus.groovy;
+    requires org.apache.groovy;
 
     exports tests;
     uses Greeter;

diff --git a/test-project-groovy/greeter.provider.testfixture/src/main/java/module-info.java b/test-project-groovy/greeter.provider.testfixture/src/main/java/module-info.java
@@ -2,7 +2,7 @@
 
 module greeter.provider.testfixture {
     requires greeter.api;
-    requires org.codehaus.groovy;
+    requires org.apache.groovy;
 
     exports testfixture;
     uses Greeter;

diff --git a/test-project-groovy/greeter.provider/src/main/java/module-info.java b/test-project-groovy/greeter.provider/src/main/java/module-info.java
@@ -2,7 +2,7 @@
 
 module greeter.provider {
     requires greeter.api;
-    requires org.codehaus.groovy;
+    requires org.apache.groovy;
 
     exports examples.greeter;
     provides Greeter with examples.greeter.Friendly;

diff --git a/test-project-groovy/greeter.runner/src/main/java/module-info.java b/test-project-groovy/greeter.runner/src/main/java/module-info.java
@@ -3,6 +3,6 @@
 module greeter.runner {
     requires greeter.api;
 
-    requires org.codehaus.groovy;
+    requires org.apache.groovy;
     uses Greeter;
 }
diff --git a/test-project-groovy/greeter.startscripts/src/main/java/module-info.java b/test-project-groovy/greeter.startscripts/src/main/java/module-info.java
@@ -2,7 +2,7 @@
 
 module greeter.startscripts {
     requires greeter.api;
-    requires org.codehaus.groovy;
+    requires org.apache.groovy;
 
     exports startscripts;
     uses Greeter;