Mitigate Issues Reported in cxf-core 3.5.11 and Port Related Regression Fixes - #2
Mitigate Issues Reported in cxf-core 3.5.11 and Port Related Regression Fixes#2RusJaI wants to merge 10 commits into
Conversation
Ports apache#3344
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Pro Plus Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
|
|
Summary
Backports Apache CXF fixes from upstream
3.6.x-fixes/mainonto3.5.x-fixes.CXF 3.5.x is EOL upstream, so these are manual backports. Each commit maps 1:1 to an
upstream PR.
Builds and tests green under JDK 8 (Temurin 1.8.0_382).
Commits
f3ccc7f82bf8e42587886d3190af42e3eed57f5c34a109c29c3ce8531baf2caa6c056d9c7afbeb785906549b3a51afb43762com.sun.mail:jakarta.mail1.6.7 → 1.6.8 (test scope)Scope was limited to the modules this branch ships; upstream changes touching modules not
built here were not backported.
Adaptations required by this branch
Ported code matches upstream except where 3.5.x forces a change:
@Deprecated(forRemoval = ...)→@Deprecated(Java 9+ elements);List.of(...)→Collections.singletonList(...);InputStream.nullInputStream()→new ByteArrayInputStream(new byte[0]).this branch has not, so
FormUtilsTestwas translated back andAttachmentUtilTestgained an expectation that
#3188makes unconditional.UnusedLocalVariablewhere upstream's newer PMD does not.#3157/#3159come from 4.x, where some of this logic lives inAttachmentDeserializerUtil/AttachmentBoundaryDeserializer. On 3.5.x it is stillinside
AttachmentDeserializer; behaviour is identical.New defaults (upgrade notes)
Previously unbounded, now capped:
attachment-max-sizeattachment-headers-max-countattachment-max-countmaxFormParameterCount-Dorg.apache.cxf.binary-max-sizeMultipart uploads above 50 MB now fail where they previously succeeded. Schema validation
also no longer resolves external DTDs/schemas; note
javax.xml.accessExternalSchemadoesnot relax this, as an explicit factory
setPropertytakes precedence.Verification (real JDK 8, not
--release 8)core- 609 tests, 0 failures; compile + checkstyle + PMD cleanrt/frontend/jaxrs- 1095 tests, 0 failures; compile + checkstyle + PMD cleanrt/ws/transfer- 69 tests, 0 failuresrt/rs/client,rt/databinding/aegis,rt/ws/rm,tools/common,tools/wsdlto/databinding/jaxb- compile cleanUpstream regression tests were ported alongside the fixes.
Pre-existing issues (not introduced here)
rt/frontend/jaxrsrequiresTZ=UTC-RetryAfterHeaderProviderTestfails onhalf-hour-offset timezones. Verified present on a clean tree.
rt/wsdlhas 4 pre-existing failures (WSDLServiceBuilderTest.testImport), confirmed ona clean checkout.
systests/databinding/MTOMBase64Testwas not compiled or run (needs a full reactorinstall); its change was verified identical to upstream.