diff --git a/grace-plugin-url-mappings/build.gradle b/grace-plugin-url-mappings/build.gradle
index 43ddeb5dea..452a4b3bb2 100644
--- a/grace-plugin-url-mappings/build.gradle
+++ b/grace-plugin-url-mappings/build.gradle
@@ -14,4 +14,8 @@ dependencies {
     api libs.spring.boot.autoconfigure
     annotationProcessor libs.spring.boot.autoconfigureProcessor
     annotationProcessor libs.spring.boot.configurationProcessor
+
+    testImplementation libs.jakarta.servlet
+    testImplementation libs.spring.test
+    testImplementation project(":grace-test")
 }
diff --git a/grace-web-url-mappings/src/main/groovy/grails/web/mapping/cors/GrailsCorsConfiguration.groovy b/grace-plugin-url-mappings/src/main/groovy/grails/web/mapping/cors/GrailsCorsConfiguration.groovy
similarity index 98%
rename from grace-web-url-mappings/src/main/groovy/grails/web/mapping/cors/GrailsCorsConfiguration.groovy
rename to grace-plugin-url-mappings/src/main/groovy/grails/web/mapping/cors/GrailsCorsConfiguration.groovy
index 93fff858f5..b714c0c91d 100644
--- a/grace-web-url-mappings/src/main/groovy/grails/web/mapping/cors/GrailsCorsConfiguration.groovy
+++ b/grace-plugin-url-mappings/src/main/groovy/grails/web/mapping/cors/GrailsCorsConfiguration.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/grace-web-url-mappings/src/main/groovy/grails/web/mapping/cors/GrailsCorsFilter.groovy b/grace-plugin-url-mappings/src/main/groovy/grails/web/mapping/cors/GrailsCorsFilter.groovy
similarity index 96%
rename from grace-web-url-mappings/src/main/groovy/grails/web/mapping/cors/GrailsCorsFilter.groovy
rename to grace-plugin-url-mappings/src/main/groovy/grails/web/mapping/cors/GrailsCorsFilter.groovy
index d4fc647b45..0430ad52bc 100644
--- a/grace-web-url-mappings/src/main/groovy/grails/web/mapping/cors/GrailsCorsFilter.groovy
+++ b/grace-plugin-url-mappings/src/main/groovy/grails/web/mapping/cors/GrailsCorsFilter.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/grace-web-url-mappings/src/main/groovy/grails/web/mapping/cors/GrailsDefaultCorsConfiguration.groovy b/grace-plugin-url-mappings/src/main/groovy/grails/web/mapping/cors/GrailsDefaultCorsConfiguration.groovy
similarity index 95%
rename from grace-web-url-mappings/src/main/groovy/grails/web/mapping/cors/GrailsDefaultCorsConfiguration.groovy
rename to grace-plugin-url-mappings/src/main/groovy/grails/web/mapping/cors/GrailsDefaultCorsConfiguration.groovy
index 0d2be0288c..cb3760a107 100644
--- a/grace-web-url-mappings/src/main/groovy/grails/web/mapping/cors/GrailsDefaultCorsConfiguration.groovy
+++ b/grace-plugin-url-mappings/src/main/groovy/grails/web/mapping/cors/GrailsDefaultCorsConfiguration.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/grace-plugin-url-mappings/src/main/groovy/org/grails/plugins/web/mapping/UrlMappingsPluginConfiguration.java b/grace-plugin-url-mappings/src/main/groovy/org/grails/plugins/web/mapping/UrlMappingsPluginConfiguration.java
index 630b068aa4..200c6f8a4c 100644
--- a/grace-plugin-url-mappings/src/main/groovy/org/grails/plugins/web/mapping/UrlMappingsPluginConfiguration.java
+++ b/grace-plugin-url-mappings/src/main/groovy/org/grails/plugins/web/mapping/UrlMappingsPluginConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -87,7 +87,7 @@ public UrlMappingsHandlerMapping urlMappingsHandlerMapping(ObjectProvider<Grails
         UrlMappingsHandlerMapping handlerMapping = new UrlMappingsHandlerMapping(urlMappingsHolderProvider.getIfAvailable());
 
         if (!corsFilterEnabled) {
-            handlerMapping.setGrailsCorsConfiguration(grailsCorsConfiguration);
+            handlerMapping.setCorsConfigurations(grailsCorsConfiguration.getCorsConfigurations());
         }
 
         return handlerMapping;
diff --git a/grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/servlet/UrlMappingsErrorPageCustomizer.groovy b/grace-plugin-url-mappings/src/main/groovy/org/grails/web/mapping/servlet/UrlMappingsErrorPageCustomizer.groovy
similarity index 97%
rename from grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/servlet/UrlMappingsErrorPageCustomizer.groovy
rename to grace-plugin-url-mappings/src/main/groovy/org/grails/web/mapping/servlet/UrlMappingsErrorPageCustomizer.groovy
index 87e5710bab..e7e7b70a7b 100644
--- a/grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/servlet/UrlMappingsErrorPageCustomizer.groovy
+++ b/grace-plugin-url-mappings/src/main/groovy/org/grails/web/mapping/servlet/UrlMappingsErrorPageCustomizer.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2023 the original author or authors.
+ * Copyright 2015-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/grace-web-url-mappings/src/test/groovy/org/grails/web/mapping/reporting/AnsiConsoleUrlMappingsRendererSpec.groovy b/grace-plugin-url-mappings/src/test/groovy/org/grails/web/mapping/reporting/AnsiConsoleUrlMappingsRendererSpec.groovy
similarity index 100%
rename from grace-web-url-mappings/src/test/groovy/org/grails/web/mapping/reporting/AnsiConsoleUrlMappingsRendererSpec.groovy
rename to grace-plugin-url-mappings/src/test/groovy/org/grails/web/mapping/reporting/AnsiConsoleUrlMappingsRendererSpec.groovy
diff --git a/grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/mvc/UrlMappingsHandlerMapping.groovy b/grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/mvc/UrlMappingsHandlerMapping.groovy
index d603a17804..c440bb71f4 100644
--- a/grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/mvc/UrlMappingsHandlerMapping.groovy
+++ b/grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/mvc/UrlMappingsHandlerMapping.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2024 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,7 +34,6 @@ import grails.web.http.HttpHeaders
 import grails.web.mapping.UrlMapping
 import grails.web.mapping.UrlMappingInfo
 import grails.web.mapping.UrlMappingsHolder
-import grails.web.mapping.cors.GrailsCorsConfiguration
 import grails.web.mime.MimeType
 import grails.web.mime.MimeTypeResolver
 
@@ -213,8 +212,4 @@ class UrlMappingsHandlerMapping extends AbstractHandlerMapping {
 
     }
 
-    void setGrailsCorsConfiguration(GrailsCorsConfiguration grailsCorsConfiguration) {
-        this.corsConfigurations = grailsCorsConfiguration.corsConfigurations
-    }
-
 }