Merge pull request #1282 from grails/groovy3

puneetbehl · web-flow · commit 4d6ec52089f6 · 2020-03-12T21:13:54.000+05:30
Upgrade to Groovy 3.0.x
diff --git a/build.gradle b/build.gradle
@@ -17,8 +17,8 @@ project.ext {
     isTravisBuild = System.getenv().get("TRAVIS") == 'true'
 
     projectMajorVersion = "7"
-    projectMinorVersion = "0"
-    projectPatchVersion = "4"
+    projectMinorVersion = "1"
+    projectPatchVersion = "0"
 //     releaseType = "RELEASE"
 //    releaseType = "M2"
     // releaseType = "RC1"
@@ -34,7 +34,7 @@ project.ext {
     nexusPassword = System.getenv("SONATYPE_PASSWORD") ?: project.hasProperty("sonatypeOssPassword") ? project.sonatypeOssPassword : ''
 }
 
-def spockDependency = "org.spockframework:spock-core:1.2-groovy-2.5"
+def spockDependency = "org.spockframework:spock-core:2.0-M2-groovy-3.0"
 
 def isGroovyProject(project) {
     !project.name.contains("grails-plugins")
@@ -62,6 +62,12 @@ allprojects {
         if(isBuildSnapshot) {
             maven { url "https://repo.grails.org/grails/libs-snapshots-local" }
         }
+        if(groovyVersion && groovyVersion.endsWith('-SNAPSHOT')) {
+            maven {
+                name 'JFrog OSS snapshot repo'
+                url 'https://oss.jfrog.org/oss-snapshot-local/'
+            }
+        }
     }
 
     configurations {
@@ -125,26 +131,29 @@ subprojects {
             documentation "org.fusesource.jansi:jansi:1.11"
             documentation "org.codehaus.groovy:groovy-dateutil:$groovyVersion"
             documentation 'info.picocli:picocli:3.8.0'
-            compile group: 'org.codehaus.groovy', name: 'groovy', version: groovyVersion
 
-            testCompile group: 'org.codehaus.groovy', name: 'groovy-test', version: groovyVersion
-
-            testCompile "junit:junit:$junitVersion"
-            testCompile (spockDependency) {
-                exclude group:'junit',module:'junit-dep'
-                exclude group:'org.codehaus.groovy',module:'groovy-all'
-                exclude group:'org.hamcrest',module:'hamcrest-core'
+            compile group: 'org.codehaus.groovy', name: 'groovy', version: groovyVersion
+            testCompile group: 'org.codehaus.groovy', name: 'groovy-test-junit5', version: groovyVersion
+            testCompile "org.junit.jupiter:junit-jupiter-api:5.6.0"
+            testCompile "org.junit.platform:junit-platform-runner:1.6.0"
+            testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.6.0"
+
+            testCompile(spockDependency) {
+                exclude group: 'junit', module: 'junit-dep'
+                exclude group: 'org.codehaus.groovy', module: 'groovy-all'
+                exclude group: 'org.hamcrest', module: 'hamcrest-core'
                 transitive = false
             }
         }
 
         if (project.name == "grails-datastore-gorm-tck") {
-            compile spockDependency, {
-                exclude group:'junit',module:'junit-dep'
-                exclude group:'org.codehaus.groovy',module:'groovy-all'
-                exclude group:'org.hamcrest',module:'hamcrest-core'
+            compile(spockDependency, {
+                exclude group: 'junit', module: 'junit-dep'
+                exclude group: 'org.codehaus.groovy', module: 'groovy-all'
+                exclude group: 'org.hamcrest', module: 'hamcrest-core'
                 transitive = false
-            }
+            })
+            compile "org.junit.platform:junit-platform-runner:1.6.0"
         }
     }
 
@@ -179,6 +188,7 @@ subprojects {
         }
 
         test {
+            useJUnitPlatform()
             testLogging {
                 exceptionFormat ='full'
             }
@@ -226,6 +236,10 @@ subprojects {
                 }
             }
         }
+//        Only enable to force update dependencies
+//        configurations.all {
+//            resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
+//        }
     }
 
     if (isStandardGroovyMavenProject) {
@@ -250,7 +264,7 @@ configurations {
 
 dependencies {
     build "com.cenqua.clover:clover:3.0.2"
-    build "org.apache.ant:ant-junit:1.8.1"
+//    build "org.apache.ant:ant-junit:1.8.1"
     build "org.apache.ant:ant-nodeps:1.8.1"
 }
 
diff --git a/gradle.properties b/gradle.properties
@@ -18,4 +18,4 @@ grailsAsyncVersion=3.3.2
 slf4jVersion=1.7.29
 junitVersion=4.12
 javassistVersion=3.21.0-GA
-groovyVersion=2.5.6
+groovyVersion=3.0.3-SNAPSHOT
diff --git a/grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/config/Entity.groovy b/grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/config/Entity.groovy
@@ -172,7 +172,7 @@ class Entity<P extends Property> {
      * @param identityConfig The id config
      * @return This mapping
      */
-    Entity<P> id(@DelegatesTo(P) Closure identityConfig) {
+    Entity<P> id(@DelegatesTo(Property) Closure identityConfig) {
         Property.configureExisting(
                 getOrInitializePropertyConfig(GormProperties.IDENTITY),
                 identityConfig
@@ -185,7 +185,7 @@ class Entity<P extends Property> {
      *
      * @param isVersioned True if a version property should be configured
      */
-    Entity version(@DelegatesTo(P) Closure versionConfig) {
+    Entity version(@DelegatesTo(Property) Closure versionConfig) {
         P pc = getOrInitializePropertyConfig(GormProperties.VERSION)
         Property.configureExisting(pc, versionConfig)
         return this
@@ -218,7 +218,7 @@ class Entity<P extends Property> {
      * @param propertyConfig The property config
      * @return This mapping
      */
-    Entity property(String name, @DelegatesTo(P) Closure propertyConfig) {
+    Entity property(String name, @DelegatesTo(Property) Closure propertyConfig) {
         P pc = getOrInitializePropertyConfig(name)
         Property.configureExisting(pc, propertyConfig)
         return this
@@ -242,7 +242,7 @@ class Entity<P extends Property> {
      * @param propertyConfig The property config
      * @return This mapping
      */
-    P property(@DelegatesTo(P) Closure propertyConfig) {
+    P property(@DelegatesTo(Property) Closure propertyConfig) {
         if(propertyConfigs.containsKey('*')) {
             P cloned = cloneGlobalConstraint()
             return Property.configureExisting(cloned, propertyConfig)
@@ -277,7 +277,7 @@ class Entity<P extends Property> {
      * @param config The configuration
      * @return The new instance
      */
-    static <T extends Entity> T configureExisting(T mapping, @DelegatesTo(T) Closure config) {
+    static <T extends Entity> T configureExisting(T mapping, @DelegatesTo(Entity) Closure config) {
         config.setDelegate(mapping)
         config.setResolveStrategy(Closure.DELEGATE_ONLY)
         config.call()
@@ -288,7 +288,7 @@ class Entity<P extends Property> {
         if(val instanceof Closure) {
             property(name, (Closure)val)
         }
-        else if(val instanceof P) {
+        else if(val instanceof Property) {
             propertyConfigs[name] =((P)val)
         }
         else {
@@ -302,7 +302,7 @@ class Entity<P extends Property> {
             if(args[0] instanceof Closure) {
                 property(name, (Closure)args[0])
             }
-            else if(args[0] instanceof P) {
+            else if(args[0] instanceof Property) {
                 propertyConfigs[name] = (P)args[0]
             }
             else if(args[0] instanceof Map) {
diff --git a/grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/reflect/AstAnnotationUtils.groovy b/grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/reflect/AstAnnotationUtils.groovy
@@ -20,7 +20,7 @@ import java.lang.annotation.Annotation
  */
 @CompileStatic
 class AstAnnotationUtils {
-    private static final Set<String> JUNIT_ANNOTATION_NAMES = new HashSet<String>(Arrays.asList("org.junit.Before", "org.junit.After"))
+    private static final Set<String> JUNIT_ANNOTATION_NAMES = new HashSet<String>(Arrays.asList("org.junit.jupiter.api.BeforeEach", "org.junit.jupiter.api.AfterEach"))
 
     static AnnotationNode findAnnotation(AnnotatedNode classNode, Class<?> type) {
         List<AnnotationNode> annotations = classNode.getAnnotations()
diff --git a/grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/reflect/ClassPropertyFetcher.java b/grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/reflect/ClassPropertyFetcher.java
@@ -418,14 +418,14 @@ public Field getDeclaredField(String name) {
         if(metaProperty instanceof MetaBeanProperty) {
             CachedField field = ((MetaBeanProperty) metaProperty).getField();
             if(field != null) {
-                return field.field;
+                return field.getCachedField();
             }
         }
         else if(metaProperty instanceof MultipleSetterProperty) {
             MultipleSetterProperty msp = (MultipleSetterProperty) metaProperty;
             CachedField field = msp.getField();
             if(field != null) {
-                return field.field;
+                return field.getCachedField();
             }
         }
         return null;
diff --git a/grails-datastore-core/src/test/groovy/org/grails/datastore/mapping/keyvalue/mapping/KeyValueMappingFactoryTests.groovy b/grails-datastore-core/src/test/groovy/org/grails/datastore/mapping/keyvalue/mapping/KeyValueMappingFactoryTests.groovy
@@ -5,8 +5,8 @@ import org.grails.datastore.mapping.keyvalue.mapping.config.KeyValue
 import org.grails.datastore.mapping.keyvalue.mapping.config.KeyValueMappingContext
 import org.grails.datastore.mapping.keyvalue.mapping.config.KeyValuePersistentEntity
 import org.grails.datastore.mapping.model.PersistentProperty
-import org.junit.Before
-import org.junit.Test
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
 
 /**
  * @author Graeme Rocher
@@ -15,7 +15,7 @@ import org.junit.Test
 class KeyValueMappingFactoryTests {
     def context
 
-    @Before
+    @BeforeEach
     void setUp() {
         context = new KeyValueMappingContext("myspace")
         context.addPersistentEntity(TestEntity)
diff --git a/grails-datastore-core/src/test/groovy/org/grails/datastore/mapping/model/GormMappingInheritanceTests.groovy b/grails-datastore-core/src/test/groovy/org/grails/datastore/mapping/model/GormMappingInheritanceTests.groovy
@@ -1,10 +1,10 @@
 package org.grails.datastore.mapping.model
 
 import grails.gorm.annotation.Entity
-import org.junit.Test
 import org.grails.datastore.mapping.model.types.*
+import org.junit.jupiter.api.Test
 
-import static org.junit.Assert.*
+import static org.junit.jupiter.api.Assertions.*
 
 /**
  * Tests for correct mapping of entities with inheritance.
@@ -188,4 +188,4 @@ class DerivedEntityChildB extends DerivedEntity {
 
 @Entity
 class DerivedEntityChildC extends DerivedEntity {
-}
+}
diff --git a/grails-datastore-core/src/test/groovy/org/grails/datastore/mapping/model/GormMappingSyntaxTests.groovy b/grails-datastore-core/src/test/groovy/org/grails/datastore/mapping/model/GormMappingSyntaxTests.groovy
@@ -3,10 +3,10 @@ package org.grails.datastore.mapping.model
 import grails.gorm.annotation.Entity
 import org.grails.datastore.mapping.model.config.JpaMappingConfigurationStrategy
 
-import static org.junit.Assert.*
+import static org.junit.jupiter.api.Assertions.*
 
 
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.grails.datastore.mapping.model.types.Association
 import org.grails.datastore.mapping.model.types.ManyToOne
 import org.grails.datastore.mapping.model.types.OneToMany
diff --git a/grails-datastore-core/src/test/groovy/org/grails/datastore/mapping/reflect/ClassPropertyFetcherTests.groovy b/grails-datastore-core/src/test/groovy/org/grails/datastore/mapping/reflect/ClassPropertyFetcherTests.groovy
@@ -2,7 +2,7 @@ package org.grails.datastore.mapping.reflect
 
 import org.grails.datastore.mapping.keyvalue.mapping.config.KeyValueMappingFactory
 import org.grails.datastore.mapping.model.config.GormProperties
-import org.junit.Test
+import org.junit.jupiter.api.Test
 
 import java.beans.PropertyDescriptor
 
@@ -142,4 +142,4 @@ class DomainWithMultipleSetter {
     void setId(Long id) {
         this.id = id
     }
-}
+}
diff --git a/grails-datastore-gorm-tck/build.gradle b/grails-datastore-gorm-tck/build.gradle
@@ -3,11 +3,11 @@ dependencies {
     compile 'commons-lang:commons-lang:2.6'
     compile project(":grails-datastore-gorm-async")
     compile project(":grails-datastore-gorm-support")
-    compile "junit:junit:$junitVersion"
+//    compile "junit:junit:$junitVersion"
     compile("javax.servlet:javax.servlet-api:$servletApiVersion")
 
     runtime "org.codehaus.groovy:groovy-dateutil:$groovyVersion"
 }
 
 //compileGroovy.groovyOptions.fork = false
-//compileGroovy.groovyOptions.forkOptions.jvmArgs = ['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005']
+//compileGroovy.groovyOptions.forkOptions.jvmArgs = ['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005']
diff --git a/grails-datastore-gorm-test/build.gradle b/grails-datastore-gorm-test/build.gradle
@@ -9,4 +9,4 @@ dependencies {
     testRuntime "log4j:log4j:1.2.16"
 }
 
-//compileTestGroovy.groovyOptions.forkOptions.jvmArgs = ['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005']
+//compileTestGroovy.groovyOptions.forkOptions.jvmArgs = ['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005']
diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/SimpleMapTestSuite.groovy b/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/SimpleMapTestSuite.groovy
@@ -1,16 +1,14 @@
 package org.grails.datastore.gorm
 
+import grails.gorm.tests.NotInListSpec
+import org.junit.platform.runner.JUnitPlatform
+import org.junit.platform.suite.api.SelectClasses
 import org.junit.runner.RunWith
-import org.junit.runners.Suite
-import org.junit.runners.Suite.SuiteClasses
-import grails.gorm.tests.*
 
 /**
  * @author graemerocher
  */
-@RunWith(Suite)
-@SuiteClasses([
-NotInListSpec
-])
+@RunWith(JUnitPlatform)
+@SelectClasses([NotInListSpec])
 class SimpleMapTestSuite {
 }
diff --git a/grails-datastore-gorm/build.gradle b/grails-datastore-gorm/build.gradle
@@ -15,4 +15,4 @@ dependencies {
     testCompile("org.hibernate:hibernate-validator:$hibernateValidatorVersion")
 }
 
-//compileGroovy.groovyOptions.forkOptions.jvmArgs = ['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005']
+//compileGroovy.groovyOptions.forkOptions.jvmArgs = ['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005']
diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/events/ConfigurableApplicationContextEventPublisher.groovy b/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/events/ConfigurableApplicationContextEventPublisher.groovy
@@ -21,7 +21,7 @@ class ConfigurableApplicationContextEventPublisher implements ConfigurableApplic
     }
 
     @Override
-    void addApplicationListener(ApplicationListener<?> listener) {
+    void addApplicationListener(ApplicationListener<? extends ApplicationEvent> listener) {
         this.applicationContext.addApplicationListener(listener)
     }
 
diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/DynamicFinder.java b/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/DynamicFinder.java
@@ -466,7 +466,8 @@ else if(sortObject instanceof Map) {
      * @param query The query
      * @param argMap The query arguments
      */
-    public static void populateArgumentsForCriteria(Class<?> targetClass, Query query, Map argMap) {
+    //TODO: Change {code}Class<? extends Object>{code} to {class<?>} once GROOVY-9460 is fixed.
+    public static void populateArgumentsForCriteria(Class<? extends Object> targetClass, Query query, Map argMap) {
         if (argMap == null) {
             return;
         }
diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/transform/ServiceTransformation.groovy b/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/transform/ServiceTransformation.groovy
@@ -187,7 +187,7 @@ class ServiceTransformation extends AbstractTraitApplyingGormASTTransformation i
         if (isInterface || isAbstractClass) {
             // create a new class to represent the implementation
             String packageName = classNode.packageName ? "${classNode.packageName}." : ""
-            ClassNode[] interfaces = isInterface ? [classNode.plainNodeReference] as ClassNode[] : new ClassNode[0]
+            ClassNode[] interfaces = isInterface ? ([classNode.plainNodeReference] as ClassNode[]) : new ClassNode[0]
             ClassNode superClass = isInterface ? ClassHelper.OBJECT_TYPE : classNode.plainNodeReference
             String serviceClassName = classNode.nameWithoutPackage
             ClassNode impl = new ClassNode("${packageName}\$${serviceClassName}Implementation", // class name
diff --git a/grails-datastore-gorm/src/test/groovy/grails/gorm/annotation/transactions/TransactionalTransformSpec.groovy b/grails-datastore-gorm/src/test/groovy/grails/gorm/annotation/transactions/TransactionalTransformSpec.groovy
@@ -224,18 +224,18 @@ import grails.gorm.transactions.Transactional
         when:
         Class mySpec = new GroovyShell().evaluate('''
     import grails.gorm.transactions.*
-    import org.junit.Test
-    import org.junit.Before
-    import org.junit.After
+    import org.junit.jupiter.api.Test
+    import org.junit.jupiter.api.BeforeEach
+    import org.junit.jupiter.api.AfterEach
 
     @Rollback
     class MyJunitTest {
-        @Before
+        @BeforeEach
         def junitSetup() {
 
         }
 
-        @After
+        @AfterEach
         def junitCleanup() {
 
         }
diff --git a/grails-datastore-gorm/src/test/groovy/org/grails/datastore/gorm/support/BeforeValidateHelperTests.groovy b/grails-datastore-gorm/src/test/groovy/org/grails/datastore/gorm/support/BeforeValidateHelperTests.groovy

Original file line number	Diff line number	Diff line change
`@@ -418,14 +418,14 @@ public Field getDeclaredField(String name) {`
`418`	`418`	`if(metaProperty instanceof MetaBeanProperty) {`
`419`	`419`	`CachedField field = ((MetaBeanProperty) metaProperty).getField();`
`420`	`420`	`if(field != null) {`
`421`		`- return field.field;`
	`421`	`+ return field.getCachedField();`
`422`	`422`	`}`
`423`	`423`	`}`
`424`	`424`	`else if(metaProperty instanceof MultipleSetterProperty) {`
`425`	`425`	`MultipleSetterProperty msp = (MultipleSetterProperty) metaProperty;`
`426`	`426`	`CachedField field = msp.getField();`
`427`	`427`	`if(field != null) {`
`428`		`- return field.field;`
	`428`	`+ return field.getCachedField();`
`429`	`429`	`}`
`430`	`430`	`}`
`431`	`431`	`return null;`