From 210e211dd549a6e36bcb7f73bf9e982102acb8bc Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 3 Dec 2021 09:28:17 +0000 Subject: [PATCH 1/3] Update spring boot to v2.6.1 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 024a993ab..22bc0cae6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,7 +21,7 @@ servletApiVersion=4.0.1 slf4jVersion=1.7.32 snakeyamlVersion=1.29 spockVersion=2.0-groovy-3.0 -springBootVersion=2.5.6 +springBootVersion=2.6.1 springVersion=5.3.13 tomcatLog4jVersion=8.5.2 tomcatVersion=9.0.55 From 56022e533478fa9f01f615ff26b119afd5768983 Mon Sep 17 00:00:00 2001 From: Puneet Behl Date: Fri, 3 Dec 2021 16:09:35 +0530 Subject: [PATCH 2/3] Update to Micrometer 1.8.0 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 22bc0cae6..b246b7351 100644 --- a/gradle.properties +++ b/gradle.properties @@ -30,6 +30,6 @@ webdriverBinariesVersion=1.4 # Following are used only for example projects fieldsVersion=3.0.0.RC1 grailsVersion=5.0.0 -micrometer.version=1.6.1 +micrometer.version=1.8.0 scaffoldingVersion=4.0.0.RC1 testingSupportVersion=2.2.0 From b338929c365dd44c5556e66adf62f4171007bded Mon Sep 17 00:00:00 2001 From: Puneet Behl Date: Wed, 8 Dec 2021 19:58:11 +0530 Subject: [PATCH 3/3] Spring Boot Allow Circular References and update dependencies --- .../grails-app/conf/application.yml | 4 +++- examples/grails3-hibernate5/grails-app/conf/application.yml | 4 +++- .../grails-app/conf/application.yml | 2 ++ .../grails-app/conf/application.yml | 5 +++-- .../grails-app/conf/application.yml | 2 ++ gradle.properties | 4 ++-- 6 files changed, 15 insertions(+), 6 deletions(-) diff --git a/examples/grails3-database-per-tenant/grails-app/conf/application.yml b/examples/grails3-database-per-tenant/grails-app/conf/application.yml index fb75bfdec..21ef8d77e 100644 --- a/examples/grails3-database-per-tenant/grails-app/conf/application.yml +++ b/examples/grails3-database-per-tenant/grails-app/conf/application.yml @@ -9,9 +9,11 @@ info: version: '@info.app.version@' grailsVersion: '@info.app.grailsVersion@' spring: - groovy: + groovy: template: check-template-location: false + main: + allow-circular-references: true --- grails: diff --git a/examples/grails3-hibernate5/grails-app/conf/application.yml b/examples/grails3-hibernate5/grails-app/conf/application.yml index 6a650e0b1..d84ca03ba 100644 --- a/examples/grails3-hibernate5/grails-app/conf/application.yml +++ b/examples/grails3-hibernate5/grails-app/conf/application.yml @@ -9,9 +9,11 @@ info: version: '@info.app.version@' grailsVersion: '@info.app.grailsVersion@' spring: - groovy: + groovy: template: check-template-location: false + main: + allow-circular-references: true --- grails: diff --git a/examples/grails3-multiple-datasources/grails-app/conf/application.yml b/examples/grails3-multiple-datasources/grails-app/conf/application.yml index 8e0027440..7661307be 100644 --- a/examples/grails3-multiple-datasources/grails-app/conf/application.yml +++ b/examples/grails3-multiple-datasources/grails-app/conf/application.yml @@ -12,6 +12,8 @@ spring: groovy: template: check-template-location: false + main: + allow-circular-references: true --- grails: diff --git a/examples/grails3-partitioned-multi-tenancy/grails-app/conf/application.yml b/examples/grails3-partitioned-multi-tenancy/grails-app/conf/application.yml index ec3b3b573..2f74aaeeb 100644 --- a/examples/grails3-partitioned-multi-tenancy/grails-app/conf/application.yml +++ b/examples/grails3-partitioned-multi-tenancy/grails-app/conf/application.yml @@ -9,10 +9,11 @@ info: version: '@info.app.version@' grailsVersion: '@info.app.grailsVersion@' spring: - groovy: + groovy: template: check-template-location: false - + main: + allow-circular-references: true --- grails: mime: diff --git a/examples/grails3-schema-per-tenant/grails-app/conf/application.yml b/examples/grails3-schema-per-tenant/grails-app/conf/application.yml index 8e80c6cbf..7904eefd8 100644 --- a/examples/grails3-schema-per-tenant/grails-app/conf/application.yml +++ b/examples/grails3-schema-per-tenant/grails-app/conf/application.yml @@ -12,6 +12,8 @@ spring: groovy: template: check-template-location: false + main: + allow-circular-references: true --- grails: diff --git a/gradle.properties b/gradle.properties index b246b7351..4546b1cee 100644 --- a/gradle.properties +++ b/gradle.properties @@ -29,7 +29,7 @@ webdriverBinariesVersion=1.4 # Following are used only for example projects fieldsVersion=3.0.0.RC1 -grailsVersion=5.0.0 +grailsVersion=5.1.0-SNAPSHOT micrometer.version=1.8.0 scaffoldingVersion=4.0.0.RC1 -testingSupportVersion=2.2.0 +testingSupportVersion=2.2.1-SNAPSHOT