Skip to content

Commit 05db0e8

Browse files
committed
Move GrailsFilters configuration from grails-spring module to grails-web-common so that grails-spring is not required for grails-boot. Fixes #13854
1 parent 25a0737 commit 05db0e8

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

grails-bootstrap/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ dependencies {
88
// when used by grails-gradle-plugin
99
// see: https://docs.gradle.org/current/userguide/compatibility.html#groovy
1010
implementation "org.springframework:spring-context"
11-
api "org.springframework.boot:spring-boot-autoconfigure"
11+
implementation "org.springframework.boot:spring-boot-autoconfigure"
1212

1313

1414
compileOnly "org.codehaus.groovy:groovy:$GroovySystem.version"

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import grails.config.Settings;
44
import jakarta.servlet.DispatcherType;
55
import jakarta.servlet.Filter;
6-
import org.grails.spring.config.http.GrailsFilters;
6+
import org.grails.web.config.http.GrailsFilters;
77
import org.grails.web.filters.HiddenHttpMethodFilter;
88
import org.grails.web.servlet.mvc.GrailsWebRequestFilter;
99
import org.springframework.beans.factory.annotation.Value;
@@ -16,7 +16,6 @@
1616
import org.springframework.boot.web.servlet.filter.OrderedCharacterEncodingFilter;
1717
import org.springframework.context.ApplicationContext;
1818
import org.springframework.context.annotation.Bean;
19-
import org.springframework.context.annotation.Primary;
2019
import org.springframework.web.filter.CharacterEncodingFilter;
2120

2221
import java.util.EnumSet;

grails-web-common/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ dependencies {
1010
compileOnly "jakarta.servlet:jakarta.servlet-api"
1111
testCompileOnly "org.springframework:spring-test"
1212

13+
compileOnly "org.springframework.boot:spring-boot-autoconfigure"
1314
api "org.springframework:spring-webmvc"
1415
api "org.springframework:spring-context-support"
1516
implementation "com.github.ben-manes.caffeine:caffeine"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* limitations under the License.
1414
*/
1515

16-
package org.grails.spring.config.http;
16+
package org.grails.web.config.http;
1717

1818
import org.springframework.boot.autoconfigure.security.SecurityProperties;
1919

0 commit comments

Comments
 (0)