Merge pull request #13855 from codeconsole/move-grails-filters

Move GrailsFilters configuration from grails-spring to grails-web-common module so that grails-spring to is not required for grails-boot.

Author: codeconsole

grails-bootstrap/build.gradle

@@ -8,7 +8,7 @@ dependencies {
     // when used by grails-gradle-plugin
     // see: https://docs.gradle.org/current/userguide/compatibility.html#groovy
     implementation "org.springframework:spring-context"
-    api "org.springframework.boot:spring-boot-autoconfigure"
+    implementation "org.springframework.boot:spring-boot-autoconfigure"
 
 
     compileOnly "org.codehaus.groovy:groovy:$GroovySystem.version"

grails-plugin-controllers/src/main/groovy/org/grails/plugins/web/controllers/ControllersAutoConfiguration.java

@@ -3,7 +3,7 @@
 import grails.config.Settings;
 import jakarta.servlet.DispatcherType;
 import jakarta.servlet.Filter;
-import org.grails.spring.config.http.GrailsFilters;
+import org.grails.web.config.http.GrailsFilters;
 import org.grails.web.filters.HiddenHttpMethodFilter;
 import org.grails.web.servlet.mvc.GrailsWebRequestFilter;
 import org.springframework.beans.factory.annotation.Value;
@@ -16,7 +16,6 @@
 import org.springframework.boot.web.servlet.filter.OrderedCharacterEncodingFilter;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Primary;
 import org.springframework.web.filter.CharacterEncodingFilter;
 
 import java.util.EnumSet;

grails-web-common/build.gradle

@@ -10,6 +10,7 @@ dependencies {
     compileOnly "jakarta.servlet:jakarta.servlet-api"
     testCompileOnly "org.springframework:spring-test"
 
+    compileOnly "org.springframework.boot:spring-boot-autoconfigure"
     api "org.springframework:spring-webmvc"
     api "org.springframework:spring-context-support"
     implementation "com.github.ben-manes.caffeine:caffeine"

…ls/spring/config/http/GrailsFilters.java …rails/web/config/http/GrailsFilters.javagrails-spring/src/main/groovy/org/grails/spring/config/http/GrailsFilters.java renamed to grails-web-common/src/main/groovy/org/grails/web/config/http/GrailsFilters.java grails-spring/src/main/groovy/org/grails/spring/config/http/GrailsFilters.java renamed to grails-web-common/src/main/groovy/org/grails/web/config/http/GrailsFilters.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.grails.spring.config.http;
+package org.grails.web.config.http;
 
 import org.springframework.boot.autoconfigure.security.SecurityProperties;