diff --git a/grails-data-graphql/core/build.gradle b/grails-data-graphql/core/build.gradle index d187e330036..d1f961db10f 100644 --- a/grails-data-graphql/core/build.gradle +++ b/grails-data-graphql/core/build.gradle @@ -11,7 +11,7 @@ dependencies { api "com.graphql-java:graphql-java:$graphqlJavaVersion" api "com.graphql-java:graphql-java-extended-scalars:$graphqlJavaScalarExtVersion" api 'com.github.javaparser:javaparser-core:3.25.7' - api 'org.grails.plugins:views-json:2.3.2' + api 'org.apache.grails:grails-views-gson:2.3.2' api 'org.javassist:javassist:3.29.2-GA' codenarc "org.codenarc:CodeNarc:$codenarcVersion" diff --git a/grails-data-graphql/examples/grails-docs-app/build.gradle b/grails-data-graphql/examples/grails-docs-app/build.gradle index e8f192d7e3e..d389134d46e 100644 --- a/grails-data-graphql/examples/grails-docs-app/build.gradle +++ b/grails-data-graphql/examples/grails-docs-app/build.gradle @@ -1,9 +1,7 @@ dependencies { implementation "org.springframework.boot:spring-boot-starter-logging" implementation "org.springframework.boot:spring-boot-autoconfigure" - implementation "org.apache.grails:grails-core", { - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated - } + 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-url-mappings" @@ -15,12 +13,12 @@ dependencies { implementation "org.apache.grails:grails-databinding" implementation "org.apache.grails.web:grails-web-boot" implementation "org.apache.grails:grails-logging" - implementation "org.grails.plugins:cache" + implementation "org.apache.grails:grails-cache" implementation "org.apache.grails:grails-async" implementation "org.apache.grails:grails-events" implementation "org.apache.grails:grails-data-hibernate5" implementation "org.hibernate:hibernate-core:$hibernateCoreVersion" - implementation "org.grails.plugins:views-json" + implementation "org.apache.grails:grails-views-gson" implementation "org.apache.grails:grails-data-mongodb-gson-templates" implementation 'io.micronaut.rxjava2:micronaut-rxjava2-http-client:1.2.0' console "org.apache.grails:grails-console" @@ -29,7 +27,7 @@ dependencies { runtimeOnly "com.h2database:h2" runtimeOnly "org.apache.tomcat:tomcat-jdbc" testImplementation project(':grails-testing-support-datamapping') - testImplementation "org.grails:grails-web-testing-support" + testImplementation "org.apache.grails:grails-testing-support-web" implementation project(":grails-plugin-gorm-graphql-plugin") } diff --git a/grails-data-graphql/examples/grails-multi-datastore-app/build.gradle b/grails-data-graphql/examples/grails-multi-datastore-app/build.gradle index 6a3c17f84b3..8193f2d0936 100644 --- a/grails-data-graphql/examples/grails-multi-datastore-app/build.gradle +++ b/grails-data-graphql/examples/grails-multi-datastore-app/build.gradle @@ -5,9 +5,7 @@ repositories { dependencies { implementation "org.springframework.boot:spring-boot-starter-logging" implementation "org.springframework.boot:spring-boot-autoconfigure" - implementation "org.apache.grails:grails-core", { - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated - } + 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-url-mappings" @@ -19,12 +17,12 @@ dependencies { implementation "org.apache.grails:grails-databinding" implementation "org.apache.grails.web:grails-web-boot" implementation "org.apache.grails:grails-logging" - implementation "org.grails.plugins:cache" + implementation "org.apache.grails:grails-cache" implementation "org.apache.grails:grails-async" implementation "org.apache.grails:grails-data-hibernate5" implementation "org.hibernate:hibernate-core:$hibernateCoreVersion" implementation "org.apache.grails:grails-data-mongodb" - implementation "org.grails.plugins:views-json" + implementation "org.apache.grails:grails-views-gson" implementation 'io.micronaut.rxjava2:micronaut-rxjava2-http-client:1.2.0' implementation "org.apache.grails:grails-data-mongodb-gson-templates" implementation "com.graphql-java:graphql-java:$graphqlJavaVersion" @@ -37,7 +35,7 @@ dependencies { implementation "org.apache.tomcat:tomcat-jdbc" compileOnly "org.apache.grails:grails-testing-support-datamapping" compileOnly "org.apache.grails:grails-geb" - compileOnly "org.grails:grails-web-testing-support" + compileOnly "org.apache.grails:grails-testing-support-web" testRuntimeOnly "org.seleniumhq.selenium:selenium-htmlunit-driver:2.47.1" testRuntimeOnly "net.sourceforge.htmlunit:htmlunit:2.18" testImplementation "org.grails:grails-test-mixins:3.3.0" diff --git a/grails-data-graphql/examples/grails-tenant-app/build.gradle b/grails-data-graphql/examples/grails-tenant-app/build.gradle index bc86b9b3b4b..d5b3d684508 100644 --- a/grails-data-graphql/examples/grails-tenant-app/build.gradle +++ b/grails-data-graphql/examples/grails-tenant-app/build.gradle @@ -1,9 +1,7 @@ dependencies { implementation "org.springframework.boot:spring-boot-starter-logging" implementation "org.springframework.boot:spring-boot-autoconfigure" - implementation "org.apache.grails:grails-core", { - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated - } + 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-url-mappings" @@ -15,12 +13,12 @@ dependencies { implementation "org.apache.grails:grails-databinding" implementation "org.apache.grails.web:grails-web-boot" implementation "org.apache.grails:grails-logging" - implementation "org.grails.plugins:cache" + implementation "org.apache.grails:grails-cache" implementation "org.apache.grails:grails-async" implementation "org.apache.grails:grails-events" implementation "org.apache.grails:grails-data-hibernate5" implementation "org.hibernate:hibernate-core:$hibernateCoreVersion" - implementation "org.grails.plugins:views-json" + implementation "org.apache.grails:grails-views-gson" implementation "org.apache.grails:grails-data-mongodb-gson-templates" implementation 'io.micronaut.rxjava2:micronaut-rxjava2-http-client:1.2.0' console "org.apache.grails:grails-console" @@ -30,7 +28,7 @@ dependencies { runtimeOnly "org.apache.tomcat:tomcat-jdbc" testImplementation project(':grails-testing-support-datamapping') testImplementation "org.apache.grails:grails-geb" - testImplementation "org.grails:grails-web-testing-support" + testImplementation "org.apache.grails:grails-testing-support-web" testRuntimeOnly "org.seleniumhq.selenium:selenium-htmlunit-driver:2.47.1" testRuntimeOnly "net.sourceforge.htmlunit:htmlunit:2.18" testImplementation "org.grails:grails-test-mixins:3.3.0" diff --git a/grails-data-graphql/examples/grails-test-app/build.gradle b/grails-data-graphql/examples/grails-test-app/build.gradle index 886158dd65e..f2cbefdf72e 100644 --- a/grails-data-graphql/examples/grails-test-app/build.gradle +++ b/grails-data-graphql/examples/grails-test-app/build.gradle @@ -1,9 +1,7 @@ dependencies { implementation "org.springframework.boot:spring-boot-starter-logging" implementation "org.springframework.boot:spring-boot-autoconfigure" - implementation "org.apache.grails:grails-core", { - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated - } + 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-url-mappings" @@ -15,12 +13,12 @@ dependencies { implementation "org.apache.grails:grails-databinding" implementation "org.apache.grails.web:grails-web-boot" implementation "org.apache.grails:grails-logging" - implementation "org.grails.plugins:cache" + implementation "org.apache.grails:grails-cache" implementation "org.apache.grails:grails-async" implementation "org.apache.grails:grails-events" implementation "org.apache.grails:grails-data-hibernate5" implementation "org.hibernate:hibernate-core:$hibernateCoreVersion" - implementation "org.grails.plugins:views-json" + implementation "org.apache.grails:grails-views-gson" implementation "org.apache.grails:grails-data-mongodb-gson-templates" implementation "com.graphql-java:graphql-java:$graphqlJavaVersion" implementation 'io.micronaut.rxjava2:micronaut-rxjava2-http-client:1.2.0' @@ -30,7 +28,7 @@ dependencies { runtimeOnly "com.h2database:h2" runtimeOnly "org.apache.tomcat:tomcat-jdbc" testImplementation project(':grails-testing-support-datamapping') - testImplementation "org.grails:grails-web-testing-support" + testImplementation "org.apache.grails:grails-testing-support-web" testImplementation "org.grails:grails-test-mixins:3.3.0" implementation project(":grails-plugin-gorm-graphql-plugin") diff --git a/grails-data-graphql/examples/spring-boot-app/build.gradle b/grails-data-graphql/examples/spring-boot-app/build.gradle index 5e83d9fb43b..c88c785594d 100644 --- a/grails-data-graphql/examples/spring-boot-app/build.gradle +++ b/grails-data-graphql/examples/spring-boot-app/build.gradle @@ -24,9 +24,7 @@ dependencies { // exclude javax variant of hibernate-core exclude group: 'org.hibernate', module: 'hibernate-core' } - implementation "org.apache.grails:grails-core", { - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated - } + implementation "org.apache.grails:grails-core" implementation project(":gorm-graphql") //implementation 'org.codehaus.groovy:groovy-astbuilder:3.0.19' implementation 'jakarta.transaction:jakarta.transaction-api' diff --git a/grails-data-graphql/plugin/build.gradle b/grails-data-graphql/plugin/build.gradle index 1d4252250ff..e9a8ab7dcd9 100644 --- a/grails-data-graphql/plugin/build.gradle +++ b/grails-data-graphql/plugin/build.gradle @@ -11,14 +11,14 @@ dependencies { exclude group: 'org.grails.plugins', module: 'converters' } api "org.apache.grails:grails-url-mappings" - api "org.grails.plugins:views-json:$viewsJsonVersion" + api "org.apache.grails:grails-views-gson" api 'io.micronaut.rxjava2:micronaut-rxjava2-http-client:1.3.0' api "javax.servlet:javax.servlet-api:$servletApiVersion" api "io.micronaut:micronaut-http-client:$micronautVersion" api "org.apache.grails:grails-converters:3.3.1" api 'com.github.javaparser:javaparser-core:3.25.7' api "com.graphql-java:graphql-java:$graphqlJavaVersion" - testImplementation "org.grails:grails-web-testing-support" + testImplementation "org.apache.grails:grails-testing-support-web" testImplementation "cglib:cglib-nodep:3.3.0" profile "org.grails.profiles:web-plugin" diff --git a/grails-data-hibernate5/database-migration/build.gradle b/grails-data-hibernate5/database-migration/build.gradle index a5cba94d094..b19506f8b4f 100644 --- a/grails-data-hibernate5/database-migration/build.gradle +++ b/grails-data-hibernate5/database-migration/build.gradle @@ -37,26 +37,15 @@ dependencies { compileOnly "org.springframework.boot:spring-boot-starter-logging" compileOnly "org.springframework.boot:spring-boot-autoconfigure" compileOnly project(":hibernate5-grails-plugin") - compileOnly "org.apache.grails:grails-core", { - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated - } + compileOnly "org.apache.grails:grails-core" compileOnly "org.apache.groovy:groovy-sql" compileOnly "org.apache.groovy:groovy-xml" testImplementation "org.springframework.boot:spring-boot-starter-tomcat" testImplementation project(":hibernate5-grails-plugin") - testImplementation "org.apache.grails:grails-core", { - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated - } + testImplementation "org.apache.grails:grails-core" testImplementation project(":grails-testing-support-datamapping") - testImplementation "org.grails:grails-web-testing-support", { - exclude group: 'org.grails', module: 'grails-testing-support' // TODO: Remove after views are published - exclude group: 'org.grails', module: 'grails-plugin-interceptors' // TODO: remove after views published - exclude group: 'org.grails', module: 'grails-plugin-rest' // TODO: remove when views published - } - testImplementation 'org.apache.grails:grails-rest-transforms' // TODO: Remove when views published - testImplementation 'org.apache.grails:grails-interceptors' // TODO: Remove when views published - testImplementation 'org.apache.grails.testing:grails-testing-support-core' // TODO: Remove after views are published + testImplementation "org.apache.grails:grails-testing-support-web" testImplementation "com.h2database:h2" } diff --git a/grails-data-hibernate5/docs/build.gradle b/grails-data-hibernate5/docs/build.gradle index 2c1de5b5019..a7298e42d07 100644 --- a/grails-data-hibernate5/docs/build.gradle +++ b/grails-data-hibernate5/docs/build.gradle @@ -27,9 +27,7 @@ dependencies { documentation 'org.apache.groovy:groovy-dateutil' documentation 'org.fusesource.jansi:jansi' documentation 'org.apache.grails.bootstrap:grails-bootstrap' - documentation 'org.apache.grails:grails-core', { - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated - } + documentation 'org.apache.grails:grails-core' documentation 'org.apache.grails:grails-spring' documentation "org.hibernate:hibernate-core-jakarta:$hibernateVersion" coreProjects.each { diff --git a/grails-data-hibernate5/examples/grails-data-service/build.gradle b/grails-data-hibernate5/examples/grails-data-service/build.gradle index a3c5284aa0b..e24c4007334 100644 --- a/grails-data-hibernate5/examples/grails-data-service/build.gradle +++ b/grails-data-hibernate5/examples/grails-data-service/build.gradle @@ -10,33 +10,8 @@ dependencies { implementation platform("org.apache.grails:grails-bom:$grailsVersion") implementation project(':hibernate5-grails-plugin') - implementation 'org.apache.grails:grails-core', { - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated - } - implementation 'org.grails.plugins:views-json', { - exclude group: 'org.grails', module: 'grails-plugin-rest' // TODO: remove when views published - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-plugin-mimetypes' // TODO: remove when views published - exclude group: 'org.grails', module: 'grails-web-url-mappings' // TODO: remove when views published - } - implementation 'org.apache.grails:grails-mimetypes', { // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm-support' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // TODO: Remove when views published - } - implementation 'org.apache.grails.web:grails-web-url-mappings', { // TODO: Remove views published - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm-support' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // TODO: Remove when views published - } - implementation 'org.apache.grails:grails-rest-transforms', { // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm-support' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // TODO: Remove when views published - } + implementation 'org.apache.grails:grails-core' + implementation 'org.apache.grails:grails-views-gson' compileOnly 'org.slf4j:slf4j-nop' // Remove warning during Gson views compilation diff --git a/grails-data-hibernate5/examples/grails-database-per-tenant/build.gradle b/grails-data-hibernate5/examples/grails-database-per-tenant/build.gradle index c5f76dc02df..90a36a8d51b 100644 --- a/grails-data-hibernate5/examples/grails-database-per-tenant/build.gradle +++ b/grails-data-hibernate5/examples/grails-database-per-tenant/build.gradle @@ -11,16 +11,9 @@ dependencies { implementation platform("org.apache.grails:grails-bom:$grailsVersion") implementation project(':hibernate5-grails-plugin') - implementation 'org.apache.grails:grails-core', { - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated - } - implementation 'org.apache.grails:grails-rest-transforms', { - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm-support' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // TODO: Remove when views published - } - implementation 'org.grails.plugins:gsp' + implementation 'org.apache.grails:grails-core' + implementation 'org.apache.grails:grails-rest-transforms' + implementation 'org.apache.grails:grails-gsp' runtimeOnly 'com.bertramlabs.plugins:asset-pipeline-grails' runtimeOnly 'com.h2database:h2' @@ -29,7 +22,7 @@ dependencies { runtimeOnly 'org.apache.grails:grails-i18n' runtimeOnly 'org.apache.grails:grails-services' runtimeOnly 'org.apache.grails:grails-url-mappings' - runtimeOnly 'org.grails.plugins:fields' + runtimeOnly 'org.apache.grails:grails-fields' 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-data-hibernate5/examples/grails-hibernate-groovy-proxy/build.gradle b/grails-data-hibernate5/examples/grails-hibernate-groovy-proxy/build.gradle index bf735c1a1f6..003f8bd97fe 100644 --- a/grails-data-hibernate5/examples/grails-hibernate-groovy-proxy/build.gradle +++ b/grails-data-hibernate5/examples/grails-hibernate-groovy-proxy/build.gradle @@ -9,9 +9,7 @@ dependencies { implementation platform("org.apache.grails:grails-bom:$grailsVersion") implementation project(':hibernate5-grails-plugin') - implementation 'org.apache.grails:grails-core', { - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated - } + implementation 'org.apache.grails:grails-core' implementation "org.yakworks:hibernate-groovy-proxy:$yakworksHibernateGroovyProxyVersion", { exclude group: 'org.codehaus.groovy', module: 'groovy' } diff --git a/grails-data-hibernate5/examples/grails-hibernate/build.gradle b/grails-data-hibernate5/examples/grails-hibernate/build.gradle index 29571405989..cfb9cfc21fb 100644 --- a/grails-data-hibernate5/examples/grails-hibernate/build.gradle +++ b/grails-data-hibernate5/examples/grails-hibernate/build.gradle @@ -14,16 +14,9 @@ dependencies { implementation project(':hibernate5-grails-plugin') implementation 'jakarta.persistence:jakarta.persistence-api' implementation 'jakarta.validation:jakarta.validation-api' - implementation 'org.apache.grails:grails-core', { - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated - } - implementation 'org.apache.grails:grails-rest-transforms', { - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm-support' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // TODO: Remove when views published - } - implementation 'org.grails.plugins:gsp' + implementation 'org.apache.grails:grails-core' + implementation 'org.apache.grails:grails-rest-transforms' + implementation 'org.apache.grails:grails-gsp' runtimeOnly 'com.bertramlabs.plugins:asset-pipeline-grails' runtimeOnly 'com.h2database:h2' @@ -32,7 +25,7 @@ dependencies { runtimeOnly 'org.apache.grails:grails-i18n' runtimeOnly 'org.apache.grails:grails-services' runtimeOnly 'org.apache.grails:grails-url-mappings' - runtimeOnly 'org.grails.plugins:fields' + runtimeOnly 'org.apache.grails:grails-fields' runtimeOnly "org.hibernate:hibernate-ehcache:$hibernateVersion", { // exclude javax variant of hibernate-core 5.6 exclude group: 'org.hibernate', module: 'hibernate-core' @@ -45,10 +38,7 @@ dependencies { runtimeOnly 'org.springframework.boot:spring-boot-starter-tomcat' testImplementation 'org.apache.grails.testing:grails-testing-support-core' - testImplementation "org.grails:grails-web-testing-support", { - exclude group: 'org.grails', module: 'grails-testing-support' // TODO: Remove after views are published - } - testImplementation 'org.apache.grails.testing:grails-testing-support-core' // TODO: Remove after views are published + testImplementation "org.apache.grails:grails-testing-support-web" integrationTestImplementation testFixtures('org.apache.grails:grails-geb') } diff --git a/grails-data-hibernate5/examples/grails-multiple-datasources/build.gradle b/grails-data-hibernate5/examples/grails-multiple-datasources/build.gradle index 1a4ad05b0c6..a44b76d0ded 100644 --- a/grails-data-hibernate5/examples/grails-multiple-datasources/build.gradle +++ b/grails-data-hibernate5/examples/grails-multiple-datasources/build.gradle @@ -17,9 +17,7 @@ dependencies { astTransformation 'org.apache.grails:grails-controllers' implementation project(':hibernate5-grails-plugin') - implementation 'org.apache.grails:grails-core', { - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated - } + implementation 'org.apache.grails:grails-core' implementation 'org.apache.grails:grails-domain-class' runtimeOnly 'com.h2database:h2' @@ -32,10 +30,7 @@ dependencies { testImplementation 'org.apache.grails.testing:grails-testing-support-core' - testRuntimeOnly "org.grails:grails-web-testing-support", { - exclude group: 'org.grails', module: 'grails-testing-support' // TODO: Remove after views are published - } - testRuntimeOnly 'org.apache.grails.testing:grails-testing-support-core' // TODO: Remove after views are published + testRuntimeOnly "org.apache.grails:grails-testing-support-web" } sourceSets { diff --git a/grails-data-hibernate5/examples/grails-partitioned-multi-tenancy/build.gradle b/grails-data-hibernate5/examples/grails-partitioned-multi-tenancy/build.gradle index a0ecc0e9081..cec73b40c3c 100644 --- a/grails-data-hibernate5/examples/grails-partitioned-multi-tenancy/build.gradle +++ b/grails-data-hibernate5/examples/grails-partitioned-multi-tenancy/build.gradle @@ -11,16 +11,9 @@ dependencies { implementation platform("org.apache.grails:grails-bom:$grailsVersion") implementation project(':hibernate5-grails-plugin') - implementation 'org.apache.grails:grails-core', { - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated - } - implementation 'org.apache.grails:grails-rest-transforms', { - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm-support' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // TODO: Remove when views published - } - implementation 'org.grails.plugins:gsp' + implementation 'org.apache.grails:grails-core' + implementation 'org.apache.grails:grails-rest-transforms' + implementation 'org.apache.grails:grails-gsp' runtimeOnly 'com.bertramlabs.plugins:asset-pipeline-grails' runtimeOnly 'com.h2database:h2' @@ -29,7 +22,7 @@ dependencies { runtimeOnly 'org.apache.grails:grails-i18n' runtimeOnly 'org.apache.grails:grails-services' runtimeOnly 'org.apache.grails:grails-url-mappings' - runtimeOnly 'org.grails.plugins:fields' + runtimeOnly 'org.apache.grails:grails-fields' 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-data-hibernate5/examples/grails-schema-per-tenant/build.gradle b/grails-data-hibernate5/examples/grails-schema-per-tenant/build.gradle index a0ecc0e9081..cec73b40c3c 100644 --- a/grails-data-hibernate5/examples/grails-schema-per-tenant/build.gradle +++ b/grails-data-hibernate5/examples/grails-schema-per-tenant/build.gradle @@ -11,16 +11,9 @@ dependencies { implementation platform("org.apache.grails:grails-bom:$grailsVersion") implementation project(':hibernate5-grails-plugin') - implementation 'org.apache.grails:grails-core', { - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated - } - implementation 'org.apache.grails:grails-rest-transforms', { - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm-support' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // TODO: Remove when views published - } - implementation 'org.grails.plugins:gsp' + implementation 'org.apache.grails:grails-core' + implementation 'org.apache.grails:grails-rest-transforms' + implementation 'org.apache.grails:grails-gsp' runtimeOnly 'com.bertramlabs.plugins:asset-pipeline-grails' runtimeOnly 'com.h2database:h2' @@ -29,7 +22,7 @@ dependencies { runtimeOnly 'org.apache.grails:grails-i18n' runtimeOnly 'org.apache.grails:grails-services' runtimeOnly 'org.apache.grails:grails-url-mappings' - runtimeOnly 'org.grails.plugins:fields' + runtimeOnly 'org.apache.grails:grails-fields' 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-data-hibernate5/examples/issue450/build.gradle b/grails-data-hibernate5/examples/issue450/build.gradle index 5fbb9be075c..ffedc5716f1 100644 --- a/grails-data-hibernate5/examples/issue450/build.gradle +++ b/grails-data-hibernate5/examples/issue450/build.gradle @@ -11,16 +11,9 @@ dependencies { implementation platform("org.apache.grails:grails-bom:$grailsVersion") implementation project(':hibernate5-grails-plugin') - implementation 'org.apache.grails:grails-core', { - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated - } - implementation 'org.apache.grails:grails-rest-transforms', { - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm-support' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // TODO: Remove when views published - } - implementation 'org.grails.plugins:gsp' + implementation 'org.apache.grails:grails-core' + implementation 'org.apache.grails:grails-rest-transforms' + implementation 'org.apache.grails:grails-gsp' runtimeOnly 'com.bertramlabs.plugins:asset-pipeline-grails' runtimeOnly 'com.h2database:h2' @@ -29,7 +22,7 @@ dependencies { runtimeOnly 'org.apache.grails:grails-i18n' runtimeOnly 'org.apache.grails:grails-services' runtimeOnly 'org.apache.grails:grails-url-mappings' - runtimeOnly 'org.grails.plugins:fields' + runtimeOnly 'org.apache.grails:grails-fields' 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-data-hibernate5/grails-plugin/build.gradle b/grails-data-hibernate5/grails-plugin/build.gradle index 3ab7ca4f8aa..eb5b9884f1c 100644 --- a/grails-data-hibernate5/grails-plugin/build.gradle +++ b/grails-data-hibernate5/grails-plugin/build.gradle @@ -38,9 +38,7 @@ dependencies { } compileOnly "org.apache.grails.bootstrap:grails-bootstrap" - compileOnly "org.apache.grails:grails-core", { - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated - } + compileOnly "org.apache.grails:grails-core" compileOnly "org.spockframework:spock-core", { exclude group: "junit", module: "junit-dep" diff --git a/grails-data-mongodb/examples/base/build.gradle b/grails-data-mongodb/examples/base/build.gradle index 2b7b9c209a1..fac73f123c9 100644 --- a/grails-data-mongodb/examples/base/build.gradle +++ b/grails-data-mongodb/examples/base/build.gradle @@ -10,23 +10,16 @@ dependencies { integrationTestImplementation platform("org.apache.grails:grails-bom:$grailsVersion") implementation project(':mongodb-grails-plugin') - implementation 'org.apache.grails:grails-core', { - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated - } - implementation 'org.apache.grails:grails-rest-transforms', { - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm-support' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // TODO: Remove when views published - } + implementation 'org.apache.grails:grails-core' + implementation 'org.apache.grails:grails-rest-transforms' implementation 'org.apache.grails.web:grails-web-boot' - implementation 'org.grails.plugins:gsp' + implementation 'org.apache.grails:grails-gsp' runtimeOnly 'com.bertramlabs.plugins:asset-pipeline-grails' runtimeOnly 'org.fusesource.jansi:jansi' runtimeOnly 'org.apache.grails:grails-i18n' runtimeOnly 'org.apache.grails:grails-url-mappings' - runtimeOnly 'org.grails.plugins:scaffolding' + runtimeOnly 'org.apache.grails:grails-scaffolding' 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-data-mongodb/examples/database-per-tenant/build.gradle b/grails-data-mongodb/examples/database-per-tenant/build.gradle index 769f7df8dc6..1053a7272ea 100644 --- a/grails-data-mongodb/examples/database-per-tenant/build.gradle +++ b/grails-data-mongodb/examples/database-per-tenant/build.gradle @@ -9,17 +9,10 @@ dependencies { implementation platform("org.apache.grails:grails-bom:$grailsVersion") implementation project(':mongodb-grails-plugin') - implementation 'org.apache.grails:grails-core', { - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated - } - implementation 'org.apache.grails:grails-rest-transforms', { - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm-support' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // TODO: Remove when views published - } + implementation 'org.apache.grails:grails-core' + implementation 'org.apache.grails:grails-rest-transforms' implementation 'org.apache.grails.web:grails-web-boot' - implementation 'org.grails.plugins:gsp' + implementation 'org.apache.grails:grails-gsp' runtimeOnly 'com.bertramlabs.plugins:asset-pipeline-grails' runtimeOnly 'org.fusesource.jansi:jansi' diff --git a/grails-data-mongodb/examples/gson-templates/build.gradle b/grails-data-mongodb/examples/gson-templates/build.gradle index cc1e1bd186b..49238432e15 100644 --- a/grails-data-mongodb/examples/gson-templates/build.gradle +++ b/grails-data-mongodb/examples/gson-templates/build.gradle @@ -7,37 +7,15 @@ apply plugin: 'org.apache.grails.gradle.grails-web' dependencies { implementation platform("org.apache.grails:grails-bom:$grailsVersion") - implementation 'org.apache.grails:grails-core', { - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated - } + implementation 'org.apache.grails:grails-core' implementation 'org.apache.grails.web:grails-web-boot' - implementation 'org.grails.plugins:views-json', { - exclude group: 'org.grails', module: 'grails-plugin-rest' // TODO: remove when views published - exclude group: 'org.grails', module: 'grails-plugin-mimetypes' // TODO: remove when views published - exclude group: 'org.grails', module: 'grails-web-url-mappings' // TODO: remove when views published - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published - } - implementation 'org.apache.grails:grails-mimetypes', { // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm-support' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // TODO: Remove when views published - } - implementation 'org.apache.grails.web:grails-web-url-mappings', { // TODO: Remove views published - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm-support' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // TODO: Remove when views published - } - implementation 'org.grails.plugins:views-markup' - implementation 'org.grails.plugins:gsp' + implementation 'org.apache.grails:grails-views-gson' + implementation 'org.apache.grails:grails-mimetypes' + implementation 'org.apache.grails.web:grails-web-url-mappings' + implementation 'org.apache.grails:grails-views-markup' + implementation 'org.apache.grails:grails-gsp' implementation 'org.apache.grails:grails-databinding' - implementation 'org.apache.grails:grails-rest-transforms', { - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm-support' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // TODO: Remove when views published - } + implementation 'org.apache.grails:grails-rest-transforms' implementation 'org.apache.grails:grails-url-mappings' implementation project(':mongodb-core') diff --git a/grails-data-mongodb/examples/hibernate5/build.gradle b/grails-data-mongodb/examples/hibernate5/build.gradle index 57201152369..0c0b74388db 100644 --- a/grails-data-mongodb/examples/hibernate5/build.gradle +++ b/grails-data-mongodb/examples/hibernate5/build.gradle @@ -10,24 +10,17 @@ dependencies { integrationTestImplementation platform("org.apache.grails:grails-bom:$grailsVersion") implementation project(':mongodb-grails-plugin') - implementation 'org.apache.grails:grails-core', { - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated - } - implementation 'org.apache.grails:grails-rest-transforms', { - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm-support' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // TODO: Remove when views published - } + implementation 'org.apache.grails:grails-core' + implementation 'org.apache.grails:grails-rest-transforms' implementation 'org.apache.grails.web:grails-web-boot' - implementation 'org.grails.plugins:gsp' + implementation 'org.apache.grails:grails-gsp' implementation project(':hibernate5-grails-plugin') runtimeOnly 'com.bertramlabs.plugins:asset-pipeline-grails' runtimeOnly 'com.h2database:h2' runtimeOnly 'com.zaxxer:HikariCP' runtimeOnly 'org.fusesource.jansi:jansi' - runtimeOnly 'org.grails.plugins:scaffolding' + runtimeOnly 'org.apache.grails:grails-scaffolding' runtimeOnly 'org.apache.grails:grails-i18n' runtimeOnly 'org.apache.grails:grails-url-mappings' runtimeOnly "org.hibernate:hibernate-ehcache:$hibernateVersion", { diff --git a/grails-data-mongodb/examples/test-data-service/build.gradle b/grails-data-mongodb/examples/test-data-service/build.gradle index f731d03dbc7..22a7c8a999a 100644 --- a/grails-data-mongodb/examples/test-data-service/build.gradle +++ b/grails-data-mongodb/examples/test-data-service/build.gradle @@ -10,59 +10,14 @@ dependencies { implementation project(':mongodb-grails-plugin') - implementation 'org.apache.grails:grails-core', { - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated - } - implementation 'org.apache.grails:grails-rest-transforms', { - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm-support' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // TODO: Remove when views published - } + implementation 'org.apache.grails:grails-core' + implementation 'org.apache.grails:grails-rest-transforms' implementation 'org.apache.grails:grails-services' implementation 'org.apache.grails.web:grails-web-boot' - implementation "org.grails.plugins:spring-security-core:$grailsSpringSecurityVersion", { - exclude group: 'org.grails.plugins', module: 'async' // TODO: remove when spring security is updated - exclude group: 'org.grails', module: 'grails-web-common' // TODO: remove when spring security is updated - exclude group: 'org.grails', module: 'grails-web-url-mappings' // TODO: remove when spring security is updated - exclude group: 'org.grails', module: 'grails-events-transform' // TODO: remove when spring security is updated - exclude group: 'org.grails', module: 'grails-plugin-mimetypes' // TODO: remove when spring security is updated - } - implementation 'org.apache.grails.events:grails-events-transforms' // TODO: Remove when spring security is updated - implementation 'org.apache.grails:grails-async' // TODO: Remove when spring security is updated - implementation 'org.apache.grails.web:grails-web-common' // TODO: Remove when spring security is updated - implementation 'org.apache.grails:grails-mimetypes', { // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm-support' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // TODO: Remove when views published - } - implementation 'org.apache.grails.web:grails-web-url-mappings', { // TODO: Remove spring security is published published - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when gorm published - exclude group: 'org.grails', module: 'grails-datastore-gorm' // TODO: Remove when gorm published - exclude group: 'org.grails', module: 'grails-datastore-gorm-support' // TODO: Remove when gorm published - exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // TODO: Remove when gorm published - } - - implementation "org.grails.plugins:spring-security-rest:$grailsSpringSecurityVersion", { - exclude group: 'org.grails.plugins', module: 'async' // TODO: remove when spring security is updated - exclude group: 'org.grails', module: 'grails-web-common' // TODO: remove when spring security is updated - exclude group: 'org.grails', module: 'grails-web-url-mappings' // TODO: remove when spring security is updated - exclude group: 'org.grails', module: 'grails-events-transform' // TODO: remove when spring security is updated - exclude group: 'org.grails', module: 'grails-plugin-mimetypes' // TODO: remove when spring security is updated - } - implementation 'org.grails.plugins:views-json', { - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-plugin-rest' // TODO: remove when views published - exclude group: 'org.grails', module: 'grails-plugin-mimetypes' // TODO: remove when views published - exclude group: 'org.grails', module: 'grails-web-url-mappings' // TODO: remove when views published - } - implementation 'org.apache.grails:grails-rest-transforms', { // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm-support' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // TODO: Remove when views published - } + implementation "org.apache.grails:grails-spring-security:$grailsSpringSecurityVersion" + implementation "org.apache.grails:grails-spring-security-rest:$grailsSpringSecurityVersion" + implementation 'org.apache.grails:grails-views-gson' + implementation 'org.apache.grails:grails-rest-transforms' runtimeOnly 'org.apache.grails:grails-i18n' runtimeOnly 'org.apache.grails:grails-url-mappings' diff --git a/grails-data-mongodb/gson-templates/build.gradle b/grails-data-mongodb/gson-templates/build.gradle index cdb8967b6b8..35848ce7859 100644 --- a/grails-data-mongodb/gson-templates/build.gradle +++ b/grails-data-mongodb/gson-templates/build.gradle @@ -17,33 +17,7 @@ dependencies { implementation(platform("org.apache.grails:grails-bom:$grailsVersion")) - api 'org.grails.plugins:views-json', { - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-plugin-mimetypes' // TODO: Remove when views is published - exclude group: 'org.grails', module: 'grails-web-url-mappings' // TODO: Remove when views is published - exclude group: 'org.grails', module: 'grails-plugin-rest' // TODO: Remove when views is published - } - - // TODO: BEGIN remove when views is published - api 'org.apache.grails:grails-mimetypes', { - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm-support' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // TODO: Remove when views published - } - api 'org.apache.grails.web:grails-web-url-mappings', { - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm-support' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // TODO: Remove when views published - } - api 'org.apache.grails:grails-rest-transforms', { // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm-support' // TODO: Remove when views published - exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' // TODO: Remove when views published - } - // TODO: END remove when views is published + api 'org.apache.grails:grails-views-gson' implementation project(':mongodb-core') implementation project(':mongodb-bson') diff --git a/grails-data-neo4j/examples/grails3-neo4j-hibernate/build.gradle b/grails-data-neo4j/examples/grails3-neo4j-hibernate/build.gradle index a3811160649..6c87263e21d 100644 --- a/grails-data-neo4j/examples/grails3-neo4j-hibernate/build.gradle +++ b/grails-data-neo4j/examples/grails3-neo4j-hibernate/build.gradle @@ -9,9 +9,7 @@ dependencies { 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", { - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated - } + implementation "org.apache.grails:grails-core:$grailsVersion" implementation "org.apache.grails:grails-dependencies:$grailsVersion" implementation "org.apache.grails.web:grails-web-boot:$grailsVersion" @@ -20,12 +18,12 @@ dependencies { implementation "org.hibernate:hibernate-ehcache:$hibernateEhcacheVersion" runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion" - runtimeOnly "org.grails.plugins:scaffolding:$scaffoldingVersion" - runtimeOnly "org.grails.plugins:fields:$fieldsVersion" + runtimeOnly "org.apache.grails:grails-scaffolding:$scaffoldingVersion" + runtimeOnly "org.apache.grails:grails-fields:$fieldsVersion" runtimeOnly "org.apache.tomcat:tomcat-jdbc:9.0.36" testImplementation project(':grails-testing-support-datamapping') - testImplementation ("org.grails:grails-web-testing-support:$testingSupportVersion") { + testImplementation ("org.apache.grails:grails-testing-support-web:$testingSupportVersion") { exclude group: "org.spockframework", module: "spock-core" } diff --git a/grails-data-neo4j/examples/grails3-neo4j/build.gradle b/grails-data-neo4j/examples/grails3-neo4j/build.gradle index 2fb3f2afa73..3fac4b0ddab 100644 --- a/grails-data-neo4j/examples/grails3-neo4j/build.gradle +++ b/grails-data-neo4j/examples/grails3-neo4j/build.gradle @@ -9,23 +9,21 @@ dependencies { 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", { - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated - } + implementation "org.apache.grails:grails-core:$grailsVersion" implementation "org.apache.grails:grails-dependencies:$grailsVersion" implementation "org.apache.grails.web:grails-web-boot:$grailsVersion" implementation project(":grails-plugin") runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion" - runtimeOnly "org.grails.plugins:scaffolding:$scaffoldingVersion" - runtimeOnly "org.grails.plugins:fields:$fieldsVersion" + runtimeOnly "org.apache.grails:grails-scaffolding:$scaffoldingVersion" + runtimeOnly "org.apache.grails:grails-fields:$fieldsVersion" testImplementation ("org.apache.grails.testing:grails-testing-support-core:$testingSupportVersion") { exclude group: "org.spockframework", module: "spock-core" } testImplementation project(':grails-testing-support-datamapping') - testImplementation ("org.grails:grails-web-testing-support:$testingSupportVersion") { + testImplementation ("org.apache.grails:grails-testing-support-web:$testingSupportVersion") { exclude group: "org.spockframework", module: "spock-core" } diff --git a/grails-data-neo4j/examples/test-data-service/build.gradle b/grails-data-neo4j/examples/test-data-service/build.gradle index 50d5eaf6a64..72bff8ee89b 100644 --- a/grails-data-neo4j/examples/test-data-service/build.gradle +++ b/grails-data-neo4j/examples/test-data-service/build.gradle @@ -3,9 +3,7 @@ group "examples" dependencies { implementation "org.springframework.boot:spring-boot-starter-logging" implementation "org.springframework.boot:spring-boot-autoconfigure" - implementation "org.apache.grails:grails-core", { - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated - } + 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") { @@ -16,14 +14,14 @@ dependencies { implementation "org.apache.grails:grails-datasource" implementation "org.apache.grails.web:grails-web-boot" implementation "org.apache.grails:grails-logging" - implementation "org.grails.plugins:cache" + implementation "org.apache.grails:graills-cache" implementation "org.apache.grails:grails-events" implementation project(":grails-plugin") - implementation "org.grails.plugins:views-json" + implementation "org.apache.grails:grails-views-gson" implementation "org.apache.grails:grails-data-mongodb-gson-templates" - implementation 'org.grails.plugins:spring-security-rest:3.0.1' + implementation 'org.apache.grails:grails-spring-security-rest:3.0.1' profile "org.grails.profiles:rest-api" testImplementation project(':grails-testing-support-datamapping') - testImplementation "org.grails:grails-web-testing-support:$testingSupportVersion" + testImplementation "org.apache.grails:grails-testing-support-web:$testingSupportVersion" testRuntimeOnly "org.neo4j.test:neo4j-harness:$neo4jVersion" } diff --git a/grails-data-neo4j/grails-plugin/build.gradle b/grails-data-neo4j/grails-plugin/build.gradle index a8ec1cd99bb..f84730d65de 100644 --- a/grails-data-neo4j/grails-plugin/build.gradle +++ b/grails-data-neo4j/grails-plugin/build.gradle @@ -25,9 +25,7 @@ configurations.all { } dependencies { - compileOnly "org.apache.grails:grails-core", { - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated - } + compileOnly "org.apache.grails:grails-core" compileOnly "org.apache.grails.bootstrap:grails-bootstrap" compileOnly "org.spockframework:spock-core:$spockVersion", { exclude group: "junit", module: "junit-dep" @@ -58,9 +56,7 @@ dependencies { exclude group:'javax.transaction', module:'jta' } - testImplementation "org.apache.grails:grails-core", { - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated - } + testImplementation "org.apache.grails:grails-core" testImplementation "org.apache.grails.bootstrap:grails-bootstrap" testImplementation "org.neo4j.test:neo4j-harness:$neo4jVersion" diff --git a/grails-datamapping-core-test/build.gradle b/grails-datamapping-core-test/build.gradle index 214b117702e..b924d7a100d 100644 --- a/grails-datamapping-core-test/build.gradle +++ b/grails-datamapping-core-test/build.gradle @@ -86,7 +86,6 @@ dependencies { exclude group: 'org.springframework.boot', module: 'spring-boot' exclude group: 'org.springframework.boot', module: 'spring-boot-autoconfigure' } - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated } testImplementation 'org.spockframework:spock-core' diff --git a/grails-datamapping-core/build.gradle b/grails-datamapping-core/build.gradle index f808f3bca5a..7712e714e1d 100644 --- a/grails-datamapping-core/build.gradle +++ b/grails-datamapping-core/build.gradle @@ -74,7 +74,6 @@ dependencies { testImplementation 'org.apache.grails:grails-core', { // impl: ValidationException - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated } testImplementation 'org.junit.jupiter:junit-jupiter-api' testImplementation 'org.spockframework:spock-core' diff --git a/grails-datamapping-support/build.gradle b/grails-datamapping-support/build.gradle index 0dffb55d474..587f04dbc7f 100644 --- a/grails-datamapping-support/build.gradle +++ b/grails-datamapping-support/build.gradle @@ -55,7 +55,6 @@ dependencies { exclude group: 'org.springframework.boot', module: 'spring-boot' exclude group: 'org.springframework.boot', module: 'spring-boot-autoconfigure' } - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated } api 'org.springframework:spring-context', { // api: ConfigurableApplicationContext diff --git a/grails-datamapping-tck-domains/build.gradle b/grails-datamapping-tck-domains/build.gradle index fb27ab9c484..a48b04892ab 100644 --- a/grails-datamapping-tck-domains/build.gradle +++ b/grails-datamapping-tck-domains/build.gradle @@ -64,7 +64,6 @@ dependencies { exclude group: 'org.springframework.boot', module: 'spring-boot' exclude group: 'org.springframework.boot', module: 'spring-boot-autoconfigure' } - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated } compileOnlyApi project(':grails-datamapping-support'), { diff --git a/grails-testing-support-datamapping/build.gradle b/grails-testing-support-datamapping/build.gradle index 8e35e5af127..fb8e106b3ff 100755 --- a/grails-testing-support-datamapping/build.gradle +++ b/grails-testing-support-datamapping/build.gradle @@ -108,7 +108,6 @@ dependencies { exclude group: 'org.springframework.boot', module: 'spring-boot' exclude group: 'org.springframework.boot', module: 'spring-boot-autoconfigure' } - exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated } compileOnly 'org.apache.groovy:groovy', { diff --git a/settings.gradle b/settings.gradle index 1229d42d142..87dba6df6e6 100644 --- a/settings.gradle +++ b/settings.gradle @@ -89,35 +89,35 @@ include 'hibernate5-boot-plugin' findProject(':hibernate5-boot-plugin').projectDir = new File(settingsDir, 'grails-data-hibernate5/boot-plugin') // Hibernate5 examples -//include "hibernate5-examples-grails-hibernate" -//project(":hibernate5-examples-grails-hibernate").projectDir = new File(settingsDir, "grails-data-hibernate5/examples/grails-hibernate") -// -//include "hibernate5-examples-grails-multiple-datasources" -//project(":hibernate5-examples-grails-multiple-datasources").projectDir = new File(settingsDir, "grails-data-hibernate5/examples/grails-multiple-datasources") -// -//include "hibernate5-examples-grails-database-per-tenant" -//project(":hibernate5-examples-grails-database-per-tenant").projectDir = new File(settingsDir, "grails-data-hibernate5/examples/grails-database-per-tenant") -// -//include "hibernate5-examples-grails-schema-per-tenant" -//project(":hibernate5-examples-grails-schema-per-tenant").projectDir = new File(settingsDir, "grails-data-hibernate5/examples/grails-schema-per-tenant") -// -//include "hibernate5-examples-grails-partitioned-multi-tenancy" -//project(":hibernate5-examples-grails-partitioned-multi-tenancy").projectDir = new File(settingsDir, "grails-data-hibernate5/examples/grails-partitioned-multi-tenancy") -// -//include "hibernate5-examples-standalone-hibernate" -//project(":hibernate5-examples-standalone-hibernate").projectDir = new File(settingsDir, "grails-data-hibernate5/examples/standalone-hibernate") -// -//include "hibernate5-examples-spring-boot-hibernate" -//project(":hibernate5-examples-spring-boot-hibernate").projectDir = new File(settingsDir, "grails-data-hibernate5/examples/spring-boot-hibernate") -// -//include "hibernate5-examples-grails-data-service" -//project(":hibernate5-examples-grails-data-service").projectDir = new File(settingsDir, "grails-data-hibernate5/examples/grails-data-service") -// -//include "hibernate5-examples-grails-hibernate-groovy-proxy" -//project(":hibernate5-examples-grails-hibernate-groovy-proxy").projectDir = new File(settingsDir, "grails-data-hibernate5/examples/grails-hibernate-groovy-proxy") -// -//include 'hibernate5-examples-issue450' -//project(':hibernate5-examples-issue450').projectDir = new File(settingsDir, 'grails-data-hibernate5/examples/issue450') +include "hibernate5-examples-grails-hibernate" +project(":hibernate5-examples-grails-hibernate").projectDir = new File(settingsDir, "grails-data-hibernate5/examples/grails-hibernate") + +include "hibernate5-examples-grails-multiple-datasources" +project(":hibernate5-examples-grails-multiple-datasources").projectDir = new File(settingsDir, "grails-data-hibernate5/examples/grails-multiple-datasources") + +include "hibernate5-examples-grails-database-per-tenant" +project(":hibernate5-examples-grails-database-per-tenant").projectDir = new File(settingsDir, "grails-data-hibernate5/examples/grails-database-per-tenant") + +include "hibernate5-examples-grails-schema-per-tenant" +project(":hibernate5-examples-grails-schema-per-tenant").projectDir = new File(settingsDir, "grails-data-hibernate5/examples/grails-schema-per-tenant") + +include "hibernate5-examples-grails-partitioned-multi-tenancy" +project(":hibernate5-examples-grails-partitioned-multi-tenancy").projectDir = new File(settingsDir, "grails-data-hibernate5/examples/grails-partitioned-multi-tenancy") + +include "hibernate5-examples-standalone-hibernate" +project(":hibernate5-examples-standalone-hibernate").projectDir = new File(settingsDir, "grails-data-hibernate5/examples/standalone-hibernate") + +include "hibernate5-examples-spring-boot-hibernate" +project(":hibernate5-examples-spring-boot-hibernate").projectDir = new File(settingsDir, "grails-data-hibernate5/examples/spring-boot-hibernate") + +include "hibernate5-examples-grails-data-service" +project(":hibernate5-examples-grails-data-service").projectDir = new File(settingsDir, "grails-data-hibernate5/examples/grails-data-service") + +include "hibernate5-examples-grails-hibernate-groovy-proxy" +project(":hibernate5-examples-grails-hibernate-groovy-proxy").projectDir = new File(settingsDir, "grails-data-hibernate5/examples/grails-hibernate-groovy-proxy") + +include 'hibernate5-examples-issue450' +project(':hibernate5-examples-issue450').projectDir = new File(settingsDir, 'grails-data-hibernate5/examples/issue450') // core include "mongodb-bson" @@ -144,22 +144,21 @@ include 'mongodb-gson-templates' project(':mongodb-gson-templates').projectDir = new File(settingsDir, 'grails-data-mongodb/gson-templates') // mongodb examples -//include 'mongodb-examples-base' -//project(":mongodb-examples-base").projectDir = new File(settingsDir, "grails-data-mongodb/examples/base") -// -//include 'mongodb-examples-database-per-tenant' -//project(":mongodb-examples-database-per-tenant").projectDir = new File(settingsDir, "grails-data-mongodb/examples/database-per-tenant") -// -//include 'mongodb-examples-hibernate5' -//project(":mongodb-examples-hibernate5").projectDir = new File(settingsDir, "grails-data-mongodb/examples/hibernate5") -// -//include 'mongodb-examples-springboot' -//project(":mongodb-examples-springboot").projectDir = new File(settingsDir, "grails-data-mongodb/examples/springboot") -// -//include 'mongodb-examples-test-data-service' -//project(":mongodb-examples-test-data-service").projectDir = new File(settingsDir, "grails-data-mongodb/examples/test-data-service") - -//TODO: Circular dependency, can't run this until views are published -//include 'mongodb-examples-gson-templates' -//project(":mongodb-examples-gson-templates").projectDir = new File(settingsDir, "grails-data-mongodb/examples/gson-templates") +include 'mongodb-examples-base' +project(":mongodb-examples-base").projectDir = new File(settingsDir, "grails-data-mongodb/examples/base") + +include 'mongodb-examples-database-per-tenant' +project(":mongodb-examples-database-per-tenant").projectDir = new File(settingsDir, "grails-data-mongodb/examples/database-per-tenant") + +include 'mongodb-examples-hibernate5' +project(":mongodb-examples-hibernate5").projectDir = new File(settingsDir, "grails-data-mongodb/examples/hibernate5") + +include 'mongodb-examples-springboot' +project(":mongodb-examples-springboot").projectDir = new File(settingsDir, "grails-data-mongodb/examples/springboot") + +include 'mongodb-examples-test-data-service' +project(":mongodb-examples-test-data-service").projectDir = new File(settingsDir, "grails-data-mongodb/examples/test-data-service") + +include 'mongodb-examples-gson-templates' +project(":mongodb-examples-gson-templates").projectDir = new File(settingsDir, "grails-data-mongodb/examples/gson-templates")