-
Notifications
You must be signed in to change notification settings - Fork 32
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #774 from grails/more-grails-7-updates
Use grails-bom, ContainerGebSpec, cleanup dependencies and fix tests
- Loading branch information
Showing
24 changed files
with
206 additions
and
551 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -161,7 +161,4 @@ jobs: | |
| with: | ||
| arguments: | | ||
| build | ||
| -Dgeb.env=chromeHeadless | ||
| -x groovydoc | ||
| -x test | ||
| -x integrationTest | ||
| -x groovydoc | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,19 @@ | ||
| dependencies { | ||
| compileOnly "org.grails:grails-shell:$grailsShellVersion", { | ||
| implementation platform("org.grails:grails-bom:$grailsVersion") | ||
| compileOnly "org.grails:grails-shell", { | ||
| exclude group:'org.apache.groovy', module:'groovy' | ||
| } | ||
|
|
||
| api "org.springframework.boot:spring-boot-autoconfigure:$springBootVersion" | ||
| api "org.apache.groovy:groovy:$groovyVersion" | ||
| api "org.springframework.boot:spring-boot-autoconfigure" | ||
| api "org.apache.groovy:groovy" | ||
| api project(":grails-datastore-gorm-mongodb"), { | ||
| exclude group:'org.grails', module:'grails-datastore-gorm-plugin-support' | ||
| } | ||
| api project(":grails-datastore-gorm-mongodb-ext"), { | ||
| exclude group:'org.grails', module:'grails-datastore-gorm-mongodb' | ||
| } | ||
| api "org.springframework:spring-tx:$springVersion" | ||
| testImplementation "org.grails:grails-shell:$grailsShellVersion", { | ||
| api "org.springframework:spring-tx" | ||
| testImplementation "org.grails:grails-shell", { | ||
| exclude group:'org.apache.groovy', module:'groovy' | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,70 +1,42 @@ | ||
| plugins { | ||
| id "com.bertramlabs.asset-pipeline" version "5.0.4" | ||
| } | ||
|
|
||
| group "examples" | ||
|
|
||
| dependencies { | ||
| implementation "org.springframework.boot:spring-boot-starter-logging" | ||
|
|
||
| implementation project(":grails-plugin") | ||
| implementation "org.mongodb:mongodb-driver-sync" | ||
| testImplementation "org.testcontainers:mongodb:$testcontainersMongodbVersion" | ||
| implementation "org.grails.plugins:hibernate5" | ||
|
|
||
| implementation "org.grails:grails-core" | ||
| implementation "org.grails:grails-logging" | ||
| implementation "org.grails:grails-plugin-databinding" | ||
| implementation "org.grails:grails-plugin-i18n" | ||
| implementation "org.grails:grails-plugin-interceptors" | ||
| implementation "org.grails:grails-plugin-rest" | ||
| implementation "org.grails:grails-plugin-services" | ||
| implementation "org.grails:grails-plugin-url-mappings" | ||
| implementation "org.grails:grails-web-boot" | ||
| implementation "org.grails.plugins:gsp" | ||
| implementation "org.grails.plugins:scaffolding" | ||
| implementation "org.springframework.boot:spring-boot-autoconfigure" | ||
| implementation "org.springframework.boot:spring-boot-starter" | ||
| implementation "org.springframework.boot:spring-boot-starter-actuator" | ||
| implementation "org.springframework.boot:spring-boot-starter-logging" | ||
| implementation "org.springframework.boot:spring-boot-starter-tomcat" | ||
| implementation "jakarta.servlet:jakarta.servlet-api:$servletApiVersion" | ||
| implementation "org.grails:grails-core:$grailsVersion" | ||
| implementation "org.grails:grails-dependencies:$grailsVersion", { | ||
| exclude module:'grails-datastore-simple' | ||
| } | ||
| implementation "org.grails:grails-web-boot:$grailsVersion" | ||
| implementation "org.mongodb:mongodb-driver-sync:$mongodbDriverVersion" | ||
| implementation project(":grails-plugin") | ||
| implementation "org.grails.plugins:hibernate5:$hibernatePluginVersion" | ||
| implementation "org.hibernate:hibernate-ehcache:$hibernateCoreVersion" | ||
|
|
||
| runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion" | ||
| runtimeOnly "com.h2database:h2:$h2Version" | ||
| runtimeOnly "org.apache.tomcat:tomcat-jdbc:$tomcatVersion" | ||
| runtimeOnly "org.grails.plugins:scaffolding:$scaffoldingVersion" | ||
| runtimeOnly "org.grails.plugins:fields:$fieldsVersion" | ||
|
|
||
| testImplementation "org.grails:grails-gorm-testing-support:$grailsTestingSupportVersion" | ||
| testImplementation "org.grails:grails-web-testing-support:$grailsTestingSupportVersion" | ||
| testImplementation "org.testcontainers:mongodb:$testcontainersMongodbVersion" | ||
| testImplementation "io.netty:netty-transport:$nettyVersion" | ||
| testImplementation "io.netty:netty-codec:$nettyVersion" | ||
| testImplementation "io.netty:netty-handler:$nettyVersion" | ||
| testImplementation "org.grails.plugins:geb:$gebPluginVersion", { | ||
| exclude group: 'org.gebish', module: 'geb-spock' | ||
| } | ||
| implementation "com.github.erdi:webdriver-binaries-gradle-plugin:$webdriverBinariesPluginVersion" | ||
| testImplementation("org.grails.plugins:geb:$gebPluginVersion") { | ||
| exclude group: 'org.gebish', module: 'geb-spock' | ||
| } | ||
| testImplementation "org.gebish:geb-spock:$gebVersion" | ||
|
|
||
| testRuntimeOnly "org.seleniumhq.selenium:selenium-chrome-driver:$seleniumVersion" | ||
| testRuntimeOnly "org.seleniumhq.selenium:selenium-firefox-driver:$seleniumVersion" | ||
| testRuntimeOnly "org.seleniumhq.selenium:selenium-safari-driver:$seleniumSafariDriverVersion" | ||
|
|
||
| testImplementation "org.seleniumhq.selenium:selenium-remote-driver:$seleniumVersion" | ||
| testImplementation "org.seleniumhq.selenium:selenium-api:$seleniumVersion" | ||
| testImplementation "org.seleniumhq.selenium:selenium-support:$seleniumVersion" | ||
| } | ||
|
|
||
| tasks.withType(Test) { | ||
| systemProperty "geb.env", System.getProperty('geb.env') | ||
| systemProperty "geb.build.reportsDir", reporting.file("geb/integrationTest") | ||
| if (!System.getenv().containsKey('CI')) { | ||
| systemProperty 'webdriver.chrome.driver', System.getProperty('webdriver.chrome.driver') | ||
| systemProperty 'webdriver.gecko.driver', System.getProperty('webdriver.gecko.driver') | ||
| } else { | ||
| systemProperty 'webdriver.chrome.driver', "${System.getenv('CHROMEWEBDRIVER')}/chromedriver" | ||
| systemProperty 'webdriver.gecko.driver', "${System.getenv('GECKOWEBDRIVER')}/geckodriver" | ||
| } | ||
| implementation "org.springframework.boot:spring-boot-starter-validation" | ||
| console "org.grails:grails-console" | ||
| runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails" | ||
| runtimeOnly "com.h2database:h2" | ||
| runtimeOnly "org.apache.tomcat:tomcat-jdbc" | ||
| runtimeOnly "org.fusesource.jansi:jansi" | ||
| integrationTestImplementation testFixtures("org.grails.plugins:geb") | ||
| testImplementation "org.grails:grails-gorm-testing-support" | ||
| testImplementation "org.grails:grails-web-testing-support" | ||
| testImplementation "org.spockframework:spock-core" | ||
| } | ||
|
|
||
| webdriverBinaries { | ||
| if (!System.getenv().containsKey('CI')) { | ||
| chromedriver "$chromeDriverVersion" | ||
| geckodriver "$geckodriverVersion" | ||
| } | ||
| } | ||
| //compileGroovy.groovyOptions.forkOptions.jvmArgs = ['-Xdebug','-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005'] | ||
|
|
||
|
|
||
|
|
||
| //compileGroovy.groovyOptions.forkOptions.jvmArgs = ['-Xdebug','-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005'] |
4 changes: 2 additions & 2 deletions
4
...bernate5-mongodb/src/integration-test/groovy/functional/tests/AuthorControllerSpec.groovy
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...hibernate5-mongodb/src/integration-test/groovy/functional/tests/BookControllerSpec.groovy
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.