-
Notifications
You must be signed in to change notification settings - Fork 2.7k
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
[MNG-7818] Removed exclusion of hamcrest from junit 4 #1178
Conversation
Nope, this result in "mixed" dependencies: excerpt from maven-core dep tree:
|
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.
This results in "mixed" deps, so is a no go.
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.
Sorry, i meant "no go" 😄
Oh I can fix that :) |
Test failures are the "locking" issues, not sure how to clean maven repo in GH actions :( |
<scope>test</scope> | ||
</dependency> | ||
<dependency> | ||
<groupId>junit</groupId> | ||
<artifactId>junit</artifactId> | ||
<version>${junitVersion}</version> | ||
<scope>test</scope> | ||
<exclusions> |
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.
Shouldn't you actually keep the exclusion to not pull older version of hamcrest that conflicts with the one you defined on the top level?
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.
I recommend to look at https://hamcrest.org/JavaHamcrest/distributables#maven-upgrade-example
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.
No. <dependencyManagement>
section will take precedence and correctly pull in the newer version, as desired.
However, it won't pull it in unless required (also correct)
It's not desirable to have hamcrest included unless required (as in JUnit 5)
You mean the IT MNG-7819 ? As that will cleared up once Resolver 1.9.13 released and updated in Maven. |
From test-arq-suite branch JUnit4 w/ removed workaround (locally built maven-3.9.x this PR + master shrinkwap-resolver + test-arg-suite, all updated with corresponding snapshots):
So, what happens, is that by placing hamcrest BEFORE junit in depMgt, the hamcrest will "overrule" the 1.3 from junit, and 2.2 (empty jar) depends on hamcrest:jar 2.2, so all good. |
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.
Good to go IMHO, we may or we may not wait for resolver 1.9.13 (to get rid of one failing IT)
Not sure if this is related but I see some warnigns in this area:
|
Fixes https://issues.apache.org/jira/browse/MNG-7818
Removed exclusion of hamcrest from JUnit 4
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.
[MNG-XXX] SUMMARY
,where you replace
MNG-XXX
andSUMMARY
with the appropriate JIRA issue.[MNG-XXX] SUMMARY
.Best practice is to use the JIRA issue title in both the pull request title and in the first line of the commit message.
mvn clean verify
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.
I hereby declare this contribution to be licenced under the Apache License Version 2.0, January 2004
In any other case, please file an Apache Individual Contributor License Agreement.