Skip to content

Commit 16d3def

Browse files
authored
docs: Consolidate LICENSE and PATENTS clauses into Apache 2.0 (#1697)
1 parent 7181faa commit 16d3def

File tree

112 files changed

+204
-936
lines changed

Some content is hidden

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

112 files changed

+204
-936
lines changed

.github/pull_request_template.md

+11-18
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,19 @@
1-
### New Pull Request Checklist
2-
<!--
3-
Check every following box [x] before submitting your PR.
4-
Click the "Preview" tab for better readability.
5-
Thanks for contributing to Parse Platform!
6-
-->
1+
## Pull Request
72

8-
- [ ] I am not disclosing a [vulnerability](https://github.com/parse-community/parse-server/blob/master/SECURITY.md).
9-
- [ ] I am creating this PR in reference to an [issue](https://github.com/parse-community/Parse-SDK-JS/issues?q=is%3Aissue).
3+
- Report security issues [confidentially](https://github.com/parse-community/Parse-SDK-JS/security/policy).
4+
- Any contribution is under this [license](https://github.com/parse-community/Parse-SDK-JS/blob/alpha/LICENSE).
5+
- Link this pull request to an [issue](https://github.com/parse-community/Parse-SDK-JS/issues?q=is%3Aissue).
106

11-
### Issue Description
12-
<!-- Add a brief description of the issue this PR solves. -->
7+
## Issue
8+
<!-- Add the link to the issue that this PR closes. -->
139

1410
Closes: FILL_THIS_OUT
1511

16-
### Approach
17-
<!-- Add a description of the approach in this PR. -->
12+
## Approach
13+
<!-- Describe the changes in this PR. -->
1814

19-
### TODOs before merging
20-
<!--
21-
Add TODOs that need to be completed before merging this PR.
22-
Delete TODOs that do not apply to this PR.
23-
-->
15+
## Tasks
16+
<!-- Delete tasks that don't apply. -->
2417

2518
- [ ] Add tests
26-
- [ ] Add changes to documentation (guides, repository pages, in-code descriptions)
19+
- [ ] Add changes to documentation (guides, repository pages, code comments)

CONTRIBUTING.md

+8-12
Original file line numberDiff line numberDiff line change
@@ -106,15 +106,11 @@ Parse Community has a [responsible Vulnerability Disclosure Program](https://git
106106

107107
This project adheres to the [Contributor Covenant Code of Conduct](https://github.com/parse-community/parse-server/blob/master/CODE_OF_CONDUCT.md). By participating, you are expected to honor this code.
108108

109-
## License
110-
111-
By contributing to the Parse JavaScript SDK, you agree that your contributions will be licensed under its license.
112-
113-
[google-group]: https://groups.google.com/forum/#!forum/parse-developers
114-
[stack-overflow]: http://stackoverflow.com/tags/parse-server
115-
[bug-reports]: https://github.com/parse-community/parse-server/issues
116-
[rest-api]: https://docs.parseplatform.org/rest/guide
117-
[parse-api-console]: http://blog.parseplatform.org/announcements/introducing-the-parse-api-console/
118-
[stacktrace-or-gtfo]: http://i.imgur.com/jacoj.jpg
119-
[tests-dir]: /src/__tests__
120-
[integration-test-dir]: /integration/test
109+
[google-group]: https://groups.google.com/forum/#!forum/parse-developers
110+
[stack-overflow]: http://stackoverflow.com/tags/parse-server
111+
[bug-reports]: https://github.com/parse-community/parse-server/issues
112+
[rest-api]: https://docs.parseplatform.org/rest/guide
113+
[parse-api-console]: http://blog.parseplatform.org/announcements/introducing-the-parse-api-console/
114+
[stacktrace-or-gtfo]: http://i.imgur.com/jacoj.jpg
115+
[tests-dir]: /src/__tests__
116+
[integration-test-dir]: /integration/test

LICENSE

+167-25
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,176 @@
1-
BSD License
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
24

3-
For Parse JavaScript SDK software
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
46

5-
Copyright (c) 2015-present, Parse, LLC. All rights reserved.
7+
1. Definitions.
68

7-
Redistribution and use in source and binary forms, with or without modification,
8-
are permitted provided that the following conditions are met:
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
911

10-
* Redistributions of source code must retain the above copyright notice, this
11-
list of conditions and the following disclaimer.
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
1214

13-
* Redistributions in binary form must reproduce the above copyright notice,
14-
this list of conditions and the following disclaimer in the documentation
15-
and/or other materials provided with the distribution.
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
1622

17-
* Neither the name Parse nor the names of its contributors may be used to
18-
endorse or promote products derived from this software without specific
19-
prior written permission.
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
2025

21-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
22-
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
23-
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
24-
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
25-
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
26-
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
27-
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
28-
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
29-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
30-
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
3129

32-
-----
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
3334

34-
As of April 5, 2017, Parse, LLC has transferred this code to the parse-community organization, and will no longer be contributing to or distributing this code.
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS

NOTICE

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
Parse JavaScript SDK
2+
3+
Copyright 2015-present Parse Platform
4+
5+
This product includes software developed at Parse Platform.
6+
www.parseplatform.org
7+
8+
---
9+
10+
As of April 5, 2017, Parse, LLC has transferred this code to the Parse Platform organization, and will no longer be contributing to or distributing this code.

PATENTS

-37
This file was deleted.

README.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
[![Backers on Open Collective](https://opencollective.com/parse-server/backers/badge.svg)][open-collective-link]
1919
[![Sponsors on Open Collective](https://opencollective.com/parse-server/sponsors/badge.svg)][open-collective-link]
20-
[![License](https://img.shields.io/badge/license-BSD-lightgrey.svg)][license-link]
2120
[![Forum](https://img.shields.io/discourse/https/community.parseplatform.org/topics.svg)](https://community.parseplatform.org/c/client-sdks/javascript-sdk)
2221
[![Twitter](https://img.shields.io/twitter/follow/ParsePlatform.svg?label=Follow&style=social)](https://twitter.com/intent/follow?screen_name=ParsePlatform)
2322

@@ -30,9 +29,9 @@ A library that gives you access to the powerful Parse Server backend from your J
3029
- [Getting Started](#getting-started)
3130
- [Using Parse on Different Platforms](#using-parse-on-different-platforms)
3231
- [Compatibility](#compatibility)
32+
- [Node.js](#nodejs)
3333
- [Upgrading to Parse SDK 2.0.0](#upgrading-to-parse-sdk-200)
3434
- [3rd Party Authentications](#3rd-party-authentications)
35-
- [Want to ride the bleeding edge?](#want-to-ride-the-bleeding-edge)
3635
- [Experimenting](#experimenting)
3736
- [Contributing](#contributing)
3837

@@ -136,4 +135,3 @@ We really want Parse to be yours, to see it grow and thrive in the open source c
136135
[migration]: https://github.com/parse-community/Parse-SDK-JS/blob/master/2.0.0.md
137136
[open-collective-link]: https://opencollective.com/parse-server
138137
[types-parse]: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/parse
139-
[license-link]: LICENSE

gulpfile.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,15 @@ const FULL_HEADER = (
5353
'/**\n' +
5454
' * Parse JavaScript SDK v' + VERSION + '\n' +
5555
' *\n' +
56-
' * Copyright (c) 2015-present, Parse, LLC.\n' +
56+
' * Copyright 2015-present Parse Platform\n' +
5757
' * All rights reserved.\n' +
5858
' *\n' +
5959
' * The source tree of this library can be found at\n' +
6060
' * https://github.com/ParsePlatform/Parse-SDK-JS\n' +
61-
' * This source code is licensed under the BSD-style license found in the\n' +
62-
' * LICENSE file in the root directory of this source tree. An additional grant\n' +
63-
' * of patent rights can be found in the PATENTS file in the same directory.\n' +
61+
' *\n' +
62+
' * This source code is licensed under the license found in the LICENSE\n' +
63+
' * file in the root directory of this source tree. Additional legal\n' +
64+
' * information can be found in the NOTICE file in the same directory.\n' +
6465
' */\n'
6566
);
6667

integration/test/mockLocalStorage.js

-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
/**
2-
* Copyright (c) 2015-present, Parse, LLC.
3-
* All rights reserved.
4-
*
5-
* This source code is licensed under the BSD-style license found in the
6-
* LICENSE file in the root directory of this source tree. An additional grant
7-
* of patent rights can be found in the PATENTS file in the same directory.
8-
*/
9-
101
let mockStorage = {};
112
const mockLocalStorage = {
123
getItem(path) {

integration/test/mockRNStorage.js

-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
/**
2-
* Copyright (c) 2015-present, Parse, LLC.
3-
* All rights reserved.
4-
*
5-
* This source code is licensed under the BSD-style license found in the
6-
* LICENSE file in the root directory of this source tree. An additional grant
7-
* of patent rights can be found in the PATENTS file in the same directory.
8-
*/
9-
101
let mockStorage = {};
112
const mockRNStorage = {
123
getItem(path, cb) {

0 commit comments

Comments
 (0)