Skip to content

Commit 970a2ef

Browse files
committed
Minor updates to license and notice
1 parent 27004aa commit 970a2ef

File tree

2 files changed

+31
-35
lines changed

2 files changed

+31
-35
lines changed

LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright © 2024 MarkLogic Corporation.
1+
Copyright © 2024 MarkLogic Corporation. All Rights Reserved.
22

33
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
44

NOTICE.txt

Lines changed: 30 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
MarkLogic® Connector for Spark
22

3-
Copyright © 2023 MarkLogic Corporation. MarkLogic and MarkLogic logo are trademarks or registered trademarks of MarkLogic Corporation in the United States and other countries. All other trademarks are the property of their respective owners.
4-
5-
This project is licensed under the Apache License, Version 2.0 (the "License"); you may not use this project except in compliance with the License. You may obtain a copy of the License at
3+
Copyright © 2024 MarkLogic Corporation. All Rights Reserved.
64

7-
http://www.apache.org/licenses/LICENSE-2.0
8-
9-
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.
10-
11-
To the extent required by the applicable open-source license, a complete machine-readable copy of the source code corresponding to such code is available upon request. This offer is valid to anyone in receipt of this information and shall expire three years following the date of the final distribution of this product version by MarkLogic Corporation. To obtain such source code, send an email to Legal-thirdpartyreview@progress.com. Please specify the product and version for which you are requesting source code.
12-
13-
The following software may be included in this project (last updated October 3, 2023):
5+
To the extent required by the applicable open-source license, a complete machine-readable copy of the source code
6+
corresponding to such code is available upon request. This offer is valid to anyone in receipt of this information and
7+
shall expire three years following the date of the final distribution of this product version by
8+
Progress Software Corporation. To obtain such source code, send an email to Legal-thirdpartyreview@progress.com.
9+
Please specify the product and version for which you are requesting source code.
1410

1511
-------------------------------------------------------------------------
1612
Third Party Components
@@ -43,8 +39,8 @@ Apache License
4339

4440
1. Definitions.
4541

46-
"License" shall mean the terms and conditions for use,
47-
reproduction, and distribution as defined by Sections 1 through 9
42+
"License" shall mean the terms and conditions for use,
43+
reproduction, and distribution as defined by Sections 1 through 9
4844
of this document.
4945

5046
"Licensor" shall mean the copyright owner or entity authorized by
@@ -75,20 +71,20 @@ Apache License
7571

7672
"Derivative Works" shall mean any work, whether in Source or Object
7773
form, that is based on (or derived from) the Work and for which the
78-
editorial revisions, annotations, elaborations, or other
79-
modifications represent, as a whole, an original work of
80-
authorship. For the purposes of this License, Derivative Works
81-
shall not include works that remain separable from, or merely link
82-
(or bind by name) to the interfaces of, the Work and Derivative
74+
editorial revisions, annotations, elaborations, or other
75+
modifications represent, as a whole, an original work of
76+
authorship. For the purposes of this License, Derivative Works
77+
shall not include works that remain separable from, or merely link
78+
(or bind by name) to the interfaces of, the Work and Derivative
8379
Works thereof.
8480

8581
"Contribution" shall mean any work of authorship, including the
8682
original version of the Work and any modifications or additions
8783
to that Work or Derivative Works thereof, that is intentionally
8884
submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
8985

90-
"Contributor" shall mean Licensor and any individual or Legal
91-
Entity on behalf of whom a Contribution has been received by
86+
"Contributor" shall mean Licensor and any individual or Legal
87+
Entity on behalf of whom a Contribution has been received by
9288
Licensor and subsequently incorporated within the Work.
9389

9490
2. Grant of Copyright License. Subject to the terms and conditions of
@@ -102,16 +98,16 @@ submitted to Licensor for inclusion in the Work by the copyright owner or by an
10298
this License, each Contributor hereby grants to You a perpetual,
10399
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
104100
(except as stated in this section) patent license to make, have
105-
made, use, offer to sell, sell, import, and otherwise transfer the
106-
Work, where such license applies only to those patent claims
107-
licensable by such Contributor that are necessarily infringed by
108-
their Contribution(s) alone or by combination of their
109-
Contribution(s) with the Work to which such Contribution(s) was
110-
submitted. If You institute patent litigation against any entity
111-
(including a cross-claim or counterclaim in a lawsuit) alleging
112-
that the Work or a Contribution incorporated within the Work
113-
constitutes direct or contributory patent infringement, then any
114-
patent licenses granted to You under this License for that Work
101+
made, use, offer to sell, sell, import, and otherwise transfer the
102+
Work, where such license applies only to those patent claims
103+
licensable by such Contributor that are necessarily infringed by
104+
their Contribution(s) alone or by combination of their
105+
Contribution(s) with the Work to which such Contribution(s) was
106+
submitted. If You institute patent litigation against any entity
107+
(including a cross-claim or counterclaim in a lawsuit) alleging
108+
that the Work or a Contribution incorporated within the Work
109+
constitutes direct or contributory patent infringement, then any
110+
patent licenses granted to You under this License for that Work
115111
shall terminate as of the date such litigation is filed.
116112

117113
4. Redistribution. You may reproduce and distribute copies of the
@@ -173,11 +169,11 @@ submitted to Licensor for inclusion in the Work by the copyright owner or by an
173169
agreed to in writing, Licensor provides the Work (and each
174170
Contributor provides its Contributions) on an "AS IS" BASIS,
175171
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
176-
implied, including, without limitation, any warranties or
177-
conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS
178-
FOR A PARTICULAR PURPOSE. You are solely responsible for
179-
determining the appropriateness of using or redistributing the Work
180-
and assume any risks associated with Your exercise of permissions
172+
implied, including, without limitation, any warranties or
173+
conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS
174+
FOR A PARTICULAR PURPOSE. You are solely responsible for
175+
determining the appropriateness of using or redistributing the Work
176+
and assume any risks associated with Your exercise of permissions
181177
under this License.
182178

183179
8. Limitation of Liability. In no event and under no legal theory,

0 commit comments

Comments
 (0)