| Summary: | Upgrade Commons Collections and DBCP2 | ||
|---|---|---|---|
| Product: | JMeter - Now in Github | Reporter: | orimarko <orimarko> |
| Component: | Main | Assignee: | JMeter issues mailing list <issues> |
| Status: | RESOLVED FIXED | ||
| Severity: | enhancement | CC: | orimarko, p.mouawad |
| Priority: | P2 | Keywords: | PatchAvailable |
| Version: | 5.2 | ||
| Target Milestone: | --- | ||
| Hardware: | All | ||
| OS: | All | ||
| Attachments: | Patch for upgrade collections | ||
|
Description
orimarko
2019-10-06 11:07:21 UTC
Thanks for the hint orimarko. The update to commons-collections4 is a bit more involved than the update of commons-dbcp2. I have opened a PR https://github.com/apache/jmeter/pull/557 which you might want to check. commit fee5548860f8dfe806a466dc0d90ffdb8a2570f4 Author: Felix Schumacher <felix.schumacher@internetallee.de> AuthorDate: Sun Feb 16 14:08:46 2020 +0100 Updated commons-dbcp2 to 2.7.0 (from 2.5.0) Bugzilla Id: 63809 --- gradle.properties | 2 +- xdocs/changes.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) Created attachment 37312 [details]
Patch for upgrade collections
Thanks for the patch, can you comment on the places, where your patch differs from the pull request https://github.com/apache/jmeter/pull/557 from comment 1? We can use your Pull request instead, Main difference is that I changed CircularFifoQueue to ArrayBlockingQueue as suggested in https://issues.apache.org/jira/browse/COLLECTIONS-432, but it also decided to keep CircularFifoQueue in collections4 Thanks for the patch, I used my old patch, as I think the ArrayBlockingQueue would not have worked as a replacement in our case, where we don't want blocking behaviour (at least in some cases :))
It would be great, if you could test the next builds and report back, whether it works for you.
commit 28fce6057c72d32aa71f7437d18abb7c28ffc62f
AuthorDate: Sun Feb 16 15:30:39 2020 +0100
Updated commons-collections to 4.4 (from 3.2.2)
Keep old commons-collections 3.x for compatibility
Bugzilla Id: 63809
Closes #557 on github
---
checksum.xml | 2 ++
gradle.properties | 1 +
src/bom/build.gradle.kts | 1 +
src/components/build.gradle.kts | 2 +-
.../visualizers/ViewResultsFullVisualizer.java | 22 ++++++++++------------
src/core/build.gradle.kts | 5 ++++-
.../java/org/apache/jmeter/gui/LoggerPanel.java | 19 +++++++++----------
.../org/apache/jmeter/save/CSVSaveService.java | 6 +++---
.../org/apache/jmeter/services/FileServer.java | 8 ++++----
.../apache/jmeter/testbeans/gui/TestBeanGUI.java | 18 ++++++++----------
.../org/apache/jmeter/util/JSR223TestElement.java | 7 +++----
src/dist/build.gradle.kts | 2 +-
src/jorphan/build.gradle.kts | 2 +-
.../java/org/apache/jorphan/util/XMLBuffer.java | 8 ++++----
src/protocol/build.gradle.kts | 2 +-
.../jmeter/protocol/http/control/CacheManager.java | 7 +++----
.../jmeter/protocol/http/parser/TestCssParser.java | 14 +++++++-------
xdocs/changes.xml | 1 +
18 files changed, 64 insertions(+), 63 deletions(-)
DBCP2 already updated to 2.9.0, have your commit already merged ? Yes, we are on dbcp2 2.9.0 and commons-collections4 4.4 We are waiting for your feedback ;) But as we already did one round of RC for JMeter 5.5, I think it is safe to close this issue as fixed. This issue has been migrated to GitHub: https://github.com/apache/jmeter/issues/5178 |