Skip to content
This repository was archived by the owner on Sep 1, 2020. It is now read-only.

Commit c64a09b

Browse files
committed
Linked to license in tree; clarified issues with mismatched license/CLA.
1 parent ad4e90c commit c64a09b

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

README.md

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -205,11 +205,13 @@ documentation][lbs-readme] — the Scala distribution is now an SBT project
205205
much the same way as any other github hosted FLOSS Scala project. [Miles Sabin][milessabin] has provided a write up
206206
(now slightly outdated) of the process [here][scalac-post].
207207

208-
Because a pull request against [scala/scala][lbs] is the first step, to contribute you will need to
209-
sign the [Scala CLA][scala-cla] and be willing to make your contributions under the [Scala License][scala-license].
210-
Typelevel is strongly in favour of this non-standard licence and CLA being replaced by the [Apache 2.0
211-
license][apache-2.0] as soon as is feasible. If you would like to contribute but are unable to sign the CLA please
212-
raise this issue on the [Lightbend][lbs-gitter] and [Typelevel][tls-gitter] gitter channels.
208+
Because a pull request against [scala/scala][lbs] is the first step, to contribute you will need to sign the [Scala
209+
CLA][scala-cla] and be willing to make your contributions under the [Scala License][scala-license]. Typelevel is
210+
strongly in favour of the currently Scala license/CLA (which requires contributors to grant a patent license but does
211+
not grant one in return) being replaced by the Apache 2.0 [license][apache-2.0-license] and [ICLA][apache-2.0-icla]
212+
(which both requires and grants a patent license) as soon as is feasible. If you would like to contribute but are
213+
unable to sign the CLA please raise this issue on the [Lightbend][lbs-gitter] and [Typelevel][tls-gitter] gitter
214+
channels.
213215

214216
## Community
215217

@@ -258,5 +260,6 @@ The current maintainers (people who can merge pull requests) are:
258260
[milessabin]: https://github.com/milessabin
259261
[2.11.8-bin-typelevel]: https://github.com/typelevel/scala/commits/2.11.8-bin-typelevel
260262
[scala-cla]: http://www.lightbend.com/contribute/cla/scala
261-
[scala-license]: http://www.scala-lang.org/license.html
262-
[apache-2.0]: http://www.apache.org/licenses/LICENSE-2.0
263+
[scala-license]: https://github.com/scala/scala/blob/2.12.x/doc/LICENSE.md
264+
[apache-2.0-license]: http://www.apache.org/licenses/LICENSE-2.0
265+
[apache-2.0-icla]: https://www.apache.org/licenses/icla.txt

0 commit comments

Comments
 (0)