From 59923121f055ea5dbd0cf37b47bbd57eca357697 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Tue, 21 Dec 2021 11:10:33 +0200 Subject: [PATCH] Make gretty samples compatible with logback 1.2.9 Explicitly reference the logback.xml file to prevent gretty from configuring the defaults using groovy. --- .../spring-session-sample-javaconfig-custom-cookie.gradle | 1 + .../spring-session-sample-javaconfig-hazelcast.gradle | 4 ++++ .../spring-session-sample-javaconfig-jdbc.gradle | 4 ++++ .../spring-session-sample-javaconfig-redis.gradle | 1 + .../spring-session-sample-javaconfig-rest.gradle | 1 + .../spring-session-sample-javaconfig-security.gradle | 1 + .../spring-session-sample-misc-hazelcast.gradle | 4 ++++ .../spring-session-sample-xml-jdbc.gradle | 4 ++++ .../spring-session-sample-xml-redis.gradle | 1 + 9 files changed, 21 insertions(+) diff --git a/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/spring-session-sample-javaconfig-custom-cookie.gradle b/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/spring-session-sample-javaconfig-custom-cookie.gradle index 533a04bc..31feb7d0 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/spring-session-sample-javaconfig-custom-cookie.gradle +++ b/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/spring-session-sample-javaconfig-custom-cookie.gradle @@ -29,4 +29,5 @@ dependencies { gretty { jvmArgs = ['-Dspring.profiles.active=embedded-redis'] + logbackConfigFile = "src/main/resources/logback.xml" } diff --git a/spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle b/spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle index a044cdb3..6b1837a2 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle +++ b/spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle @@ -29,3 +29,7 @@ dependencies { integrationTestCompile "org.seleniumhq.selenium:htmlunit-driver" integrationTestCompile "org.seleniumhq.selenium:selenium-support" } + +gretty { + logbackConfigFile = "src/main/resources/logback.xml" +} diff --git a/spring-session-samples/spring-session-sample-javaconfig-jdbc/spring-session-sample-javaconfig-jdbc.gradle b/spring-session-samples/spring-session-sample-javaconfig-jdbc/spring-session-sample-javaconfig-jdbc.gradle index 7308dd06..3d3f5ad9 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-jdbc/spring-session-sample-javaconfig-jdbc.gradle +++ b/spring-session-samples/spring-session-sample-javaconfig-jdbc/spring-session-sample-javaconfig-jdbc.gradle @@ -25,3 +25,7 @@ dependencies { integrationTestCompile "org.seleniumhq.selenium:htmlunit-driver" integrationTestCompile "org.seleniumhq.selenium:selenium-support" } + +gretty { + logbackConfigFile = "src/main/resources/logback.xml" +} diff --git a/spring-session-samples/spring-session-sample-javaconfig-redis/spring-session-sample-javaconfig-redis.gradle b/spring-session-samples/spring-session-sample-javaconfig-redis/spring-session-sample-javaconfig-redis.gradle index b1232e23..6f12909c 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-redis/spring-session-sample-javaconfig-redis.gradle +++ b/spring-session-samples/spring-session-sample-javaconfig-redis/spring-session-sample-javaconfig-redis.gradle @@ -29,4 +29,5 @@ dependencies { gretty { jvmArgs = ['-Dspring.profiles.active=embedded-redis'] + logbackConfigFile = "src/main/resources/logback.xml" } diff --git a/spring-session-samples/spring-session-sample-javaconfig-rest/spring-session-sample-javaconfig-rest.gradle b/spring-session-samples/spring-session-sample-javaconfig-rest/spring-session-sample-javaconfig-rest.gradle index 7a9bc6e1..d827edc4 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-rest/spring-session-sample-javaconfig-rest.gradle +++ b/spring-session-samples/spring-session-sample-javaconfig-rest/spring-session-sample-javaconfig-rest.gradle @@ -30,4 +30,5 @@ dependencies { gretty { jvmArgs = ['-Dspring.profiles.active=embedded-redis'] servletContainer = 'tomcat9' + logbackConfigFile = "src/main/resources/logback.xml" } diff --git a/spring-session-samples/spring-session-sample-javaconfig-security/spring-session-sample-javaconfig-security.gradle b/spring-session-samples/spring-session-sample-javaconfig-security/spring-session-sample-javaconfig-security.gradle index da4e5e34..13b3e261 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-security/spring-session-sample-javaconfig-security.gradle +++ b/spring-session-samples/spring-session-sample-javaconfig-security/spring-session-sample-javaconfig-security.gradle @@ -33,4 +33,5 @@ dependencies { gretty { jvmArgs = ['-Dspring.profiles.active=embedded-redis'] + logbackConfigFile = "src/main/resources/logback.xml" } diff --git a/spring-session-samples/spring-session-sample-misc-hazelcast/spring-session-sample-misc-hazelcast.gradle b/spring-session-samples/spring-session-sample-misc-hazelcast/spring-session-sample-misc-hazelcast.gradle index 926c6c0b..27910b9c 100644 --- a/spring-session-samples/spring-session-sample-misc-hazelcast/spring-session-sample-misc-hazelcast.gradle +++ b/spring-session-samples/spring-session-sample-misc-hazelcast/spring-session-sample-misc-hazelcast.gradle @@ -24,3 +24,7 @@ dependencies { integrationTestCompile "org.seleniumhq.selenium:htmlunit-driver" integrationTestCompile "org.seleniumhq.selenium:selenium-support" } + +gretty { + logbackConfigFile = "src/main/resources/logback.xml" +} diff --git a/spring-session-samples/spring-session-sample-xml-jdbc/spring-session-sample-xml-jdbc.gradle b/spring-session-samples/spring-session-sample-xml-jdbc/spring-session-sample-xml-jdbc.gradle index 55fc55c6..4f516f74 100644 --- a/spring-session-samples/spring-session-sample-xml-jdbc/spring-session-sample-xml-jdbc.gradle +++ b/spring-session-samples/spring-session-sample-xml-jdbc/spring-session-sample-xml-jdbc.gradle @@ -25,3 +25,7 @@ dependencies { integrationTestCompile "org.seleniumhq.selenium:htmlunit-driver" integrationTestCompile "org.seleniumhq.selenium:selenium-support" } + +gretty { + logbackConfigFile = "src/main/resources/logback.xml" +} diff --git a/spring-session-samples/spring-session-sample-xml-redis/spring-session-sample-xml-redis.gradle b/spring-session-samples/spring-session-sample-xml-redis/spring-session-sample-xml-redis.gradle index b1232e23..6f12909c 100644 --- a/spring-session-samples/spring-session-sample-xml-redis/spring-session-sample-xml-redis.gradle +++ b/spring-session-samples/spring-session-sample-xml-redis/spring-session-sample-xml-redis.gradle @@ -29,4 +29,5 @@ dependencies { gretty { jvmArgs = ['-Dspring.profiles.active=embedded-redis'] + logbackConfigFile = "src/main/resources/logback.xml" }