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

Jump to bottom

[chores] Copyright switch Pivotal to VMware, polish headers #161

Merged
merged 3 commits into from Jun 30, 2021
Merged

[chores] Copyright switch Pivotal to VMware, polish headers #161

merged 3 commits into from Jun 30, 2021

Conversation

simonbasle
Copy link
Member

  • copyright header to VMware instead of Pivotal
  • update the README link
  • in copyright headers, have date range harmonized on 2017-2021
  • polish copyright header: url indentation, blank line after license

@simonbasle simonbasle added the type/chore A task not related to code (build, formatting, process, ...) label Jun 30, 2021
@simonbasle simonbasle added this to the 1.4.7.RELEASE milestone Jun 30, 2021
@simonbasle simonbasle self-assigned this Jun 30, 2021
@simonbasle
Copy link
Member Author

depends on #160

@simonbasle simonbasle changed the title [build] Asciidoctor-convert plugin 1.5.6 not found, bump to 1.5.12 [chores] Copyright switch Pivotal to VMware, polish headers Jun 30, 2021
@simonbasle simonbasle changed the base branch from 1.4.x to bumpAsciidoctorJConvert June 30, 2021 10:01
@simonbasle
Copy link
Member Author

(temporarily targeting bumpAsciidoctorJConvert branch to have a more representative diff)

@simonbasle simonbasle mentioned this pull request Jun 30, 2021
Closed
17 tasks
Base automatically changed from bumpAsciidoctorJConvert to 1.4.x June 30, 2021 10:12
@simonbasle
Copy link
Member Author

(rebased since 160 is now merged)

@simonbasle simonbasle marked this pull request as ready for review June 30, 2021 10:15
@simonbasle simonbasle merged commit 4a5ded8 into 1.4.x Jun 30, 2021
@simonbasle simonbasle deleted the copyrightUpdateDysprosium branch June 30, 2021 12:45
@simonbasle
Copy link
Member Author

simonbasle commented Jun 30, 2021 •
edited

currently doing the forward merge, which has a lot of (minor) conflicts forward merge done

simonbasle added a commit that referenced this pull request Jun 30, 2021
@simonbasle
Merge #161 into 1.5.3
e8c6f06 
Most files conflicted due to the versions on `main` already having been
updated (but not aligned on the 2017-2021 range).
simonbasle added a commit that referenced this pull request Jul 2, 2021
@simonbasle
[chores] Copyright: Correct start year for all files
930b40b 
This is a follow up on #161 which mistakenly harmonized all the start
dates in range to 2017. Some files have more ancient history than that,
having been transferred from older repositories. Others are more recent.

This commit manually reverts the start year part of the previous change
to refine the start dates as much as possible.

See #161.
See reactor/reactor#682.
@simonbasle simonbasle mentioned this pull request Jul 2, 2021
Merged
simonbasle added a commit that referenced this pull request Jul 2, 2021
@simonbasle
[chores] Copyright: Correct start year for all files (#162)
f204790 
This is a follow up on #161 which mistakenly harmonized all the start
dates in range to 2017. Some files have more ancient history than that,
having been transferred from older repositories. Others are more recent.

This commit manually reverts the start year part of the previous change
to refine the start dates as much as possible.

See #161.
See reactor/reactor#682.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@acogoluegnes acogoluegnes acogoluegnes approved these changes

Assignees

@simonbasle simonbasle

Labels
type/chore A task not related to code (build, formatting, process, ...)
Projects
None yet
Milestone
1.4.7.RELEASE
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@simonbasle @acogoluegnes