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

[MSHARED-1202] update to parent POM 39 #22

Merged
merged 4 commits into from Mar 15, 2023
Merged

[MSHARED-1202] update to parent POM 39 #22

merged 4 commits into from Mar 15, 2023

Conversation

elharo
Copy link
Contributor

@elharo elharo commented Mar 11, 2023

contains the usual automated spotless churn that this update requires.

@elharo elharo marked this pull request as ready for review March 11, 2023 14:08
@slawekjaranowski
Copy link
Member

check for duplicate license header:

git grep -c "Licensed to the Apache Software Foundation (ASF) under one" | grep -v ":1"

Good will be to have 2 commits - one with parent update and one with code reformat.
After merge we can add commit with reformat to .git-blame-ignore-revs

https://maven.apache.org/pom/maven/#the-format-profile

Copy link
Contributor Author

@elharo elharo left a comment

Choose a reason for hiding this comment

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

Thanks for the grep command. It found one duped license I had missed.

@elharo elharo changed the title MSHARED-1202 update to parent POM 39 [MSHARED-1202] update to parent POM 39 Mar 12, 2023
Copy link
Member

@slawekjaranowski slawekjaranowski left a comment

Choose a reason for hiding this comment

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

Please prepare 2 commits - one with change and one with code reformat

@elharo
Copy link
Contributor Author

elharo commented Mar 12, 2023

It all gets squashed in the end. Separating the commits for the update and the reformatting leaves broken states in the history.

@elharo elharo merged commit 1eb3fbb into master Mar 15, 2023
@elharo elharo deleted the plex branch March 15, 2023 12:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants