Merge branch '1.1.x' into 1.2.x

Author: jgrandja

CODE_OF_CONDUCT.adoc

@@ -4,9 +4,7 @@ Spring Authorization Server is released under the Apache 2.0 license.
 If you would like to contribute something, or simply want to hack on the code this document should help you https://github.com/spring-projects/spring-authorization-server#getting-started[get started].
 
 == Code of Conduct
-This project adheres to the Contributor Covenant link:CODE_OF_CONDUCT.adoc[code of conduct].
-By participating, you are expected to uphold this code.
-Please report unacceptable behavior to [email protected].
+Please see our https://github.com/spring-projects/.github/blob/main/CODE_OF_CONDUCT.md[code of conduct].
 
 == Using GitHub Issues
 We use GitHub issues to track bugs and enhancements.

CONTRIBUTING.adoc

@@ -36,8 +36,7 @@ Be sure to read the https://docs.spring.io/spring-authorization-server/reference
 JavaDoc is also available for the https://docs.spring.io/spring-authorization-server/docs/current/api/[Spring Authorization Server API] and https://docs.spring.io/spring-security/site/docs/current/api/[Spring Security API].
 
 == Code of Conduct
-This project adheres to the Contributor Covenant link:CODE_OF_CONDUCT.adoc[code of conduct].
-By participating, you are expected to uphold this code. Please report unacceptable behavior to [email protected].
+Please see our https://github.com/spring-projects/.github/blob/main/CODE_OF_CONDUCT.md[code of conduct].
 
 == Downloading Artifacts
 See https://github.com/spring-projects/spring-framework/wiki/Spring-Framework-Artifacts[downloading Spring artifacts] for Maven repository information.