Gradle deprecations

gradle/java-config.gradle

@@ -45,9 +45,9 @@ tasks.withType(GroovyCompile).configureEach {
 // Note: we exclude attributes such as Built-By, Build-Jdk, Created-By to ensure the build is reproducible.
 tasks.withType(Jar).configureEach {
     manifest.attributes(
-            'Implementation-Title': 'Grails',
+            'Implementation-Title': 'Apache Grails',
             'Implementation-Version': grailsVersion,
-            'Implementation-Vendor': 'grails.org'
+            'Implementation-Vendor': 'grails.apache.org'
     )
 }
 
@@ -56,7 +56,12 @@ tasks.withType(Jar).configureEach {
 tasks.withType(AbstractArchiveTask).configureEach {
     preserveFileTimestamps = false // to prevent timestamp mismatches
     reproducibleFileOrder = true // to keep the same ordering
-    dirMode = 0755 // To avoid platform specific defaults
-    fileMode = 0644 // to avoid platform specific defaults
+    // to avoid platform specific defaults, set the permissions consistently
+    filePermissions { permissions ->
+        permissions.unix(0644)
+    }
+    dirPermissions { permissions ->
+        permissions.unix(0755)
+    }
 }
 

grails-bom/build.gradle

@@ -102,6 +102,15 @@ tasks.register('extractConstraints', ExtractDependenciesTask).configure { Extrac
     it.platformDefinitions = combinedPlatforms
     it.definitions = combinedDependencies
     it.versions = combinedVersions
+    Map<String, String> artifactIdMappings = [:]
+    rootProject.subprojects.each { p ->
+        evaluationDependsOn(p.path)
+        String artifactId = p.findProperty('pomArtifactId')
+        if(artifactId) {
+            artifactIdMappings[p.name] = artifactId
+        }
+    }
+    it.projectArtifactIds.set(artifactIdMappings)
 
     it.dependsOn(project.tasks.named('generateMetadataFileForMavenPublication'), project.tasks.named('generatePomFileForMavenPublication'))
 }

grails-data-docs/stage/build.gradle

@@ -121,6 +121,7 @@ tasks.register('copyGuides').configure { Task task ->
 
     Set<Project> dataHeaderGuides = rootProject.subprojects.findAll { it.name.startsWith('grails-data-docs-guide-') }
     task.dependsOn(dataHeaderGuides.tasks*.named('asciidoctor'))
+    def guideDataDirectory = project.layout.buildDirectory.dir('guides/grails-data')
     doLast {
         copy {
             for (Project subproject : dataHeaderGuides) {
@@ -132,7 +133,7 @@ tasks.register('copyGuides').configure { Task task ->
                 }
             }
 
-            into(project.layout.buildDirectory.dir('guides/grails-data'))
+            into(guideDataDirectory)
         }
     }
 }

grails-doc/build.gradle

@@ -225,22 +225,25 @@ tasks.register('generateBomDocumentation').configure { Task it ->
     it.inputs.files(project(':grails-bom').layout.projectDirectory.asFileTree)
     it.outputs.file(project.layout.projectDirectory.file('src/en/ref/Versions/Grails BOM.adoc'))
 
+    def versionsDir = project.layout.projectDirectory.dir('src/en/ref/Versions')
     it.doFirst {
-        project.layout.projectDirectory.dir('src/en/ref/Versions').asFile.mkdirs()
+        versionsDir.asFile.mkdirs()
     }
 
+    def bomDocumentFile = project.layout.projectDirectory.file('src/en/ref/Versions/Grails BOM.adoc')
+    def grailsBomConstraintFile = project(':grails-bom').layout.buildDirectory.file('grails-bom-constraints.adoc')
     it.doLast {
-        def bomDocument = project.layout.projectDirectory.file('src/en/ref/Versions/Grails BOM.adoc').asFile
+        def bomDocument = bomDocumentFile.asFile
         bomDocument.withWriter { writer ->
             writer.writeLine '== Grails BOM Dependencies'
             writer.writeLine ''
             writer.writeLine 'This document provides information about the dependencies defined in the Grails BOM - also known as `org.apache.grails:grails-bom`. It includes the artifact coordinates, where in the hierarchy the coordinate was defined, and the maven property that defines the version.'
             writer.writeLine ''
-            writer.write(project(':grails-bom').layout.buildDirectory.file('grails-bom-constraints.adoc').get().asFile.text)
+            writer.write(grailsBomConstraintFile.get().asFile.text)
             writer.writeLine ''
         }
 
-        project.logger.lifecycle "BOM Dependency Page generated to: ${bomDocument.absolutePath}"
+        it.logger.lifecycle "BOM Dependency Page generated to: ${bomDocument.absolutePath}"
     }
 }
 

grails-gradle/docs-core/src/main/groovy/grails/doc/gradle/PublishGuide.groovy

@@ -28,6 +28,7 @@ import org.gradle.api.model.ObjectFactory
 import org.gradle.api.provider.ListProperty
 import org.gradle.api.provider.MapProperty
 import org.gradle.api.provider.Property
+import org.gradle.api.AntBuilder
 import org.gradle.api.tasks.*
 
 import javax.inject.Inject
@@ -80,8 +81,11 @@ class PublishGuide extends DefaultTask {
     @OutputDirectory
     final DirectoryProperty targetDir
 
+    private final AntBuilder ant
+
     @Inject
     PublishGuide(ObjectFactory objects, Project project) {
+        this.ant = project.ant
         language = objects.property(String).convention(null as String)
         sourceRepo = objects.property(String)
         properties = objects.mapProperty(String, Object).convention([:])
@@ -120,7 +124,7 @@ class PublishGuide extends DefaultTask {
         apiDir.mkdirs()
 
         def publisher = new DocPublisher(sourceDir.get().asFile, apiDir)
-        publisher.ant = project.ant
+        publisher.ant = ant
         publisher.asciidoc = asciidoc
         publisher.workDir = workDir.get().asFile
         publisher.apiDir = apiDir

grails-gradle/docs-core/src/main/groovy/org/apache/grails/gradle/tasks/bom/ExtractDependenciesTask.groovy

@@ -59,6 +59,9 @@ abstract class ExtractDependenciesTask extends DefaultTask {
     @Input
     abstract MapProperty<String, String> getPlatformDefinitions()
 
+    @Input
+    abstract MapProperty<String, String> getProjectArtifactIds()
+
     @Input
     abstract MapProperty<String, String> getDefinitions()
 
@@ -121,19 +124,21 @@ abstract class ExtractDependenciesTask extends DefaultTask {
     private populateExplicitConstraints(Configuration configuration,
                                         Map<CoordinateHolder, ExtractedDependencyConstraint> constraints,
                                         PropertyNameCalculator propertyNameCalculator) {
+        Map<String, String> artifactIdMappings = getProjectArtifactIds().get()
         configuration.getAllDependencyConstraints().all { DependencyConstraint constraint ->
             String groupId = constraint.module.group as String
             String artifactId = constraint.module.name as String
             String artifactVersion = constraint.version as String
 
             //TODO: need to look for project property ? or manually find the project?
             if (constraint instanceof DefaultProjectDependencyConstraint) {
-                DefaultProjectDependencyConstraint pConstraint = (DefaultProjectDependencyConstraint) constraint
-                artifactId = pConstraint.projectDependency.dependencyProject.findProperty('pomArtifactId') ?: artifactId
+                if(artifactIdMappings.containsKey(constraint.name)) {
+                    artifactId = artifactIdMappings.get(constraint.name)
+                }
             }
 
             ExtractedDependencyConstraint extractConstraint = propertyNameCalculator.calculate(groupId, artifactId, artifactVersion, false) ?: new ExtractedDependencyConstraint(groupId: groupId, artifactId: artifactId, version: artifactVersion)
-            extractConstraint.source = project.name
+            extractConstraint.source = constraint.name // this will be the project name
             constraints.put(new CoordinateHolder(groupId: extractConstraint.groupId, artifactId: extractConstraint.artifactId), extractConstraint)
         }
     }

grails-gradle/gradle/docs-config.gradle

@@ -62,8 +62,13 @@ tasks.named('javadoc').configure {
 tasks.named('javadocJar', Jar).configure { Jar jar ->
     jar.reproducibleFileOrder = true
     jar.preserveFileTimestamps = false
-    jar.dirMode = 0755 // To avoid platform specific defaults
-    jar.fileMode = 0644 // to avoid platform specific defaults
+    // to avoid platform specific defaults, set the permissions consistently
+    jar.filePermissions { permissions ->
+        permissions.unix(0644)
+    }
+    jar.dirPermissions { permissions ->
+        permissions.unix(0755)
+    }
 
     jar.dependsOn(groovydocTask)
 

grails-gradle/gradle/java-config.gradle

@@ -29,8 +29,14 @@ tasks.named('sourcesJar', Jar).configure { Jar jar ->
     SourceSetContainer sourceSets = project.extensions.getByType(JavaPluginExtension).sourceSets
     jar.reproducibleFileOrder = true
     jar.preserveFileTimestamps = false
-    jar.dirMode = 0755 // To avoid platform specific defaults
-    jar.fileMode = 0644 // to avoid platform specific defaults
+    // to avoid platform specific defaults, set the permissions consistently
+    jar.filePermissions { permissions ->
+        permissions.unix(0644)
+    }
+    jar.dirPermissions { permissions ->
+        permissions.unix(0755)
+    }
+
     jar.duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 
     // don't only include main, but any source set
@@ -53,9 +59,9 @@ tasks.withType(GroovyCompile).configureEach {
 // Note: we exclude attributes such as Built-By, Build-Jdk, Created-By to ensure the build is reproducible.
 tasks.withType(Jar).configureEach {
     manifest.attributes(
-            'Implementation-Title': 'Grails',
+            'Implementation-Title': 'Apache Grails',
             'Implementation-Version': projectVersion,
-            'Implementation-Vendor': 'grails.org'
+            'Implementation-Vendor': 'grails.apache.org'
     )
 }
 
@@ -64,6 +70,11 @@ tasks.withType(Jar).configureEach {
 tasks.withType(AbstractArchiveTask).configureEach {
     preserveFileTimestamps = false // to prevent timestamp mismatches
     reproducibleFileOrder = true // to keep the same ordering
-    dirMode = 0755 // To avoid platform specific defaults
-    fileMode = 0644 // to avoid platform specific defaults
+    // to avoid platform specific defaults, set the permissions consistently
+    filePermissions { permissions ->
+        permissions.unix(0644)
+    }
+    dirPermissions { permissions ->
+        permissions.unix(0755)
+    }
 }

grails-gradle/model/src/main/groovy/grails/util/Environment.groovy

@@ -129,7 +129,7 @@ enum Environment {
     private static Boolean RELOADING_AGENT_ENABLED = null
     private static boolean initializingState = false
 
-    private static final String GRAILS_IMPLEMENTATION_TITLE = "Grails"
+    private static final String GRAILS_IMPLEMENTATION_TITLE = "Apache Grails"
     private static final String GRAILS_VERSION
     private static final boolean STANDALONE_DEPLOYED
     private static final boolean WAR_DEPLOYED

grails-gradle/model/src/main/groovy/org/grails/io/support/MainClassFinder.groovy

@@ -43,7 +43,8 @@ class MainClassFinder {
 
     private static final String MAIN_METHOD_NAME = "main"
 
-    static final Map<String, String> mainClasses = new ConcurrentHashMap<>()
+    static final Map<String, MainClassHolder> mainClasses = new ConcurrentHashMap<>()
+
     public static final String ROOT_FOLDER_PATH = "build/classes/main"
 
     /**
@@ -53,14 +54,13 @@ class MainClassFinder {
      * @return The name of the main class
      */
     static String searchMainClass(URI path) {
-
         if (!path) {
             return null
         }
 
         def pathStr = path.toString()
         if (mainClasses.containsKey(pathStr)) {
-            return mainClasses.get(pathStr)
+            return mainClasses.get(pathStr).className
         }
 
         try {
@@ -87,16 +87,17 @@ class MainClassFinder {
                 }
             }
 
-            String mainClass = null
-
+            MainClassHolder holder = null
             for (File dir in searchDirs) {
-                mainClass = findMainClass(dir)
-                if (mainClass) break
+                holder = findMainClass(dir)
+                if (holder) break
             }
-            if (mainClass != null) {
-                mainClasses.put(pathStr, mainClass)
+
+            if (holder != null) {
+                mainClasses.put(pathStr, holder)
             }
-            return mainClass
+
+            return holder.className
         } catch (Throwable e) {
             return null
         }
@@ -117,13 +118,12 @@ class MainClassFinder {
         return null
     }
 
-    static String findMainClass(File rootFolder = BuildSettings.CLASSES_DIR) {
+    static MainClassHolder findMainClass(File rootFolder = BuildSettings.CLASSES_DIR) {
         if (rootFolder == null) {
             // try current directory
             rootFolder = new File(ROOT_FOLDER_PATH)
         }
 
-
         if (!rootFolder.exists()) {
             return null // nothing to do
         }
@@ -146,9 +146,13 @@ class MainClassFinder {
                 try {
                     def classReader = new ClassReader(inputStream)
                     if (isMainClass(classReader)) {
-                        def mainClassName = classReader.getClassName().replace('/', '.').replace('\\', '.')
-                        mainClasses.put(rootFolderCanonicalPath, mainClassName)
-                        return mainClassName
+                        MainClassHolder holder = new MainClassHolder()
+                        holder.className = classReader.getClassName().replace('/', '.').replace('\\', '.')
+                        holder.classFile = file
+
+                        mainClasses.put(rootFolderCanonicalPath, holder)
+
+                        return holder
                     }
                 } finally {
                     inputStream?.close()
@@ -206,5 +210,4 @@ class MainClassFinder {
             return !requiredOpsCodes.any { int requiredOpsCode -> (access & requiredOpsCode) == 0 }
         }
     }
-
 }

grails-gradle/model/src/main/groovy/org/grails/io/support/MainClassHolder.groovy

@@ -0,0 +1,28 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.grails.io.support
+
+import groovy.transform.CompileStatic
+
+@CompileStatic
+class MainClassHolder {
+    File classFile
+    String className
+}