Skip to content

Restore all functional tests and update for spring security coordinate change #2080

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Restore all functional tests and update for spring security coordinate change #2080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f9b17dd
Restore all functional tests and update for spring security coordinat…
jdaugherty Apr 5, 2025
7b90ed1
switch to https://ge.apache.org
jdaugherty Apr 5, 2025
4426f84
Merge remote-tracking branch 'upstream/9.0.x' into 9.0.x
jdaugherty Apr 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion grails-data-graphql/core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
10 changes: 4 additions & 6 deletions grails-data-graphql/examples/grails-docs-app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"
Expand All @@ -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")
}
Expand Down
10 changes: 4 additions & 6 deletions grails-data-graphql/examples/grails-multi-datastore-app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand Down
10 changes: 4 additions & 6 deletions grails-data-graphql/examples/grails-tenant-app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand Down
10 changes: 4 additions & 6 deletions grails-data-graphql/examples/grails-test-app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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'
Expand All @@ -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")
Expand Down
4 changes: 1 addition & 3 deletions grails-data-graphql/examples/spring-boot-app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions grails-data-graphql/plugin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
17 changes: 3 additions & 14 deletions grails-data-hibernate5/database-migration/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand Down
4 changes: 1 addition & 3 deletions grails-data-hibernate5/docs/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
29 changes: 2 additions & 27 deletions grails-data-hibernate5/examples/grails-data-service/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
15 changes: 4 additions & 11 deletions grails-data-hibernate5/examples/grails-database-per-tenant/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand Down
4 changes: 1 addition & 3 deletions grails-data-hibernate5/examples/grails-hibernate-groovy-proxy/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand Down
20 changes: 5 additions & 15 deletions grails-data-hibernate5/examples/grails-hibernate/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand All @@ -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')
}
Expand Down
Loading
Loading