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

Pick-up parent pom 1.41 adding junit to dependencyManagement #3410

Merged

Conversation

@batmat
Copy link
Member

batmat commented Apr 27, 2018

Pick up jenkinsci/pom#19 which basically only adds junit to dependencyManagement.

Full diff: https://github.com/jenkinsci/pom/compare/jenkins-1.40...jenkins-1.41?expand=1

No JIRA issue since this is a very small internal change and only touches the test code.

Proposed changelog entries

  • Internal:: N/A (only changes test framework)

Submitter checklist

  • JIRA issue is well described
  • Changelog entry appropriate for the audience affected by the change (users or developer, depending on the change). Examples
    * Use the Internal: prefix if the change has no user-visible impact (API, test frameworks, etc.)
  • Appropriate autotests or explanation to why this change has no tests
  • For dependency updates: links to external changelogs and, if possible, full diffs

Desired reviewers

@reviewbybees esp. @oleg-nenashev

@batmat batmat requested a review from oleg-nenashev Apr 27, 2018
@batmat
Copy link
Member Author

batmat commented Apr 27, 2018

FTR, filing this because I would like to pick up the 1.42 also soon, so I preferred to serialize changes so that we can possibly bisect things if something goes wrong.

@oleg-nenashev
Copy link
Member

oleg-nenashev commented Apr 27, 2018

I would just go forward and pick 1.42.
Maven Site is not a critical functionality.

P.S. Apparently something does not work in the builder

@@ -149,7 +149,6 @@ THE SOFTWARE.
<dependency>

This comment has been minimized.

Copy link
@oleg-nenashev

oleg-nenashev Apr 27, 2018

Member

You need to just remove the entire section IIUC

This comment has been minimized.

Copy link
@batmat

batmat Apr 27, 2018

Author Member

@oleg-nenashev not sure I get what you mean, removing the whole dependencyManagement section?

If so, then either I'm missing something, or I disagree: this would be out of scope for this change, and there are 10+ other dependencies declared there. So it would look like much more involved/risky. Some things like the servlet-api override are not even declared in the parent pom, so really I must be missing your point.

This comment has been minimized.

Copy link
@oleg-nenashev

oleg-nenashev Apr 27, 2018

Member

Just for junit, of course. The rest could be eventually removed as well (or moved to BOM), but this is a separate story

Copy link
Member

oleg-nenashev left a comment

dependencyManagement section for junit needs to be removed entirely

@batmat
Copy link
Member Author

batmat commented Apr 27, 2018

@batmat
Copy link
Member Author

batmat commented Apr 27, 2018

Will merge it later today if nobody objects. Thanks for the review!

@oleg-nenashev
Copy link
Member

oleg-nenashev commented Apr 27, 2018

@batmat batmat merged commit 621ef56 into jenkinsci:master Apr 27, 2018
1 check passed
1 check passed
continuous-integration/jenkins/pr-merge This commit looks good
Details
@batmat batmat deleted the batmat:bump-to-parent-1.41-add-junit-to-depMgmt branch Apr 27, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.