-
Notifications
You must be signed in to change notification settings - Fork 136
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
Conversation
@rfscholte Can you have a look as this seems to be a regression of 419114d#diff-dc91aa6b8566714aa9abc3cd3740cfd26c5f38e1ee68dcc9dcbb4df6f8701fcb. |
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 |
3b51761
to
38939c3
Compare
Done in 38939c3. |
38939c3
to
fb3ccf3
Compare
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) |
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? |
So better introduce a new it-project? |
You tell me, please. I don't know the original intent of the existing ITs. |
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. |
c190d6f
to
7b5c74b
Compare
Done in 7b5c74b |
@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... |
maven-release-plugin/src/it/projects/prepare/regular-multi-module/module-parent/pom.xml
Outdated
Show resolved
Hide resolved
maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/verify.groovy
Outdated
Show resolved
Hide resolved
maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/pom.xml
Outdated
Show resolved
Hide resolved
maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-parent/pom.xml
Outdated
Show resolved
Hide resolved
maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/pom.xml
Outdated
Show resolved
Hide resolved
maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/pom.xml
Outdated
Show resolved
Hide resolved
42eeaf7
to
c2cc411
Compare
maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-parent/pom.xml
Outdated
Show resolved
Hide resolved
c2cc411
to
dfba56d
Compare
@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"> |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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
dfba56d
to
70bd5be
Compare
Merged with 67dc2f8 |
Following this checklist to help us incorporate your
contribution quickly and easily:
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.
[MJAVADOC-XXX] - Fixes bug in ApproximateQuantiles
,where you replace
MJAVADOC-XXX
with the appropriate JIRA issue. Best practiceis to use the JIRA issue title in the pull request title and in the first line of the
commit message.
mvn clean verify -Prun-its
to make sure basic checks pass. A more thorough check willbe 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.