Merge pull request #14946 from apache/reproducibleViewRegistry

#14930 - make views reproducible by sorting views always

Author: jdaugherty

grails-core/src/main/groovy/org/grails/compiler/injection/GlobalGrailsClassInjectorTransformation.groovy

@@ -28,6 +28,7 @@ import grails.util.GrailsNameUtils
 import groovy.transform.CompilationUnitAware
 import groovy.transform.CompileDynamic
 import groovy.transform.CompileStatic
+import org.springframework.core.CollectionFactory
 import groovy.xml.MarkupBuilder
 import groovy.xml.StreamingMarkupBuilder
 import groovy.xml.XmlSlurper
@@ -191,7 +192,8 @@ class GlobalGrailsClassInjectorTransformation implements ASTTransformation, Comp
             if (Modifier.isAbstract(classNode.getModifiers())) return false
 
             def classNodeName = classNode.name
-            def props = new Properties()
+            // Use SortedProperties to ensure a consistent order of entries for reproducible builds
+            def props = CollectionFactory.createSortedProperties(false)
             def superTypeName = superType.getName()
 
             // generate META-INF/grails.factories

grails-gsp/core/src/main/groovy/org/grails/gsp/compiler/GroovyPageCompiler.groovy

@@ -30,6 +30,8 @@ import org.grails.gsp.GroovyPageMetaInfo
 import org.grails.gsp.compiler.transform.GroovyPageInjectionOperation
 import org.grails.taglib.encoder.OutputEncodingSettings
 import groovy.transform.CompileStatic
+import org.springframework.core.CollectionFactory
+
 import java.util.concurrent.Callable
 import java.util.concurrent.Executors
 import java.util.concurrent.ExecutorService
@@ -148,7 +150,8 @@ class GroovyPageCompiler {
                 // write the view registry to a properties file (this is read by GroovyPagesTemplateEngine at runtime)
                 File viewregistryFile = new File(targetDir, "gsp/views.properties")
                 viewregistryFile.parentFile.mkdirs()
-                Properties views = new Properties()
+                // Use SortedProperties to ensure a consistent order of entries for reproducible builds
+                Properties views = CollectionFactory.createSortedProperties(false)
                 if (viewregistryFile.exists()) {
                     // only changed files are added to the mapping, read the existing mapping file
                     viewregistryFile.withInputStream { stream ->