Skip to content

fix(deps): clarify and update usage of caffeine #15091

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

Draft
matrei wants to merge 3 commits into
base: 7.0.x
Choose a base branch
from
Draft

fix(deps): clarify and update usage of caffeine #15091

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
51100cd
fix(deps): clarify and update usage of `caffeine`
matrei Sep 23, 2025
43e95fa
Merge branch '7.0.x' into fix/clarify-caffeine
matrei Mar 31, 2026
5818e9c
build: minor cleanup
matrei Mar 31, 2026
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
12 changes: 5 additions & 7 deletions grails-core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ dependencies {
api 'jakarta.persistence:jakarta.persistence-api'
api 'jakarta.annotation:jakarta.annotation-api'

implementation 'com.github.ben-manes.caffeine:caffeine'
api 'org.apache.groovy:groovy'
api 'org.springframework.boot:spring-boot'
api 'org.springframework:spring-core'
Expand Down Expand Up @@ -84,14 +83,13 @@ dependencies {
testImplementation 'org.objenesis:objenesis'
}

TaskProvider<WriteProperties> writeProps = tasks.register('writeGrailsProperties', WriteProperties)
writeProps.configure { WriteProperties it ->
it.destinationFile = project.layout.buildDirectory.file('grails.build.properties')
it.property('grails.version', project.version)
tasks.register('writeGrailsProperties', WriteProperties) {
destinationFile = project.layout.buildDirectory.file('grails.build.properties')
property('grails.version', project.version)
}

tasks.named('processResources', ProcessResources).configure { ProcessResources it ->
it.from writeProps
tasks.named('processResources', ProcessResources) {
from(tasks.named('writeGrailsProperties'))
}

apply {
Expand Down
1 change: 0 additions & 1 deletion grails-data-mongodb/core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ dependencies {
exclude group: 'jakarta.inject', module: 'jakarta.inject-api'
exclude group: 'jakarta.persistence', module: 'jakarta.persistence-api'
exclude group: 'org.apache.grails.bootstrap', module: 'grails-bootstrap'
exclude group: 'org.apache.grails.data', module: 'grails-datastore-core'
exclude group: 'org.apache.grails', module: 'grails-spring'
exclude group: 'org.springframework', module: 'spring-beans'
exclude group: 'org.springframework', module: 'spring-context'
Expand Down
3 changes: 0 additions & 3 deletions grails-data-simple/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,6 @@ dependencies {
// api: PlatformTransactionManager
}

// RemovalListener (caffeine)
implementation "com.github.ben-manes.caffeine:caffeine"

compileOnly 'org.apache.groovy:groovy', {
// comp: CompileStatic
}
Expand Down
1 change: 0 additions & 1 deletion grails-datastore-core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ dependencies {
// provided: Logger, LoggerFactory
}


testImplementation project(':grails-datamapping-core'), {
// we only need the @grails.gorm.annotation.Entity annotation to test GORM syntax mapping
transitive = false
Expand Down
4 changes: 3 additions & 1 deletion grails-rest-transforms/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ dependencies {
implementation project(':grails-common'), {
// impl: GrailsMessageSourceUtils
}
implementation 'com.github.ben-manes.caffeine:caffeine'
implementation 'com.github.ben-manes.caffeine:caffeine', {
// impl: Cache, Caffeine
}

testImplementation project(':grails-url-mappings')
testImplementation project(':grails-test-suite-base')
Expand Down
5 changes: 4 additions & 1 deletion grails-web-common/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,10 @@ dependencies {

api 'org.springframework:spring-webmvc'
api 'org.springframework:spring-context-support'
implementation 'com.github.ben-manes.caffeine:caffeine'

implementation 'com.github.ben-manes.caffeine:caffeine', {
// impl: Cache, Caffeine
}

compileOnly 'jakarta.servlet:jakarta.servlet-api'
compileOnly 'org.springframework:spring-test', {
Expand Down
4 changes: 3 additions & 1 deletion grails-web-url-mappings/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ dependencies {
testRuntimeOnly 'org.fusesource.jansi:jansi'
compileOnly 'jline:jline'

implementation 'com.github.ben-manes.caffeine:caffeine'
implementation 'com.github.ben-manes.caffeine:caffeine', {
// impl: Cache, Caffeine, Weigher
}

testImplementation project(':grails-test-suite-base')

Expand Down
Loading