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

Update Apache-1.1.xml to match original #2301

Merged
merged 4 commits into from
Jan 4, 2024
Merged

Update Apache-1.1.xml to match original #2301

merged 4 commits into from
Jan 4, 2024

Conversation

jlovejoy
Copy link
Member

@jlovejoy jlovejoy commented Jan 3, 2024

fixes #2270

Signed-off-by: Jilayne Lovejoy

fixes #2270 

Signed-off-by: Jilayne Lovejoy
@jlovejoy jlovejoy added XML markup change potential change or addition to XML markup in license minor updates to file URL update, notes update, etc. labels Jan 3, 2024
@jlovejoy jlovejoy added this to the 3.23 milestone Jan 3, 2024
@jlovejoy jlovejoy self-assigned this Jan 3, 2024
@jlovejoy
Copy link
Member Author

jlovejoy commented Jan 3, 2024

this PR fixes some holdovers from the prior, pre-XML way we stored the license texts and accommodated variations.

In sum, it should match: https://www.apache.org/licenses/LICENSE-1.1

As such, I have:

  • update the title
  • removed the copyrightText tag, b/c this is one of those few examples where the copyright notice is (allegedly) to cover the license itself
  • removed the holdover variable names text in []
  • add the <> in the second to last paragraph around the URL

Signed-off-by: Steve Winslow <steve@swinslow.net>
Signed-off-by: Steve Winslow <steve@swinslow.net>
@swinslow
Copy link
Member

swinslow commented Jan 4, 2024

Thanks @jlovejoy! My only comments on this one is that, if we're really trying to match the upstream version, there appears to be one line near the end (just before "AS IS") where single-quotes were being used instead of backticks from the original.

I've added a couple of commits to fix this, and I'll merge if/when the tests pass afterwards. Thanks!

@swinslow swinslow merged commit a70c44e into main Jan 4, 2024
5 checks passed
@swinslow swinslow deleted the Apache-1.1-update branch January 4, 2024 22:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
minor updates to file URL update, notes update, etc. XML markup change potential change or addition to XML markup in license
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Apache-1.1 XML template does not match official license texts
2 participants