Skip to content

Commit ebb5782

Browse files
matreimatrei
authored
build: remove version catalog usage (#1053)
1 parent 2e73201 commit ebb5782

File tree

12 files changed

+161
-225
lines changed

12 files changed

+161
-225
lines changed

‎build.gradle

+1-5
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ plugins {
55
}
66

77
version = projectVersion
8-
ext.set('grailsVersion', libs.versions.grails.asProvider().get())
98
ext.set('isSnapshot', projectVersion.endsWith('-SNAPSHOT'))
109
ext.set('isReleaseVersion', !isSnapshot)
1110

@@ -31,16 +30,13 @@ subprojects {
3130
repositories {
3231
mavenCentral()
3332
maven { url = 'https://repo.grails.org/grails/core' }
34-
if (libs.versions.groovy.get().endsWith('-SNAPSHOT')) {
33+
if (groovyVersion.endsWith('-SNAPSHOT')) {
3534
maven {
3635
name = 'JFrog Groovy snapshot repo'
3736
url = 'https://groovy.jfrog.io/artifactory/libs-snapshot-local'
3837
}
3938
}
4039
}
41-
dependencies {
42-
implementation platform(libs.grails.bom)
43-
}
4440
}
4541

4642
// Do not generate extra load on Nexus with new staging repository if signing fails

‎buildSrc/build.gradle

+14-9
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
1+
plugins {
2+
id 'groovy-gradle-plugin'
3+
}
4+
5+
Properties versions = new Properties()
6+
file('../gradle.properties').withInputStream {
7+
versions.load(it)
8+
}
9+
110
repositories {
211
mavenCentral()
312
maven { url = 'https://repo.grails.org/grails/core' }
413
}
514

615
dependencies {
7-
implementation platform(buildsrcLibs.grails.bom)
8-
implementation buildsrcLibs.asciidoctorj
9-
implementation buildsrcLibs.asset.pipeline.gradle
10-
implementation buildsrcLibs.grails.gradle.plugin, {
11-
// Grails Gradle plugin leaks groovy-xml onto compile classpath
12-
// which is causes a version conflict for Gradle
13-
exclude group: 'org.apache.groovy', module: 'groovy-xml'
14-
}
15-
testImplementation buildsrcLibs.spock.core
16+
implementation platform("org.grails:grails-bom:${versions.get('grailsVersion')}")
17+
implementation "org.asciidoctor:asciidoctor-gradle-jvm:${versions.get('asciidoctorGradlePluginVersion')}"
18+
implementation "com.bertramlabs.plugins:asset-pipeline-gradle:${versions.get('assetPipelineGradlePluginVersion')}"
19+
implementation 'org.grails:grails-gradle-plugin'
20+
testImplementation 'org.spockframework:spock-core'
1621
}
1722

1823
tasks.withType(Test).configureEach {

‎buildSrc/settings.gradle

-7
This file was deleted.

‎examples/functional-test-app/build.gradle

+27-26
Original file line numberDiff line numberDiff line change
@@ -10,35 +10,36 @@ group = 'examples.test'
1010

1111
dependencies {
1212

13-
implementation project(':spring-security-core')
13+
implementation platform("org.grails:grails-bom:$grailsVersion")
1414

15-
implementation libs.grails.core
16-
implementation libs.grails.datastore.core
17-
implementation libs.grails.datastore.gorm
18-
implementation libs.grails.events.transform
19-
implementation libs.grails.gsp
20-
implementation libs.grails.rest
21-
implementation libs.grails.validation
22-
implementation libs.groovy.core
23-
implementation libs.spring.security.core
24-
implementation libs.spring.web
15+
implementation project(':spring-security-core')
16+
implementation 'org.grails:grails-core'
17+
implementation 'org.grails:grails-datastore-core'
18+
implementation 'org.grails:grails-datastore-gorm'
19+
implementation "org.grails:grails-events-transform:$grailsAsyncVersion" // Not yet in the milestone bom
20+
implementation 'org.grails.plugins:gsp'
21+
implementation 'org.grails:grails-plugin-rest'
22+
implementation 'org.grails:grails-plugin-validation'
23+
implementation 'org.apache.groovy:groovy'
24+
implementation 'org.springframework.security:spring-security-core'
25+
implementation 'org.springframework:spring-web'
2526

26-
runtimeOnly libs.micronaut.jackson.databind
27-
runtimeOnly libs.gorm.hibernate5
28-
runtimeOnly libs.grails.asset.pipeline
29-
runtimeOnly libs.grails.i18n
30-
runtimeOnly libs.grails.interceptors
31-
runtimeOnly libs.grails.services
32-
runtimeOnly libs.grails.urlmappings
33-
runtimeOnly libs.springboot.autoconfigure
34-
runtimeOnly libs.springboot.starter.logging
35-
runtimeOnly libs.springboot.starter.tomcat
36-
runtimeOnly libs.h2database
37-
runtimeOnly libs.tomcat.jdbc
27+
runtimeOnly "io.micronaut:micronaut-jackson-databind:$micronautVersion"
28+
runtimeOnly 'org.grails.plugins:hibernate5'
29+
runtimeOnly 'com.bertramlabs.plugins:asset-pipeline-grails'
30+
runtimeOnly 'org.grails:grails-plugin-i18n'
31+
runtimeOnly 'org.grails:grails-plugin-interceptors'
32+
runtimeOnly 'org.grails:grails-plugin-services'
33+
runtimeOnly 'org.grails:grails-plugin-url-mappings'
34+
runtimeOnly 'org.springframework.boot:spring-boot-autoconfigure'
35+
runtimeOnly 'org.springframework.boot:spring-boot-starter-logging'
36+
runtimeOnly 'org.springframework.boot:spring-boot-starter-tomcat'
37+
runtimeOnly 'com.h2database:h2'
38+
runtimeOnly 'org.apache.tomcat:tomcat-jdbc'
3839

39-
compileOnly libs.jakarta.annotation.api
40-
compileOnly libs.jakarta.servlet.api
41-
compileOnly libs.slf4j.nop // Prevent warnings about missing SLF4j implementation during GSP compilation
40+
compileOnly 'jakarta.annotation:jakarta.annotation-api'
41+
compileOnly 'jakarta.servlet:jakarta.servlet-api'
42+
compileOnly 'org.slf4j:slf4j-nop' // Prevent warnings about missing SLF4j implementation during GSP compilation
4243
}
4344

4445
apply from: rootProject.layout.projectDirectory.file('gradle/java-config.gradle')

‎examples/integration-test-app/build.gradle

+31-28
Original file line numberDiff line numberDiff line change
@@ -9,35 +9,38 @@ group = 'misc.integration.test.app'
99

1010
dependencies {
1111

12-
implementation project(':spring-security-core')
12+
implementation platform("org.grails:grails-bom:$grailsVersion")
1313

14-
implementation libs.grails.core
15-
implementation libs.grails.datastore.gorm
16-
implementation libs.grails.domain
17-
implementation libs.groovy.core
18-
implementation libs.spring.security.core
19-
implementation libs.spring.security.crypto
20-
implementation libs.spring.security.web
21-
implementation libs.spring.web
22-
implementation libs.springboot.autoconfigure
23-
24-
runtimeOnly libs.gorm.hibernate5
25-
runtimeOnly libs.grails.i18n
26-
runtimeOnly libs.grails.interceptors
27-
runtimeOnly libs.grails.services
28-
runtimeOnly libs.grails.urlmappings
29-
runtimeOnly libs.grails.web.common
30-
runtimeOnly libs.h2database
31-
runtimeOnly libs.springboot.starter.logging
32-
runtimeOnly libs.springboot.starter.tomcat
33-
runtimeOnly libs.tomcat.jdbc
34-
35-
compileOnly libs.jakarta.servlet.api
36-
compileOnly libs.slf4j.nop
37-
38-
testImplementation libs.spock.core
39-
testImplementation libs.spring.tx
40-
testImplementation libs.bundles.grails.testing.support
14+
implementation project(':spring-security-core')
15+
implementation 'org.grails:grails-core'
16+
implementation 'org.grails:grails-datastore-gorm'
17+
implementation 'org.grails:grails-plugin-domain-class'
18+
implementation 'org.apache.groovy:groovy'
19+
implementation 'org.springframework.security:spring-security-core'
20+
implementation 'org.springframework.security:spring-security-crypto'
21+
implementation 'org.springframework.security:spring-security-web'
22+
implementation 'org.springframework:spring-web'
23+
implementation 'org.springframework.boot:spring-boot-autoconfigure'
24+
25+
runtimeOnly 'org.grails.plugins:hibernate5'
26+
runtimeOnly 'org.grails:grails-plugin-i18n'
27+
runtimeOnly 'org.grails:grails-plugin-interceptors'
28+
runtimeOnly 'org.grails:grails-plugin-services'
29+
runtimeOnly 'org.grails:grails-plugin-url-mappings'
30+
runtimeOnly 'org.grails:grails-web-common'
31+
runtimeOnly 'com.h2database:h2'
32+
runtimeOnly 'org.springframework.boot:spring-boot-starter-logging'
33+
runtimeOnly 'org.springframework.boot:spring-boot-starter-tomcat'
34+
runtimeOnly 'org.apache.tomcat:tomcat-jdbc'
35+
36+
compileOnly 'jakarta.servlet:jakarta.servlet-api'
37+
compileOnly 'org.slf4j:slf4j-nop'
38+
39+
testImplementation 'org.spockframework:spock-core'
40+
testImplementation 'org.springframework:spring-tx'
41+
testImplementation 'org.grails:grails-gorm-testing-support'
42+
testImplementation 'org.grails:grails-web-testing-support'
43+
testImplementation 'org.springframework.boot:spring-boot-starter-test'
4144
}
4245

4346
apply from: rootProject.layout.projectDirectory.file('gradle/java-config.gradle')

‎examples/misc-functional-test-app/grails-spring-security-group/build.gradle

+18-18
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,25 @@ dependencies {
1010

1111
implementation project(':spring-security-core')
1212

13-
implementation libs.grails.core
14-
implementation libs.grails.datastore.core
15-
implementation libs.grails.datastore.gorm
16-
implementation libs.grails.events.transform
17-
implementation libs.grails.rest
18-
implementation libs.groovy.core
19-
implementation libs.spring.beans
13+
implementation 'org.grails:grails-core'
14+
implementation 'org.grails:grails-datastore-core'
15+
implementation 'org.grails:grails-datastore-gorm'
16+
implementation "org.grails:grails-events-transform:$grailsAsyncVersion" // Not yet in the milestone bom
17+
implementation 'org.grails:grails-plugin-rest'
18+
implementation 'org.apache.groovy:groovy'
19+
implementation 'org.springframework:spring-beans'
2020

21-
runtimeOnly libs.gorm.hibernate5
22-
runtimeOnly libs.grails.gsp
23-
runtimeOnly libs.grails.i18n
24-
runtimeOnly libs.grails.interceptors
25-
runtimeOnly libs.grails.services
26-
runtimeOnly libs.grails.urlmappings
27-
runtimeOnly libs.springboot.autoconfigure
28-
runtimeOnly libs.springboot.starter.logging
29-
runtimeOnly libs.springboot.starter.tomcat
30-
runtimeOnly libs.h2database
31-
runtimeOnly libs.tomcat.jdbc
21+
runtimeOnly 'org.grails.plugins:hibernate5'
22+
runtimeOnly 'org.grails.plugins:gsp'
23+
runtimeOnly 'org.grails:grails-plugin-i18n'
24+
runtimeOnly 'org.grails:grails-plugin-interceptors'
25+
runtimeOnly 'org.grails:grails-plugin-services'
26+
runtimeOnly 'org.grails:grails-plugin-url-mappings'
27+
runtimeOnly 'org.springframework.boot:spring-boot-autoconfigure'
28+
runtimeOnly 'org.springframework.boot:spring-boot-starter-logging'
29+
runtimeOnly 'org.springframework.boot:spring-boot-starter-tomcat'
30+
runtimeOnly 'com.h2database:h2'
31+
runtimeOnly 'org.apache.tomcat:tomcat-jdbc'
3232
}
3333

3434
apply from: rootProject.layout.projectDirectory.file('gradle/java-config.gradle')

‎examples/misc-functional-test-app/grails-spring-security-hierarchical-roles/build.gradle

+16-16
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,23 @@ dependencies {
1010

1111
implementation project(':spring-security-core')
1212

13-
implementation libs.grails.core
14-
implementation libs.grails.datastore.core
15-
implementation libs.grails.datastore.gorm
16-
implementation libs.grails.domain
17-
implementation libs.grails.events.transform
18-
implementation libs.grails.rest
19-
implementation libs.groovy.core
20-
implementation libs.spring.beans
13+
implementation 'org.grails:grails-core'
14+
implementation 'org.grails:grails-datastore-core'
15+
implementation 'org.grails:grails-datastore-gorm'
16+
implementation 'org.grails:grails-plugin-domain-class'
17+
implementation "org.grails:grails-events-transform:$grailsAsyncVersion" // Not yet in the milestone bom
18+
implementation 'org.grails:grails-plugin-rest'
19+
implementation 'org.apache.groovy:groovy'
20+
implementation 'org.springframework:spring-beans'
2121

22-
runtimeOnly libs.gorm.hibernate5
23-
runtimeOnly libs.grails.services
24-
runtimeOnly libs.grails.urlmappings
25-
runtimeOnly libs.h2database
26-
runtimeOnly libs.springboot.autoconfigure
27-
runtimeOnly libs.springboot.starter.logging
28-
runtimeOnly libs.springboot.starter.tomcat
29-
runtimeOnly libs.tomcat.jdbc
22+
runtimeOnly 'org.grails.plugins:hibernate5'
23+
runtimeOnly 'org.grails:grails-plugin-services'
24+
runtimeOnly 'org.grails:grails-plugin-url-mappings'
25+
runtimeOnly 'com.h2database:h2'
26+
runtimeOnly 'org.springframework.boot:spring-boot-autoconfigure'
27+
runtimeOnly 'org.springframework.boot:spring-boot-starter-logging'
28+
runtimeOnly 'org.springframework.boot:spring-boot-starter-tomcat'
29+
runtimeOnly 'org.apache.tomcat:tomcat-jdbc'
3030
}
3131

3232
apply from: rootProject.layout.projectDirectory.file('gradle/java-config.gradle')

‎gradle.properties

+10
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
11
projectVersion=7.0.0-SNAPSHOT
2+
grailsVersion=7.0.0-M1
3+
4+
# Refactor to use the version from the BOM
5+
groovyVersion=4.0.24
6+
assetPipelineGradlePluginVersion=5.0.5
7+
8+
grailsAsyncVersion=6.0.0-M2
9+
micronautVersion=4.5.3
10+
11+
asciidoctorGradlePluginVersion=4.0.4
212

313
# This prevents the Grails Gradle Plugin from unnecessarily excluding slf4j-simple in the generated POMs
414
# https://github.com/grails/grails-gradle-plugin/issues/222

‎gradle/buildsrc.libs.versions.toml

-13
This file was deleted.

‎gradle/integrationTest.gradle

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
dependencies {
2-
add('testImplementation', libs.micronaut.httpclient)
3-
add('testImplementation', libs.bundles.grails.testing.support)
2+
add('testImplementation', "io.micronaut:micronaut-http-client:$micronautVersion")
3+
add('testImplementation', 'org.grails:grails-gorm-testing-support')
4+
add('testImplementation', 'org.grails:grails-web-testing-support')
5+
add('testImplementation', 'org.springframework.boot:spring-boot-starter-test')
46

5-
integrationTestImplementation testFixtures(libs.geb.plugin)
7+
add('integrationTestImplementation', testFixtures('org.grails.plugins:geb'))
68
}
79

810
tasks.named('integrationTest', Test) {

‎gradle/libs.versions.toml

-65
This file was deleted.

0 commit comments

Comments
 (0)