Skip to content
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.

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

fix(deps): update dependency com.github.ben-manes.caffeine:caffeine to v3 #13373

Merged
merged 11 commits into from
Feb 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/groovy-joint-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
distribution: 'adopt'
java-version: '11.0.6'
- name: Cache local Maven repository & Groovy
uses: actions/cache@v3
uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4
with:
path: |
~/groovy
Expand Down Expand Up @@ -130,7 +130,7 @@ jobs:
distribution: 'adopt'
java-version: '11'
- name: Cache local Maven repository & Groovy
uses: actions/cache@v3
uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4
with:
path: |
~/groovy
Expand Down
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ projectVersion=6.1.2-SNAPSHOT
antVersion=1.10.14
aspectjVersion=1.9.21
asyncVersion=5.0.2
caffeineVersion=2.9.3
caffeineVersion=3.1.8
cglibVersion=2.2.2
commonsLangVersion=2.6
datastoreVersion=8.0.3
datastoreVersion=8.0.4
directoryWatcherVersion=0.9.9
gdocEngineVersion=1.0.1
gradleNexusPluginVersion=2.3.1
gradleNexusStagingPluginVersion=0.12.0
groovyVersion=3.0.11
gspVersion=6.1.2
gspVersion=6.1.3
h2.version=2.2.224
h2Version=2.2.224
hibernateDatastoreVersion=8.0.2
Expand Down Expand Up @@ -43,9 +43,9 @@ springLoadedVersion=1.2.8.RELEASE
springVersion=5.3.31
spring.version=5.3.30
testingSupportVersion=3.1.1
testingSupportVersionForTests=3.1.1
testingSupportVersionForTests=3.1.2
tomcatLog4jVersion=8.5.2
tomcatVersion=9.0.84
tomcatVersion=9.0.85
viewsVersion=3.1.1
org.gradle.caching=true
org.gradle.parallel=true
Expand Down
4 changes: 2 additions & 2 deletions grails-docs/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies {
'org.yaml:snakeyaml:2.2',
"org.codehaus.groovy:groovy-ant:$groovyVersion"

api 'org.asciidoctor:asciidoctorj:2.5.10'
api 'org.asciidoctor:asciidoctorj:2.5.11'
api('org.xhtmlrenderer:core-renderer:8.0') {
exclude group: 'bouncycastle', module:'bcprov-jdk14'
}
Expand All @@ -21,7 +21,7 @@ dependencies {

runtimeOnly('com.lowagie:itext:2.0.8')

api 'org.jsoup:jsoup:1.17.1'
api 'org.jsoup:jsoup:1.17.2'
testImplementation("org.spockframework:spock-core:${spockVersion}") { transitive = false }
}

Expand Down
3 changes: 2 additions & 1 deletion grails-shell/src/main/groovy/org/grails/cli/GrailsCli.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import groovy.transform.CompileStatic
import jline.UnixTerminal
import jline.console.UserInterruptException
import jline.console.completer.ArgumentCompleter
import jline.console.completer.Completer
import jline.internal.NonBlockingInputStream
import org.gradle.tooling.BuildActionExecuter
import org.gradle.tooling.BuildCancelledException
Expand Down Expand Up @@ -417,7 +418,7 @@ class GrailsCli {
new RegexCompletor("!\\w+"), new EscapingFileNameCompletor())
)

completers.addAll((profile.getCompleters(projectContext) ?: []) as Collection)
completers.addAll((profile.getCompleters(projectContext) ?: []) as Collection<Completer>)
consoleReader.addCompleter(aggregateCompleter)
return console
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,8 @@ abstract class AbstractProfile implements Profile {
}
}

defaultFeaturesNames.addAll(defaultFeatures)
requiredFeatureNames.addAll(requiredFeatures)
defaultFeaturesNames.addAll(defaultFeatures as Set<String>)
requiredFeatureNames.addAll(requiredFeatures as Set<String>)
}


Expand Down
2 changes: 1 addition & 1 deletion grails-test-suite-persistence/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies {
project(':grails-spring')

testImplementation "org.grails:grails-datastore-gorm-validation:$datastoreVersion"
testImplementation "org.grails:grails-datastore-gorm-hibernate5:8.0.2", {
testImplementation "org.grails:grails-datastore-gorm-hibernate5:8.0.3", {
exclude group: 'org.grails', module:'grails-datastore-gorm'
exclude group: 'org.grails', module:'grails-datastore-core'
exclude group: 'org.springframework', module:'spring-core'
Expand Down
2 changes: 1 addition & 1 deletion grails-test-suite-uber/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ dependencies {
project(":grails-plugin-databinding"),
project(':grails-spring')

testImplementation "org.grails:grails-datastore-gorm-hibernate5:8.0.2", {
testImplementation "org.grails:grails-datastore-gorm-hibernate5:8.0.3", {
exclude group: 'org.grails', module:'grails-datastore-gorm'
exclude group: 'org.grails', module:'grails-datastore-core'
exclude group: 'org.springframework', module:'spring-core'
Expand Down
2 changes: 1 addition & 1 deletion grails-test-suite-web/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies {
project(':grails-spring')
testImplementation "org.grails.plugins:converters:$legacyConvertersVersion"

testImplementation "org.grails:grails-datastore-gorm-hibernate5:8.0.2", {
testImplementation "org.grails:grails-datastore-gorm-hibernate5:8.0.3", {
exclude group: 'org.grails', module:'grails-datastore-gorm'
exclude group: 'org.grails', module:'grails-datastore-core'
exclude group: 'org.springframework', module:'spring-core'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,6 @@ abstract class AbstractStructuredBindingEditor<T> implements TypedStructuredBind
valuesMap[propName] = bindingSource.getPropertyValue(key)
}
}
valuesMap
valuesMap as Map<String, Object>
}
}
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "com.gradle.enterprise" version "3.16.1"
id "com.gradle.enterprise" version "3.16.2"
id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.12.1'
}

Expand Down
Loading