diff --git a/build.gradle b/build.gradle index f26e54cf..531f1532 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,25 @@ import io.github.gradlenexus.publishplugin.InitializeNexusStagingRepository +buildscript { + repositories { + gradlePluginPortal() + mavenCentral() + maven { url = 'https://repo.grails.org/grails/core' } + } + dependencies { + classpath 'io.github.gradle-nexus:publish-plugin:1.3.0' + classpath "org.grails:grails-gradle-plugin:${grailsGradlePluginVersion}" + classpath "org.grails:grails-docs:${grailsVersion}" + } +} + plugins { id 'groovy' - id 'io.github.gradle-nexus.publish-plugin' } +apply plugin: 'io.github.gradle-nexus.publish-plugin' + version = projectVersion -ext.set('grailsVersion', libs.versions.grails.get()) ext.set('isSnapshot', projectVersion.endsWith('-SNAPSHOT')) ext.set('isReleaseVersion', !isSnapshot) @@ -71,11 +84,6 @@ subprojects { } } } - - dependencies { - implementation platform(libs.grails.bom) - } - tasks.withType(Test).configureEach { useJUnitPlatform() testLogging { diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle deleted file mode 100644 index cdaaef63..00000000 --- a/buildSrc/build.gradle +++ /dev/null @@ -1,38 +0,0 @@ -plugins { - id 'groovy-gradle-plugin' - id 'maven-publish' -} - -repositories { - gradlePluginPortal() - mavenCentral() - maven { url = 'https://repo.grails.org/grails/core' } -} - -configurations.configureEach { exclude group: 'org.apache.groovy' } - -dependencies { - // Needs to be implementation as classes are referenced in build scripts - implementation buildsrcLibs.grails.docs - implementation buildsrcLibs.nexus.publish.gradle.plugin - - runtimeOnly buildsrcLibs.grails.gradle.plugin - runtimeOnly buildsrcLibs.groovydoc.gradle.plugin -} - -def groovyVersion = project.rootProject - .extensions - .getByType(VersionCatalogsExtension.class) - .named("libs") - .findVersion("groovy") - .get() - .displayName - -configurations.configureEach { - resolutionStrategy.eachDependency { DependencyResolveDetails details -> - if ((details.requested.group == 'org.codehaus.groovy' || details.requested.group == 'org.apache.groovy') && details.requested.name != 'groovy-bom') { - details.useTarget(group: 'org.apache.groovy', name: details.requested.name, version: groovyVersion) - details.because "The dependency coordinates are changed in Apache Groovy 4, plus ensure version" - } - } -} \ No newline at end of file diff --git a/buildSrc/settings.gradle b/buildSrc/settings.gradle deleted file mode 100644 index 80738597..00000000 --- a/buildSrc/settings.gradle +++ /dev/null @@ -1,11 +0,0 @@ -dependencyResolutionManagement { - versionCatalogs { - buildsrcLibs { - from(files('../gradle/buildsrc.libs.versions.toml')) - } - - libs { - from(files('../gradle/libs.versions.toml')) - } - } -} \ No newline at end of file diff --git a/docs/build.gradle b/docs/build.gradle index 87dd2490..59600168 100644 --- a/docs/build.gradle +++ b/docs/build.gradle @@ -7,6 +7,7 @@ plugins { configurations.register('groovydocRuntimeOnly') dependencies { + implementation platform("org.grails:grails-bom:${grailsVersion}") groovydocRuntimeOnly localGroovy() } @@ -56,10 +57,10 @@ tasks.register('generateGuide', PublishGuide) { 'sourcedir': rootProject.layout.projectDirectory.asFile, 'javaee' : 'https://docs.oracle.com/javaee/7/api/', 'javase' : 'https://docs.oracle.com/en/java/javase/11/docs/api/', - 'groovyapi': "https://docs.groovy-lang.org/${libs.versions.groovy.get()}/html/gapi/", - 'grailsapi': "https://docs.grails.org/${libs.versions.grails.get()}/api/", - 'gormapi' : "https://gorm.grails.org/${libs.versions.gorm.get()}/api/", - 'springapi': "https://docs.spring.io/spring/docs/${libs.versions.spring.get()}/javadoc-api/" + 'groovyapi': "https://docs.groovy-lang.org/${project['groovy.version']}/html/gapi/", + 'grailsapi': "https://docs.grails.org/${grailsVersion}/api/", + 'gormapi' : "https://gorm.grails.org/${project['grails-datastore.version']}/api/", + 'springapi': "https://docs.spring.io/spring/docs/${project['spring-framework.version']}/javadoc-api/" ] doLast { def dir = project.layout.buildDirectory.dir('docs').get().asFile diff --git a/examples/pubsub-demo/build.gradle b/examples/pubsub-demo/build.gradle index 87af8077..9e26eb39 100644 --- a/examples/pubsub-demo/build.gradle +++ b/examples/pubsub-demo/build.gradle @@ -7,6 +7,7 @@ version = rootProject.version group = 'pubsub.demo' dependencies { + implementation platform("org.grails:grails-bom:${grailsVersion}") implementation project(':grails-plugin-async') implementation project(':grails-plugin-events') @@ -27,13 +28,13 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter' implementation 'org.springframework.boot:spring-boot-starter-logging' implementation 'org.springframework.boot:spring-boot-starter-tomcat' - implementation libs.micronaut.serde.jackson + implementation 'io.micronaut.serde:micronaut-serde-jackson:2.10.2' runtimeOnly 'com.h2database:h2' runtimeOnly 'org.fusesource.jansi:jansi' runtimeOnly 'com.zaxxer:HikariCP' - testImplementation libs.micronaut.http.client + testImplementation 'io.micronaut:micronaut-http-client:4.6.5' testImplementation 'org.grails:grails-web-testing-support' } diff --git a/gradle.properties b/gradle.properties index a6168c7a..7a1b6043 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,6 +12,14 @@ githubSlug=grails/grails-async githubBranch=6.0.x developers=Graeme Rocher, Mattias Reichel +grailsVersion=7.0.0-SNAPSHOT +grailsGradlePluginVersion=7.0.0-SNAPSHOT + +# TODO: These are for the documentation links, can these be referenced from the bom instead? +spring-framework.version=6.2.1 +grails-datastore.version=9.0.0-SNAPSHOT +groovy.version=4.0.24 + #gpars docs is currently not available with https gparsdocs=http://gpars.org/1.2.1/groovydoc rxjavadocs=https://reactivex.io/RxJava/1.x/javadoc diff --git a/gradle/buildsrc.libs.versions.toml b/gradle/buildsrc.libs.versions.toml deleted file mode 100644 index d26910d6..00000000 --- a/gradle/buildsrc.libs.versions.toml +++ /dev/null @@ -1,11 +0,0 @@ -[versions] -grails = '7.0.0-SNAPSHOT' -grails-gradle-plugin = '7.0.0-SNAPSHOT' -groovy-doc = '1.0.1' -nexus-publish-gradle-plugin = '1.3.0' - -[libraries] -grails-gradle-plugin = { module = 'org.grails:grails-gradle-plugin', version.ref = 'grails-gradle-plugin' } -nexus-publish-gradle-plugin = { module = 'io.github.gradle-nexus:publish-plugin', version.ref = 'nexus-publish-gradle-plugin' } -groovydoc-gradle-plugin = { module = 'io.github.groovylang.groovydoc:groovydoc-gradle-plugin', version.ref = 'groovy-doc' } -grails-docs = { module = 'org.grails:grails-docs', version.ref = 'grails' } diff --git a/gradle/java-config.gradle b/gradle/java-config.gradle index 7e8c621b..61962475 100644 --- a/gradle/java-config.gradle +++ b/gradle/java-config.gradle @@ -7,9 +7,9 @@ java { configurations.all { resolutionStrategy.dependencySubstitution { - substitute module("org.codehaus.groovy:groovy") using module('org.apache.groovy:groovy:4.0.22') - substitute module("org.codehaus.groovy:groovy-templates") using module('org.apache.groovy:groovy-templates:4.0.22') - substitute module("org.codehaus.groovy:groovy-xml") using module('org.apache.groovy:groovy-xml:4.0.22') - substitute module("org.codehaus.groovy:groovy-json") using module('org.apache.groovy:groovy-json:4.0.22') + substitute module("org.codehaus.groovy:groovy") using module('org.apache.groovy:groovy:4.0.24') + substitute module("org.codehaus.groovy:groovy-templates") using module('org.apache.groovy:groovy-templates:4.0.24') + substitute module("org.codehaus.groovy:groovy-xml") using module('org.apache.groovy:groovy-xml:4.0.24') + substitute module("org.codehaus.groovy:groovy-json") using module('org.apache.groovy:groovy-json:4.0.24') } } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml deleted file mode 100644 index d1d09e07..00000000 --- a/gradle/libs.versions.toml +++ /dev/null @@ -1,40 +0,0 @@ -[versions] -gpars = '1.2.1' -grails = '7.0.0-SNAPSHOT' -groovy = '4.0.24' -gorm = '9.0.0-SNAPSHOT' -micronaut-http-client = '4.6.5' -micronaut-serde-jackson = '2.10.2' -rxjava = '1.3.8' -rxjava2 = '2.2.21' -spring = '6.2.0' - -[libraries] -bytebuddy = { module = 'net.bytebuddy:byte-buddy' } -grails-bootstrap = { module = 'org.grails:grails-bootstrap' } -grails-bom = { module = 'org.grails:grails-bom', version.ref = 'grails' } -grails-core = { module = 'org.grails:grails-core' } -grails-controllers = { module = 'org.grails:grails-plugin-controllers' } -grails-datastore-core = { module = 'org.grails:grails-datastore-core' } -grails-datastore-gorm = { module = 'org.grails:grails-datastore-gorm' } -grails-datastore-gorm-test = { module = 'org.grails:grails-datastore-gorm-test' } -grails-web-common = { module = 'org.grails:grails-web-common' } -grails-web-mvc = { module = 'org.grails:grails-web-mvc' } -gpars = { module = 'org.codehaus.gpars:gpars', version.ref = 'gpars' } -groovy-core = { module = 'org.apache.groovy:groovy' } -jakarta-annotation-api = { module = 'jakarta.annotation:jakarta.annotation-api' } -objenesis = { module = 'org.objenesis:objenesis' } -rxjava = { module = 'io.reactivex:rxjava', version.ref = 'rxjava' } -rxjava2 = { module = 'io.reactivex.rxjava2:rxjava', version.ref = 'rxjava2' } -slf4j-api = { module = 'org.slf4j:slf4j-api' } -slf4j-nop = { module = 'org.slf4j:slf4j-nop' } -servlet-api = { module = 'jakarta.servlet:jakarta.servlet-api' } -spock-core = { module = 'org.spockframework:spock-core' } -spring-beans = { module = 'org.springframework:spring-beans' } -spring-core = { module = 'org.springframework:spring-core' } -spring-context = { module = 'org.springframework:spring-context' } -spring-test = { module = 'org.springframework:spring-test' } -spring-tx = { module = 'org.springframework:spring-tx' } -spring-web = { module = 'org.springframework:spring-web' } -micronaut-serde-jackson = { module = 'io.micronaut.serde:micronaut-serde-jackson', version.ref = 'micronaut-serde-jackson' } -micronaut-http-client = { module = 'io.micronaut:micronaut-http-client', version.ref = 'micronaut-http-client' } \ No newline at end of file diff --git a/grails-async-core/build.gradle b/grails-async-core/build.gradle index 333ea185..08417039 100644 --- a/grails-async-core/build.gradle +++ b/grails-async-core/build.gradle @@ -7,19 +7,20 @@ plugins { group = 'org.grails' dependencies { + implementation platform("org.grails:grails-bom:${grailsVersion}") - implementation libs.groovy.core - implementation libs.slf4j.api - implementation libs.jakarta.annotation.api + implementation 'org.apache.groovy:groovy' + implementation 'org.slf4j:slf4j-api' + implementation 'jakarta.annotation:jakarta.annotation-api' - compileOnly libs.jakarta.annotation.api + compileOnly 'jakarta.annotation:jakarta.annotation-api' - testImplementation libs.spock.core + testImplementation 'org.spockframework:spock-core' - testRuntimeOnly libs.bytebuddy - testRuntimeOnly libs.objenesis + testRuntimeOnly 'net.bytebuddy:byte-buddy' + testRuntimeOnly 'org.objenesis:objenesis' - testRuntimeOnly libs.slf4j.nop // Get rid of warning about missing slf4j implementation during test task + testRuntimeOnly 'org.slf4j:slf4j-nop' // Get rid of warning about missing slf4j implementation during test task } diff --git a/grails-async-gpars/build.gradle b/grails-async-gpars/build.gradle index 3d705cec..9b04e9e4 100644 --- a/grails-async-gpars/build.gradle +++ b/grails-async-gpars/build.gradle @@ -7,19 +7,20 @@ plugins { group = 'org.grails' dependencies { + implementation platform("org.grails:grails-bom:${grailsVersion}") api project(':grails-async-core') - api libs.gpars, { + api 'org.codehaus.gpars:gpars:1.2.1', { exclude group: 'org.multiverse', module: 'multiverse-core' // Multiverse Software Transactional Memory (STM) Engine not used exclude group: 'org.codehaus.groovy', module: 'groovy-all' // Gpars 1.2.1 pulls in groovy-all:2.1.9 } - implementation libs.groovy.core - implementation libs.slf4j.api + implementation 'org.apache.groovy:groovy' + implementation 'org.slf4j:slf4j-api' - testImplementation libs.spock.core + testImplementation 'org.spockframework:spock-core' - testRuntimeOnly libs.slf4j.nop // Get rid of warning about missing slf4j implementation during test task + testRuntimeOnly 'org.slf4j:slf4j-nop' // Get rid of warning about missing slf4j implementation during test task } diff --git a/grails-async-rxjava/build.gradle b/grails-async-rxjava/build.gradle index 74def4a3..1e3faac8 100644 --- a/grails-async-rxjava/build.gradle +++ b/grails-async-rxjava/build.gradle @@ -7,16 +7,17 @@ plugins { group = 'org.grails' dependencies { + implementation platform("org.grails:grails-bom:${grailsVersion}") api project(':grails-async-core') - api libs.rxjava + api 'io.reactivex:rxjava:1.3.8' - implementation libs.groovy.core - implementation libs.slf4j.api + implementation 'org.apache.groovy:groovy' + implementation 'org.slf4j:slf4j-api' - testImplementation libs.spock.core + testImplementation 'org.spockframework:spock-core' - testRuntimeOnly libs.slf4j.nop // Get rid of warning about missing slf4j implementation during test task + testRuntimeOnly 'org.slf4j:slf4j-nop' // Get rid of warning about missing slf4j implementation during test task } apply from: rootProject.layout.projectDirectory.file('gradle/java-config.gradle') diff --git a/grails-async-rxjava2/build.gradle b/grails-async-rxjava2/build.gradle index 4b4edb8d..c48a6e25 100644 --- a/grails-async-rxjava2/build.gradle +++ b/grails-async-rxjava2/build.gradle @@ -8,16 +8,17 @@ plugins { group = 'org.grails' dependencies { + implementation platform("org.grails:grails-bom:${grailsVersion}") api project(':grails-async-core') - api libs.rxjava2 + api 'io.reactivex.rxjava2:rxjava:2.2.21' - implementation libs.groovy.core - implementation libs.slf4j.api + implementation 'org.apache.groovy:groovy' + implementation 'org.slf4j:slf4j-api' - testImplementation libs.spock.core + testImplementation 'org.spockframework:spock-core' - testRuntimeOnly libs.slf4j.nop // Get rid of warning about missing slf4j implementation during test task + testRuntimeOnly 'org.slf4j:slf4j-nop' // Get rid of warning about missing slf4j implementation during test task } diff --git a/grails-events-compat/build.gradle b/grails-events-compat/build.gradle index ceb8e73a..3616570f 100644 --- a/grails-events-compat/build.gradle +++ b/grails-events-compat/build.gradle @@ -7,11 +7,12 @@ plugins { group = 'org.grails' dependencies { + implementation platform("org.grails:grails-bom:${grailsVersion}") api project(':grails-events-core') - implementation libs.groovy.core - implementation libs.slf4j.api + implementation 'org.apache.groovy:groovy' + implementation 'org.slf4j:slf4j-api' } diff --git a/grails-events-core/build.gradle b/grails-events-core/build.gradle index 3246a9d5..9270a8ee 100644 --- a/grails-events-core/build.gradle +++ b/grails-events-core/build.gradle @@ -7,16 +7,17 @@ plugins { group = 'org.grails' dependencies { + implementation platform("org.grails:grails-bom:${grailsVersion}") - api libs.spring.context - api libs.spring.tx + api 'org.springframework:spring-context' + api 'org.springframework:spring-tx' - implementation libs.groovy.core - implementation libs.slf4j.api + implementation 'org.apache.groovy:groovy' + implementation 'org.slf4j:slf4j-api' - testImplementation libs.spock.core + testImplementation 'org.spockframework:spock-core' - testRuntimeOnly libs.slf4j.nop // Get rid of warning about missing slf4j implementation during test task + testRuntimeOnly 'org.slf4j:slf4j-nop' // Get rid of warning about missing slf4j implementation during test task } diff --git a/grails-events-gpars/build.gradle b/grails-events-gpars/build.gradle index 2f08603d..8f1d0935 100644 --- a/grails-events-gpars/build.gradle +++ b/grails-events-gpars/build.gradle @@ -8,17 +8,18 @@ plugins { group = 'org.grails' dependencies { + implementation platform("org.grails:grails-bom:${grailsVersion}") api project(':grails-events-core') - api libs.gpars, { + api 'org.codehaus.gpars:gpars:1.2.1', { exclude group: 'org.multiverse', module: 'multiverse-core' // Multiverse Software Transactional Memory (STM) Engine not used exclude group: 'org.codehaus.groovy', module: 'groovy-all' // Gpars 1.2.1 pulls in Groovy 2.1.9 } - implementation libs.groovy.core - implementation libs.slf4j.api + implementation 'org.apache.groovy:groovy' + implementation 'org.slf4j:slf4j-api' - testImplementation libs.spock.core + testImplementation 'org.spockframework:spock-core' } diff --git a/grails-events-rxjava/build.gradle b/grails-events-rxjava/build.gradle index 71facee9..a8f262a4 100644 --- a/grails-events-rxjava/build.gradle +++ b/grails-events-rxjava/build.gradle @@ -7,20 +7,21 @@ plugins { group = 'org.grails' dependencies { + implementation platform("org.grails:grails-bom:${grailsVersion}") api project(':grails-events-core') - api libs.rxjava + api 'io.reactivex:rxjava:1.3.8' - implementation libs.groovy.core - implementation libs.slf4j.api + implementation 'org.apache.groovy:groovy' + implementation 'org.slf4j:slf4j-api' testImplementation project(':grails-events-transform') - testImplementation libs.grails.datastore.core - testImplementation libs.grails.datastore.gorm.test - testImplementation libs.spock.core - testImplementation libs.spring.context + testImplementation 'org.grails:grails-datastore-core' + testImplementation 'org.grails:grails-datastore-gorm-test' + testImplementation 'org.spockframework:spock-core' + testImplementation 'org.springframework:spring-context' - testRuntimeOnly libs.slf4j.nop // Get rid of warning about missing slf4j implementation during test task + testRuntimeOnly 'org.slf4j:slf4j-nop' // Get rid of warning about missing slf4j implementation during test task } diff --git a/grails-events-rxjava2/build.gradle b/grails-events-rxjava2/build.gradle index 326f0c5b..1af9f4a2 100644 --- a/grails-events-rxjava2/build.gradle +++ b/grails-events-rxjava2/build.gradle @@ -7,16 +7,17 @@ plugins { group = 'org.grails' dependencies { + implementation platform("org.grails:grails-bom:${grailsVersion}") api project(':grails-events-core') - api libs.rxjava2 + api 'io.reactivex.rxjava2:rxjava:2.2.21' - implementation libs.groovy.core - implementation libs.slf4j.api + implementation 'org.apache.groovy:groovy' + implementation 'org.slf4j:slf4j-api' - testImplementation libs.spock.core + testImplementation 'org.spockframework:spock-core' - testRuntimeOnly libs.slf4j.nop // Get rid of warning about missing slf4j implementation during test task + testRuntimeOnly 'org.slf4j:slf4j-nop' // Get rid of warning about missing slf4j implementation during test task } diff --git a/grails-events-spring/build.gradle b/grails-events-spring/build.gradle index b2e97aa8..b0b78cb3 100644 --- a/grails-events-spring/build.gradle +++ b/grails-events-spring/build.gradle @@ -8,16 +8,17 @@ plugins { group = 'org.grails' dependencies { + implementation platform("org.grails:grails-bom:${grailsVersion}") api project(':grails-events-core') - api libs.spring.context + api 'org.springframework:spring-context' - implementation libs.groovy.core - implementation libs.slf4j.api + implementation 'org.apache.groovy:groovy' + implementation 'org.slf4j:slf4j-api' - testImplementation libs.spock.core + testImplementation 'org.spockframework:spock-core' - testRuntimeOnly libs.slf4j.nop // Get rid of warning about missing slf4j implementation during test task + testRuntimeOnly 'org.slf4j:slf4j-nop' // Get rid of warning about missing slf4j implementation during test task } diff --git a/grails-events-transform/build.gradle b/grails-events-transform/build.gradle index 0df884db..84320ae9 100644 --- a/grails-events-transform/build.gradle +++ b/grails-events-transform/build.gradle @@ -7,34 +7,35 @@ plugins { group = 'org.grails' dependencies { + implementation platform("org.grails:grails-bom:${grailsVersion}") api project(':grails-events-core') - api libs.grails.datastore.core - api libs.spring.context + api 'org.grails:grails-datastore-core' + api 'org.springframework:spring-context' - compileOnly libs.grails.datastore.gorm, { + compileOnly 'org.grails:grails-datastore-gorm', { // TODO: Explain why this exclusion is done exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' } - implementation libs.groovy.core - implementation libs.slf4j.api - implementation libs.spring.beans - implementation libs.spring.core - implementation libs.spring.tx - implementation libs.jakarta.annotation.api - - testImplementation libs.grails.datastore.gorm, { + implementation 'org.apache.groovy:groovy' + implementation 'org.slf4j:slf4j-api' + implementation 'org.springframework:spring-beans' + implementation 'org.springframework:spring-core' + implementation 'org.springframework:spring-tx' + implementation 'jakarta.annotation:jakarta.annotation-api' + + testImplementation 'org.grails:grails-datastore-gorm', { // TODO: Explain why this exclusion is done exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' } - testImplementation libs.grails.datastore.gorm.test, { + testImplementation 'org.grails:grails-datastore-gorm-test', { // TODO: Explain why this exclusion is done (I don't know) exclude group: 'org.grails', module: 'grails-datastore-gorm-validation' } - testImplementation libs.spock.core + testImplementation 'org.spockframework:spock-core' - testRuntimeOnly libs.slf4j.nop // Get rid of warning about missing slf4j implementation during test task + testRuntimeOnly 'org.slf4j:slf4j-nop' // Get rid of warning about missing slf4j implementation during test task } apply from: rootProject.layout.projectDirectory.file('gradle/java-config.gradle') diff --git a/grails-plugin-async/build.gradle b/grails-plugin-async/build.gradle index cf168e72..9359b722 100644 --- a/grails-plugin-async/build.gradle +++ b/grails-plugin-async/build.gradle @@ -7,29 +7,30 @@ plugins { } dependencies { + implementation platform("org.grails:grails-bom:${grailsVersion}") api project(':grails-async-core') api project(':grails-events-compat') api project(':grails-events-core') - api libs.grails.core - api libs.grails.web.common - api libs.groovy.core - api libs.spring.beans - api libs.spring.context - api libs.spring.tx + api 'org.grails:grails-core' + api 'org.grails:grails-web-common' + api 'org.apache.groovy:groovy' + api 'org.springframework:spring-beans' + api 'org.springframework:spring-context' + api 'org.springframework:spring-tx' - implementation libs.grails.controllers - implementation libs.grails.web.mvc - implementation libs.spring.core - implementation libs.spring.web + implementation 'org.grails:grails-plugin-controllers' + implementation 'org.grails:grails-web-mvc' + implementation 'org.springframework:spring-core' + implementation 'org.springframework:spring-web' - compileOnly libs.servlet.api // Provided + compileOnly 'jakarta.servlet:jakarta.servlet-api' // Provided - testImplementation libs.spock.core - testImplementation libs.spring.test - testImplementation libs.servlet.api + testImplementation 'org.spockframework:spock-core' + testImplementation 'org.springframework:spring-test' + testImplementation 'jakarta.servlet:jakarta.servlet-api' - testRuntimeOnly libs.slf4j.nop // Get rid of warning about missing slf4j implementation during test task + testRuntimeOnly 'org.slf4j:slf4j-nop' // Get rid of warning about missing slf4j implementation during test task } diff --git a/grails-plugin-events/build.gradle b/grails-plugin-events/build.gradle index 4ca4e64a..b8fb4bb4 100644 --- a/grails-plugin-events/build.gradle +++ b/grails-plugin-events/build.gradle @@ -6,6 +6,7 @@ plugins { } dependencies { + implementation platform("org.grails:grails-bom:${grailsVersion}") api project(':grails-events-core') api project(':grails-events-compat') @@ -17,13 +18,13 @@ dependencies { // As this is a plugin these dependencies will be provided by the Grails application // This removes circular dependencies - compileOnly libs.grails.bootstrap - compileOnly libs.grails.core + compileOnly 'org.grails:grails-bootstrap' + compileOnly 'org.grails:grails-core' - testImplementation libs.spock.core + testImplementation 'org.spockframework:spock-core' - testRuntimeOnly libs.grails.bootstrap - testRuntimeOnly libs.slf4j.nop // Get rid of warning about missing slf4j implementation during test task + testRuntimeOnly 'org.grails:grails-bootstrap' + testRuntimeOnly 'org.slf4j:slf4j-nop' // Get rid of warning about missing slf4j implementation during test task }