diff --git a/gradle.properties b/gradle.properties index 22d964e9f38..88efd26c093 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,11 +1,11 @@ -projectVersion=6.0.0-M4 +projectVersion=6.0.0-RC1 antVersion=1.10.13 aspectjVersion=1.9.19 asyncVersion=4.0.0 caffeineVersion=2.9.3 cglibVersion=2.2.2 commonsLangVersion=2.6 -datastoreVersion=8.0.0-M2 +datastoreVersion=8.0.0-RC1 directoryWatcherVersion=0.9.9 gdocEngineVersion=1.0.1 gradleNexusPluginVersion=2.3.1 @@ -14,7 +14,7 @@ groovyVersion=3.0.11 gspVersion=6.0.0-M1 h2.version=1.4.199 h2Version=1.4.200 -hibernateDatastoreVersion=7.2.2 +hibernateDatastoreVersion=8.0.0-RC1 jakartaAnnotationApiVersion=2.0.0 jansiVersion=1.18 javaParserCoreVersion=3.15.14 @@ -29,21 +29,21 @@ methvinDirectoryWatcherVersion=0.18.0 micronautCacheVersion=3.5.0 micronautRuntimeGroovyVersion=3.0.0 micronautSpringVersion=4.5.1 -micronautVersion=3.9.1 +micronautVersion=3.9.2 mongodbJavaDriverVersion=4.5.0 objenesisVersion=3.3 scaffoldingCoreVersion=2.1.0 servletApiVersion=4.0.1 slf4jVersion=1.7.36 spockVersion=2.1-groovy-3.0 -springBootVersion=2.7.11 +springBootVersion=2.7.12 springLoadedVersion=1.2.8.RELEASE springVersion=5.3.27 -testingSupportVersion=3.0.0-M2 -testingSupportVersionForTests=2.6.1 +testingSupportVersion=3.0.0-RC1 +testingSupportVersionForTests=3.0.0-M2 tomcatLog4jVersion=8.5.2 tomcatVersion=9.0.75 -viewsVersion=3.0.0-M1 +viewsVersion=3.0.0-RC1 org.gradle.caching=true org.gradle.parallel=true org.gradle.daemon=true diff --git a/grails-bom/plugins.properties b/grails-bom/plugins.properties index 384d8a49b2c..b69104a8815 100644 --- a/grails-bom/plugins.properties +++ b/grails-bom/plugins.properties @@ -1,13 +1,13 @@ -gorm.hibernate5=8.0.0-M2 -gorm.mongodb=8.0.0-M2 -gorm.neo4j=8.0.0-M1 -grails-gradle-plugin=6.0.0-M4 +gorm.hibernate5=8.0.0-RC1 +gorm.mongodb=8.0.0-RC1 +gorm.neo4j=8.0.0-RC1 +grails-gradle-plugin=6.0.0-RC1 cache=5.0.1 rxjava=1.1.1 rxjava2=2.0.0 scaffolding=4.1.0 fields=3.0.0.RC1 geb=3.0.0 -views-json=3.0.0-M1 -views-json-templates=3.0.0-M1 -views-markup=3.0.0-M1 +views-json=3.0.0-RC1 +views-json-templates=3.0.0-RC1 +views-markup=3.0.0-RC1 diff --git a/grails-core/src/test/groovy/grails/util/GrailsUtilTests.java b/grails-core/src/test/groovy/grails/util/GrailsUtilTests.java index c5acdb6e90f..75b0d5a595a 100644 --- a/grails-core/src/test/groovy/grails/util/GrailsUtilTests.java +++ b/grails-core/src/test/groovy/grails/util/GrailsUtilTests.java @@ -29,7 +29,7 @@ public class GrailsUtilTests { @Test public void testGrailsVersion() { - assertEquals("6.0.0-M4", GrailsUtil.getGrailsVersion()); + assertEquals("6.0.0-RC1", GrailsUtil.getGrailsVersion()); } @AfterEach diff --git a/grails-test-suite-uber/src/test/groovy/grails/compiler/GrailsCompileStaticCompilationErrorsSpec.groovy b/grails-test-suite-uber/src/test/groovy/grails/compiler/GrailsCompileStaticCompilationErrorsSpec.groovy index 733b430a67c..d232113b8cc 100644 --- a/grails-test-suite-uber/src/test/groovy/grails/compiler/GrailsCompileStaticCompilationErrorsSpec.groovy +++ b/grails-test-suite-uber/src/test/groovy/grails/compiler/GrailsCompileStaticCompilationErrorsSpec.groovy @@ -170,12 +170,10 @@ class SomeClass { given: def gcl = new GroovyClassLoader() - when: 'a class marked with @GrailsCompileStatic invokes dynamic finders on a non-domain class inside of a method marked with TypeCheckingMode.SKIP' + when: def c = gcl.parseClass(''' package grails.compiler -import groovy.transform.TypeCheckingMode - @GrailsCompileStatic class SomeClass implements grails.validation.Validateable { String name @@ -193,12 +191,10 @@ class SomeClass implements grails.validation.Validateable { given: def gcl = new GroovyClassLoader() - when: 'a class marked with @GrailsCompileStatic invokes dynamic finders on a non-domain class inside of a method marked with TypeCheckingMode.SKIP' + when: def c = gcl.parseClass(''' package grails.compiler -import groovy.transform.TypeCheckingMode - @GrailsCompileStatic @grails.persistence.Entity class SomeClass implements grails.validation.Validateable { @@ -229,12 +225,10 @@ class SomeClass implements grails.validation.Validateable { given: def gcl = new GroovyClassLoader() - when: 'a class marked with @GrailsCompileStatic invokes dynamic finders on a non-domain class inside of a method marked with TypeCheckingMode.SKIP' + when: def c = gcl.parseClass(''' package grails.compiler -import groovy.transform.TypeCheckingMode - @GrailsCompileStatic class SomeClass implements grails.validation.Validateable { @@ -341,8 +335,6 @@ class SomeSubClass extends SomeClass implements grails.validation.Validateable { def c = gcl.parseClass(''' package grails.compiler -import groovy.transform.TypeCheckingMode - @GrailsCompileStatic class SomeClass { diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/validation/TestingValidationSpec.groovy b/grails-test-suite-uber/src/test/groovy/org/grails/validation/TestingValidationSpec.groovy index fcb5c196feb..611d0eeb7d5 100644 --- a/grails-test-suite-uber/src/test/groovy/org/grails/validation/TestingValidationSpec.groovy +++ b/grails-test-suite-uber/src/test/groovy/org/grails/validation/TestingValidationSpec.groovy @@ -82,29 +82,29 @@ class TestingValidationSpec extends Specification implements DomainUnitTest