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

MRELEASE-1053 populate scm info from current module instead of execution root #84

Closed
wants to merge 1 commit into from

Conversation

kwin
Copy link
Member

@kwin kwin commented Nov 5, 2021

Following this checklist to help us incorporate your
contribution quickly and easily:

  • Make sure there is a JIRA issue filed
    for the change (usually before you start working on it). Trivial changes like typos do not
    require a JIRA issue. Your pull request should address just this issue, without
    pulling in other changes.
  • Each commit in the pull request should have a meaningful subject line and body.
  • Format the pull request title like [MJAVADOC-XXX] - Fixes bug in ApproximateQuantiles,
    where you replace MJAVADOC-XXX with the appropriate JIRA issue. Best practice
    is to use the JIRA issue title in the pull request title and in the first line of the
    commit message.
  • Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
  • Run mvn clean verify -Prun-its to make sure basic checks pass. A more thorough check will
    be performed on your pull request automatically.

If your pull request is about ~20 lines of code you don't need to sign an
Individual Contributor License Agreement if you are unsure
please ask on the developers list.

To make clear that you license your contribution under
the Apache License Version 2.0, January 2004
you have to acknowledge this by using the following check-box.

This probably needs some unit/integration test, but I am not familiar enough with the code base to come up with some. The fix itself is trivial.

@kwin
Copy link
Member Author

kwin commented Nov 5, 2021

@rfscholte Can you have a look as this seems to be a regression of 419114d#diff-dc91aa6b8566714aa9abc3cd3740cfd26c5f38e1ee68dcc9dcbb4df6f8701fcb.

@rfscholte
Copy link
Contributor

Can you extend https://github.com/apache/maven-release/tree/master/maven-release-plugin/src/it/projects/prepare/regular-multi-module with an extra module and update verify.groovy?

@kwin
Copy link
Member Author

kwin commented Nov 5, 2021

Can you extend https://github.com/apache/maven-release/tree/master/maven-release-plugin/src/it/projects/prepare/regular-multi-module with an extra module and update verify.groovy?

Done in 38939c3.

@rfscholte
Copy link
Contributor

Ah, you need a flat structure. In that case it is better to adjust flat-multi-module and keep this one as it (as it is the most common setup)

@kwin
Copy link
Member Author

kwin commented Nov 6, 2021

flat-multi-module

This module currently uses the parent project as reactor root project. This particular issue only happens in case both projects are not the same. Should I really adjust flat-multi-module accordingly to add a reactor root pom.xml at https://github.com/apache/maven-release/tree/master/maven-release-plugin/src/it/projects/prepare/flat-multi-module?

@rfscholte
Copy link
Contributor

So better introduce a new it-project?

@kwin
Copy link
Member Author

kwin commented Nov 6, 2021

You tell me, please. I don't know the original intent of the existing ITs.

@rfscholte
Copy link
Contributor

I hadn't looked at any IT, just trying to match based on the description. If it is just about adding a sub-module, that would be fine, but if it changes inheritence or execution root, there should be a new IT.
I want to prevent a huge list of ITs where some verification details could easily be combined.

@kwin kwin changed the title MRELEASE-1053 populate scm info from current module instead of reactor MRELEASE-1053 populate scm info from current module instead of execution root Nov 6, 2021
@kwin kwin force-pushed the bugfix/MRELEASE-1053 branch 2 times, most recently from c190d6f to 7b5c74b Compare November 6, 2021 14:08
@kwin
Copy link
Member Author

kwin commented Nov 6, 2021

there should be a new IT.

Done in 7b5c74b

@kwin
Copy link
Member Author

kwin commented Nov 11, 2021

@rfscholte Would it possible for you to review the PR and comment or merge? Really looking forward to a new version of m-release-p with this issue fixed...

@kwin kwin force-pushed the bugfix/MRELEASE-1053 branch 3 times, most recently from 42eeaf7 to c2cc411 Compare November 21, 2021 09:17
@kwin
Copy link
Member Author

kwin commented Dec 2, 2021

@rfscholte Gentle ping

~ specific language governing permissions and limitations
~ under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" child.project.url.inherit.append.path="false">
Copy link
Contributor

Choose a reason for hiding this comment

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

child.project.url.inherit.append.path="false" needs to be removed here too.

Copy link
Member Author

Choose a reason for hiding this comment

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

removed in 70bd5be

Previously scm information was only detected in execution root
@rfscholte
Copy link
Contributor

Merged with 67dc2f8
Thanks!

@rfscholte rfscholte closed this Dec 5, 2021
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