Merge remote-tracking branch 'origin/7.0.x'

Author: puneetbehl

build.gradle

@@ -6,15 +6,15 @@ buildscript {
     dependencies {
         classpath "io.github.gradle-nexus:publish-plugin:1.1.0"
         classpath 'com.bmuschko:gradle-nexus-plugin:2.3.1'
-        classpath "io.github.groovylang.groovydoc:groovydoc-gradle-plugin:1.0.1"
     }
 }
 
-project.ext {
+ext {
     isTravisBuild = System.getenv().get("TRAVIS") == 'true'
     // overall project version
     isCiBuild = project.hasProperty("isCiBuild")
-    isBuildSnapshot = version.endsWith("-SNAPSHOT")
+    isSnapshot = project.projectVersion.endsWith("-SNAPSHOT")
+    isReleaseVersion = !isSnapshot
 
     nexusUsername = System.getenv("SONATYPE_USERNAME") ?: project.hasProperty("sonatypeOssUsername") ? project.sonatypeOssUsername : ''
     nexusPassword = System.getenv("SONATYPE_PASSWORD") ?: project.hasProperty("sonatypeOssPassword") ? project.sonatypeOssPassword : ''
@@ -36,14 +36,10 @@ group = "org.grails"
 apply plugin: 'idea'
 apply plugin: 'project-report'
 
-ext {
-    isCiBuild = project.hasProperty("isCiBuild")
-}
-
 allprojects {
     repositories {
         maven { url "https://repo.grails.org/grails/core" }
-        if(isBuildSnapshot) {
+        if(isSnapshot) {
             maven { url "https://repo.grails.org/grails/libs-snapshots-local" }
         }
         if(groovyVersion && groovyVersion.endsWith('-SNAPSHOT')) {
@@ -75,11 +71,11 @@ subprojects {
    version = project.projectVersion
    group = "org.grails"
 
-   afterEvaluate { project ->
-        if (isGroovyProject(project)) {
-            def hasSnapshotVersion = project.version.endsWith("-SNAPSHOT")
-            if(isBuildSnapshot != hasSnapshotVersion) {
-                throw new StopExecutionException("${project.name} has version \"${project.version}\" which is${isBuildSnapshot ? 'n\'t' : ''} a snapshot version.")
+   afterEvaluate { subproject ->
+        if (isGroovyProject(subproject)) {
+            def hasSnapshotVersion = subproject.version.endsWith("-SNAPSHOT")
+            if(isSnapshot != hasSnapshotVersion) {
+                throw new StopExecutionException("${subproject.name} has version \"${subproject.version}\" which is${isSnapshot ? 'n\'t' : ''} a snapshot version.")
             }
         }
     }
@@ -277,7 +273,7 @@ task test(dependsOn: getTasksByName("test", true)) {
      }
 }
 
-if (!isBuildSnapshot) {
+if (isReleaseVersion) {
     nexusPublishing {
         transitionCheckOptions {
             maxRetries.set(50)

grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/config/Entity.groovy

@@ -82,7 +82,7 @@ class Entity<P extends Property> {
         return defaultSort
     }
 
-    Entity setSort(Object defaultSort) {
+    Entity<P> setSort(Object defaultSort) {
         this.defaultSort = defaultSort
         return this
     }
@@ -99,7 +99,7 @@ class Entity<P extends Property> {
      * @param name
      * @return
      */
-    Entity datasource(String name) {
+    Entity<P> datasource(String name) {
         this.datasources = [name]
         return this
     }
@@ -111,7 +111,7 @@ class Entity<P extends Property> {
      * @param name
      * @return
      */
-    Entity connection(String name) {
+    Entity<P> connection(String name) {
         this.datasources = [name]
         return this
     }
@@ -123,7 +123,7 @@ class Entity<P extends Property> {
      * @param name
      * @return
      */
-    Entity connections(String...names) {
+    Entity<P> connections(String...names) {
         connections(Arrays.asList(names))
         return this
     }
@@ -134,7 +134,7 @@ class Entity<P extends Property> {
      * @param name
      * @return
      */
-    Entity connections(List<String> names) {
+    Entity<P> connections(List<String> names) {
         if(names != null && names.size() > 0) {
             this.datasources = names
         }
@@ -172,7 +172,7 @@ class Entity<P extends Property> {
      * @param identityConfig The id config
      * @return This mapping
      */
-    Entity<P> id(@DelegatesTo(Property) Closure identityConfig) {
+    Entity<P> id(@DelegatesTo(type='P') 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(Property) Closure versionConfig) {
+    Entity<P> version(@DelegatesTo(type='P') Closure versionConfig) {
         P pc = getOrInitializePropertyConfig(GormProperties.VERSION)
         Property.configureExisting(pc, versionConfig)
         return this
@@ -196,7 +196,7 @@ class Entity<P extends Property> {
      *
      * @param isVersioned True if a version property should be configured
      */
-    Entity version(Map versionConfig) {
+    Entity<P> version(Map versionConfig) {
         P pc = getOrInitializePropertyConfig(GormProperties.VERSION)
         Property.configureExisting(pc, versionConfig)
         return this
@@ -207,7 +207,7 @@ class Entity<P extends Property> {
      *
      * @param tenantIdProperty The tenant id property
      */
-    Entity tenantId(String tenantIdProperty) {
+    Entity<P> tenantId(String tenantIdProperty) {
         P pc = getOrInitializePropertyConfig(GormProperties.TENANT_IDENTITY)
         pc.name = tenantIdProperty
         return this
@@ -218,7 +218,7 @@ class Entity<P extends Property> {
      * @param propertyConfig The property config
      * @return This mapping
      */
-    Entity property(String name, @DelegatesTo(Property) Closure propertyConfig) {
+    Entity<P> property(String name, @DelegatesTo(type='P') Closure propertyConfig) {
         P pc = getOrInitializePropertyConfig(name)
         Property.configureExisting(pc, propertyConfig)
         return this
@@ -230,7 +230,7 @@ class Entity<P extends Property> {
      * @param propertyConfig The property config
      * @return This mapping
      */
-    Entity property(String name, Map propertyConfig) {
+    Entity<P> property(String name, Map 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(Property) Closure propertyConfig) {
+    P property(@DelegatesTo(type='P') 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(Entity) Closure config) {
+    static <T extends Entity> T configureExisting(@DelegatesTo.Target T mapping, @DelegatesTo(genericTypeIndex = 0) Closure config) {
         config.setDelegate(mapping)
         config.setResolveStrategy(Closure.DELEGATE_ONLY)
         config.call()