Make gretty samples compatible with logback 1.2.9

eleftherias · eleftherias · commit 59923121f055 · 2021-12-21T11:10:33.000+02:00
Explicitly reference the logback.xml file to prevent gretty from configuring the defaults using groovy.
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -29,4 +29,5 @@ dependencies {
 
 gretty {
 	jvmArgs = ['-Dspring.profiles.active=embedded-redis']
+	logbackConfigFile = "src/main/resources/logback.xml"
 }

Original file line number	Diff line number	Diff line change
`@@ -29,4 +29,5 @@ dependencies {`
`29`	`29`
`30`	`30`	`gretty {`
`31`	`31`	`jvmArgs = ['-Dspring.profiles.active=embedded-redis']`
	`32`	`+ logbackConfigFile = "src/main/resources/logback.xml"`
`32`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,3 +29,7 @@ dependencies {`
`29`	`29`	`integrationTestCompile "org.seleniumhq.selenium:htmlunit-driver"`
`30`	`30`	`integrationTestCompile "org.seleniumhq.selenium:selenium-support"`
`31`	`31`	`}`
	`32`	`+`
	`33`	`+gretty {`
	`34`	`+ logbackConfigFile = "src/main/resources/logback.xml"`
	`35`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -25,3 +25,7 @@ dependencies {`
`25`	`25`	`integrationTestCompile "org.seleniumhq.selenium:htmlunit-driver"`
`26`	`26`	`integrationTestCompile "org.seleniumhq.selenium:selenium-support"`
`27`	`27`	`}`
	`28`	`+`
	`29`	`+gretty {`
	`30`	`+ logbackConfigFile = "src/main/resources/logback.xml"`
	`31`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -30,4 +30,5 @@ dependencies {`
`30`	`30`	`gretty {`
`31`	`31`	`jvmArgs = ['-Dspring.profiles.active=embedded-redis']`
`32`	`32`	`servletContainer = 'tomcat9'`
	`33`	`+ logbackConfigFile = "src/main/resources/logback.xml"`
`33`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,4 +33,5 @@ dependencies {`
`33`	`33`
`34`	`34`	`gretty {`
`35`	`35`	`jvmArgs = ['-Dspring.profiles.active=embedded-redis']`
	`36`	`+ logbackConfigFile = "src/main/resources/logback.xml"`
`36`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,3 +24,7 @@ dependencies {`
`24`	`24`	`integrationTestCompile "org.seleniumhq.selenium:htmlunit-driver"`
`25`	`25`	`integrationTestCompile "org.seleniumhq.selenium:selenium-support"`
`26`	`26`	`}`
	`27`	`+`
	`28`	`+gretty {`
	`29`	`+ logbackConfigFile = "src/main/resources/logback.xml"`
	`30`	`+}`