This is an automated email from the ASF dual-hosted git repository. jdaugherty pushed a commit to branch dependencyCoordinateProposal in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 186c13d19fc26b40cc95b4f29d25fc9e5ef1f864 Author: James Daugherty <[email protected]> AuthorDate: Mon Jul 21 20:38:38 2025 -0400 feature: add grails-dependencies-all, -assets, -test for easier inclusion / exclusion of grails "platform" dependencies --- RENAME.md | 2 +- gradle/publish-root-config.gradle | 4 ++- .../examples/grails3-neo4j-hibernate/build.gradle | 9 ++---- .../examples/grails3-neo4j/build.gradle | 10 ++----- .../examples/test-data-service/build.gradle | 13 ++------- grails-dependencies/{ => all}/README.md | 3 +- grails-dependencies/{ => all}/build.gradle | 33 ++++++++++++++++------ grails-dependencies/{ => assets}/README.md | 3 +- grails-dependencies/{ => assets}/build.gradle | 19 ++++--------- grails-dependencies/src/main/resources/publish-fix | 1 - grails-dependencies/{ => test}/README.md | 3 +- grails-dependencies/{ => test}/build.gradle | 19 ++++--------- grails-doc/build.gradle | 2 +- grails-test-examples/app1/build.gradle | 9 ++---- grails-test-examples/app2/build.gradle | 8 ++---- grails-test-examples/app3/build.gradle | 8 ++---- grails-test-examples/datasources/build.gradle | 7 ++--- grails-test-examples/gorm/build.gradle | 8 ++---- grails-test-examples/hyphenated/build.gradle | 8 ++---- .../issue-698-domain-save-npe/build.gradle | 8 ++---- grails-test-examples/namespaces/build.gradle | 8 ++---- .../plugins/issue11005/build.gradle | 9 ++---- .../plugins/loadafter/build.gradle | 9 ++---- .../plugins/loadfirst/build.gradle | 9 ++---- .../plugins/loadsecond/build.gradle | 9 ++---- settings.gradle | 8 +++++- 26 files changed, 83 insertions(+), 146 deletions(-) diff --git a/RENAME.md b/RENAME.md index 6b8e88ebfa..364fc9a206 100644 --- a/RENAME.md +++ b/RENAME.md @@ -93,7 +93,7 @@ Below is a reference of all migrated artifacts - both their old and new name. | org.grails | grails-datastore-async | org.apache.grails.data | grails-datastore-async | | | grails-data-mapping | | org.grails | grails-datastore-core | org.apache.grails.data | grails-datastore-core | | | grails-data-mapping | | org.grails | grails-datastore-web | org.apache.grails.data | grails-datastore-web | | | grails-data-mapping | -| org.grails | grails-dependencies | org.apache.grails | grails-dependencies | | | grails-core | +| org.grails | grails-dependencies | org.apache.grails | grails-dependencies-all | | | grails-core | | org.grails | grails-docs | org.apache.grails | grails-docs-core | | | grails-core | | org.grails | grails-plugin-domain-class | org.apache.grails | grails-domain-class | | | grails-core | | org.grails | grails-encoder | org.apache.grails.web | grails-encoder | | | grails-core | diff --git a/gradle/publish-root-config.gradle b/gradle/publish-root-config.gradle index c09a37aa7e..761b1bc89c 100644 --- a/gradle/publish-root-config.gradle +++ b/gradle/publish-root-config.gradle @@ -43,7 +43,9 @@ def publishedProjects = [ 'grails-databinding', 'grails-databinding-core', 'grails-datasource', - 'grails-dependencies', + 'grails-dependencies-all', + 'grails-dependencies-assets', + 'grails-dependencies-test', 'grails-domain-class', 'grails-encoder', 'grails-events-compat', diff --git a/grails-data-neo4j/examples/grails3-neo4j-hibernate/build.gradle b/grails-data-neo4j/examples/grails3-neo4j-hibernate/build.gradle index 054b1a843b..91f739c627 100644 --- a/grails-data-neo4j/examples/grails3-neo4j-hibernate/build.gradle +++ b/grails-data-neo4j/examples/grails3-neo4j-hibernate/build.gradle @@ -25,14 +25,9 @@ configurations.configureEach { dependencies { implementation platform(project(':grails-bom')) - implementation "org.springframework.boot:spring-boot-starter-logging" - implementation "org.springframework.boot:spring-boot-autoconfigure" - implementation "org.springframework.boot:spring-boot-starter-actuator" - implementation "org.springframework.boot:spring-boot-starter-tomcat" implementation "javax.servlet:javax.servlet-api:$servletApiVersion" - implementation "org.apache.grails:grails-core:$grailsVersion" - implementation "org.apache.grails:grails-dependencies:$grailsVersion" - implementation "org.apache.grails:grails-web-boot:$grailsVersion" + implementation 'org.apache.grails:grails-dependencies-all' + implementation 'com.h2database:h2' implementation project(':grails-plugin') implementation "org.apache.grails:grails-data-hibernate5:$hibernateDatastoreVersion" diff --git a/grails-data-neo4j/examples/grails3-neo4j/build.gradle b/grails-data-neo4j/examples/grails3-neo4j/build.gradle index 2ec3ec59b3..524f91bbc2 100644 --- a/grails-data-neo4j/examples/grails3-neo4j/build.gradle +++ b/grails-data-neo4j/examples/grails3-neo4j/build.gradle @@ -24,15 +24,9 @@ configurations.configureEach { dependencies { implementation platform(project(':grails-bom')) - - implementation "org.springframework.boot:spring-boot-starter-logging" - implementation "org.springframework.boot:spring-boot-autoconfigure" - implementation "org.springframework.boot:spring-boot-starter-actuator" - implementation "org.springframework.boot:spring-boot-starter-tomcat" implementation "javax.servlet:javax.servlet-api:$servletApiVersion" - implementation "org.apache.grails:grails-core" - implementation "org.apache.grails:grails-dependencies:$grailsVersion" - implementation "org.apache.grails:grails-web-boot:$grailsVersion" + implementation 'org.apache.grails:grails-dependencies-all' + implementation 'com.h2database:h2' implementation project(":grails-plugin") diff --git a/grails-data-neo4j/examples/test-data-service/build.gradle b/grails-data-neo4j/examples/test-data-service/build.gradle index 084a470585..5090c59feb 100644 --- a/grails-data-neo4j/examples/test-data-service/build.gradle +++ b/grails-data-neo4j/examples/test-data-service/build.gradle @@ -20,21 +20,12 @@ group "examples" dependencies { - implementation "org.springframework.boot:spring-boot-starter-logging" - implementation "org.springframework.boot:spring-boot-autoconfigure" - implementation "org.apache.grails:grails-core" - implementation "org.springframework.boot:spring-boot-starter-actuator" - implementation "org.springframework.boot:spring-boot-starter-tomcat" - implementation ("org.apache.grails:grails-dependencies") { - exclude module:'grails-data-simple' - } + implementation 'org.apache.grails:grails-dependencies-all' + implementation 'com.h2database:h2' implementation "org.apache.grails:grails-codecs" - implementation "org.apache.grails:grails-services" implementation "org.apache.grails:grails-datasource" - implementation "org.apache.grails:grails-web-boot" implementation "org.apache.grails:grails-logging" implementation "org.apache.grails:grails-cache" - implementation "org.apache.grails:grails-events" implementation project(":grails-plugin") implementation "org.apache.grails:grails-views-gson" implementation project(":mongodb-gson-templates") diff --git a/grails-dependencies/README.md b/grails-dependencies/all/README.md similarity index 84% copy from grails-dependencies/README.md copy to grails-dependencies/all/README.md index f61a6bfdbb..f840878795 100644 --- a/grails-dependencies/README.md +++ b/grails-dependencies/all/README.md @@ -14,5 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. --> -## grails-dependencies +## grails-dependencies-all +A meta-project that aggregates all non-test, non-database Grails dependencies. diff --git a/grails-dependencies/build.gradle b/grails-dependencies/all/build.gradle similarity index 67% copy from grails-dependencies/build.gradle copy to grails-dependencies/all/build.gradle index 1305ed257f..81eb1bb4df 100644 --- a/grails-dependencies/build.gradle +++ b/grails-dependencies/all/build.gradle @@ -27,23 +27,38 @@ group = 'org.apache.grails' ext { skipJavaComponent = true + pomDescription = 'A meta-project that aggregates all non-test, non-database Grails dependencies.' } def configurations = [ - 'api' : [ + 'api': [ + // minimum dependencies that include critical APIs or ASTs + ':grails-async', + ':grails-cache', + ':grails-codecs', + ':grails-console', + ':grails-controllers', + ':grails-converters', ':grails-core', - ':grails-rest-transforms', ':grails-databinding', + ':grails-domain-class', // grails-controllers exports this, but include it here for completeness + ':grails-encoder', + ':grails-events', + ':grails-gsp', ':grails-i18n', + ':grails-interceptors', + ':grails-logging', + ':grails-rest-transforms', ':grails-services', ':grails-url-mappings', - ':grails-interceptors', - ':grails-async', - ':grails-events', - ':grails-gsp', - ], - 'runtimeOnly': [ - 'com.h2database:h2', + ':grails-web-boot', + // Minimum dependencies for spring boot + 'org.springframework.boot:spring-boot-autoconfigure', + 'org.springframework.boot:spring-boot-starter', + 'org.springframework.boot:spring-boot-starter-actuator', + 'org.springframework.boot:spring-boot-starter-logging', + 'org.springframework.boot:spring-boot-starter-validation', + 'org.springframework.boot:spring-boot-starter-tomcat', ] ] diff --git a/grails-dependencies/README.md b/grails-dependencies/assets/README.md similarity index 84% copy from grails-dependencies/README.md copy to grails-dependencies/assets/README.md index f61a6bfdbb..45bbe9cc0f 100644 --- a/grails-dependencies/README.md +++ b/grails-dependencies/assets/README.md @@ -14,5 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. --> -## grails-dependencies +## grails-dependencies-assets +A meta-project that aggregates all Grails assets files under one place. diff --git a/grails-dependencies/build.gradle b/grails-dependencies/assets/build.gradle similarity index 80% copy from grails-dependencies/build.gradle copy to grails-dependencies/assets/build.gradle index 1305ed257f..3828cba182 100644 --- a/grails-dependencies/build.gradle +++ b/grails-dependencies/assets/build.gradle @@ -27,23 +27,14 @@ group = 'org.apache.grails' ext { skipJavaComponent = true + pomDescription = 'A meta-project that aggregates all Grails assets files under one place.' } def configurations = [ - 'api' : [ - ':grails-core', - ':grails-rest-transforms', - ':grails-databinding', - ':grails-i18n', - ':grails-services', - ':grails-url-mappings', - ':grails-interceptors', - ':grails-async', - ':grails-events', - ':grails-gsp', - ], - 'runtimeOnly': [ - 'com.h2database:h2', + 'api': [ + 'org.webjars.npm:bootstrap', + 'org.webjars.npm:bootstrap-icons', + 'org.webjars.npm:jquery', ] ] diff --git a/grails-dependencies/src/main/resources/publish-fix b/grails-dependencies/src/main/resources/publish-fix deleted file mode 100644 index a6d1231b93..0000000000 --- a/grails-dependencies/src/main/resources/publish-fix +++ /dev/null @@ -1 +0,0 @@ -Grails Gradle Plugin needs something in a sourceSet to be able to publish \ No newline at end of file diff --git a/grails-dependencies/README.md b/grails-dependencies/test/README.md similarity index 80% rename from grails-dependencies/README.md rename to grails-dependencies/test/README.md index f61a6bfdbb..5786614235 100644 --- a/grails-dependencies/README.md +++ b/grails-dependencies/test/README.md @@ -14,5 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. --> -## grails-dependencies +## grails-dependencies-test +A meta-project that aggregates all non-data test dependencies that will be commonly used in Grails applications. diff --git a/grails-dependencies/build.gradle b/grails-dependencies/test/build.gradle similarity index 81% rename from grails-dependencies/build.gradle rename to grails-dependencies/test/build.gradle index 1305ed257f..c6d539f3c4 100644 --- a/grails-dependencies/build.gradle +++ b/grails-dependencies/test/build.gradle @@ -27,23 +27,16 @@ group = 'org.apache.grails' ext { skipJavaComponent = true + pomDescription = 'A meta-project that aggregates all non-data test dependencies that will be commonly used in Grails applications.' } def configurations = [ 'api' : [ - ':grails-core', - ':grails-rest-transforms', - ':grails-databinding', - ':grails-i18n', - ':grails-services', - ':grails-url-mappings', - ':grails-interceptors', - ':grails-async', - ':grails-events', - ':grails-gsp', - ], - 'runtimeOnly': [ - 'com.h2database:h2', + ':grails-testing-support-datamapping', + ':grails-testing-support-web', + // Minimum expected test dependencies + 'org.spockframework:spock-core', + 'org.mockito:mockito-core' // Allows for Mock() ] ] diff --git a/grails-doc/build.gradle b/grails-doc/build.gradle index c8a12a8fba..2f746d302c 100644 --- a/grails-doc/build.gradle +++ b/grails-doc/build.gradle @@ -46,7 +46,7 @@ dependencies { implementation 'org.apache.groovy:groovy' // Used to surface versions for groovydoc - implementation project(':grails-dependencies') + implementation project(':grails-dependencies-all') implementation project(':grails-testing-support-core') implementation project(':grails-data-hibernate5') implementation 'org.apache.grails:grails-gradle-plugins' diff --git a/grails-test-examples/app1/build.gradle b/grails-test-examples/app1/build.gradle index d72754be08..37dbdbf592 100644 --- a/grails-test-examples/app1/build.gradle +++ b/grails-test-examples/app1/build.gradle @@ -31,13 +31,8 @@ apply plugin: 'org.apache.grails.gradle.grails-gsp' dependencies { implementation platform(project(':grails-bom')) - implementation 'org.springframework.boot:spring-boot-starter-logging' - implementation 'org.springframework.boot:spring-boot-starter-actuator' - implementation 'org.springframework.boot:spring-boot-autoconfigure' - implementation 'org.springframework.boot:spring-boot-starter-tomcat' - implementation 'org.apache.grails:grails-dependencies' - implementation 'org.apache.grails:grails-web-boot' - implementation 'org.apache.grails:grails-core' + implementation 'org.apache.grails:grails-dependencies-all' + implementation 'com.h2database:h2' if(System.getenv('SITEMESH3_TESTING_ENABLED') == 'true') { implementation 'org.apache.grails:grails-sitemesh3' } diff --git a/grails-test-examples/app2/build.gradle b/grails-test-examples/app2/build.gradle index 6587bf062e..1ae3f72335 100644 --- a/grails-test-examples/app2/build.gradle +++ b/grails-test-examples/app2/build.gradle @@ -32,12 +32,8 @@ apply plugin: 'org.apache.grails.gradle.grails-gsp' dependencies { implementation platform(project(':grails-bom')) - implementation 'org.springframework.boot:spring-boot-starter-logging' - implementation 'org.springframework.boot:spring-boot-starter-actuator' - implementation 'org.springframework.boot:spring-boot-autoconfigure' - implementation 'org.springframework.boot:spring-boot-starter-tomcat' - implementation 'org.apache.grails:grails-dependencies' - implementation 'org.apache.grails:grails-web-boot' + implementation 'org.apache.grails:grails-dependencies-all' + implementation 'com.h2database:h2' if(System.getenv('SITEMESH3_TESTING_ENABLED') == 'true') { implementation 'org.apache.grails:grails-sitemesh3' } diff --git a/grails-test-examples/app3/build.gradle b/grails-test-examples/app3/build.gradle index bbe812d9c4..90ede965de 100644 --- a/grails-test-examples/app3/build.gradle +++ b/grails-test-examples/app3/build.gradle @@ -30,12 +30,8 @@ apply plugin: 'org.apache.grails.gradle.grails-gsp' dependencies { implementation platform(project(':grails-bom')) - implementation 'org.springframework.boot:spring-boot-starter-logging' - implementation 'org.springframework.boot:spring-boot-starter-actuator' - implementation 'org.springframework.boot:spring-boot-autoconfigure' - implementation 'org.springframework.boot:spring-boot-starter-tomcat' - implementation 'org.apache.grails:grails-dependencies' - implementation 'org.apache.grails:grails-web-boot' + implementation 'org.apache.grails:grails-dependencies-all' + implementation 'com.h2database:h2' if(System.getenv('SITEMESH3_TESTING_ENABLED') == 'true') { implementation 'org.apache.grails:grails-sitemesh3' } diff --git a/grails-test-examples/datasources/build.gradle b/grails-test-examples/datasources/build.gradle index 61931956cb..de723cf946 100644 --- a/grails-test-examples/datasources/build.gradle +++ b/grails-test-examples/datasources/build.gradle @@ -25,11 +25,8 @@ apply plugin: 'org.apache.grails.gradle.grails-web' dependencies { implementation platform(project(':grails-bom')) - implementation 'org.springframework.boot:spring-boot-starter-logging' - implementation 'org.springframework.boot:spring-boot-starter-actuator' - implementation 'org.springframework.boot:spring-boot-autoconfigure' - implementation 'org.springframework.boot:spring-boot-starter-tomcat' - implementation 'org.apache.grails:grails-dependencies' + implementation 'org.apache.grails:grails-dependencies-all' + implementation 'com.h2database:h2' implementation 'org.apache.grails:grails-web-boot' if(System.getenv('SITEMESH3_TESTING_ENABLED') == 'true') { implementation 'org.apache.grails:grails-sitemesh3' diff --git a/grails-test-examples/gorm/build.gradle b/grails-test-examples/gorm/build.gradle index 4b3a791cc0..53a4d6eaa6 100644 --- a/grails-test-examples/gorm/build.gradle +++ b/grails-test-examples/gorm/build.gradle @@ -25,12 +25,8 @@ apply plugin: 'org.apache.grails.gradle.grails-web' dependencies { implementation platform(project(':grails-bom')) - implementation 'org.springframework.boot:spring-boot-starter-logging' - implementation 'org.springframework.boot:spring-boot-starter-actuator' - implementation 'org.springframework.boot:spring-boot-autoconfigure' - implementation 'org.springframework.boot:spring-boot-starter-tomcat' - implementation 'org.apache.grails:grails-dependencies' - implementation 'org.apache.grails:grails-web-boot' + implementation 'org.apache.grails:grails-dependencies-all' + implementation 'com.h2database:h2' if(System.getenv('SITEMESH3_TESTING_ENABLED') == 'true') { implementation 'org.apache.grails:grails-sitemesh3' } diff --git a/grails-test-examples/hyphenated/build.gradle b/grails-test-examples/hyphenated/build.gradle index 76ac1a2bb1..a069c5b221 100644 --- a/grails-test-examples/hyphenated/build.gradle +++ b/grails-test-examples/hyphenated/build.gradle @@ -31,12 +31,8 @@ apply plugin: 'org.apache.grails.gradle.grails-gsp' dependencies { implementation platform(project(':grails-bom')) - implementation 'org.springframework.boot:spring-boot-starter-logging' - implementation 'org.springframework.boot:spring-boot-starter-actuator' - implementation 'org.springframework.boot:spring-boot-autoconfigure' - implementation 'org.springframework.boot:spring-boot-starter-tomcat' - implementation 'org.apache.grails:grails-dependencies' - implementation 'org.apache.grails:grails-web-boot' + implementation 'org.apache.grails:grails-dependencies-all' + implementation 'com.h2database:h2' if(System.getenv('SITEMESH3_TESTING_ENABLED') == 'true') { implementation 'org.apache.grails:grails-sitemesh3' } diff --git a/grails-test-examples/issue-698-domain-save-npe/build.gradle b/grails-test-examples/issue-698-domain-save-npe/build.gradle index fab1fc9943..bc4322e89e 100644 --- a/grails-test-examples/issue-698-domain-save-npe/build.gradle +++ b/grails-test-examples/issue-698-domain-save-npe/build.gradle @@ -25,12 +25,8 @@ apply plugin: 'org.apache.grails.gradle.grails-web' dependencies { implementation platform(project(':grails-bom')) - implementation 'org.springframework.boot:spring-boot-starter-logging' - implementation 'org.springframework.boot:spring-boot-starter-actuator' - implementation 'org.springframework.boot:spring-boot-autoconfigure' - implementation 'org.springframework.boot:spring-boot-starter-tomcat' - implementation 'org.apache.grails:grails-dependencies' - implementation 'org.apache.grails:grails-web-boot' + implementation 'org.apache.grails:grails-dependencies-all' + implementation 'com.h2database:h2' if(System.getenv('SITEMESH3_TESTING_ENABLED') == 'true') { implementation 'org.apache.grails:grails-sitemesh3' } diff --git a/grails-test-examples/namespaces/build.gradle b/grails-test-examples/namespaces/build.gradle index a20e91dd55..2fe2c1fae6 100644 --- a/grails-test-examples/namespaces/build.gradle +++ b/grails-test-examples/namespaces/build.gradle @@ -31,12 +31,8 @@ apply plugin: 'org.apache.grails.gradle.grails-gsp' dependencies { implementation platform(project(':grails-bom')) - implementation 'org.springframework.boot:spring-boot-starter-logging' - implementation 'org.springframework.boot:spring-boot-starter-actuator' - implementation 'org.springframework.boot:spring-boot-autoconfigure' - implementation 'org.springframework.boot:spring-boot-starter-tomcat' - implementation 'org.apache.grails:grails-dependencies' - implementation 'org.apache.grails:grails-web-boot' + implementation 'org.apache.grails:grails-dependencies-all' + implementation 'com.h2database:h2' if(System.getenv('SITEMESH3_TESTING_ENABLED') == 'true') { implementation 'org.apache.grails:grails-sitemesh3' } diff --git a/grails-test-examples/plugins/issue11005/build.gradle b/grails-test-examples/plugins/issue11005/build.gradle index a73dc87030..3d315f9ada 100644 --- a/grails-test-examples/plugins/issue11005/build.gradle +++ b/grails-test-examples/plugins/issue11005/build.gradle @@ -27,19 +27,14 @@ group = 'com.example.grails.plugins' dependencies { implementation platform(project(':grails-bom')) - api 'org.springframework.boot:spring-boot-starter-logging' - api 'org.springframework.boot:spring-boot-starter-actuator' - api 'org.springframework.boot:spring-boot-autoconfigure' - api 'org.springframework.boot:spring-boot-starter-tomcat' - - api 'org.apache.grails:grails-web-boot' if(System.getenv('SITEMESH3_TESTING_ENABLED') == 'true') { implementation 'org.apache.grails:grails-sitemesh3' } else { implementation 'org.apache.grails:grails-layout' } - api 'org.apache.grails:grails-dependencies' + api 'org.apache.grails:grails-dependencies-all' + api 'com.h2database:h2' api 'jakarta.servlet:jakarta.servlet-api' testImplementation 'org.apache.grails:grails-testing-support-web' diff --git a/grails-test-examples/plugins/loadafter/build.gradle b/grails-test-examples/plugins/loadafter/build.gradle index 62b4782e1f..c2c392c6f8 100644 --- a/grails-test-examples/plugins/loadafter/build.gradle +++ b/grails-test-examples/plugins/loadafter/build.gradle @@ -27,19 +27,14 @@ apply plugin: 'org.apache.grails.gradle.grails-gsp' dependencies { implementation platform(project(':grails-bom')) - api 'org.springframework.boot:spring-boot-starter-logging' - api 'org.springframework.boot:spring-boot-starter-actuator' - api 'org.springframework.boot:spring-boot-autoconfigure' - api 'org.springframework.boot:spring-boot-starter-tomcat' - - api 'org.apache.grails:grails-web-boot' if(System.getenv('SITEMESH3_TESTING_ENABLED') == 'true') { api 'org.apache.grails:grails-sitemesh3' } else { api 'org.apache.grails:grails-layout' } - api 'org.apache.grails:grails-dependencies' + api 'org.apache.grails:grails-dependencies-all' + api 'com.h2database:h2' api 'jakarta.servlet:jakarta.servlet-api' implementation "org.apache.grails:grails-spring-security:$grailsSpringSecurityVersion" diff --git a/grails-test-examples/plugins/loadfirst/build.gradle b/grails-test-examples/plugins/loadfirst/build.gradle index 5100b19be9..34d8e4d354 100644 --- a/grails-test-examples/plugins/loadfirst/build.gradle +++ b/grails-test-examples/plugins/loadfirst/build.gradle @@ -27,19 +27,14 @@ apply plugin: 'org.apache.grails.gradle.grails-gsp' dependencies { implementation platform(project(':grails-bom')) - api 'org.springframework.boot:spring-boot-starter-logging' - api 'org.springframework.boot:spring-boot-starter-actuator' - api 'org.springframework.boot:spring-boot-autoconfigure' - api 'org.springframework.boot:spring-boot-starter-tomcat' - - api 'org.apache.grails:grails-web-boot' if(System.getenv('SITEMESH3_TESTING_ENABLED') == 'true') { api 'org.apache.grails:grails-sitemesh3' } else { api 'org.apache.grails:grails-layout' } - api 'org.apache.grails:grails-dependencies' + api 'org.apache.grails:grails-dependencies-all' + api 'com.h2database:h2' api 'jakarta.servlet:jakarta.servlet-api' console 'org.apache.grails:grails-console' diff --git a/grails-test-examples/plugins/loadsecond/build.gradle b/grails-test-examples/plugins/loadsecond/build.gradle index 12429862af..204d9f5e67 100644 --- a/grails-test-examples/plugins/loadsecond/build.gradle +++ b/grails-test-examples/plugins/loadsecond/build.gradle @@ -26,19 +26,14 @@ apply plugin: 'org.apache.grails.gradle.grails-gsp' dependencies { implementation platform(project(':grails-bom')) - api 'org.springframework.boot:spring-boot-starter-logging' - api 'org.springframework.boot:spring-boot-starter-actuator' - api 'org.springframework.boot:spring-boot-autoconfigure' - api 'org.springframework.boot:spring-boot-starter-tomcat' - - api 'org.apache.grails:grails-web-boot' if(System.getenv('SITEMESH3_TESTING_ENABLED') == 'true') { api 'org.apache.grails:grails-sitemesh3' } else { api 'org.apache.grails:grails-layout' } - api 'org.apache.grails:grails-dependencies' + api 'org.apache.grails:grails-dependencies-all' + api 'com.h2database:h2' api 'jakarta.servlet:jakarta.servlet-api' console 'org.apache.grails:grails-console' diff --git a/settings.gradle b/settings.gradle index fbca82c3a4..f0f5cd6404 100644 --- a/settings.gradle +++ b/settings.gradle @@ -103,7 +103,9 @@ include( 'grails-web-url-mappings', // POM / BOMs - 'grails-dependencies', + 'grails-dependencies-all', + 'grails-dependencies-test', + 'grails-dependencies-assets', 'grails-bom', // Docs @@ -191,6 +193,10 @@ project(':grails-async-rxjava2').projectDir = file('grails-async/rxjava2') project(':grails-async-rxjava3').projectDir = file('grails-async/rxjava3') project(':grails-async').projectDir = file('grails-async/plugin') +project(':grails-dependencies-all').projectDir = file('grails-dependencies/all') +project(':grails-dependencies-test').projectDir = file('grails-dependencies/test') +project(':grails-dependencies-assets').projectDir = file('grails-dependencies/assets') + project(':grails-gsp-core').projectDir = file('grails-gsp/core') project(':grails-gsp').projectDir = file('grails-gsp/plugin') project(':grails-sitemesh3').projectDir = file('grails-gsp/grails-sitemesh3')
