From fe475618e179b1c95cdefe886f2336607f3b6c9f Mon Sep 17 00:00:00 2001
From: Vladimir Orany <vladimir@orany.cz>
Date: Wed, 10 Nov 2021 14:42:02 +0100
Subject: [PATCH] [branch sc46794] Upgrade to Spock 2 (#23)

* Upgraded to Spock 2

* Upgraded to Spock 2

* Upgraded to Spock 2

* fixed JUnit version and missing JUnit Platform Engine
---
 build.gradle                                           | 10 +++++++---
 .../micronaut-grails-example.gradle                    |  3 ++-
 .../grails/example/AbstractApplicationSpec.groovy      |  4 ++--
 gradle.properties                                      |  7 ++++---
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index 0ea3b00e..7de3daed 100644
--- a/build.gradle
+++ b/build.gradle
@@ -156,9 +156,12 @@ subprojects { Project subproject ->
 
         testCompile "io.micronaut:micronaut-inject-groovy"
 
-        testCompile("org.spockframework:spock-core:$spockVersion") {
-            exclude group: "org.codehaus.groovy", module: "groovy-all"
-        }
+
+        testCompile platform("org.junit:junit-bom:$junitVersion")
+        testCompile "org.junit.jupiter:junit-jupiter-engine"
+        testCompile "org.junit.jupiter:junit-jupiter-api"
+
+        testCompile("org.spockframework:spock-core:$spockVersion")
         testCompile 'cglib:cglib-nodep:3.2.0'
         testCompile 'org.objenesis:objenesis:1.2'
 
@@ -169,6 +172,7 @@ subprojects { Project subproject ->
     compileTestJava.options.compilerArgs += '-parameters'
 
     test {
+        useJUnitPlatform()
         environment 'AWS_CBOR_DISABLE', 'true'
         systemProperty 'TEST_RESOURCES_FOLDER', new File(subproject.projectDir, 'src/test/resources').canonicalPath
         systemProperty 'user.timezone', 'UTC'
diff --git a/examples/micronaut-grails-example/micronaut-grails-example.gradle b/examples/micronaut-grails-example/micronaut-grails-example.gradle
index 87bf1af1..96de8829 100644
--- a/examples/micronaut-grails-example/micronaut-grails-example.gradle
+++ b/examples/micronaut-grails-example/micronaut-grails-example.gradle
@@ -49,6 +49,7 @@ dependencyManagement {
     imports {
         mavenBom "io.micronaut:micronaut-bom:$micronautVersion"
         mavenBom "org.grails:grails-bom:${grailsVersion}"
+        mavenBom  "org.junit:junit-bom:$junitVersion"
     }
 }
 
@@ -64,7 +65,7 @@ dependencies {
     compile project(':micronaut-grails-web-boot')
     compile project(':micronaut-grails-domain-library')
 
-    testCompile 'com.agorapulse:gru-http:0.8.4'
+    testCompile "com.agorapulse:gru-http:$gruVersion"
 
     developmentOnly("org.springframework.boot:spring-boot-devtools")
     compile "org.springframework.boot:spring-boot-starter-logging"
diff --git a/examples/micronaut-grails-example/src/test/groovy/micronaut/grails/example/AbstractApplicationSpec.groovy b/examples/micronaut-grails-example/src/test/groovy/micronaut/grails/example/AbstractApplicationSpec.groovy
index 14273ad1..544d4803 100644
--- a/examples/micronaut-grails-example/src/test/groovy/micronaut/grails/example/AbstractApplicationSpec.groovy
+++ b/examples/micronaut-grails-example/src/test/groovy/micronaut/grails/example/AbstractApplicationSpec.groovy
@@ -22,8 +22,8 @@ import com.agorapulse.gru.http.Http
 import com.agorapulse.micronaut.grails.domain.ManagerService
 import com.agorapulse.micronaut.grails.example.DirectlyInjected
 import com.agorapulse.micronaut.grails.example.InjectedUsingBridge
-import org.junit.Rule
 import org.springframework.context.ConfigurableApplicationContext
+import spock.lang.AutoCleanup
 import spock.lang.Shared
 import spock.lang.Specification
 
@@ -31,7 +31,7 @@ abstract class AbstractApplicationSpec extends Specification {
 
     @Shared ConfigurableApplicationContext context
 
-    @Rule Gru gru = Gru.equip(Http.steal(this)).prepare('http://localhost:9999')
+    @AutoCleanup Gru gru = Gru.equip(Http.steal(this)).prepare('http://localhost:9999')
 
     abstract Class<?> getApplicationClass()
 
diff --git a/gradle.properties b/gradle.properties
index 5abc306e..b49cbc74 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -22,10 +22,11 @@ version = 3.0.0-SNAPSHOT
 
 micronautVersion = 1.2.11
 grailsVersion=4.0.4
-gruVersion = 0.8.2
-druVersion = 0.6.0
+gruVersion = 0.9.4
+druVersion = 0.8.1
 groovyVersion = 2.5.8
-spockVersion = 1.3-groovy-2.5
+spockVersion = 2.0-groovy-2.5
+junitVersion = 5.7.2
 awsSdkVersion = 1.11.656
 awsSdk2Version = 2.9.24
 testcontainersVersion = 1.15.3