-
Notifications
You must be signed in to change notification settings - Fork 674
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
Update dependency commons-io:commons-io to v2.14.0 #1653
Update dependency commons-io:commons-io to v2.14.0 #1653
Conversation
1dd8168
to
151d3da
Compare
ac6dd9a
to
2978ebe
Compare
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 don't see the forbidden signatures version fix.
// .findAll { id -> id.group == 'commons-io' && id.name == 'commons-io' } | ||
// .collect { id -> "${id.name}-unsafe-${id.version}" as String } | ||
// Hack until forbiddenapis supports commons-io 2.12.0 | ||
bundledSignatures += ['commons-io-unsafe-2.11.0'] |
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 now adds commons-io to all Solr modules, although it may not be part of dependencies. This should not hurt, but could cause failures if we have a Solr module that does not refer to commons-io.
I'd change only line 56 to be:
.collect { id -> "${id.name}-unsafe-2.11.0" as String }
This ensures the forbiddenapis are only added if the compilation unit depends on commons-io.
Maybe keep the existing line commented.
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.
Well, I see commons-IO yesterday released 2.13.0 to fix some regressions in 2.12. In fact I think the test failure on this PR may be due to that.. I'll re-purpose this to upgrade to 2.13
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.
Upgraded to 2.13.0 and made the workaround hack better..
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 have seen your PR for commons-io. I will update this.
Theres also another forbiddenapis issue to make the version parsing a bit better for commons-io. So whenever a newer version is passed to the bundled signatures it will fallback to the last recent version before the requested one.
This should solve issues like this in future. I just have no time before bbuzz.... (my talk is still mostly unprepared)
Somehow your solr bot tried to force-push his own changes over and over. |
Yea, I think I made a mistake in my first push. Now it is blocked so that's better. But there are test failures that I believe relate to the upgrade, so will change this to draft and investigate. |
Confirmed that The test attempt to clean up after a "bad core" where the instanceDir does not exist. commons-io v2.11 throws But in commons-io v2.13 it throws
Spent some time digging, but lots of code has changed since last release in these delete calls. Have no time to pursue yet.. |
I filed https://issues.apache.org/jira/browse/IO-800 for this, to see if this rings a bell upstream... |
The commons-io project merged my PR, so when 2.13.1 is released our failing test will once again succeed. We could have changed our try/catch but better to preserve back-compat. Leaving this in draft state for now. |
038d82c
to
ac7b163
Compare
Oops, I checked the "If you want to rebase/retry this PR, check this box" option before fully reading the PR history here ... unchecked it again now but not sure if @solrbot will see that in time. |
Yea, looks like the bot foce pushed. Unfortunately the commons project have not released a 2.13.1 or 2.14, even if 2.13.0 contains a non-compatible change :( So we just have to wait until their next release I suppose, to get an upgrade that is compatible with what we have... |
ac7b163
to
183d8b0
Compare
I’m on holiday, please someone review and merge this. It will unblock other dependency upgrades too. |
When #1971 is merged, the upgrade should succeed as 2.14.0 is supported by forbiddenapis. |
I retriggered the jobs. |
Oh I think the jobs are not running of the diff against main branch, i think the bot has to merge his branch first. No idea how to tell it to do this. |
183d8b0
to
1775574
Compare
There was a checkbox on top of PR. |
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.
Looks like this time upgrade worked well. No test failures anymore.
I'll going to merge this.
This PR contains the following updates:
2.11.0
->2.14.0
Configuration
📅 Schedule: Branch creation - "* * * * 0" (UTC), Automerge - At any time (no schedule defined).
🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.
♻ Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.
🔕 Ignore: Close this PR and you won't be reminded about this update again.
This PR has been generated by Renovate Bot