Skip to content

Commit f4e96c1

Browse files
mathomp4mathomp4
committed
Update LICENSE to Apache, other license changes
GEOS was recently moved to use the Apache 2.0 license. This update: * Changes the main `LICENSE` file in the repo to be the Apache 2.0 license * Adds a `COPYRIGHT` file * Moves the old NOSA license to a `LICENSE-NOSA` file * Adds text to the `README.md` about the new and old licenses
1 parent 5215b26 commit f4e96c1

File tree

4 files changed

+225
-2
lines changed

4 files changed

+225
-2
lines changed

‎COPYRIGHT

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
NASA Docket No. GSC-15,354-1, and identified as "GEOS-5 GCM Modeling Software”
2+
3+
“Copyright © 2008 United States Government as represented by the Administrator
4+
of the National Aeronautics and Space Administration. All Rights Reserved.”
5+
6+
Licensed under the Apache License, Version 2.0 (the "License"); you may not use
7+
this file except in compliance with the License. You may obtain a copy of the
8+
License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software distributed
13+
under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
14+
CONDITIONS OF ANY KIND, either express or implied. See the License for the
15+
specific language governing permissions and limitations under the License.

‎LICENSE

Lines changed: 200 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,200 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction, and
10+
distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by the copyright
13+
owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all other entities
16+
that control, are controlled by, or are under common control with that entity.
17+
For the purposes of this definition, "control" means (i) the power, direct or
18+
indirect, to cause the direction or management of such entity, whether by
19+
contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
20+
outstanding shares, or (iii) beneficial ownership of such entity.
21+
22+
"You" (or "Your") shall mean an individual or Legal Entity exercising
23+
permissions granted by this License.
24+
25+
"Source" form shall mean the preferred form for making modifications, including
26+
but not limited to software source code, documentation source, and configuration
27+
files.
28+
29+
"Object" form shall mean any form resulting from mechanical transformation or
30+
translation of a Source form, including but not limited to compiled object code,
31+
generated documentation, and conversions to other media types.
32+
33+
"Work" shall mean the work of authorship, whether in Source or Object form, made
34+
available under the License, as indicated by a copyright notice that is included
35+
in or attached to the work (an example is provided in the Appendix below).
36+
37+
"Derivative Works" shall mean any work, whether in Source or Object form, that
38+
is based on (or derived from) the Work and for which the editorial revisions,
39+
annotations, elaborations, or other modifications represent, as a whole, an
40+
original work of authorship. For the purposes of this License, Derivative Works
41+
shall not include works that remain separable from, or merely link (or bind by
42+
name) to the interfaces of, the Work and Derivative Works thereof.
43+
44+
"Contribution" shall mean any work of authorship, including the original version
45+
of the Work and any modifications or additions to that Work or Derivative Works
46+
thereof, that is intentionally submitted to Licensor for inclusion in the Work
47+
by the copyright owner or by an individual or Legal Entity authorized to submit
48+
on behalf of the copyright owner. For the purposes of this definition,
49+
"submitted" means any form of electronic, verbal, or written communication sent
50+
to the Licensor or its representatives, including but not limited to
51+
communication on electronic mailing lists, source code control systems, and
52+
issue tracking systems that are managed by, or on behalf of, the Licensor for
53+
the purpose of discussing and improving the Work, but excluding communication
54+
that is conspicuously marked or otherwise designated in writing by the copyright
55+
owner as "Not a Contribution."
56+
57+
"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
58+
of whom a Contribution has been received by Licensor and subsequently
59+
incorporated within the Work.
60+
61+
2. Grant of Copyright License.
62+
63+
Subject to the terms and conditions of this License, each Contributor hereby
64+
grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
65+
irrevocable copyright license to reproduce, prepare Derivative Works of,
66+
publicly display, publicly perform, sublicense, and distribute the Work and such
67+
Derivative Works in Source or Object form.
68+
69+
3. Grant of Patent License.
70+
71+
Subject to the terms and conditions of this License, each Contributor hereby
72+
grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
73+
irrevocable (except as stated in this section) patent license to make, have
74+
made, use, offer to sell, sell, import, and otherwise transfer the Work, where
75+
such license applies only to those patent claims licensable by such Contributor
76+
that are necessarily infringed by their Contribution(s) alone or by combination
77+
of their Contribution(s) with the Work to which such Contribution(s) was
78+
submitted. If You institute patent litigation against any entity (including a
79+
cross-claim or counterclaim in a lawsuit) alleging that the Work or a
80+
Contribution incorporated within the Work constitutes direct or contributory
81+
patent infringement, then any patent licenses granted to You under this License
82+
for that Work shall terminate as of the date such litigation is filed.
83+
84+
4. Redistribution.
85+
86+
You may reproduce and distribute copies of the Work or Derivative Works
87+
thereof in any medium, with or without modifications, and in Source or Object
88+
form, provided that You meet the following conditions:
89+
90+
(a) You must give any other recipients of the Work or Derivative Works a
91+
copy of this License; and
92+
93+
(b) You must cause any modified files to carry prominent notices stating that
94+
You changed the files; and
95+
96+
(c) You must retain, in the Source form of any Derivative Works that You
97+
distribute, all copyright, patent, trademark, and attribution notices from
98+
the Source form of the Work, excluding those notices that do not pertain
99+
to any part of the Derivative Works; and
100+
101+
(d) If the Work includes a "NOTICE" text file as part of its distribution,
102+
then any Derivative Works that You distribute must include a readable copy
103+
of the attribution notices contained within such NOTICE file, excluding
104+
those notices that do not pertain to any part of the Derivative Works, in
105+
at least one of the following places: within a NOTICE text file
106+
distributed as part of the Derivative Works; within the Source form or
107+
documentation, if provided along with the Derivative Works; or, within a
108+
display generated by the Derivative Works, if and wherever such
109+
third-party notices normally appear. The contents of the NOTICE file are
110+
for informational purposes only and do not modify the License. You may add
111+
Your own attribution notices within Derivative Works that You distribute,
112+
alongside or as an addendum to the NOTICE text from the Work, provided
113+
that such additional attribution notices cannot be construed as modifying
114+
the License.
115+
116+
You may add Your own copyright statement to Your modifications and may
117+
provide additional or different license terms and conditions for use,
118+
reproduction, or distribution of Your modifications, or for any such
119+
Derivative Works as a whole, provided Your use, reproduction, and
120+
distribution of the Work otherwise complies with the conditions stated in
121+
this License.
122+
123+
5. Submission of Contributions.
124+
125+
Unless You explicitly state otherwise, any Contribution intentionally
126+
submitted for inclusion in the Work by You to the Licensor shall be under the
127+
terms and conditions of this License, without any additional terms or
128+
conditions. Notwithstanding the above, nothing herein shall supersede or
129+
modify the terms of any separate license agreement you may have executed with
130+
Licensor regarding such Contributions.
131+
132+
6. Trademarks.
133+
134+
This License does not grant permission to use the trade names, trademarks,
135+
service marks, or product names of the Licensor, except as required for
136+
reasonable and customary use in describing the origin of the Work and
137+
reproducing the content of the NOTICE file.
138+
139+
7. Disclaimer of Warranty.
140+
141+
Unless required by applicable law or agreed to in writing, Licensor provides
142+
the Work (and each Contributor provides its Contributions) on an "AS IS"
143+
BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
144+
implied, including, without limitation, any warranties or conditions of
145+
TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR
146+
PURPOSE. You are solely responsible for determining the appropriateness of
147+
using or redistributing the Work and assume any risks associated with Your
148+
exercise of permissions under this License.
149+
150+
8. Limitation of Liability.
151+
152+
In no event and under no legal theory, whether in tort (including
153+
negligence), contract, or otherwise, unless required by applicable law (such
154+
as deliberate and grossly negligent acts) or agreed to in writing, shall any
155+
Contributor be liable to You for damages, including any direct, indirect,
156+
special, incidental, or consequential damages of any character arising as a
157+
result of this License or out of the use or inability to use the Work
158+
(including but not limited to damages for loss of goodwill, work stoppage,
159+
computer failure or malfunction, or any and all other commercial damages or
160+
losses), even if such Contributor has been advised of the possibility of such
161+
damages.
162+
163+
9. Accepting Warranty or Additional Liability.
164+
165+
While redistributing the Work or Derivative Works thereof, You may choose to
166+
offer, and charge a fee for, acceptance of support, warranty, indemnity, or
167+
other liability obligations and/or rights consistent with this License.
168+
However, in accepting such obligations, You may act only on Your own behalf
169+
and on Your sole responsibility, not on behalf of any other Contributor, and
170+
only if You agree to indemnify, defend, and hold each Contributor harmless
171+
for any liability incurred by, or claims asserted against, such Contributor
172+
by reason of your accepting any such warranty or additional liability.
173+
174+
END OF TERMS AND CONDITIONS
175+
176+
APPENDIX: How to apply the Apache License to your work
177+
178+
To apply the Apache License to your work, attach the following boilerplate
179+
notice with the fields enclosed by brackets "[]" replaced with your own
180+
identifying information. (Don't include the brackets!) The text should be
181+
enclosed in the appropriate comment syntax for the file format. We also
182+
recommend that a file or class name and description of purpose be included on
183+
the same "printed page" as the copyright notice for easier identification within
184+
third-party archives.
185+
186+
NASA Docket No. GSC-15,354-1, and identified as "GEOS-5 GCM Modeling Software”
187+
188+
“Copyright © 2008 United States Government as represented by the Administrator
189+
of the National Aeronautics and Space Administration. All Rights Reserved.”
190+
191+
Licensed under the Apache License, Version 2.0 (the "License"); you may not use
192+
this file except in compliance with the License. You may obtain a copy of the
193+
License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software distributed
198+
under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
199+
CONDITIONS OF ANY KIND, either express or implied. See the License for the
200+
specific language governing permissions and limitations under the License.

‎LICENSE.md renamed to ‎LICENSE-NOSA

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
```
21

32
NASA OPEN SOURCE SOFTWARE AGREEMENT
43

@@ -260,4 +259,3 @@ hereby agrees to all terms and conditions herein.
260259
F. Point of Contact: Any Recipient contact with Government Agency is to
261260
be directed to the designated representative as follows: Dale Hithon,
262261
SRA Assistant, (301) 286-2691.
263-
```

‎README.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,13 @@ MAPL also has a variety of other auxiliary directories:
2222

2323

2424

25+
26+
## Contributing
27+
28+
Please check out our [contributing guidelines](CONTRIBUTING.md).
29+
30+
## License
31+
32+
All files are currently licensed under the Apache-2.0 license, see [`LICENSE`](LICENSE).
33+
34+
Previously, the code was licensed under the [NASA Open Source Agreement, Version 1.3](LICENSE-NOSA).

0 commit comments

Comments
 (0)