This is an automated email from the ASF dual-hosted git repository. jamesfredley pushed a commit to branch remove-servletContext-bootstrap in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit da809edcfcb3f98a6a2729307270db48723779cf Author: James Fredley <jamesfred...@users.noreply.github.com> AuthorDate: Wed Aug 13 16:27:31 2025 -0400 remove ServletContext from generated and test BootStrap.groovy files --- .../plugin/grails-app/init/gorm/graphql/BootStrap.groovy | 2 +- .../examples/grails3-neo4j-hibernate/grails-app/init/BootStrap.groovy | 2 +- .../examples/grails3-neo4j/grails-app/init/BootStrap.groovy | 2 +- .../test-data-service/grails-app/init/example/BootStrap.groovy | 2 +- .../java/org/grails/forge/feature/lang/groovy/bootStrap.rocker.raw | 4 ---- .../init/@grails.codegen.defaultPackage.path@/BootStrap.groovy | 4 ---- .../app1/grails-app/init/functionaltests/BootStrap.groovy | 4 ---- grails-test-examples/app2/grails-app/init/BootStrap.groovy | 4 ---- grails-test-examples/app3/grails-app/init/app3/BootStrap.groovy | 4 ---- grails-test-examples/demo33/grails-app/init/demo/BootStrap.groovy | 4 ---- grails-test-examples/gorm/grails-app/init/gorm/BootStrap.groovy | 4 ---- .../grails-data-service/grails-app/init/example/BootStrap.groovy | 4 ---- grails-test-examples/hyphenated/grails-app/init/BootStrap.groovy | 4 ---- .../issue-11102/grails-app/init/issue11102/BootStrap.groovy | 4 ---- .../issue-698-domain-save-npe/grails-app/init/BootStrap.groovy | 4 ---- .../issue-views-182/grails-app/init/issueviews182/BootStrap.groovy | 4 ---- .../micronaut/grails-app/init/micronaut/BootStrap.groovy | 2 -- grails-test-examples/mongodb/base/grails-app/init/BootStrap.groovy | 3 --- .../mongodb/database-per-tenant/grails-app/init/BootStrap.groovy | 2 -- .../mongodb/gson-templates/grails-app/init/BootStrap.groovy | 3 --- .../mongodb/hibernate5/grails-app/init/BootStrap.groovy | 4 ---- .../test-data-service/grails-app/init/example/BootStrap.groovy | 4 ---- .../plugins/issue11005/grails-app/init/issue11005/BootStrap.groovy | 4 ---- .../plugins/loadafter/grails-app/init/loadafter/BootStrap.groovy | 4 ---- 24 files changed, 4 insertions(+), 78 deletions(-) diff --git a/grails-data-graphql/plugin/grails-app/init/gorm/graphql/BootStrap.groovy b/grails-data-graphql/plugin/grails-app/init/gorm/graphql/BootStrap.groovy index 22752e17da..25ea2312fa 100644 --- a/grails-data-graphql/plugin/grails-app/init/gorm/graphql/BootStrap.groovy +++ b/grails-data-graphql/plugin/grails-app/init/gorm/graphql/BootStrap.groovy @@ -21,7 +21,7 @@ package gorm.graphql class BootStrap { - def init = { servletContext -> + def init = { } def destroy = { } diff --git a/grails-data-neo4j/examples/grails3-neo4j-hibernate/grails-app/init/BootStrap.groovy b/grails-data-neo4j/examples/grails3-neo4j-hibernate/grails-app/init/BootStrap.groovy index 126aa81782..ed61370cfa 100644 --- a/grails-data-neo4j/examples/grails3-neo4j-hibernate/grails-app/init/BootStrap.groovy +++ b/grails-data-neo4j/examples/grails3-neo4j-hibernate/grails-app/init/BootStrap.groovy @@ -19,7 +19,7 @@ class BootStrap { - def init = { servletContext -> + def init = { } def destroy = { } diff --git a/grails-data-neo4j/examples/grails3-neo4j/grails-app/init/BootStrap.groovy b/grails-data-neo4j/examples/grails3-neo4j/grails-app/init/BootStrap.groovy index 126aa81782..ed61370cfa 100644 --- a/grails-data-neo4j/examples/grails3-neo4j/grails-app/init/BootStrap.groovy +++ b/grails-data-neo4j/examples/grails3-neo4j/grails-app/init/BootStrap.groovy @@ -19,7 +19,7 @@ class BootStrap { - def init = { servletContext -> + def init = { } def destroy = { } diff --git a/grails-data-neo4j/examples/test-data-service/grails-app/init/example/BootStrap.groovy b/grails-data-neo4j/examples/test-data-service/grails-app/init/example/BootStrap.groovy index c4ea8053a8..13ecf8e4e6 100644 --- a/grails-data-neo4j/examples/test-data-service/grails-app/init/example/BootStrap.groovy +++ b/grails-data-neo4j/examples/test-data-service/grails-app/init/example/BootStrap.groovy @@ -21,7 +21,7 @@ package example class BootStrap { - def init = { servletContext -> + def init = { } def destroy = { } diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/lang/groovy/bootStrap.rocker.raw b/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/lang/groovy/bootStrap.rocker.raw index 6b5af32c2a..f787b63057 100644 --- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/lang/groovy/bootStrap.rocker.raw +++ b/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/lang/groovy/bootStrap.rocker.raw @@ -23,12 +23,8 @@ under the License. package @project.getPackageName() -import jakarta.servlet.ServletContext - class BootStrap { - ServletContext servletContext - def init = { } diff --git a/grails-profiles/base/skeleton/grails-app/init/@grails.codegen.defaultPackage.path@/BootStrap.groovy b/grails-profiles/base/skeleton/grails-app/init/@grails.codegen.defaultPackage.path@/BootStrap.groovy index 360f89aa91..dd1cef5ff2 100644 --- a/grails-profiles/base/skeleton/grails-app/init/@grails.codegen.defaultPackage.path@/BootStrap.groovy +++ b/grails-profiles/base/skeleton/grails-app/init/@grails.codegen.defaultPackage.path@/BootStrap.groovy @@ -1,11 +1,7 @@ package @grails.codegen.defaultPackage@ -import jakarta.servlet.ServletContext - class BootStrap { - ServletContext servletContext - def init = { } diff --git a/grails-test-examples/app1/grails-app/init/functionaltests/BootStrap.groovy b/grails-test-examples/app1/grails-app/init/functionaltests/BootStrap.groovy index 27f525c0df..7931e6c5d8 100644 --- a/grails-test-examples/app1/grails-app/init/functionaltests/BootStrap.groovy +++ b/grails-test-examples/app1/grails-app/init/functionaltests/BootStrap.groovy @@ -19,12 +19,8 @@ package functionaltests -import jakarta.servlet.ServletContext - class BootStrap { - ServletContext servletContext - def init = { Book.withTransaction { new Book(title:"Example Book").save(flush:true) diff --git a/grails-test-examples/app2/grails-app/init/BootStrap.groovy b/grails-test-examples/app2/grails-app/init/BootStrap.groovy index 5556f63434..2e50a66c64 100644 --- a/grails-test-examples/app2/grails-app/init/BootStrap.groovy +++ b/grails-test-examples/app2/grails-app/init/BootStrap.groovy @@ -17,12 +17,8 @@ * under the License. */ -import jakarta.servlet.ServletContext - class BootStrap { - ServletContext servletContext - def init = { } diff --git a/grails-test-examples/app3/grails-app/init/app3/BootStrap.groovy b/grails-test-examples/app3/grails-app/init/app3/BootStrap.groovy index a15a50290d..c1858f9c60 100755 --- a/grails-test-examples/app3/grails-app/init/app3/BootStrap.groovy +++ b/grails-test-examples/app3/grails-app/init/app3/BootStrap.groovy @@ -19,12 +19,8 @@ package app3 -import jakarta.servlet.ServletContext - class BootStrap { - ServletContext servletContext - def init = { } diff --git a/grails-test-examples/demo33/grails-app/init/demo/BootStrap.groovy b/grails-test-examples/demo33/grails-app/init/demo/BootStrap.groovy index 21bd05f280..a4e3dff830 100644 --- a/grails-test-examples/demo33/grails-app/init/demo/BootStrap.groovy +++ b/grails-test-examples/demo33/grails-app/init/demo/BootStrap.groovy @@ -19,12 +19,8 @@ package demo -import jakarta.servlet.ServletContext - class BootStrap { - ServletContext servletContext - def init = { } diff --git a/grails-test-examples/gorm/grails-app/init/gorm/BootStrap.groovy b/grails-test-examples/gorm/grails-app/init/gorm/BootStrap.groovy index 47f34c5adc..eccba40c67 100644 --- a/grails-test-examples/gorm/grails-app/init/gorm/BootStrap.groovy +++ b/grails-test-examples/gorm/grails-app/init/gorm/BootStrap.groovy @@ -19,12 +19,8 @@ package gorm -import jakarta.servlet.ServletContext - class BootStrap { - ServletContext servletContext - def init = { Book.withTransaction { def b = new Book(title:"The Stand") diff --git a/grails-test-examples/hibernate5/grails-data-service/grails-app/init/example/BootStrap.groovy b/grails-test-examples/hibernate5/grails-data-service/grails-app/init/example/BootStrap.groovy index 8fe248f051..74e0314c18 100644 --- a/grails-test-examples/hibernate5/grails-data-service/grails-app/init/example/BootStrap.groovy +++ b/grails-test-examples/hibernate5/grails-data-service/grails-app/init/example/BootStrap.groovy @@ -19,12 +19,8 @@ package example -import jakarta.servlet.ServletContext - class BootStrap { - ServletContext servletContext - def init = { } diff --git a/grails-test-examples/hyphenated/grails-app/init/BootStrap.groovy b/grails-test-examples/hyphenated/grails-app/init/BootStrap.groovy index 5556f63434..2e50a66c64 100644 --- a/grails-test-examples/hyphenated/grails-app/init/BootStrap.groovy +++ b/grails-test-examples/hyphenated/grails-app/init/BootStrap.groovy @@ -17,12 +17,8 @@ * under the License. */ -import jakarta.servlet.ServletContext - class BootStrap { - ServletContext servletContext - def init = { } diff --git a/grails-test-examples/issue-11102/grails-app/init/issue11102/BootStrap.groovy b/grails-test-examples/issue-11102/grails-app/init/issue11102/BootStrap.groovy index 881b1e61e7..b95e1651ce 100644 --- a/grails-test-examples/issue-11102/grails-app/init/issue11102/BootStrap.groovy +++ b/grails-test-examples/issue-11102/grails-app/init/issue11102/BootStrap.groovy @@ -19,12 +19,8 @@ package issue11102 -import jakarta.servlet.ServletContext - class BootStrap { - ServletContext servletContext - def init = { } diff --git a/grails-test-examples/issue-698-domain-save-npe/grails-app/init/BootStrap.groovy b/grails-test-examples/issue-698-domain-save-npe/grails-app/init/BootStrap.groovy index 5556f63434..2e50a66c64 100644 --- a/grails-test-examples/issue-698-domain-save-npe/grails-app/init/BootStrap.groovy +++ b/grails-test-examples/issue-698-domain-save-npe/grails-app/init/BootStrap.groovy @@ -17,12 +17,8 @@ * under the License. */ -import jakarta.servlet.ServletContext - class BootStrap { - ServletContext servletContext - def init = { } diff --git a/grails-test-examples/issue-views-182/grails-app/init/issueviews182/BootStrap.groovy b/grails-test-examples/issue-views-182/grails-app/init/issueviews182/BootStrap.groovy index dfaaf9e3c3..97b1ab20e7 100644 --- a/grails-test-examples/issue-views-182/grails-app/init/issueviews182/BootStrap.groovy +++ b/grails-test-examples/issue-views-182/grails-app/init/issueviews182/BootStrap.groovy @@ -19,12 +19,8 @@ package issueviews182 -import jakarta.servlet.ServletContext - class BootStrap { - ServletContext servletContext - def init = { } diff --git a/grails-test-examples/micronaut/grails-app/init/micronaut/BootStrap.groovy b/grails-test-examples/micronaut/grails-app/init/micronaut/BootStrap.groovy index 92f85ecbd7..f38351695f 100644 --- a/grails-test-examples/micronaut/grails-app/init/micronaut/BootStrap.groovy +++ b/grails-test-examples/micronaut/grails-app/init/micronaut/BootStrap.groovy @@ -21,8 +21,6 @@ package micronaut class BootStrap { - ServletContext servletContext - def init = { } diff --git a/grails-test-examples/mongodb/base/grails-app/init/BootStrap.groovy b/grails-test-examples/mongodb/base/grails-app/init/BootStrap.groovy index b63fe01f0e..e78684e9dd 100644 --- a/grails-test-examples/mongodb/base/grails-app/init/BootStrap.groovy +++ b/grails-test-examples/mongodb/base/grails-app/init/BootStrap.groovy @@ -18,12 +18,9 @@ */ import functional.tests.* -import jakarta.servlet.ServletContext class BootStrap { - ServletContext servletContext - def init = { Book.DB.drop() } diff --git a/grails-test-examples/mongodb/database-per-tenant/grails-app/init/BootStrap.groovy b/grails-test-examples/mongodb/database-per-tenant/grails-app/init/BootStrap.groovy index 15446c1c57..bf91c850d4 100644 --- a/grails-test-examples/mongodb/database-per-tenant/grails-app/init/BootStrap.groovy +++ b/grails-test-examples/mongodb/database-per-tenant/grails-app/init/BootStrap.groovy @@ -17,12 +17,10 @@ * under the License. */ -import jakarta.servlet.ServletContext import org.grails.datastore.mapping.mongo.MongoDatastore class BootStrap { - ServletContext servletContext MongoDatastore mongoDatastore def init = { diff --git a/grails-test-examples/mongodb/gson-templates/grails-app/init/BootStrap.groovy b/grails-test-examples/mongodb/gson-templates/grails-app/init/BootStrap.groovy index 3376d0032c..391eb767e9 100644 --- a/grails-test-examples/mongodb/gson-templates/grails-app/init/BootStrap.groovy +++ b/grails-test-examples/mongodb/gson-templates/grails-app/init/BootStrap.groovy @@ -18,13 +18,10 @@ */ import groovy.transform.CompileStatic -import jakarta.servlet.ServletContext @CompileStatic class BootStrap { - ServletContext servletContext - def init = { } } diff --git a/grails-test-examples/mongodb/hibernate5/grails-app/init/BootStrap.groovy b/grails-test-examples/mongodb/hibernate5/grails-app/init/BootStrap.groovy index b63fe01f0e..3c93c1bb21 100644 --- a/grails-test-examples/mongodb/hibernate5/grails-app/init/BootStrap.groovy +++ b/grails-test-examples/mongodb/hibernate5/grails-app/init/BootStrap.groovy @@ -18,12 +18,8 @@ */ import functional.tests.* -import jakarta.servlet.ServletContext class BootStrap { - - ServletContext servletContext - def init = { Book.DB.drop() } diff --git a/grails-test-examples/mongodb/test-data-service/grails-app/init/example/BootStrap.groovy b/grails-test-examples/mongodb/test-data-service/grails-app/init/example/BootStrap.groovy index 8fe248f051..74e0314c18 100644 --- a/grails-test-examples/mongodb/test-data-service/grails-app/init/example/BootStrap.groovy +++ b/grails-test-examples/mongodb/test-data-service/grails-app/init/example/BootStrap.groovy @@ -19,12 +19,8 @@ package example -import jakarta.servlet.ServletContext - class BootStrap { - ServletContext servletContext - def init = { } diff --git a/grails-test-examples/plugins/issue11005/grails-app/init/issue11005/BootStrap.groovy b/grails-test-examples/plugins/issue11005/grails-app/init/issue11005/BootStrap.groovy index b0b3f8a440..32521de94c 100644 --- a/grails-test-examples/plugins/issue11005/grails-app/init/issue11005/BootStrap.groovy +++ b/grails-test-examples/plugins/issue11005/grails-app/init/issue11005/BootStrap.groovy @@ -19,12 +19,8 @@ package issue11005 -import jakarta.servlet.ServletContext - class BootStrap { - ServletContext servletContext - def init = { } diff --git a/grails-test-examples/plugins/loadafter/grails-app/init/loadafter/BootStrap.groovy b/grails-test-examples/plugins/loadafter/grails-app/init/loadafter/BootStrap.groovy index bcbc5b0dc4..ba22a27d52 100755 --- a/grails-test-examples/plugins/loadafter/grails-app/init/loadafter/BootStrap.groovy +++ b/grails-test-examples/plugins/loadafter/grails-app/init/loadafter/BootStrap.groovy @@ -19,12 +19,8 @@ package loadafter -import jakarta.servlet.ServletContext - class BootStrap { - ServletContext servletContext - def init = { }