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

Correct license information for kotlin icon/grammar #1229

Merged
merged 1 commit into from May 5, 2019

Conversation

@matthiasblaesing
Copy link
Contributor

commented May 3, 2019

The kotlin grammar and icon are not donated to the ASF, so the correct license reference is "Apache-2.0" (without the "-ASF" suffix). The difference between the two:

Apache-2.0-ASF means the file could be relicensed (for example when an apache license 3 is released), as it is owned by the ASF. Apache-2.0 means the file is licenses ALv2, but is not owned by the ASF.

This PR adjusts the license reference for the kotlin grammar. The icons were updated from the kotline repository. The license in the repository clearly states, that the license is ALv2 and the exceptions don't match the image files. However, the kotlin license comes with a NOTICE file, which is now included in the notice.

@matthiasblaesing matthiasblaesing requested a review from JaroslavTulach May 3, 2019

@JaroslavTulach

This comment has been minimized.

Copy link
Contributor

commented May 5, 2019

Thanks for polishing the mess I had created.

@JaroslavTulach JaroslavTulach merged commit aa5863e into apache:master May 5, 2019

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@matthiasblaesing matthiasblaesing deleted the matthiasblaesing:license-kotlin branch May 30, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.