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

Polish copyright headers and other org changes #2722

Merged
merged 6 commits into from
Jun 24, 2021
Merged

Conversation

simonbasle
Copy link
Member

@simonbasle simonbasle commented Jun 23, 2021

This PR will introduce several commits updating the codebase to be in line with
past organizational changes, like VMware replacing Pivotal in copyright headers,
polishing of date ranges in same headers, pom org and developer list updates.

see reactor/reactor#682

@simonbasle simonbasle added this to the 3.3.x Backlog milestone Jun 23, 2021
@simonbasle simonbasle added type/chores A task not related to code (build, formatting, process, ...) wide-change labels Jun 23, 2021
@simonbasle simonbasle self-assigned this Jun 23, 2021
@simonbasle
Copy link
Member Author

simonbasle commented Jun 23, 2021

how the copyright replacement was done:

  1. search-and-replace on all files with regexp
    • from ([0-9]+)-[0-9]+ Pivotal Software Inc, All Rights Reserved (eg. 2017-2019)
    • to $1-2021 VMware Inc. or its affiliates, All Rights Reserved (eg. 2017-2021)
  2. search-and-replace on all files with regexp
    • from ([0-9]+)-Present Pivotal Software Inc, All Rights Reserved (eg. 2017-Present)
    • to $1-2021 VMware Inc. or its affiliates, All Rights Reserved (eg. 2017-2021)

this was the first commit ☝️

second commit was to harmonize license header URL via a search-and-replace on all files with regexp
- ([ ]?[^ ])[ ]+https://www.apache.org (matching both # and * kind of comment blocks)
- $1 https://www.apache.org (harmonizing on 3 spaces: one for the comment block and 2 for indentation of the url, as in the ASF example)
- then rollback some of the files that are obviously not reactor's (the LICENSE file at root, some Gradle files...)

third commit was to find duplicate copyright headers via terminal:

for file in ./**/*; do if [ "$(grep -s -c "Copyright" "${file}")" -gt 1 ]; then echo "${file}"; fi; done

then the fourth commit was made to replace all the start dates with the same date (project inception, 2011):

  • from 20[12][^1]-2021 VMware Inc (I made sure no 2021 start date was there)
  • to 2011-2021 VMware Inc

simonbasle added a commit that referenced this pull request Jun 23, 2021
The Apache2 license link is also harmonized to be preceded by 2 spaces
(+1 space if the rest of the text is preceded by a space as part of
the comment marker).
simonbasle added a commit that referenced this pull request Jun 23, 2021
This is the project inception year, not the file creation year.
@simonbasle simonbasle added the for/merge-with-rebase Reminder to merge the PR in rebase mode (several semantic commits) label Jun 23, 2021
The Pivotal copyright has been changed to VMware.

The date range has been modified across the board to end at 2021. For
now start dates have been kept as is.
We keep 3 spaces: one for the comment block marker, 2 for indentation
(as in the ASF example).
simonbasle added a commit that referenced this pull request Jun 23, 2021
This is the project inception year, not the file creation year.
@simonbasle simonbasle marked this pull request as ready for review June 23, 2021 13:25
@simonbasle simonbasle requested a review from a team as a code owner June 23, 2021 13:25
@simonbasle simonbasle requested a review from a team June 23, 2021 13:25
simonbasle added a commit that referenced this pull request Jun 23, 2021
This only applies to .java files changed compared to the origin base
branch (3.3.x):

 - Ensure tab indentation is used, with regexp fix for comment blocks
 - Trim trailing whitespaces
 - Ensure files end with a blank line
 - Remove unused imports
 - Enfore license header with up-to-date end year
simonbasle added a commit that referenced this pull request Jun 23, 2021
This only applies to .java files changed compared to the origin base
branch (3.3.x):

 - Ensure tab indentation is used, with regexp fix for comment blocks
 - Trim trailing whitespaces
 - Ensure files end with a blank line
 - Remove unused imports
 - Enfore license header with up-to-date end year
simonbasle added a commit that referenced this pull request Jun 23, 2021
This only applies to .java files changed compared to the origin base
branch (3.3.x):

 - Ensure tab indentation is used, with regexp fix for comment blocks
 - Trim trailing whitespaces
 - Ensure files end with a blank line
 - Remove unused imports
 - Enfore license header with up-to-date end year
@simonbasle
Copy link
Member Author

the first two commits are the largest (hitting 800+ files) and the other commits are smaller. if you have trouble loading the large ones for review, here is the link to see smaller commits only: https://github.com/reactor/reactor-core/pull/2722/files/054f33f6954b88b459dc5f20a4ab47b85bc17b3a..1cd161835f3f7bc9ce27b3cdaa2268c8d89023d3

@simonbasle
Copy link
Member Author

I'll merge this, forward-merge the change to main then follow-up with a similar change but in a single commit for files that have been added on main side (which should represent around 20 files)

@simonbasle simonbasle merged commit 8da7d59 into 3.3.x Jun 24, 2021
@reactorbot
Copy link

@simonbasle this PR seems to have been merged on a maintenance branch, please ensure the change is merge-forwarded to intermediate maintenance branches and up to main 🙇

@simonbasle simonbasle deleted the pivotalToVmware branch June 24, 2021 08:36
simonbasle added a commit that referenced this pull request Jun 24, 2021
The Pivotal copyright has been changed to VMware.

The date range has been modified across the board to end at 2021. For
now start dates have been kept as is.
simonbasle added a commit that referenced this pull request Jun 24, 2021
We keep 3 spaces: one for the comment block marker, 2 for indentation
(as in the ASF example).
simonbasle added a commit that referenced this pull request Jun 24, 2021
Some files had license header twice.
simonbasle added a commit that referenced this pull request Jun 24, 2021
This is the project inception year, not the file creation year.
simonbasle added a commit that referenced this pull request Jun 24, 2021
simonbasle added a commit that referenced this pull request Jun 24, 2021
This commit performs the same changes as in #2722, on files that were
introduced in the `main` branch (3.4.x) only.

Since the scope is far more restricted, the changes are done in a
single commit.

See reactor/reactor#682
simonbasle added a commit that referenced this pull request Jun 24, 2021
This only applies to .java files changed compared to the origin base
branch (3.3.x):

 - Ensure tab indentation is used, with regexp fix for comment blocks
 - Trim trailing whitespaces
 - Ensure files end with a blank line
 - Remove unused imports
 - Enfore license header with up-to-date end year
simonbasle added a commit that referenced this pull request Jun 28, 2021
This commit performs the same changes as in #2722, on files that were
introduced in the `main` branch (3.4.x) only.

Since the scope is far more restricted, the changes are done in a
single commit.

See reactor/reactor#682
simonbasle added a commit that referenced this pull request Jul 1, 2021
This reverts commit 6fa6182.

The start year MUST reflect the actual year the _content_ of the file
(copyrighted material) has been created.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
for/merge-with-rebase Reminder to merge the PR in rebase mode (several semantic commits) type/chores A task not related to code (build, formatting, process, ...) wide-change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants