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

Issue #5784 - fix dual license text #5795

Merged
merged 5 commits into from
Dec 11, 2020

Conversation

joakime
Copy link
Contributor

@joakime joakime commented Dec 10, 2020

Fixing LICENSE file.
Cleaning up source header template.
Updating all source headers (*.java and *.adoc)

+ Eliminating header
+ Merging SPDX into 1 line

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
+ Using proper language, no further mention
  of "secondary" license (which was an invalid
  way of handling an "OR" situation)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
@joakime
Copy link
Contributor Author

joakime commented Dec 11, 2020

Setting this back to Draft.

I need to investigate the build failure.
Also, I need to double check that excluded source files are still sane.

https://github.com/eclipse/jetty.project/blob/f0badc5c5ec6ceb8a5d45eccfb0bc284f65471f5/pom.xml#L351-L357

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
@joakime
Copy link
Contributor Author

joakime commented Dec 11, 2020

Done.

The license-checker plugin is more well defined in it's exclusions.
No longer excluding GLOB on jetty-ant and infinispan.

@joakime joakime marked this pull request as ready for review December 11, 2020 01:56
Copy link
Contributor

@gregw gregw left a comment

Choose a reason for hiding this comment

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

LGTM

@joakime joakime merged commit 2662be0 into jetty-10.0.x Dec 11, 2020
@joakime joakime deleted the jetty-10.0.x-5784-fix-dual-license-text branch December 16, 2020 18:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Apache 2.0 license incorrectly stated as "secondary license" to EPL 2.0
2 participants