Fixed bean grailsResourceLocator name conflict in CoreConfiguration and GroovyPagesAutoConfiguration

Closes gh-736

Author: rainboyan

grace-plugin-core/src/main/groovy/org/grails/plugins/core/CoreConfiguration.java

@@ -24,6 +24,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
+import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
 
 import grails.config.ConfigProperties;
@@ -32,6 +33,7 @@
 import grails.core.support.proxy.ProxyHandler;
 import grails.util.BuildSettings;
 import org.grails.core.io.DefaultResourceLocator;
+import org.grails.core.io.ResourceLocator;
 
 /**
  * Core Auto-Configuration.
@@ -41,7 +43,7 @@
  * @since 4.0
  */
 @AutoConfiguration
-@AutoConfigureOrder(300)
+@AutoConfigureOrder(Ordered.LOWEST_PRECEDENCE)
 public class CoreConfiguration {
 
     @Bean
@@ -59,9 +61,8 @@ public ConfigProperties grailsConfigProperties(ObjectProvider<GrailsApplication>
     }
 
     @Bean
-    @Order(0)
     @ConditionalOnMissingBean
-    public DefaultResourceLocator grailsResourceLocator() throws IOException {
+    public ResourceLocator grailsResourceLocator() throws IOException {
         DefaultResourceLocator defaultResourceLocator = new DefaultResourceLocator();
         defaultResourceLocator.setSearchLocations(List.of(BuildSettings.BASE_DIR.getCanonicalPath()));
 

grace-plugin-gsp/src/main/groovy/org/grails/plugins/web/GroovyPagesAutoConfiguration.java

@@ -31,7 +31,6 @@
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Primary;
 import org.springframework.core.annotation.Order;
 import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.core.io.FileUrlResource;
@@ -159,8 +158,6 @@ public CachingGrailsConventionGroovyPageLocator groovyPageLocator(GroovyPagesPro
     }
 
     @Bean
-    @Order(-20)
-    @Primary
     @ConditionalOnMissingBean
     public ResourceLocator grailsResourceLocator(GroovyPagesProperties groovyPagesProperties, ObjectProvider<GrailsApplication> grailsApplication) {
         Config config = grailsApplication.getIfAvailable().getConfig();