Make gretty samples compatible with logback 1.2.9

eleftherias · eleftherias · commit 8cea4152a0fe · 2021-12-21T13:30:52.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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -21,4 +21,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
`@@ -21,4 +21,5 @@ dependencies {`
`21`	`21`
`22`	`22`	`gretty {`
`23`	`23`	`jvmArgs = ['-Dspring.profiles.active=embedded-redis']`
	`24`	`+ logbackConfigFile = "src/main/resources/logback.xml"`
`24`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,3 +21,7 @@ dependencies {`
`21`	`21`
`22`	`22`	`integrationTestCompile seleniumDependencies`
`23`	`23`	`}`
	`24`	`+`
	`25`	`+gretty {`
	`26`	`+ logbackConfigFile = "src/main/resources/logback.xml"`
	`27`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -17,3 +17,7 @@ dependencies {`
`17`	`17`
`18`	`18`	`integrationTestCompile seleniumDependencies`
`19`	`19`	`}`
	`20`	`+`
	`21`	`+gretty {`
	`22`	`+ logbackConfigFile = "src/main/resources/logback.xml"`
	`23`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -23,4 +23,5 @@ dependencies {`
`23`	`23`	`gretty {`
`24`	`24`	`jvmArgs = ['-Dspring.profiles.active=embedded-redis']`
`25`	`25`	`servletContainer = 'tomcat9'`
	`26`	`+ logbackConfigFile = "src/main/resources/logback.xml"`
`26`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,4 +25,5 @@ dependencies {`
`25`	`25`
`26`	`26`	`gretty {`
`27`	`27`	`jvmArgs = ['-Dspring.profiles.active=embedded-redis']`
	`28`	`+ logbackConfigFile = "src/main/resources/logback.xml"`
`28`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,3 +16,7 @@ dependencies {`
`16`	`16`
`17`	`17`	`integrationTestCompile seleniumDependencies`
`18`	`18`	`}`
	`19`	`+`
	`20`	`+gretty {`
	`21`	`+ logbackConfigFile = "src/main/resources/logback.xml"`
	`22`	`+}`