Make gretty samples compatible with logback 1.2.9

eleftherias · eleftherias · commit 3a3399d388e5 · 2021-12-20T19:06:45.000+02:00
Explicitly reference the logback.xml file to prevent gretty from configuring the defaults using groovy. Issue gh-10642
diff --git a/samples/javaconfig/concurrency/spring-security-samples-javaconfig-concurrency.gradle b/samples/javaconfig/concurrency/spring-security-samples-javaconfig-concurrency.gradle
@@ -18,3 +18,7 @@ dependencies {
 	runtime 'ch.qos.logback:logback-classic'
 	runtime 'opensymphony:sitemesh'
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
diff --git a/samples/javaconfig/form/spring-security-samples-javaconfig-form.gradle b/samples/javaconfig/form/spring-security-samples-javaconfig-form.gradle
@@ -38,3 +38,7 @@ dependencies {
 
 	integrationTestCompile seleniumDependencies
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
diff --git a/samples/javaconfig/hellojs/spring-security-samples-javaconfig-hellojs.gradle b/samples/javaconfig/hellojs/spring-security-samples-javaconfig-hellojs.gradle
@@ -18,3 +18,7 @@ dependencies {
 
 	runtime 'opensymphony:sitemesh'
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
diff --git a/samples/javaconfig/hellomvc/spring-security-samples-javaconfig-hellomvc.gradle b/samples/javaconfig/hellomvc/spring-security-samples-javaconfig-hellomvc.gradle
@@ -20,3 +20,7 @@ dependencies {
 
 	testCompile project(':spring-security-test')
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
diff --git a/samples/javaconfig/helloworld/spring-security-samples-javaconfig-helloworld.gradle b/samples/javaconfig/helloworld/spring-security-samples-javaconfig-helloworld.gradle
@@ -27,3 +27,7 @@ dependencies {
 
 	integrationTestCompile seleniumDependencies
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
diff --git a/samples/javaconfig/inmemory/spring-security-samples-javaconfig-inmemory.gradle b/samples/javaconfig/inmemory/spring-security-samples-javaconfig-inmemory.gradle
@@ -20,3 +20,7 @@ dependencies {
 
 	testCompile project(':spring-security-test')
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
diff --git a/samples/javaconfig/jdbc/spring-security-samples-javaconfig-jdbc.gradle b/samples/javaconfig/jdbc/spring-security-samples-javaconfig-jdbc.gradle
@@ -39,3 +39,7 @@ dependencies {
 
 	integrationTestCompile seleniumDependencies
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
diff --git a/samples/javaconfig/ldap/spring-security-samples-javaconfig-ldap.gradle b/samples/javaconfig/ldap/spring-security-samples-javaconfig-ldap.gradle
@@ -37,3 +37,7 @@ dependencies {
 
 	integrationTestCompile seleniumDependencies
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
diff --git a/samples/javaconfig/messages/spring-security-samples-javaconfig-messages.gradle b/samples/javaconfig/messages/spring-security-samples-javaconfig-messages.gradle
@@ -29,3 +29,7 @@ dependencies {
 
 	providedCompile 'javax.servlet:javax.servlet-api'
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
diff --git a/samples/javaconfig/openid/spring-security-samples-javaconfig-openid.gradle b/samples/javaconfig/openid/spring-security-samples-javaconfig-openid.gradle
@@ -20,3 +20,7 @@ dependencies {
 	runtime 'net.sourceforge.nekohtml:nekohtml'
 	runtime 'opensymphony:sitemesh'
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
diff --git a/samples/javaconfig/preauth/spring-security-samples-javaconfig-preauth.gradle b/samples/javaconfig/preauth/spring-security-samples-javaconfig-preauth.gradle
@@ -17,3 +17,7 @@ dependencies {
 
 	runtime 'opensymphony:sitemesh'
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
diff --git a/samples/javaconfig/rememberme/spring-security-samples-javaconfig-rememberme.gradle b/samples/javaconfig/rememberme/spring-security-samples-javaconfig-rememberme.gradle
@@ -17,3 +17,7 @@ dependencies {
 
 	runtime 'opensymphony:sitemesh'
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
diff --git a/samples/javaconfig/saml2login/spring-security-samples-javaconfig-saml2-login.gradle b/samples/javaconfig/saml2login/spring-security-samples-javaconfig-saml2-login.gradle
@@ -9,3 +9,7 @@ dependencies {
 
 	testCompile project(':spring-security-test')
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
diff --git a/samples/javaconfig/x509/spring-security-samples-javaconfig-x509.gradle b/samples/javaconfig/x509/spring-security-samples-javaconfig-x509.gradle
@@ -17,3 +17,7 @@ dependencies {
 
 	runtime 'opensymphony:sitemesh'
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
diff --git a/samples/xml/cas/cassample/spring-security-samples-xml-cassample.gradle b/samples/xml/cas/cassample/spring-security-samples-xml-cassample.gradle
@@ -65,6 +65,7 @@ gretty {
 	sslKeyStorePath = keystore
 	sslKeyStorePassword = password
 	jvmArgs = ["-Djavax.net.ssl.trustStore=${keystore}", "-Djavax.net.ssl.trustStorePassword=${password}"]
+	logbackConfigFile = "src/main/resources/logback.xml"
 }
 
 def casServer() {
diff --git a/samples/xml/cas/cassample/src/main/resources/logback.xml b/samples/xml/cas/cassample/src/main/resources/logback.xml
@@ -0,0 +1,12 @@
+<configuration>
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+	<encoder>
+		<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+	</encoder>
+	</appender>
+
+	<root level="WARN">
+		<appender-ref ref="STDOUT" />
+	</root>
+
+</configuration>
diff --git a/samples/xml/cas/casserver/spring-security-samples-xml-casserver.gradle b/samples/xml/cas/casserver/spring-security-samples-xml-casserver.gradle
@@ -53,4 +53,5 @@ gretty {
 	sslKeyStorePath = keystore
 	sslKeyStorePassword = password
 	jvmArgs = ["-Djavax.net.ssl.trustStore=${keystore}", "-Djavax.net.ssl.trustStorePassword=${password}"]
+	logbackConfigFile = "src/main/resources/logback.xml"
 }
diff --git a/samples/xml/cas/casserver/src/main/resources/logback.xml b/samples/xml/cas/casserver/src/main/resources/logback.xml
@@ -0,0 +1,12 @@
+<configuration>
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+	<encoder>
+		<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+	</encoder>
+	</appender>
+
+	<root level="WARN">
+		<appender-ref ref="STDOUT" />
+	</root>
+
+</configuration>
diff --git a/samples/xml/contacts/spring-security-samples-xml-contacts.gradle b/samples/xml/contacts/spring-security-samples-xml-contacts.gradle
@@ -41,3 +41,7 @@ dependencies {
 
 	integrationTestCompile seleniumDependencies
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
diff --git a/samples/xml/helloworld/spring-security-samples-xml-helloworld.gradle b/samples/xml/helloworld/spring-security-samples-xml-helloworld.gradle
@@ -31,3 +31,7 @@ dependencies {
 
 	integrationTestCompile seleniumDependencies
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
diff --git a/samples/xml/insecure/spring-security-samples-xml-insecure.gradle b/samples/xml/insecure/spring-security-samples-xml-insecure.gradle
@@ -26,3 +26,7 @@ dependencies {
 
 	integrationTestCompile seleniumDependencies
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
diff --git a/samples/xml/insecure/src/main/resources/logback.xml b/samples/xml/insecure/src/main/resources/logback.xml
@@ -0,0 +1,12 @@
+<configuration>
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+	<encoder>
+		<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+	</encoder>
+	</appender>
+
+	<root level="WARN">
+		<appender-ref ref="STDOUT" />
+	</root>
+
+</configuration>
diff --git a/samples/xml/insecuremvc/spring-security-samples-xml-insecuremvc.gradle b/samples/xml/insecuremvc/spring-security-samples-xml-insecuremvc.gradle
@@ -15,3 +15,7 @@ dependencies {
 
 	runtime 'opensymphony:sitemesh'
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
diff --git a/samples/xml/insecuremvc/src/main/resources/logback.xml b/samples/xml/insecuremvc/src/main/resources/logback.xml
@@ -0,0 +1,12 @@
+<configuration>
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+	<encoder>
+		<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+	</encoder>
+	</appender>
+
+	<root level="WARN">
+		<appender-ref ref="STDOUT" />
+	</root>
+
+</configuration>
diff --git a/samples/xml/jaas/spring-security-samples-xml-jaas.gradle b/samples/xml/jaas/spring-security-samples-xml-jaas.gradle
@@ -31,3 +31,7 @@ dependencies {
 
 	integrationTestCompile seleniumDependencies
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
diff --git a/samples/xml/ldap/spring-security-samples-xml-ldap.gradle b/samples/xml/ldap/spring-security-samples-xml-ldap.gradle
@@ -29,3 +29,7 @@ dependencies {
 
 	integrationTestCompile seleniumDependencies
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
diff --git a/samples/xml/openid/spring-security-samples-xml-openid.gradle b/samples/xml/openid/spring-security-samples-xml-openid.gradle
@@ -12,3 +12,7 @@ dependencies {
 	runtime jstlDependencies
 	runtime slf4jDependencies
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
diff --git a/samples/xml/preauth/spring-security-samples-xml-preauth.gradle b/samples/xml/preauth/spring-security-samples-xml-preauth.gradle
@@ -14,3 +14,7 @@ dependencies {
 //jettyRun {
 //	userRealms = [jettyRun.class.classLoader.loadClass('org.mortbay.jetty.security.HashUserRealm').newInstance('Preauth Realm' '$projectDir/realm.properties')]
 //}
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
diff --git a/samples/xml/servletapi/spring-security-samples-xml-servletapi.gradle b/samples/xml/servletapi/spring-security-samples-xml-servletapi.gradle
@@ -19,3 +19,7 @@ dependencies {
 }
 
 eclipse.wtp.component.contextPath = 'servletapi'
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
diff --git a/samples/xml/tutorial/spring-security-samples-xml-tutorial.gradle b/samples/xml/tutorial/spring-security-samples-xml-tutorial.gradle
@@ -14,3 +14,7 @@ dependencies {
 	runtime project(':spring-security-web')
 	runtime jstlDependencies
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}

Original file line number	Diff line number	Diff line change
`@@ -18,3 +18,7 @@ dependencies {`
`18`	`18`	`runtime 'ch.qos.logback:logback-classic'`
`19`	`19`	`runtime 'opensymphony:sitemesh'`
`20`	`20`	`}`
	`21`	`+`
	`22`	`+gretty {`
	`23`	`+ logbackConfigFile = "src/main/resources/logback.xml"`
	`24`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -38,3 +38,7 @@ dependencies {`
`38`	`38`
`39`	`39`	`integrationTestCompile seleniumDependencies`
`40`	`40`	`}`
	`41`	`+`
	`42`	`+gretty {`
	`43`	`+ logbackConfigFile = "src/main/resources/logback.xml"`
	`44`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -20,3 +20,7 @@ dependencies {`
`20`	`20`
`21`	`21`	`testCompile project(':spring-security-test')`
`22`	`22`	`}`
	`23`	`+`
	`24`	`+gretty {`
	`25`	`+ logbackConfigFile = "src/main/resources/logback.xml"`
	`26`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -27,3 +27,7 @@ dependencies {`
`27`	`27`
`28`	`28`	`integrationTestCompile seleniumDependencies`
`29`	`29`	`}`
	`30`	`+`
	`31`	`+gretty {`
	`32`	`+ logbackConfigFile = "src/main/resources/logback.xml"`
	`33`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -39,3 +39,7 @@ dependencies {`
`39`	`39`
`40`	`40`	`integrationTestCompile seleniumDependencies`
`41`	`41`	`}`
	`42`	`+`
	`43`	`+gretty {`
	`44`	`+ logbackConfigFile = "src/main/resources/logback.xml"`
	`45`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -37,3 +37,7 @@ dependencies {`
`37`	`37`
`38`	`38`	`integrationTestCompile seleniumDependencies`
`39`	`39`	`}`
	`40`	`+`
	`41`	`+gretty {`
	`42`	`+ logbackConfigFile = "src/main/resources/logback.xml"`
	`43`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -29,3 +29,7 @@ dependencies {`
`29`	`29`
`30`	`30`	`providedCompile 'javax.servlet:javax.servlet-api'`
`31`	`31`	`}`
	`32`	`+`
	`33`	`+gretty {`
	`34`	`+ logbackConfigFile = "src/main/resources/logback.xml"`
	`35`	`+}`