From 8cea4152a0feaa67d937a7396168aa78785b83fb 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 4ef73b46..9879e212 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 @@ -21,4 +21,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 9255de93..5acf9648 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 @@ -21,3 +21,7 @@ dependencies { integrationTestCompile seleniumDependencies } + +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 4ed115a9..f514ccd1 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 @@ -17,3 +17,7 @@ dependencies { integrationTestCompile seleniumDependencies } + +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 4ef73b46..9879e212 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 @@ -21,4 +21,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 5f953393..a17526b9 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 @@ -23,4 +23,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 e418f640..7aee43e5 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 @@ -25,4 +25,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 5121e401..bebf5ab8 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 @@ -16,3 +16,7 @@ dependencies { integrationTestCompile seleniumDependencies } + +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 de6e3bcb..87abbf8d 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 @@ -17,3 +17,7 @@ dependencies { integrationTestCompile seleniumDependencies } + +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 e094ce96..81a1b9d4 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 @@ -21,4 +21,5 @@ dependencies { gretty { jvmArgs = ['-Dspring.profiles.active=embedded-redis'] + logbackConfigFile = "src/main/resources/logback.xml" }