8000 [2.12.x] Finish re-licensing to Apache License 2.0 by dwijnand · Pull Request #7407 · scala/scala · GitHub
[go: up one dir, main page]
Skip to content

[2.12.x] Finish re-licensing to Apache License 2.0 #7407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 12, 2018
Merged

[2.12.x] Finish re-licensing to Apache License 2.0 #7407

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1e6ed6
Finish re-licensing to Apache License 2.0
dwijnand Nov 9, 2018
b3ab860
License.rtf parses
adriaanm Nov 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Finish re-licensing to Apache License 2.0
  • Loading branch information
@dwijnand
dwijnand committed Nov 9, 2018
commit c1e6ed6110a27a2e45dc72f1b28b3413721026b6< 8000 /span>
17 changes: 10 additions & 7 deletions doc/License.rtf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
\margl1440\margr1440\vieww25140\viewh18960\viewkind0
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural

\f0\fs26 \cf0 Scala is licensed under the {\field{\*\fldinst{HYPERLINK "http://opensource.org/licenses/BSD-3-Clause"}}{\fldrslt BSD 3-Clause License}}.\
\f0\fs26 \cf0 Scala is licensed under the {\field{\*\fldinst{HYPERLINK "https://www.apache.org/licenses/LICENSE-2.0"}}{\fldrslt Apache License Version 2.0}}.\
\

\fs48 Scala License
Expand All @@ -14,12 +14,15 @@
Copyright (c) 2011-2018 Lightbend, Inc.\
All rights reserved.\
\
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\
\'95 Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.\
\'95 Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.\
\'95 Neither the name of the EPFL nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.\
\
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \'93AS IS\'94 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\
Licensed under the Apache License, Version 2.0 (the "License");\
you may not use this file except in compliance with the License.\
You may obtain a copy of the License at\
http://www.apache.org/licenses/LICENSE-2.0\
Unless required by applicable law or agreed to in writing, software\
distributed under the License is distributed on an "AS IS" BASIS,\
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\
See the License for the specific language governing permissions and\
limitations under the License.\

\fs52 \

Expand Down
4 changes: 2 additions & 2 deletions doc/README
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ environment variable.
Licenses
--------

Scala is licensed under the standard 3-clause BSD license,
Scala is licensed under the Apache License 2.0,
included in the distribution as the file `doc/LICENSE.md`.
The licenses of the software included in the Scala distribution can
be found in the `doc/licenses` directory.
be found in the `doc/licenses` directory.
7F0E
2 changes: 1 addition & 1 deletion src/manual/scala/man1/Command.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ trait Command {

def copyright = Section("COPYRIGHT",

"This is open-source software, available to you under a BSD-like license. " &
"This is open-source software, available to you under the Apache License 2.0. " &
"See accompanying \"copyright\" or \"LICENSE\" file for copying conditions. " &
"There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A " &
"PARTICULAR PURPOSE.")
Expand Down
0