Skip to content

Commit d7dd3aa

Browse files
viktorklangviktorklang
committed
Preparing relicensing to MIT-0
1 parent d4d08aa commit d7dd3aa

File tree

69 files changed

+203
-791
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+203
-791
lines changed

‎CONTRIBUTING.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Contributing to the Reactive Streams Project
22

3-
The Reactive Streams project welcomes contributions from anybody who wants to participate in moving this initiative forward. All code or documentation that is contributed will have to be covered by a waiver of all copyrights and other rights as detailed by the LICENSE and COPYING files at each repository root, the rationale for this is that the APIs defined by this project shall be freely implementable and usable by everyone.
3+
The Reactive Streams project welcomes contributions from anybody who wants to participate in moving this initiative forward. All code or documentation that is contributed will have to be covered the MIT No Attribution (SPDX: MIT-0) license, the rationale for this is that the APIs defined by this project shall be freely implementable and usable by everyone.
44

5-
## Copyright Statement
5+
## Contributor License Agreement
66

7-
The aforementioned waiver of copyrights and other rights is represented by the addition of a line to the file [CopyrightWaivers.txt](https://github.com/reactive-streams/reactive-streams-jvm/blob/master/CopyrightWaivers.txt). For a pull request to be considered every contributor must have signed the copyright statement in this way; this may be included within that same pull request.
7+
The aforementioned waiver of copyrights and other rights is represented by the addition of a line to the file [ContributorLicenseAgreements.txt](https://github.com/reactive-streams/reactive-streams-jvm/blob/master/ContributorLicenseAgreements.txt). For a pull request to be considered every contributor must have signed the contributor license agreement; this may be included within that same pull request.
88

99
## Gatekeepers
1010

@@ -28,7 +28,7 @@ Gatekeepers commit to the following:
2828

2929
## General Workflow
3030

31-
1. Make sure you have signed the Copyright Statement, see above.
31+
1. Make sure you have signed the Contributor License Agreement, see above.
3232
2. Before starting to work on a change, make sure that:
3333
1. There is a ticket for your work in the project's issue tracker. If not, create it first. It can help accelerating the pull request acceptance process if the change is agreed upon beforehand within the ticket, but in some cases it may be preferable to discuss the necessity of the change in consideration of a concrete proposal.
3434
2. The ticket has been scheduled for the current milestone.
@@ -68,7 +68,7 @@ Example:
6868

6969
* clarify how pull requests should look like
7070
* describe the acceptance process
71-
* define the Copyright Statement signing process
71+
* define the Contributor License Agreement signing process
7272

7373
## Performing Official Releases
7474

‎COPYING

-121
This file was deleted.

‎CopyrightWaivers.txt renamed to ‎ContributorLicenseAgreements.txt

+1-10
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,7 @@ Copyright Statement for Contributions to the Reactive Streams Project
33

44
I hereby represent that all present, past and future contributions I make to
55
the Reactive Streams project (which includes all repositories owned by the
6-
“reactive-streams” github organization) are governed by the Creative Commons
7-
Zero 1.0 Universal copyright statement, placing my contributions in the public
8-
domain. This entails that to the extent possible under law I waive all
9-
copyright and related or neighboring rights to the code or documents I
10-
contribute. I also represent that I have the authority to perform the above
11-
waiver with respect to the entirety of my contributions.
12-
13-
The text of the copyright statement is included in the COPYING file at the root
14-
of the reactive-streams repository at
15-
https://github.com/reactive-streams/reactive-streams-jvm/blob/master/COPYING.
6+
“reactive-streams” github organization) are governed by the MIT No Attribution (SPDX: MIT-0) license.
167

178
Underwriting parties:
189

‎LICENSE

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
Licensed under Public Domain (CC0)
1+
MIT No Attribution
22

3-
To the extent possible under law, the person who associated CC0 with
4-
this code has waived all copyright and related or neighboring
5-
rights to this code.
3+
Copyright 2014 Reactive Streams
64

7-
You should have received a copy of the CC0 legalcode along with this
8-
work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
5+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so.
6+
7+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

‎README.md

+1-16
Original file line numberDiff line numberDiff line change
@@ -282,19 +282,4 @@ Subscribers signaling a demand for one element after the reception of an element
282282
283283
## Legal
284284
285-
This project is a collaboration between engineers from Kaazing, Lightbend, Netflix, Pivotal, Red Hat, Twitter and many others. The code is offered to the Public Domain in order to allow free use by interested parties who want to create compatible implementations. For details see `COPYING`.
286-
287-
<p xmlns:dct="http://purl.org/dc/terms/" xmlns:vcard="http://www.w3.org/2001/vcard-rdf/3.0#">
288-
<a rel="license" href="http://creativecommons.org/publicdomain/zero/1.0/">
289-
<img src="http://i.creativecommons.org/p/zero/1.0/88x31.png" style="border-style: none;" alt="CC0" />
290-
</a>
291-
<br />
292-
To the extent possible under law,
293-
<a rel="dct:publisher" href="http://www.reactive-streams.org/">
294-
<span property="dct:title">Reactive Streams Special Interest Group</span></a>
295-
has waived all copyright and related or neighboring rights to
296-
<span property="dct:title">Reactive Streams JVM</span>.
297-
This work is published from:
298-
<span property="vcard:Country" datatype="dct:ISO3166" content="US" about="http://www.reactive-streams.org/">United States</span>.
299-
</p>
300-
285+
This project is a collaboration between engineers from Kaazing, Lightbend, Netflix, Pivotal, Red Hat, Twitter and many others. This project is licensed under MIT No Attribution (SPDX: MIT-0).

‎api/src/main/java/org/reactivestreams/Processor.java

+3-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
1-
/************************************************************************
2-
* Licensed under Public Domain (CC0) *
3-
* *
4-
* To the extent possible under law, the person who associated CC0 with *
5-
* this code has waived all copyright and related or neighboring *
6-
* rights to this code. *
7-
* *
8-
* You should have received a copy of the CC0 legalcode along with this *
9-
* work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.*
10-
************************************************************************/
1+
/***************************************************
2+
* Licensed under MIT No Attribution (SPDX: MIT-0) *
3+
***************************************************/
114

125
package org.reactivestreams;
136

‎api/src/main/java/org/reactivestreams/Publisher.java

+3-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
1-
/************************************************************************
2-
* Licensed under Public Domain (CC0) *
3-
* *
4-
* To the extent possible under law, the person who associated CC0 with *
5-
* this code has waived all copyright and related or neighboring *
6-
* rights to this code. *
7-
* *
8-
* You should have received a copy of the CC0 legalcode along with this *
9-
* work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.*
10-
************************************************************************/
1+
/***************************************************
2+
* Licensed under MIT No Attribution (SPDX: MIT-0) *
3+
***************************************************/
114

125
package org.reactivestreams;
136

‎api/src/main/java/org/reactivestreams/Subscriber.java

+3-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
1-
/************************************************************************
2-
* Licensed under Public Domain (CC0) *
3-
* *
4-
* To the extent possible under law, the person who associated CC0 with *
5-
* this code has waived all copyright and related or neighboring *
6-
* rights to this code. *
7-
* *
8-
* You should have received a copy of the CC0 legalcode along with this *
9-
* work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.*
10-
************************************************************************/
1+
/***************************************************
2+
* Licensed under MIT No Attribution (SPDX: MIT-0) *
3+
***************************************************/
114

125
package org.reactivestreams;
136

‎api/src/main/java/org/reactivestreams/Subscription.java

+3-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
1-
/************************************************************************
2-
* Licensed under Public Domain (CC0) *
3-
* *
4-
* To the extent possible under law, the person who associated CC0 with *
5-
* this code has waived all copyright and related or neighboring *
6-
* rights to this code. *
7-
* *
8-
* You should have received a copy of the CC0 legalcode along with this *
9-
* work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.*
10-
************************************************************************/
1+
/***************************************************
2+
* Licensed under MIT No Attribution (SPDX: MIT-0) *
3+
***************************************************/
114

125
package org.reactivestreams;
136

‎api/src/main/java9/org/reactivestreams/FlowAdapters.java

+3-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
1-
/************************************************************************
2-
* Licensed under Public Domain (CC0) *
3-
* *
4-
* To the extent possible under law, the person who associated CC0 with *
5-
* this code has waived all copyright and related or neighboring *
6-
* rights to this code. *
7-
* *
8-
* You should have received a copy of the CC0 legalcode along with this *
9-
* work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.*
10-
************************************************************************/
1+
/***************************************************
2+
* Licensed under MIT No Attribution (SPDX: MIT-0) *
3+
***************************************************/
114

125
package org.reactivestreams;
136

‎build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@ subprojects {
131131

132132
licenses {
133133
license {
134-
name "CC0"
135-
url "http://creativecommons.org/publicdomain/zero/1.0/"
134+
name "MIT-0"
135+
url "https://spdx.org/licenses/MIT-0.html"
136136
distribution "repo"
137137
}
138138
}

‎examples/src/main/java/org/reactivestreams/example/unicast/AsyncIterablePublisher.java

+3-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
1-
/************************************************************************
2-
* Licensed under Public Domain (CC0) *
3-
* *
4-
* To the extent possible under law, the person who associated CC0 with *
5-
* this code has waived all copyright and related or neighboring *
6-
* rights to this code. *
7-
* *
8-
* You should have received a copy of the CC0 legalcode along with this *
9-
* work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.*
10-
************************************************************************/
1+
/***************************************************
2+
* Licensed under MIT No Attribution (SPDX: MIT-0) *
3+
***************************************************/
114

125
package org.reactivestreams.example.unicast;
136

0 commit comments

Comments
 (0)