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

fix(license): apache license should not be modified #832

Merged
merged 10 commits into from May 30, 2021

Conversation

eladb
Copy link
Contributor

@eladb eladb commented May 30, 2021

Do not modify the appendix in Apache 2.0 license. To allow other licenses to be modified (like MIT), change the substitution string to $copyright_period and $copyright_owner. If the text includes these tokens and the relevant options are not provided, fail.

Fixes #830

BREAKING CHANGE: The initializer of the License now takes spdx through the options struct instead of a positional argument. Additionally, an error is thrown if MIT license is selected but the copyrightOwner is not provided (because it is required in the license text).


By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

Remove the appendix from the Apache 2.0 license text. It's not required and not supposed to be edited.

Fixes #830
@mergify mergify bot added the contribution/core ⚙️ used by automation label May 30, 2021
Copy link

@wchaws wchaws left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@eladb I don't think we should remove the APPENDIX part. IMO, The lineCopyright [yyyy] [name of copyright owner] should be kept without any modification.

@codecov-commenter
Copy link

codecov-commenter commented May 30, 2021

Codecov Report

Merging #832 (66eb1ee) into main (377966e) will increase coverage by 5.06%.
The diff coverage is 73.80%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #832      +/-   ##
==========================================
+ Coverage   78.46%   83.53%   +5.06%     
==========================================
  Files          88       99      +11     
  Lines        3181     3838     +657     
  Branches      809      904      +95     
==========================================
+ Hits         2496     3206     +710     
+ Misses        683      629      -54     
- Partials        2        3       +1     
Impacted Files Coverage Δ
src/cdk8s-app-ts.ts 91.89% <ø> (ø)
src/cdk8s-construct.ts 33.33% <ø> (ø)
src/file.ts 97.14% <ø> (+0.17%) ⬆️
src/github/auto-merge.ts 92.85% <ø> (-7.15%) ⬇️
src/github/dependabot.ts 96.77% <ø> (ø)
src/github/index.ts 100.00% <ø> (ø)
src/java/pom.ts 93.84% <ø> (ø)
src/object-file.ts 100.00% <ø> (+2.38%) ⬆️
src/tasks/runtime.ts 15.53% <14.28%> (-0.78%) ⬇️
src/typescript/projenrc.ts 16.66% <16.66%> (ø)
... and 116 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update cf31a6a...66eb1ee. Read the comment docs.

@eladb eladb removed the auto-merge label May 30, 2021
@eladb
Copy link
Contributor Author

eladb commented May 30, 2021

@eladb I don't think we should remove the APPENDIX part. IMO, The lineCopyright [yyyy] [name of copyright owner] should be kept without any modification.

@wchaws can you please point to the guidance that indicates that this is what is expected by Apache?

@wchaws
Copy link

wchaws commented May 30, 2021

@eladb I don't think we should remove the APPENDIX part. IMO, The lineCopyright [yyyy] [name of copyright owner] should be kept without any modification.

@wchaws can you please point to the guidance that indicates that this is what is expected by Apache?

I've checked some projects under https://github.com/apache/. They both have APPENDIX in Apache-2.0 LICENSE.

@eladb
Copy link
Contributor Author

eladb commented May 30, 2021

OK, reverting

@eladb eladb changed the title fix(license): remove appendix from Apache 2.0 license fix(license): license texts are not supposed to be modified May 30, 2021
src/license.ts Show resolved Hide resolved
@eladb eladb changed the title fix(license): license texts are not supposed to be modified fix(license): apache license should not be modified May 30, 2021
@mergify mergify bot merged commit df0a922 into main May 30, 2021
@mergify mergify bot deleted the benisrae/cleanup-apache-license branch May 30, 2021 11:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
contribution/core ⚙️ used by automation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Incorrect Apache-2.0 license file
3 participants