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

Apache 2.0 re-license (backport) [ci: last-only] #7314

Merged
merged 3 commits into from Oct 24, 2018

Conversation

adriaanm
Copy link
Contributor

@adriaanm adriaanm commented Oct 5, 2018

Backport of #7306

@scala-jenkins scala-jenkins added this to the 2.12.8 milestone Oct 5, 2018
@adriaanm
Copy link
Contributor Author

adriaanm commented Oct 5, 2018

Cherry-picked the essence in the first commit. Second commit is hybrid of code generation and manual editing (in src/library-aux -- probably not worth automating). Third commit is purely result of running headerCreate.

eed3si9n and others added 3 commits Oct 5, 2018
Re-generated by `generateSources` sbt task, and the
JavaUniverseForce test (test/files/run/t6240-universe-code-gen.scala)

Also update headers under library-aux and in some test files,
as the `headerCreate` task won't touch those.
Using the `headerCreate` sbt task, now enforced in CI using `headerCheck`.
@adriaanm adriaanm changed the title Apache 2.0 re-license (backport) Apache 2.0 re-license (backport) [ci: last-only] Oct 5, 2018
@adriaanm
Copy link
Contributor Author

adriaanm commented Oct 5, 2018

To take it easy on the CI, I'm only validating the last commit on my push, even though they should now all pass.

@SethTisue SethTisue merged commit ed41f96 into scala:2.12.x Oct 24, 2018
@SethTisue SethTisue added the release-notes worth highlighting in next release notes label Oct 24, 2018
@SethTisue SethTisue mentioned this pull request Feb 13, 2019
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-notes worth highlighting in next release notes
4 participants