fix archetypes

Ricardo · Ricardo · commit d588e4918400 · 2025-10-24T15:13:05.000-03:00
diff --git a/archetypes/griffon-javafx-groovy-archetype/src/main/resources/archetype-resources/build.gradle b/archetypes/griffon-javafx-groovy-archetype/src/main/resources/archetype-resources/build.gradle
@@ -9,9 +9,9 @@ buildscript {
 
     dependencies {
         classpath 'org.codehaus.griffon:gradle-griffon-plugin:${griffonVersion}'
-        classpath 'gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.15.0'
+        classpath 'gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.16.1'
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.39.0'
-        classpath 'gradle.plugin.net.nemerosa:versioning:2.15.1'
+        classpath 'gradle.plugin.net.nemerosa:versioning:3.1.0'
     }
 }
 
@@ -53,7 +53,7 @@ dependencies {
     testImplementation "org.apache.groovy:groovy-all:${groovyVersion}"
     testImplementation "org.spockframework:spock-core:${spockVersion}"
     testImplementation("org.awaitility:awaitility-groovy:${awaitilityVersion}") {
-        exclude group: 'org.codehaus.groovy', module: 'groovy'
+        exclude group: 'org.apache.groovy', module: 'groovy'
     }
 }
 
diff --git a/archetypes/griffon-javafx-java-archetype/src/main/resources/archetype-resources/build.gradle b/archetypes/griffon-javafx-java-archetype/src/main/resources/archetype-resources/build.gradle
@@ -9,9 +9,9 @@ buildscript {
 
     dependencies {
         classpath 'org.codehaus.griffon:gradle-griffon-plugin:${griffonVersion}'
-        classpath 'gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.15.0'
+        classpath 'gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.16.1'
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.39.0'
-        classpath 'gradle.plugin.net.nemerosa:versioning:2.15.1'
+        classpath 'gradle.plugin.net.nemerosa:versioning:3.1.0'
     }
 }
 
diff --git a/archetypes/griffon-swing-groovy-archetype/src/main/resources/archetype-resources/build.gradle b/archetypes/griffon-swing-groovy-archetype/src/main/resources/archetype-resources/build.gradle
@@ -9,9 +9,9 @@ buildscript {
 
     dependencies {
         classpath 'org.codehaus.griffon:griffon-gradle-plugin:${griffonVersion}'
-        classpath 'gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.15.0'
+        classpath 'gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.16.1'
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.39.0'
-        classpath 'gradle.plugin.net.nemerosa:versioning:2.15.1'
+        classpath 'gradle.plugin.net.nemerosa:versioning:3.1.0'
     }
 }
 
@@ -52,11 +52,18 @@ dependencies {
     testImplementation "org.codehaus.griffon:griffon-swing-test:${griffon.version.get()}"
     testImplementation "org.spockframework:spock-core:${spockVersion}"
     testImplementation("org.awaitility:awaitility-groovy:${awaitilityVersion}") {
-        exclude group: 'org.codehaus.groovy', module: 'groovy'
+        exclude group: 'org.apache.groovy', module: 'groovy'
     }
     testImplementation "org.apache.groovy:groovy-all:${groovyVersion}"
 }
 
+configurations.all {
+    resolutionStrategy {
+        force "org.apache.groovy:groovy:${groovyVersion}"
+        force "org.junit.jupiter:junit-jupiter-api:${junit5Version}"
+    }
+}
+
 startScripts {
     doLast {
         if (!macosx) unixScript.text = unixScript.text.replaceAll('"(-Xdock:(name|icon)=)([^"]*?)(")', ' ')
diff --git a/archetypes/griffon-swing-java-archetype/src/main/resources/archetype-resources/build.gradle b/archetypes/griffon-swing-java-archetype/src/main/resources/archetype-resources/build.gradle
@@ -9,9 +9,9 @@ buildscript {
 
     dependencies {
         classpath 'org.codehaus.griffon:gradle-griffon-plugin:${griffonVersion}'
-        classpath 'gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.15.0'
+        classpath 'gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.16.1'
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.39.0'
-        classpath 'gradle.plugin.net.nemerosa:versioning:2.15.1'
+        classpath 'gradle.plugin.net.nemerosa:versioning:3.1.0'
     }
 }
 
diff --git a/archetypes/shared-files/archetypes-common.gradle b/archetypes/shared-files/archetypes-common.gradle
@@ -28,22 +28,27 @@ config {
         }
     }
 }
-
+/*
 task copyArchetypeResources(type: Copy, dependsOn: 'jar') {
     //dependsOn(Jar)
     destinationDir = project.file("${buildDir}/resources/main")
     from(rootProject.file('archetypes/shared-files/sources/archetype')) {
         into 'META-INF'
     }
     duplicatesStrategy = DuplicatesStrategy.INHERIT
-}
+}*/
 
+tasks.register("copyArchetypeResources", Copy) {
+    dependsOn tasks.named("jar")
+    into(layout.buildDirectory.dir("resources/main"))
+    from(rootProject.file("archetypes/shared-files/sources/archetype")) {
+        into "META-INF"
+    }
+    duplicatesStrategy = DuplicatesStrategy.INHERIT
+}
+/*
 task copyProjectResources(type: Copy, dependsOn: 'jar') {
-    //dependsOn(Jar)
     destinationDir = project.file("${buildDir}/resources/main/archetype-resources")
-    //from(rootProject.file('archetypes/shared-files/sources/project/.mvn')) {
-    //    into '.mvn'
-    //}
     from(rootProject.file('archetypes/shared-files/sources/project'))
     from(rootProject.file('src/media')) {
         include 'griffon*'
@@ -54,6 +59,22 @@ task copyProjectResources(type: Copy, dependsOn: 'jar') {
     }
 
 }
+*/
+tasks.register("copyProjectResources", Copy) {
+    dependsOn tasks.named("jar")
+    into(layout.buildDirectory.dir("resources/main/archetype-resources"))
+    from(rootProject.file("archetypes/shared-files/sources/project"))
+    from(rootProject.file("src/media")) {
+        include 'griffon*'
+        into 'src/media'
+    }
+    from(rootProject.file("src/javadoc")) {
+        into 'src/javadoc'
+    }
+    duplicatesStrategy = DuplicatesStrategy.INHERIT
+}
+
+
 
 processResources.finalizedBy copyArchetypeResources
 processResources.finalizedBy copyProjectResources
diff --git a/archetypes/shared-files/sources/project/gradle/code-quality.gradle b/archetypes/shared-files/sources/project/gradle/code-quality.gradle
@@ -8,7 +8,7 @@ license {
         java   = 'SLASHSTAR_STYLE'
         groovy = 'SLASHSTAR_STYLE'
     }
-    ext.copyrightYear = '2021'
+    ext.copyrightYear = '2025'
     exclude '**/*.png'
 }
 
diff --git a/archetypes/shared-files/sources/project/gradle/wrapper/gradle-wrapper.properties b/archetypes/shared-files/sources/project/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
-networkTimeout=10000
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/build.gradle b/build.gradle
@@ -489,4 +489,5 @@ project.gradle.addBuildListener(new BuildAdapter() {
             }
         }
     }
-})
+})
+
diff --git a/gradle.properties b/gradle.properties
@@ -20,7 +20,7 @@ group                     = org.codehaus.griffon
 previousVersion           = 2.16.0
 sourceCompatibility       = 17
 targetCompatibility       = 17
-javafxVersion             = 11
+javafxVersion             = 21
 
 antVersion                = 1.10.13
 annotationsVersion        = 2.1.1
@@ -29,7 +29,7 @@ asciidoctorjVersion       = 2.5.7
 assertjVersion            = 3.24.2
 assertjSwingVersion       = 3.17.0
 asmVersion                = 9.5
-awaitilityVersion         = 4.2.0
+awaitilityVersion         = 4.3.0
 bootstrapfxVersion        = 0.2.4
 bytebuddyVersion          = 1.14.4
 cglibVersion              = 3.3.0
@@ -43,26 +43,26 @@ commonsCollectionsVersion = 3.2.2
 concurrentLHMVersion      = 1.4.2
 flexmarkVersion           = 0.64.0
 groovyVersion             = 4.0.29
-groovyfxVersion           = 8.0.0
-guavaVersion              = 33.3.1-jre
+groovyfxVersion           = 12.0.0-SNAPSHOT
+guavaVersion              = 33.5.0-jre
 guiceBerryVersion         = 3.3.1
 guiceVersion              = 7.0.0
 guiceExtensionVersion     = 1.2.1
 hamcrestVersion           = 2.0.0.0
 jacocoVersion             = 0.8.14
 jettyVersion              = 12.1.3
-jgitVersion               = 6.5.0.202303070854-r
+jgitVersion               = 7.4.0.202509020913-r
 jipsyVersion              = 1.2.0
-jlineVersion              = 3.23.0
-jrubyVersion              = 9.4.2.0
+jlineVersion              = 3.30.6
+jrubyVersion              = 10.0.2.0
 jschAgentproxyVersion     = 0.0.9
 jschVersion               = 0.1.55
 jsr305Version             = 3.0.2
 junitVersion              = 4.13.2
-junit5Version             = 5.12.2
-junitPlatformVersion      = 1.12.2
-kotlinVersion             = 1.4.31
-ikonliVersion             = 12.3.1
+junit5Version             = 5.13.4
+junitPlatformVersion      = 1.13.4
+kotlinVersion             = 2.2.21
+ikonliVersion             = 12.4.0
 mavenVersion              = 3.9.1
 mavenResolverVersion      = 1.9.7
 mockitoVersion            = 5.11.0
@@ -75,7 +75,8 @@ kordampBuildVersion       = 3.0.0
 enforcerPluginVersion     = 0.14.0
 gitPluginVersion          = 3.0.0
 osPluginVersion           = 1.7.3
-injectApiVerson = 2.0.0
+injectApiVerson = 2.0.1
+httpbuilderVersion = 0.8.0-SNAPSHOT
 
 project_description       = Griffon
 project_vcs_url           = https://github.com/griffon/griffon.git
diff --git a/plugins/griffon-plugin-gradle-plugin/src/main/groovy/org/codehaus/griffon/gradle/GriffonParentPomPlugin.groovy b/plugins/griffon-plugin-gradle-plugin/src/main/groovy/org/codehaus/griffon/gradle/GriffonParentPomPlugin.groovy
@@ -294,12 +294,13 @@ class GriffonParentPomPlugin implements Plugin<Project> {
                         testImplementation(sub.config.dependencyManagement.gav('junit')) {
                             exclude group: 'org.hamcrest', module: 'hamcrest-core'
                         }
-                        testImplementation("org.apache.groovy:groovy-all:${sub.groovyVersion}") {
+                        testImplementation("org.apache.groovy:groovy-all${sub.groovyVersion}") {
                             exclude group: 'junit', module: 'junit'
+                            exclude group: 'org.apache.groovy', module: 'groovy-test-junit5'
                         }
                         testImplementation("org.spockframework:spock-core:${sub.spockVersion}") {
                             exclude group: 'junit', module: 'junit'
-                            exclude group: 'org.codehaus.groovy', module: 'groovy-all'
+                            exclude group: 'org.apache.groovy', module: 'groovy-all'
                         }
 
                         compileOnly "org.codehaus.griffon:griffon-core-compile:${sub.griffonVersion}"
@@ -315,7 +316,7 @@ class GriffonParentPomPlugin implements Plugin<Project> {
 
                         testImplementation "org.codehaus.griffon:griffon-core-test:${sub.griffonVersion}"
                         testImplementation("org.codehaus.griffon:griffon-groovy:${sub.griffonVersion}") {
-                            exclude group: 'org.codehaus.groovy', module: 'groovy-all'
+                            exclude group: 'org.apache.groovy', module: 'groovy-all'
                         }
 
                         testRuntimeOnly "org.codehaus.griffon:griffon-guice:${sub.griffonVersion}"
@@ -364,6 +365,7 @@ class GriffonParentPomPlugin implements Plugin<Project> {
                     dependencies {
                         compileOnly("org.apache.groovy:groovy-all:${project.groovyVersion}") {
                             exclude group: 'junit', module: 'junit'
+                            exclude group: 'org.apache.groovy', module: 'groovy-test-junit5'
                         }
                     }
                 }
diff --git a/samples/console-swing-groovy/build.gradle.txt b/samples/console-swing-groovy/build.gradle.txt
@@ -58,9 +58,9 @@ dependencies {
 
     runtime "org.slf4j:slf4j-simple:{slf4j-version}"
 
-    testCompile "org.codehaus.griffon:griffon-swing-test:${griffon.version}"
-    testCompile "org.apache.groovy:groovy-all:{groovy-version}"
-    testCompile "org.spockframework:spock-core:{spock-version}"
+    testImplementation "org.codehaus.griffon:griffon-swing-test:${griffon.version}"
+    testImplementation "org.apache.groovy:groovy-all:{groovy-version}"
+    testImplementation "org.spockframework:spock-core:{spock-version}"
 }
 
 task sourceJar(type: Jar) {
diff --git a/samples/console-swing-groovy/pom.xml.txt b/samples/console-swing-groovy/pom.xml.txt
@@ -40,7 +40,7 @@
     <dependencies>
         <!-- compile -->
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-all</artifactId>
             <scope>compile</scope>
         </dependency>
diff --git a/samples/shared-files/samples-common.gradle b/samples/shared-files/samples-common.gradle
@@ -39,7 +39,8 @@ dependencies {
         exclude group: 'org.codehaus.groovy', module: 'groovy'
     }
     functionalTestImplementation("org.apache.groovy:groovy-all:$groovyVersion") {
-        exclude module: 'junit', group: 'junit'
+        exclude group: 'junit', module: 'junit'
+        exclude group: 'org.apache.groovy', module: 'groovy-test-junit5'
     }
 
     if (project.name.contains('javafx')) {
diff --git a/settings.gradle b/settings.gradle
@@ -142,16 +142,15 @@ enforce {
             "org.apache.maven:maven-settings:$mavenVersion",
             "org.apiguardian:apiguardian-api:$apiguardianVersion",
             "org.asciidoctor:asciidoctorj:$asciidoctorjVersion",
-            "org.apache.groovy:groovy-all:$groovyVersion",
-            "org.codehaus.groovy.modules.http-builder:http-builder:0.7.2",
+            "org.apache.groovy:groovy:$groovyVersion",
+            "org.codehaus.groovy.modules.http-builder:http-builder:${httpbuilderVersion}",
             "org.apache.groovy:groovy-json:$groovyVersion",
             "org.apache.groovy:groovy-macro:$groovyVersion",
             "org.apache.groovy:groovy-nio:$groovyVersion",
             "org.apache.groovy:groovy-sql:$groovyVersion",
             "org.apache.groovy:groovy-templates:$groovyVersion",
             "org.apache.groovy:groovy-test:$groovyVersion",
             "org.apache.groovy:groovy-xml:$groovyVersion",
-            "org.apache.groovy:groovy-all:$groovyVersion",
             "org.codehaus.plexus:plexus-component-annotations:2.1.1",
             "org.codehaus.plexus:plexus-interpolation:1.26",
             "org.codehaus.plexus:plexus-utils:3.5.1",
diff --git a/subprojects/griffon-groovy-compile/griffon-groovy-compile.gradle b/subprojects/griffon-groovy-compile/griffon-groovy-compile.gradle
@@ -24,9 +24,11 @@ dependencies {
     api project(':griffon-groovy')
     api("org.apache.groovy:groovy-all:$groovyVersion") {
         exclude group: 'junit', module: 'junit'
+        exclude group: 'org.apache.groovy', module: 'groovy-test-junit5'
     }
     api(config.dependencyManagement.gav('gipsy')) {
         exclude group: 'org.codehaus.groovy', module: 'groovy-all'
+        exclude group: 'org.apache.groovy', module: 'groovy-all'
     }
 
     compileOnly "org.openjfx:javafx-base:${javafxVersion}:${javafxPlatform}"
diff --git a/subprojects/griffon-groovy/griffon-groovy.gradle b/subprojects/griffon-groovy/griffon-groovy.gradle
@@ -19,6 +19,7 @@ dependencies {
     api project(':griffon-core-impl')
     api("org.apache.groovy:groovy-all:$groovyVersion") {
         exclude group: 'junit', module: 'junit'
+        exclude group: 'org.apache.groovy', module: 'groovy-test-junit5'
     }
 
     compileOnly project(':griffon-core-compile')
diff --git a/subprojects/griffon-javafx-groovy/griffon-javafx-groovy.gradle b/subprojects/griffon-javafx-groovy/griffon-javafx-groovy.gradle
@@ -19,7 +19,7 @@ dependencies {
     api project(':griffon-groovy')
     api project(':griffon-javafx')
     api("org.groovyfx:groovyfx:$groovyfxVersion") {
-        exclude group: 'org.codehaus.groovy', module: 'groovy-all'
+        exclude group: 'org.apache.groovy', module: 'groovy-all'
     }
 
     compileOnly project(':griffon-core-compile')
diff --git a/subprojects/griffon-swing-groovy/griffon-swing-groovy.gradle b/subprojects/griffon-swing-groovy/griffon-swing-groovy.gradle
@@ -24,8 +24,10 @@ dependencies {
 
     testImplementation project(':griffon-core-test')
     testImplementation("org.awaitility:awaitility-groovy:$awaitilityVersion") {
-        exclude group: 'org.codehaus.groovy', module: 'groovy'
-        exclude group: 'org.codehaus.groovy', module: 'groovy-all'
+        exclude group: 'org.apache.groovy', module: 'groovy'
+        exclude group: 'org.apache.groovy', module: 'groovy-all'
+        exclude group: 'org.codehouse.groovy', module: 'groovy'
+        exclude group: 'org.codehouse.groovy', module: 'groovy-all'
         exclude group: 'org.hamcrest', module: 'hamcrest-core'
         exclude group: 'org.hamcrest', module: 'hamcrest-library'
     }
diff --git a/tutorials/calculator/client/calculator-client-javafx/calculator-client-javafx.gradle b/tutorials/calculator/client/calculator-client-javafx/calculator-client-javafx.gradle
@@ -69,8 +69,8 @@ dependencies {
 
     runtime "org.slf4j:slf4j-simple:${slf4jVersion}"
 
-    testCompile 'org.apache.groovy:groovy-all:2.5.12'
-    testCompile 'org.spockframework:spock-core:2.0-groovy-2.5'
+    testCompile "org.apache.groovy:groovy-all:${groovyVersion}"
+    testCompile "org.spockframework:spock-core:${spockVersion}"
 }
 
 compileGroovy.enabled = false
diff --git a/tutorials/calculator/client/calculator-client-swing/calculator-client-swing.gradle b/tutorials/calculator/client/calculator-client-swing/calculator-client-swing.gradle
@@ -44,14 +44,14 @@ apply from: rootProject.file('client/calculator-client-common/gradle/package.gra
 apply from: rootProject.file('client/calculator-client-common/gradle/docs.gradle')
 
 dependencies {
-    compile project(':calculator-component-swing')
-    compile project(':calculator-client-common')
+    implementation project(':calculator-component-swing')
+    implementation project(':calculator-client-common')
 
     griffon "org.codehaus.griffon.plugins:griffon-miglayout-plugin:${miglayoutVersion}"
 
-    compile "org.codehaus.griffon:griffon-guice:${griffon.version.get()}"
-    compile "org.slf4j:jul-to-slf4j:${slf4jVersion}"
-    compile "org.slf4j:jcl-over-slf4j:${slf4jVersion}"
+    implementation "org.codehaus.griffon:griffon-guice:${griffon.version.get()}"
+    implementation "org.slf4j:jul-to-slf4j:${slf4jVersion}"
+    implementation "org.slf4j:jcl-over-slf4j:${slf4jVersion}"
 
     runtime('log4j:log4j:1.2.17') {
         exclude group: 'ant',         module: 'ant-nodeps'
@@ -60,8 +60,8 @@ dependencies {
     }
     runtime "org.slf4j:slf4j-log4j12:${slf4jVersion}"
 
-    testCompile 'org.apache.groovy:groovy-all:2.5.12'
-    testCompile 'org.spockframework:spock-core:2.0-groovy-2.5'
+    testImplementation "org.apache.groovy:groovy-all:${groovyVersion}"
+    testImplementation "org.spockframework:spock-core:${spockVersion}"
 }
 
 compileGroovy.enabled = false
diff --git a/tutorials/calculator/component/calculator-component/calculator-component.gradle b/tutorials/calculator/component/calculator-component/calculator-component.gradle
diff --git a/tutorials/calculator/server/calculator-server/calculator-server.gradle b/tutorials/calculator/server/calculator-server/calculator-server.gradle
diff --git a/tutorials/javafx-app/build.gradle b/tutorials/javafx-app/build.gradle
diff --git a/tutorials/patterns/mvc/build.gradle b/tutorials/patterns/mvc/build.gradle
diff --git a/tutorials/patterns/mvp/build.gradle b/tutorials/patterns/mvp/build.gradle
diff --git a/tutorials/patterns/mvvm/build.gradle b/tutorials/patterns/mvvm/build.gradle
diff --git a/tutorials/patterns/pmvc/build.gradle b/tutorials/patterns/pmvc/build.gradle

Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,9 @@ buildscript {`
`9`	`9`
`10`	`10`	`dependencies {`
`11`	`11`	`classpath 'org.codehaus.griffon:gradle-griffon-plugin:${griffonVersion}'`
`12`		`- classpath 'gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.15.0'`
	`12`	`+ classpath 'gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.16.1'`
`13`	`13`	`classpath 'com.github.ben-manes:gradle-versions-plugin:0.39.0'`
`14`		`- classpath 'gradle.plugin.net.nemerosa:versioning:2.15.1'`
	`14`	`+ classpath 'gradle.plugin.net.nemerosa:versioning:3.1.0'`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`
`@@ -53,7 +53,7 @@ dependencies {`
`53`	`53`	`testImplementation "org.apache.groovy:groovy-all:${groovyVersion}"`
`54`	`54`	`testImplementation "org.spockframework:spock-core:${spockVersion}"`
`55`	`55`	`testImplementation("org.awaitility:awaitility-groovy:${awaitilityVersion}") {`
`56`		`- exclude group: 'org.codehaus.groovy', module: 'groovy'`
	`56`	`+ exclude group: 'org.apache.groovy', module: 'groovy'`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ license {`
`8`	`8`	`java = 'SLASHSTAR_STYLE'`
`9`	`9`	`groovy = 'SLASHSTAR_STYLE'`
`10`	`10`	`}`
`11`		`- ext.copyrightYear = '2021'`
	`11`	`+ ext.copyrightYear = '2025'`
`12`	`12`	`exclude '*/.png'`
`13`	`13`	`}`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -489,4 +489,5 @@ project.gradle.addBuildListener(new BuildAdapter() {`
`489`	`489`	`}`
`490`	`490`	`}`
`491`	`491`	`}`
`492`		`-})`
	`492`	`+})`
	`493`	`+`
Original file line number	Diff line number	Diff line change
`@@ -294,12 +294,13 @@ class GriffonParentPomPlugin implements Plugin<Project> {`
`294`	`294`	`testImplementation(sub.config.dependencyManagement.gav('junit')) {`
`295`	`295`	`exclude group: 'org.hamcrest', module: 'hamcrest-core'`
`296`	`296`	`}`
`297`		`- testImplementation("org.apache.groovy:groovy-all:${sub.groovyVersion}") {`
	`297`	`+ testImplementation("org.apache.groovy:groovy-all${sub.groovyVersion}") {`
`298`	`298`	`exclude group: 'junit', module: 'junit'`
	`299`	`+ exclude group: 'org.apache.groovy', module: 'groovy-test-junit5'`
`299`	`300`	`}`
`300`	`301`	`testImplementation("org.spockframework:spock-core:${sub.spockVersion}") {`
`301`	`302`	`exclude group: 'junit', module: 'junit'`
`302`		`- exclude group: 'org.codehaus.groovy', module: 'groovy-all'`
	`303`	`+ exclude group: 'org.apache.groovy', module: 'groovy-all'`
`303`	`304`	`}`
`304`	`305`
`305`	`306`	`compileOnly "org.codehaus.griffon:griffon-core-compile:${sub.griffonVersion}"`
`@@ -315,7 +316,7 @@ class GriffonParentPomPlugin implements Plugin<Project> {`
`315`	`316`
`316`	`317`	`testImplementation "org.codehaus.griffon:griffon-core-test:${sub.griffonVersion}"`
`317`	`318`	`testImplementation("org.codehaus.griffon:griffon-groovy:${sub.griffonVersion}") {`
`318`		`- exclude group: 'org.codehaus.groovy', module: 'groovy-all'`
	`319`	`+ exclude group: 'org.apache.groovy', module: 'groovy-all'`
`319`	`320`	`}`
`320`	`321`
`321`	`322`	`testRuntimeOnly "org.codehaus.griffon:griffon-guice:${sub.griffonVersion}"`
`@@ -364,6 +365,7 @@ class GriffonParentPomPlugin implements Plugin<Project> {`
`364`	`365`	`dependencies {`
`365`	`366`	`compileOnly("org.apache.groovy:groovy-all:${project.groovyVersion}") {`
`366`	`367`	`exclude group: 'junit', module: 'junit'`
	`368`	`+ exclude group: 'org.apache.groovy', module: 'groovy-test-junit5'`
`367`	`369`	`}`
`368`	`370`	`}`
`369`	`371`	`}`