Skip to content
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.

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

Remove extra text from license #18

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

schneems
Copy link

@schneems schneems commented Nov 19, 2024

The Apache 2.0 license on the website shows that it ends after "END OF TERMS AND CONDITIONS" https://www.apache.org/licenses/LICENSE-2.0

387383537-f56c8594-5c32-41d5-a5b7-f4a587125ca2

Our https://github.com/salesforce/oss-template/blob/main/license_info.md also shows the license ending there:

387383715-c9a35e3c-160d-4d3a-96d5-7be07d548dec

This text exists because it's been mistakenly copied and pasted from https://www.apache.org/licenses/LICENSE-2.0.txt where it includes placeholder text and the intent seems to be reproducing the application instructions as seen on https://www.apache.org/licenses/LICENSE-2.0 rather than as text that's intended to be included in the license.

The text removed in this PR diverges slightly from the text on https://www.apache.org/licenses/LICENSE-2.0#apply

How to apply the Apache License to your work

Include a copy of the Apache License, typically in a file called LICENSE, in your work, and consider also including a NOTICE file that references the License.

To apply the Apache License to specific files in your work, attach the following boilerplate declaration, replacing the fields enclosed by brackets "[]" with your own identifying information. (Don't include the brackets!) Enclose the text in the appropriate comment syntax for the file format. We also recommend that you include a file or class name and description of purpose on the same "printed page" as the copyright notice for easier identification within third-party archives.

The text on the website ⬆️ seems to indicate that placing the Apache 2.0 license text in a LICENSE is sufficient for a project. The text given in the text file ⬇️ does not mention a LICENSE file and instead seems to imply that the full text of the Apache 2.0 license is not required, but use the "boilerplate" after swapping out the placeholders.

Looking at other high profile projects that use the Apache 2.0 license it looks like their understanding matches mine, here's Rust https://github.com/rust-lang/rust/blob/fda68927475070696fcc9d1f5c9c990f0e1af87a/LICENSE-APACHE. Here's a discussion from 5 years ago on whether to remove the appendix from there rust-lang/rust#67734.

Close #16

The Apache 2.0 license on the website shows that it ends after "END OF TERMS AND CONDITIONS" https://www.apache.org/licenses/LICENSE-2.0

![](https://private-user-images.githubusercontent.com/59744/387383537-f56c8594-5c32-41d5-a5b7-f4a587125ca2.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MzIwNTE4MDcsIm5iZiI6MTczMjA1MTUwNywicGF0aCI6Ii81OTc0NC8zODczODM1MzctZjU2Yzg1OTQtNWMzMi00MWQ1LWE1YjctZjRhNTg3MTI1Y2EyLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNDExMTklMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjQxMTE5VDIxMjUwN1omWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTQwOTNkODQzZTI2YmQ5ZGNlYTM5ZTAxOGNhY2Q4Y2I2ODQyNWVmNjM5YTUzMWRhZGY1YTc4MDNlZjY0NmNmMmEmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0In0.FvvHOgNE1RrLTHYCjNUcUv0iq8KyzfXgrZS6J4f7igg)

Our https://github.com/salesforce/oss-template/blob/main/license_info.md also shows the license ending there:

![](https://private-user-images.githubusercontent.com/59744/387383715-c9a35e3c-160d-4d3a-96d5-7be07d548dec.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MzIwNTE4MDcsIm5iZiI6MTczMjA1MTUwNywicGF0aCI6Ii81OTc0NC8zODczODM3MTUtYzlhMzVlM2MtMTYwZC00ZDNhLTk2ZDUtN2JlMDdkNTQ4ZGVjLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNDExMTklMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjQxMTE5VDIxMjUwN1omWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPThmNDJmMWEzODg0NTZiNzdjZTkzOTMxYjQ1MTAxOTVjMGE4YmFlMmMxYjQzMGUxMzE2NmJlNzk2M2IwNGZiYzkmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0In0.132uqpmlORqSqiuBnu16TlgDkiF-9k3nJ3slt6QZ91A)

This text exists because it's been mistakenly copied and pasted from https://www.apache.org/licenses/LICENSE-2.0.txt where its intent seems to be reproducing the application instructions as seen on https://www.apache.org/licenses/LICENSE-2.0 rather than as text that's intended to be included in the license.

Close salesforce#16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Appendix with placeholder text is mildly confusing
1 participant