14017 - cleanup - move i18n to be included by default and no longer require it as an exported dependency

jdaugherty · jdaugherty · commit e2e0a85da990 · 2025-09-01T10:44:08.000-04:00
diff --git a/RENAME.md b/RENAME.md
@@ -112,7 +112,7 @@ Below is a reference of all migrated artifacts - both their old and new name.
 | org.grails.plugins                | gsp                                             | org.apache.grails                               | grails-gsp                                                    |                        |                        | grails-views           |
 | org.grails                        | grails-gsp                                      | org.apache.grails.views                         | grails-gsp-core                                               |                        |                        | grails-views           |
 | org.grails                        | grails-logging                                  | org.apache.grails                               | grails-logging                                                |                        |                        | grails-core            |
-| org.grails                        | grails-plugin-i18n                              | org.apache.grails                               | grails-i18n                                                   |                        |                        | grails-core            |
+| org.grails                        | grails-plugin-i18n                              | org.apache.grails.i18n                          | grails-i18n                                                   |                        |                        | grails-core            |
 | org.grails                        | grails-plugin-interceptors                      | org.apache.grails                               | grails-interceptors                                           |                        |                        | grails-core            |
 | org.grails                        | grails-plugin-mimetypes                         | org.apache.grails                               | grails-mimetypes                                              |                        |                        | grails-core            |
 | org.grails.plugins                | quartz                                          | org.apache.grails                               | grails-quartz                                                 |                        |                        | grails-quartz          |
diff --git a/etc/bin/rename_gradle_artifacts.sh b/etc/bin/rename_gradle_artifacts.sh
@@ -67,7 +67,7 @@ declare -a core_mappings=(
 "org[.]grails:grails-plugin-rest|org.apache.grails:grails-rest-transforms"
 "org[.]grails:grails-plugin-mimetypes|org.apache.grails:grails-mimetypes"
 "org[.]grails:grails-plugin-interceptors|org.apache.grails:grails-interceptors"
-"org[.]grails:grails-plugin-i18n|org.apache.grails:grails-i18n"
+"org[.]grails:grails-plugin-i18n|REMOVE_ME" # i18n is now included by default and should not be included explicitly
 "org[.]grails:grails-plugin-domain-class|org.apache.grails:grails-domain-class"
 "org[.]grails:grails-plugin-datasource|org.apache.grails:grails-datasource"
 "org[.]grails:grails-plugin-databinding|org.apache.grails:grails-databinding"
@@ -109,7 +109,7 @@ declare -a excluded_core_mappings=(
 "exclude[[:space:]]+module[[:space:]]*:[[:space:]]*['\"]grails-plugin-rest['\"]|exclude module:'grails-rest-transforms'"
 "exclude[[:space:]]+module[[:space:]]*:[[:space:]]*['\"]grails-plugin-mimetypes['\"]|exclude module:'grails-mimetypes'"
 "exclude[[:space:]]+module[[:space:]]*:[[:space:]]*['\"]grails-plugin-interceptors['\"]|exclude module:'grails-interceptors'"
-"exclude[[:space:]]+module[[:space:]]*:[[:space:]]*['\"]grails-plugin-i18n['\"]|exclude module:'grails-i18n'"
+"exclude[[:space:]]+module[[:space:]]*:[[:space:]]*['\"]grails-plugin-i18n['\"]|exclude module:'REMOVE_THIS_EXCLUDE'"
 "exclude[[:space:]]+module[[:space:]]*:[[:space:]]*['\"]grails-plugin-domain-class['\"]|exclude module:'grails-domain-class'"
 "exclude[[:space:]]+module[[:space:]]*:[[:space:]]*['\"]grails-plugin-datasource['\"]|exclude module:'grails-datasource'"
 "exclude[[:space:]]+module[[:space:]]*:[[:space:]]*['\"]grails-plugin-databinding['\"]|exclude module:'grails-databinding'"
diff --git a/grails-dependencies/starter-web/build.gradle b/grails-dependencies/starter-web/build.gradle
@@ -45,7 +45,6 @@ def configurations = [
                 ':grails-encoder',
                 ':grails-events',
                 ':grails-gsp',
-                ':grails-i18n',
                 ':grails-interceptors',
                 System.getenv('SITEMESH3_TESTING_ENABLED') == 'true' ? ':grails-sitemesh3' : ':grails-layout',
                 ':grails-logging',
diff --git a/grails-doc/src/en/guide/commandLine/gradleBuild/gradleDependencies.adoc b/grails-doc/src/en/guide/commandLine/gradleBuild/gradleDependencies.adoc
@@ -32,7 +32,6 @@ dependencies {
     implementation "org.apache.grails:grails-core"
     implementation "org.apache.grails:grails-logging"
     implementation "org.apache.grails:grails-databinding"
-    implementation "org.apache.grails:grails-i18n"
     implementation "org.apache.grails:grails-interceptors"
     implementation "org.apache.grails:grails-rest-transforms"
     implementation "org.apache.grails:grails-services"
diff --git a/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/feature/grails/GrailsDefaultPluginsSpec.groovy b/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/feature/grails/GrailsDefaultPluginsSpec.groovy
@@ -36,7 +36,6 @@ class GrailsDefaultPluginsSpec extends ApplicationContextSpec implements Command
         expect:
         buildGradle.contains("implementation \"org.apache.grails:grails-rest-transforms\"")
         buildGradle.contains("implementation \"org.apache.grails:grails-databinding\"")
-        buildGradle.contains("implementation \"org.apache.grails:grails-i18n\"")
         buildGradle.contains("implementation \"org.apache.grails:grails-services\"")
         buildGradle.contains("implementation \"org.apache.grails:grails-interceptors\"")
     }
diff --git a/grails-i18n/build.gradle b/grails-i18n/build.gradle
@@ -24,7 +24,7 @@ plugins {
 }
 
 version = projectVersion
-group = 'org.apache.grails'
+group = 'org.apache.grails.i18n'
 
 dependencies {
 
diff --git a/grails-profiles/base/profile.yml b/grails-profiles/base/profile.yml
@@ -45,8 +45,6 @@ dependencies:
       coords: "org.springframework.boot:spring-boot-starter"
     - scope: implementation
       coords: "org.apache.grails:grails-core"
-    - scope: implementation
-      coords: "org.apache.grails:grails-i18n"
     - scope: testImplementation
       coords: "org.apache.grails:grails-testing-support-datamapping"
     - scope: console
diff --git a/grails-shell-cli/src/main/groovy/org/grails/cli/compiler/autoconfigure/GrailsCompilerAutoConfiguration.java b/grails-shell-cli/src/main/groovy/org/grails/cli/compiler/autoconfigure/GrailsCompilerAutoConfiguration.java
@@ -38,7 +38,7 @@ public void applyDependencies(DependencyCustomizer dependencies) {
         dependencies.ifAnyMissingClasses("grails.boot.config.GrailsAutoConfiguration").add("grails-boot");
         dependencies.ifAnyMissingClasses("grails.core.DefaultGrailsApplication").add("grails-core");
         dependencies.add("grails-web");
-        dependencies.add("grails-i18n", "grails-codecs", "grails-controllers",
+        dependencies.add("grails-codecs", "grails-controllers",
                 "grails-converters", "grails-databinding", "grails-interceptors", "grails-mimetypes",
                 "grails-rest-transforms", "grails-url-mappings");
         dependencies.add("gsp", "plain", "jar", true);
diff --git a/grails-test-examples/cache/build.gradle b/grails-test-examples/cache/build.gradle
@@ -37,7 +37,6 @@ dependencies {
     implementation 'org.apache.grails:grails-core'
     implementation 'org.apache.grails:grails-logging'
     implementation 'org.apache.grails:grails-databinding'
-    implementation 'org.apache.grails:grails-i18n'
     implementation 'org.apache.grails:grails-interceptors'
     implementation 'org.apache.grails:grails-rest-transforms'
     implementation 'org.apache.grails:grails-services'
diff --git a/grails-test-examples/demo33/build.gradle b/grails-test-examples/demo33/build.gradle
@@ -35,7 +35,6 @@ dependencies {
     implementation 'org.apache.grails:grails-core'
     implementation 'org.apache.grails:grails-rest-transforms'
     implementation 'org.apache.grails:grails-databinding'
-    implementation 'org.apache.grails:grails-i18n'
     implementation 'org.apache.grails:grails-services'
     implementation 'org.apache.grails:grails-url-mappings'
     implementation 'org.apache.grails:grails-interceptors'
diff --git a/grails-test-examples/external-configuration/build.gradle b/grails-test-examples/external-configuration/build.gradle
@@ -29,7 +29,6 @@ dependencies {
     implementation 'org.apache.grails:grails-core'
     implementation 'org.apache.grails:grails-logging'
     implementation 'org.apache.grails:grails-databinding'
-    implementation 'org.apache.grails:grails-i18n'
     implementation 'org.apache.grails:grails-interceptors'
     implementation 'org.apache.grails:grails-rest-transforms'
     implementation 'org.apache.grails:grails-services'
diff --git a/grails-test-examples/geb-gebconfig/build.gradle b/grails-test-examples/geb-gebconfig/build.gradle
@@ -32,7 +32,6 @@ dependencies {
     implementation 'org.apache.grails:grails-core'
     implementation 'org.apache.grails:grails-logging'
     implementation 'org.apache.grails:grails-databinding'
-    implementation 'org.apache.grails:grails-i18n'
     implementation 'org.apache.grails:grails-interceptors'
     implementation 'org.apache.grails:grails-rest-transforms'
     implementation 'org.apache.grails:grails-services'
diff --git a/grails-test-examples/geb/build.gradle b/grails-test-examples/geb/build.gradle
@@ -32,7 +32,6 @@ dependencies {
     implementation 'org.apache.grails:grails-core'
     implementation 'org.apache.grails:grails-logging'
     implementation 'org.apache.grails:grails-databinding'
-    implementation 'org.apache.grails:grails-i18n'
     implementation 'org.apache.grails:grails-interceptors'
     implementation 'org.apache.grails:grails-rest-transforms'
     implementation 'org.apache.grails:grails-services'
diff --git a/grails-test-examples/gsp-layout/build.gradle b/grails-test-examples/gsp-layout/build.gradle
@@ -45,7 +45,6 @@ dependencies {
     runtimeOnly 'cloud.wondrify:asset-pipeline-grails'
     runtimeOnly 'org.fusesource.jansi:jansi'
     runtimeOnly 'org.apache.grails:grails-url-mappings'
-    runtimeOnly 'org.apache.grails:grails-i18n'
     runtimeOnly 'org.springframework.boot:spring-boot-autoconfigure'
     runtimeOnly 'org.springframework.boot:spring-boot-starter-logging'
     runtimeOnly 'org.springframework.boot:spring-boot-starter-tomcat'
diff --git a/grails-test-examples/gsp-sitemesh3/build.gradle b/grails-test-examples/gsp-sitemesh3/build.gradle
@@ -45,7 +45,6 @@ dependencies {
     runtimeOnly 'cloud.wondrify:asset-pipeline-grails'
     runtimeOnly 'org.fusesource.jansi:jansi'
     runtimeOnly 'org.apache.grails:grails-url-mappings'
-    runtimeOnly 'org.apache.grails:grails-i18n'
     runtimeOnly 'org.springframework.boot:spring-boot-autoconfigure'
     runtimeOnly 'org.springframework.boot:spring-boot-starter-logging'
     runtimeOnly 'org.springframework.boot:spring-boot-starter-tomcat'
diff --git a/grails-test-examples/hibernate5/grails-data-service/build.gradle b/grails-test-examples/hibernate5/grails-data-service/build.gradle
@@ -37,7 +37,6 @@ dependencies {
     runtimeOnly 'com.h2database:h2'
     runtimeOnly 'com.zaxxer:HikariCP'
     runtimeOnly 'org.apache.grails:grails-databinding'
-    runtimeOnly 'org.apache.grails:grails-i18n'
     runtimeOnly 'org.apache.grails:grails-services'
     runtimeOnly 'org.apache.grails:grails-url-mappings'
     runtimeOnly 'org.springframework.boot:spring-boot-autoconfigure'
diff --git a/grails-test-examples/hibernate5/grails-database-per-tenant/build.gradle b/grails-test-examples/hibernate5/grails-database-per-tenant/build.gradle
@@ -47,7 +47,6 @@ dependencies {
     runtimeOnly 'com.h2database:h2'
     runtimeOnly 'com.zaxxer:HikariCP'
     runtimeOnly 'org.apache.grails:grails-databinding'
-    runtimeOnly 'org.apache.grails:grails-i18n'
     runtimeOnly 'org.apache.grails:grails-services'
     runtimeOnly 'org.apache.grails:grails-url-mappings'
     runtimeOnly 'org.apache.grails:grails-fields'
diff --git a/grails-test-examples/hibernate5/grails-hibernate/build.gradle b/grails-test-examples/hibernate5/grails-hibernate/build.gradle
@@ -49,7 +49,6 @@ dependencies {
     runtimeOnly 'com.h2database:h2'
     runtimeOnly 'com.zaxxer:HikariCP'
     runtimeOnly 'org.apache.grails:grails-databinding'
-    runtimeOnly 'org.apache.grails:grails-i18n'
     runtimeOnly 'org.apache.grails:grails-services'
     runtimeOnly 'org.apache.grails:grails-url-mappings'
     runtimeOnly 'org.apache.grails:grails-fields'
diff --git a/grails-test-examples/hibernate5/grails-partitioned-multi-tenancy/build.gradle b/grails-test-examples/hibernate5/grails-partitioned-multi-tenancy/build.gradle
@@ -47,7 +47,6 @@ dependencies {
     runtimeOnly 'com.h2database:h2'
     runtimeOnly 'com.zaxxer:HikariCP'
     runtimeOnly 'org.apache.grails:grails-databinding'
-    runtimeOnly 'org.apache.grails:grails-i18n'
     runtimeOnly 'org.apache.grails:grails-services'
     runtimeOnly 'org.apache.grails:grails-url-mappings'
     runtimeOnly 'org.apache.grails:grails-fields'
diff --git a/grails-test-examples/hibernate5/grails-schema-per-tenant/build.gradle b/grails-test-examples/hibernate5/grails-schema-per-tenant/build.gradle
@@ -47,7 +47,6 @@ dependencies {
     runtimeOnly 'com.h2database:h2'
     runtimeOnly 'com.zaxxer:HikariCP'
     runtimeOnly 'org.apache.grails:grails-databinding'
-    runtimeOnly 'org.apache.grails:grails-i18n'
     runtimeOnly 'org.apache.grails:grails-services'
     runtimeOnly 'org.apache.grails:grails-url-mappings'
     runtimeOnly 'org.apache.grails:grails-fields'
diff --git a/grails-test-examples/hibernate5/issue450/build.gradle b/grails-test-examples/hibernate5/issue450/build.gradle
@@ -48,7 +48,6 @@ dependencies {
     runtimeOnly 'com.h2database:h2'
     runtimeOnly 'com.zaxxer:HikariCP'
     runtimeOnly 'org.apache.grails:grails-databinding'
-    runtimeOnly 'org.apache.grails:grails-i18n'
     runtimeOnly 'org.apache.grails:grails-services'
     runtimeOnly 'org.apache.grails:grails-url-mappings'
     runtimeOnly 'org.apache.grails:grails-fields'
diff --git a/grails-test-examples/issue-11102/build.gradle b/grails-test-examples/issue-11102/build.gradle
@@ -46,7 +46,6 @@ dependencies {
     implementation 'org.apache.grails:grails-logging'
     implementation 'org.apache.grails:grails-rest-transforms'
     implementation 'org.apache.grails:grails-databinding'
-    implementation 'org.apache.grails:grails-i18n'
     implementation 'org.apache.grails:grails-services'
     implementation 'org.apache.grails:grails-url-mappings'
     implementation 'org.apache.grails:grails-interceptors'
diff --git a/grails-test-examples/mongodb/base/build.gradle b/grails-test-examples/mongodb/base/build.gradle
@@ -45,7 +45,6 @@ dependencies {
 
     runtimeOnly 'cloud.wondrify:asset-pipeline-grails'
     runtimeOnly 'org.fusesource.jansi:jansi'
-    runtimeOnly 'org.apache.grails:grails-i18n'
     runtimeOnly 'org.apache.grails:grails-url-mappings'
     runtimeOnly 'org.apache.grails:grails-scaffolding'
     runtimeOnly 'org.springframework.boot:spring-boot-autoconfigure'
diff --git a/grails-test-examples/mongodb/database-per-tenant/build.gradle b/grails-test-examples/mongodb/database-per-tenant/build.gradle
@@ -45,7 +45,6 @@ dependencies {
 
     runtimeOnly 'cloud.wondrify:asset-pipeline-grails'
     runtimeOnly 'org.fusesource.jansi:jansi'
-    runtimeOnly 'org.apache.grails:grails-i18n'
     runtimeOnly 'org.apache.grails:grails-url-mappings'
     runtimeOnly 'org.springframework.boot:spring-boot-autoconfigure'
     runtimeOnly 'org.springframework.boot:spring-boot-starter-logging'
diff --git a/grails-test-examples/mongodb/hibernate5/build.gradle b/grails-test-examples/mongodb/hibernate5/build.gradle
@@ -49,7 +49,6 @@ dependencies {
     runtimeOnly 'com.zaxxer:HikariCP'
     runtimeOnly 'org.fusesource.jansi:jansi'
     runtimeOnly 'org.apache.grails:grails-scaffolding'
-    runtimeOnly 'org.apache.grails:grails-i18n'
     runtimeOnly 'org.apache.grails:grails-url-mappings'
     runtimeOnly "org.hibernate:hibernate-ehcache:$hibernate5Version", {
         // exclude javax variant of hibernate-core
diff --git a/grails-test-examples/mongodb/test-data-service/build.gradle b/grails-test-examples/mongodb/test-data-service/build.gradle
@@ -37,7 +37,6 @@ dependencies {
     implementation "org.apache.grails:grails-spring-security-rest:$grailsSpringSecurityVersion"
     implementation 'org.apache.grails:grails-views-gson'
 
-    runtimeOnly 'org.apache.grails:grails-i18n'
     runtimeOnly 'org.apache.grails:grails-url-mappings'
     runtimeOnly 'org.apache.grails:grails-events'
     runtimeOnly 'org.springframework.boot:spring-boot-autoconfigure'
diff --git a/grails-test-examples/views-functional-tests/build.gradle b/grails-test-examples/views-functional-tests/build.gradle
@@ -46,7 +46,6 @@ dependencies {
     }
 
     implementation 'org.apache.grails:grails-databinding'
-    implementation 'org.apache.grails:grails-i18n'
     implementation 'org.apache.grails:grails-interceptors'
     implementation 'org.apache.grails:grails-rest-transforms'
     implementation 'org.apache.grails:grails-services'
diff --git a/grails-test-suite-persistence/build.gradle b/grails-test-suite-persistence/build.gradle
@@ -34,7 +34,6 @@ dependencies {
     testImplementation project(':grails-test-suite-base')
     testImplementation project(':grails-domain-class')
     testImplementation project(':grails-datasource')
-    testImplementation project(':grails-i18n')
     testImplementation project(':grails-url-mappings')
     testImplementation project(':grails-databinding')
     testImplementation project(':grails-services')
diff --git a/grails-test-suite-uber/build.gradle b/grails-test-suite-uber/build.gradle
@@ -34,7 +34,6 @@ dependencies {
     testImplementation project(':grails-databinding')
     testImplementation project(':grails-datasource')
     testImplementation project(':grails-domain-class')
-    testImplementation project(':grails-i18n')
     testImplementation project(':grails-interceptors')
     testImplementation project(':grails-rest-transforms')
     testImplementation project(':grails-services')
diff --git a/grails-web-boot/build.gradle b/grails-web-boot/build.gradle
@@ -36,7 +36,6 @@ dependencies {
     testImplementation project(':grails-controllers')
 
     testImplementation 'org.apache.tomcat.embed:tomcat-embed-core'
-    testRuntimeOnly project(':grails-i18n')
     testRuntimeOnly project(':grails-url-mappings')
 
     compileOnly 'jakarta.servlet:jakarta.servlet-api'

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@ class GrailsDefaultPluginsSpec extends ApplicationContextSpec implements Command`
`36`	`36`	`expect:`
`37`	`37`	`buildGradle.contains("implementation \"org.apache.grails:grails-rest-transforms\"")`
`38`	`38`	`buildGradle.contains("implementation \"org.apache.grails:grails-databinding\"")`
`39`		`- buildGradle.contains("implementation \"org.apache.grails:grails-i18n\"")`
`40`	`39`	`buildGradle.contains("implementation \"org.apache.grails:grails-services\"")`
`41`	`40`	`buildGradle.contains("implementation \"org.apache.grails:grails-interceptors\"")`
`42`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ plugins {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`version = projectVersion`
`27`		`-group = 'org.apache.grails'`
	`27`	`+group = 'org.apache.grails.i18n'`
`28`	`28`
`29`	`29`	`dependencies {`
`30`	`30`