The GitHub Actions job "CI" on 
grails-core.git/feature/spring-media-type-negotiation-8.0.x has failed.
Run started by GitHub user codeconsole (triggered by codeconsole).

Head commit for run:
d69d4b6e697a1e519a6168e18c381362161ca2f0 / Scott Murphy Heiberg 
<[email protected]>
Merge upstream/8.0.x into feature/spring-media-type-negotiation-8.0.x

Conflict resolutions:

* SpringIOUtils: upstream replaced the inline setFeature block with the
  cached factories and the XmlParserFeature enum. That rewrite already
  carries the http:// feature identifiers this branch was fixing, so
  upstream's version is taken whole.

* upgrading80x.adoc: both sides appended sections. Upstream's 53-60 are
  kept in place and this branch's five sections are renumbered 61-65.

Semantic conflicts git did not flag:

* XmlDataBindingSourceCreatorSpec, added upstream in grails-web-databinding,
  moved to grails-xml, where this branch moved the creator it exercises.
  grails-web-databinding cannot depend on grails-xml.

* The XML NonPublicClassMarshallingSpec stays in grails-converters beside
  its JSON twin and the bean fixtures it shares, reached through the
  existing testImplementation project(':grails-xml').

* XmlCompatibilitySpec expected XML.parse to accept a DOCTYPE and resolve
  internal entities. Upstream's parser hardening refuses any declaration,
  internal or not, as upgrading.adoc and threat model P10 both state. The
  two affected features now assert refusal on the converter and binding
  paths.

Report URL: https://github.com/apache/grails-core/actions/runs/34713756751

With regards,
GitHub Actions via GitBox

Reply via email to