root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

SpringSource CLA renamed to Spring ICLA

This commit is contained in:
Sam Brannen 2015-10-14 17:22:34 +03:00
parent c2bc2b27ea
commit 6ea407aa46
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
CONTRIBUTING.md
View File

@ -30,10 +30,10 @@ submitting a pull request. We're happy to provide guidance, but please spend an
hour or two researching the subject on your own, including searching the mailing hour or two researching the subject on your own, including searching the mailing
list for prior discussions. list for prior discussions.
### Sign the Contributor License Agreement ### Sign the Individual Contributor License Agreement (ICLA)
If you have not previously done so, please fill out and submit the If you have not previously done so, please fill out and submit the
[SpringSource CLA form][]. You'll receive a token when this process is complete. [Spring ICLA form][]. You'll receive a token when this process is complete.
Keep track of this; you may be asked for it later! Keep track of this; you may be asked for it later!
Note that emailing/postal mailing a signed copy is _not_ necessary. Submission Note that emailing/postal mailing a signed copy is _not_ necessary. Submission
@ -42,8 +42,8 @@ of the web form is all that is required.
Once you've completed the web form, simply add the following in a comment on Once you've completed the web form, simply add the following in a comment on
your pull request: your pull request:
I have signed and agree to the terms of the SpringSource Individual I have signed and agree to the terms of the Spring Individual Contributor
Contributor License Agreement. License Agreement.
You do not need to include your token/id. Please add the above statement to all You do not need to include your token/id. Please add the above statement to all
future pull requests as well, simply so that the Spring Framework team knows future pull requests as well, simply so that the Spring Framework team knows
@ -93,7 +93,7 @@ present in the framework.
```java ```java
/* /*
* Copyright 2002-2014 the original author or authors. * Copyright 2002-2015 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -114,16 +114,18 @@ package ...;
### Update Apache license header in modified files as necessary ### Update Apache license header in modified files as necessary
Always check the date range in the license header. For example, if you've Always check the date range in the license header. For example, if you've
modified a file in 2014 whose header still reads: modified a file in 2015 whose header still reads:
```java ```java
/*
* Copyright 2002-2011 the original author or authors. * Copyright 2002-2011 the original author or authors.
``` ```
Then be sure to update it to 2014 accordingly: Then be sure to update it to 2015 accordingly:
```java ```java
* Copyright 2002-2014 the original author or authors. /*
* Copyright 2002-2015 the original author or authors.
``` ```
### Use @since tags for newly-added public API types and methods ### Use @since tags for newly-added public API types and methods
@ -135,7 +137,7 @@ For example:
* ... * ...
* *
* @author First Last * @author First Last
* @since 4.0 * @since 4.2.3
* @see ... * @see ...
*/ */
``` ```
@ -307,7 +309,7 @@ need to issue a new pull request when asked to make changes.
[help documentation]: http://help.github.com/send-pull-requests [help documentation]: http://help.github.com/send-pull-requests
[JIRA issue tracker]: https://jira.spring.io/browse/SPR [JIRA issue tracker]: https://jira.spring.io/browse/SPR
[spring-framework-contrib]: https://groups.google.com/forum/#!forum/spring-framework-contrib [spring-framework-contrib]: https://groups.google.com/forum/#!forum/spring-framework-contrib
[SpringSource CLA form]: https://support.springsource.com/spring_committer_signup [Spring ICLA form]: https://support.springsource.com/spring_committer_signup
[fork-and-edit]: https://github.com/blog/844-forking-with-the-edit-button [fork-and-edit]: https://github.com/blog/844-forking-with-the-edit-button
[Spring Framework Code Style]: https://github.com/spring-projects/spring-framework/wiki/Spring-Framework-Code-Style [Spring Framework Code Style]: https://github.com/spring-projects/spring-framework/wiki/Spring-Framework-Code-Style
[Rewriting History section of Pro Git]: http://git-scm.com/book/en/Git-Tools-Rewriting-History [Rewriting History section of Pro Git]: http://git-scm.com/book/en/Git-Tools-Rewriting-History