Merge pull request #13689 from codeconsole/7.0.x-testing-fixes

Fix tests

grails-plugin-databinding/build.gradle

@@ -1,15 +1,19 @@
   dependencies {
     api project(':grails-core'), project(':grails-web')
+    api "org.springframework.boot:spring-boot-autoconfigure:$springBootVersion"
 
     testImplementation project(':grails-test-suite-base')
     testImplementation "org.grails:grails-web-testing-support:$testingSupportVersionForTests", {
-        exclude module:'grails-plugin-codecs'
         exclude module:'grails-plugin-rest'
         exclude module:'grails-plugin-interceptors'
         exclude module:'grails-test'
         exclude module:'grails-core'
         exclude module:'async'
         exclude module:'gsp'
     }
-
+    testRuntimeOnly "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion"
 }
+
+tasks.named('compileTestGroovy').configure {
+  dependsOn tasks.named('jar')
+}

grails-plugin-databinding/src/main/groovy/org/grails/plugins/databinding/DataBindingConfiguration.java

@@ -8,14 +8,21 @@
 import grails.util.GrailsArrayUtils;
 import grails.web.databinding.GrailsWebDataBinder;
 import org.grails.databinding.bindingsource.DataBindingSourceCreator;
+import org.grails.databinding.converters.DefaultConvertersConfiguration;
 import org.grails.web.databinding.bindingsource.*;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.AutoConfigureOrder;
+import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.MessageSource;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.core.annotation.AnnotationAwareOrderComparator;
 
-@Configuration
+@AutoConfiguration
+@AutoConfigureOrder
+@EnableConfigurationProperties(DataBindingConfigurationProperties.class)
+@ImportAutoConfiguration(DefaultConvertersConfiguration.class)
 public class DataBindingConfiguration {
 
     private final DataBindingConfigurationProperties configurationProperties;

grails-test-suite-persistence/build.gradle

@@ -52,17 +52,16 @@ dependencies {
                   "org.aspectj:aspectjweaver:$aspectjVersion"
 
     testImplementation "org.grails.plugins:async:$asyncVersion", {
-        exclude module:'grails-plugin-codecs'
         exclude module:'grails-plugin-controllers'
         exclude module:'grails-core'
         exclude module:'grails-plugin-domain-class'
     }
     testImplementation "org.grails:grails-gorm-testing-support:$testingSupportVersionForTests", {
-        exclude module:'grails-plugin-codecs'
         exclude module:'grails-plugin-domain-class'
         exclude module:'grails-test'
         exclude module:'async'
     }
+    testRuntimeOnly "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion"
 }
 
 test {