Skip to content

Commit

Permalink
Merge pull request reactive-streams#55 from reactive-streams/wip-reli…
Browse files Browse the repository at this point in the history
…cense-√

Relicensing to MIT-0
  • Loading branch information
viktorklang authored Nov 2, 2020
2 parents d964c3e + 6466b37 commit c4d6d54
Show file tree
Hide file tree
Showing 63 changed files with 231 additions and 236 deletions.
22 changes: 8 additions & 14 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
# Contributing to the Reactive Streams Project

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.

## Copyright Statement

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-dotnet/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.
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 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. For more detail, see [LICENSE](https://github.com/reactive-streams/reactive-streams-jvm/blob/master/LICENSE).

## Gatekeepers

Expand All @@ -28,16 +24,15 @@ Gatekeepers commit to the following:

## General Workflow

1. Make sure you have signed the Copyright Statement, see above.
2. Before starting to work on a change, make sure that:
1. Before starting to work on a change, make sure that:
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.
2. The ticket has been scheduled for the current milestone.
3. You should always perform your work in a Git feature branch within your own fork of the repository your are targeting (even if you should have push rights to the target repository).
4. When the change is completed you should open a [Pull Request](https://help.github.com/articles/using-pull-requests) on GitHub.
5. Anyone can comment on the pull request while it is open, and you are expected to answer questions or incorporate feedback.
6. Once at least two thirds of the gatekeepers have signaled their consent, the pull request is merged by one of the gatekeepers into the branch and repository it is targeting. Consent is signaled by commenting on the pull request with the text “LGTM”, and it suffices for one representative of a gatekeeper to signal consent for that gatekeeper to be counted towards the two thirds quorum.
7. It is not allowed to force-push to the branch on which the pull request is based. Replacing or adding to the commits on that branch will invalidate all previous consenting comments and consent needs to be re-established.
8. Before merging a branch that contains multiple commits, it is recommended that these are squashed into a single commit before performing the merge. To aid in verification that no new changes are introduced, a new pull request should be opened in this case, targeting the same branch and repository and containing just one commit which encompasses the full change set of the original pull request.
2. You should always perform your work in a Git feature branch within your own fork of the repository your are targeting (even if you should have push rights to the target repository).
3. When the change is completed you should open a [Pull Request](https://help.github.com/articles/using-pull-requests) on GitHub.
4. Anyone can comment on the pull request while it is open, and you are expected to answer questions or incorporate feedback.
5. Once at least two thirds of the gatekeepers have signaled their consent, the pull request is merged by one of the gatekeepers into the branch and repository it is targeting. Consent is signaled by commenting on the pull request with the text “LGTM”, and it suffices for one representative of a gatekeeper to signal consent for that gatekeeper to be counted towards the two thirds quorum.
6. It is not allowed to force-push to the branch on which the pull request is based. Replacing or adding to the commits on that branch will invalidate all previous consenting comments and consent needs to be re-established.
7. Before merging a branch that contains multiple commits, it is recommended that these are squashed into a single commit before performing the merge. To aid in verification that no new changes are introduced, a new pull request should be opened in this case, targeting the same branch and repository and containing just one commit which encompasses the full change set of the original pull request.

## Pull Request Requirements

Expand Down Expand Up @@ -68,7 +63,6 @@ Example:

* clarify how pull requests should look like
* describe the acceptance process
* define the Copyright Statement signing process

## Performing Official Releases

Expand Down
121 changes: 0 additions & 121 deletions COPYING

This file was deleted.

25 changes: 0 additions & 25 deletions CopyrightWaivers.txt

This file was deleted.

11 changes: 5 additions & 6 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
Licensed under Public Domain (CC0)
MIT No Attribution

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

You should have received a copy of the CC0 legalcode along with this
work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
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.

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.
16 changes: 1 addition & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -229,18 +229,4 @@ ISubscribers signaling a demand for one element after the reception of an elemen
## Legal
This project is a collaboration between engineers from Kaazing, Netflix, Pivotal, Red Hat, Twitter, Typesafe 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`.
<p xmlns:dct="http://purl.org/dc/terms/" xmlns:vcard="http://www.w3.org/2001/vcard-rdf/3.0#">
<a rel="license" href="http://creativecommons.org/publicdomain/zero/1.0/">
<img src="http://i.creativecommons.org/p/zero/1.0/88x31.png" style="border-style: none;" alt="CC0" />
</a>
<br />
To the extent possible under law,
<a rel="dct:publisher" href="http://www.reactive-streams.org/">
<span property="dct:title">Reactive Streams Special Interest Group</span></a>
has waived all copyright and related or neighboring rights to
<span property="dct:title">Reactive Streams .NET</span>.
This work is published from:
<span property="vcard:Country" datatype="dct:ISO3166" content="US" about="http://www.reactive-streams.org/">United States</span>.
</p>
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).
2 changes: 1 addition & 1 deletion src/SharedAssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Reflection;

[assembly: AssemblyCompanyAttribute("Reactive Streams")]
[assembly: AssemblyCopyrightAttribute("CC0 1.0 Universal")]
[assembly: AssemblyCopyrightAttribute("MIT-0")]
[assembly: AssemblyTrademarkAttribute("")]
[assembly: AssemblyVersionAttribute("1.0.0.0")]
[assembly: AssemblyFileVersionAttribute("1.0.0.0")]
3 changes: 3 additions & 0 deletions src/api/Reactive.Streams/IProcessor.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/***************************************************
* Licensed under MIT No Attribution (SPDX: MIT-0) *
***************************************************/
namespace Reactive.Streams
{
/// <summary>
Expand Down
3 changes: 3 additions & 0 deletions src/api/Reactive.Streams/IPublisher.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/***************************************************
* Licensed under MIT No Attribution (SPDX: MIT-0) *
***************************************************/
namespace Reactive.Streams
{
/// <summary>
Expand Down
5 changes: 4 additions & 1 deletion src/api/Reactive.Streams/ISubscriber.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
using System;
/***************************************************
* Licensed under MIT No Attribution (SPDX: MIT-0) *
***************************************************/
using System;

namespace Reactive.Streams
{
Expand Down
3 changes: 3 additions & 0 deletions src/api/Reactive.Streams/ISubscription.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/***************************************************
* Licensed under MIT No Attribution (SPDX: MIT-0) *
***************************************************/
namespace Reactive.Streams
{
/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion src/api/Reactive.Streams/Reactive.Streams.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<AssemblyName>Reactive.Streams</AssemblyName>
<Description>Reactive Streams API</Description>
<Copyright>CC0 1.0 Universal</Copyright>
<Copyright>MIT-0</Copyright>
<VersionPrefix>1.0.3</VersionPrefix>
<Authors>Reactive Streams</Authors>
<TargetFrameworks>netstandard1.0;net45</TargetFrameworks>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
using System;
/***************************************************
* Licensed under MIT No Attribution (SPDX: MIT-0) *
***************************************************/
using System;
using System.Threading;
using NUnit.Framework;
using Reactive.Streams.TCK;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
using System;
/***************************************************
* Licensed under MIT No Attribution (SPDX: MIT-0) *
***************************************************/
using System;
using System.Collections;
using System.Collections.Generic;
using NUnit.Framework;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
using System.Reflection;
/***************************************************
* Licensed under MIT No Attribution (SPDX: MIT-0) *
***************************************************/
using System.Reflection;
using System.Runtime.InteropServices;

// Allgemeine Informationen über eine Assembly werden über die folgenden
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
using System;
/***************************************************
* Licensed under MIT No Attribution (SPDX: MIT-0) *
***************************************************/
using System;
using NUnit.Framework;
using Reactive.Streams.TCK;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
using System;
/***************************************************
* Licensed under MIT No Attribution (SPDX: MIT-0) *
***************************************************/
using System;
using NUnit.Framework;
using Reactive.Streams.TCK;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
using System;
/***************************************************
* Licensed under MIT No Attribution (SPDX: MIT-0) *
***************************************************/
using System;
using System.Collections;
using System.Collections.Generic;
using NUnit.Framework;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
using System;
/***************************************************
* Licensed under MIT No Attribution (SPDX: MIT-0) *
***************************************************/
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Threading.Tasks;
Expand Down
Loading

0 comments on commit c4d6d54

Please sign in to comment.