This is an automated email from the ASF dual-hosted git repository.
scottheiberg pushed a change to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/grails-core.git
from 5d78f8d1ce Merge pull request #15202 from jdaugherty/7.0.x
add cdf324f9fc Fix Enum JSON/XML Serialization for Round-Trip Compatibility
add bb87e1c368 restore and deprecate old marahllers
add 26e6cf30bb Introduce simple xml/json marshaller config
add 944590eded Merge branch '7.0.x' into 7.0.x-simple-enum-json-support
add 1eb9d24642 remove unused import
add 9beb261be1 change enum registration comment
add dbe8c7bc51 document simple enum converter
new 06e8208313 Merge pull request #15212 from
codeconsole/7.0.x-simple-enum-json-support
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../ConvertersConfigurationInitializer.java | 26 ++++++--
.../converters/marshaller/json/EnumMarshaller.java | 4 ++
...umMarshaller.java => SimpleEnumMarshaller.java} | 20 +++---
.../converters/marshaller/xml/EnumMarshaller.java | 4 ++
...umMarshaller.java => SimpleEnumMarshaller.java} | 12 ++--
.../src/en/guide/upgrading/upgrading60x.adoc | 71 ++++++++++++++++++++++
.../web/converters/JSONConverterTests.groovy | 24 ++++++++
7 files changed, 138 insertions(+), 23 deletions(-)
copy
grails-converters/src/main/groovy/org/grails/web/converters/marshaller/json/{EnumMarshaller.java
=> SimpleEnumMarshaller.java} (74%)
copy
grails-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/{EnumMarshaller.java
=> SimpleEnumMarshaller.java} (81%)