Merge branch '6.1.x'
This commit is contained in:
commit
5787bc569d
|
@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe
|
||||||
individual is representing the project or its community.
|
individual is representing the project or its community.
|
||||||
|
|
||||||
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by
|
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by
|
||||||
contacting a project maintainer at spring-code-of-conduct@pivotal.io . All complaints will
|
contacting a project maintainer at spring-code-of-conduct@spring.io. All complaints will
|
||||||
be reviewed and investigated and will result in a response that is deemed necessary and
|
be reviewed and investigated and will result in a response that is deemed necessary and
|
||||||
appropriate to the circumstances. Maintainers are obligated to maintain confidentiality
|
appropriate to the circumstances. Maintainers are obligated to maintain confidentiality
|
||||||
with regard to the reporter of an incident.
|
with regard to the reporter of an incident.
|
||||||
|
|
|
@ -18,7 +18,7 @@ First off, thank you for taking the time to contribute! :+1: :tada:
|
||||||
|
|
||||||
This project is governed by the [Spring Code of Conduct](CODE_OF_CONDUCT.adoc).
|
This project is governed by the [Spring Code of Conduct](CODE_OF_CONDUCT.adoc).
|
||||||
By participating you are expected to uphold this code.
|
By participating you are expected to uphold this code.
|
||||||
Please report unacceptable behavior to spring-code-of-conduct@pivotal.io.
|
Please report unacceptable behavior to spring-code-of-conduct@spring.io.
|
||||||
|
|
||||||
### How to Contribute
|
### How to Contribute
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ Spring provides everything required beyond the Java programming language for cre
|
||||||
|
|
||||||
## Code of Conduct
|
## Code of Conduct
|
||||||
|
|
||||||
This project is governed by the [Spring Code of Conduct](CODE_OF_CONDUCT.adoc). By participating, you are expected to uphold this code of conduct. Please report unacceptable behavior to spring-code-of-conduct@pivotal.io.
|
This project is governed by the [Spring Code of Conduct](CODE_OF_CONDUCT.adoc). By participating, you are expected to uphold this code of conduct. Please report unacceptable behavior to spring-code-of-conduct@spring.io.
|
||||||
|
|
||||||
## Access to Binaries
|
## Access to Binaries
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,7 @@ publishing {
|
||||||
developer {
|
developer {
|
||||||
id = "jhoeller"
|
id = "jhoeller"
|
||||||
name = "Juergen Hoeller"
|
name = "Juergen Hoeller"
|
||||||
email = "jhoeller@pivotal.io"
|
email = "juergen.hoeller@broadcom.com"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
issueManagement {
|
issueManagement {
|
||||||
|
|
Loading…
Reference in New Issue