This is an automated email from the ASF dual-hosted git repository. heneveld pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit 45d376c2e78ba4479960d8c2cee4e2c30860366b Merge: 8b1044f311 3718c1e190 Author: Alex Heneveld <[email protected]> AuthorDate: Thu Dec 1 14:10:08 2022 +0000 Merge branch 'master' into workflow-nested .../BrooklynComponentTemplateResolver.java | 3 +- .../creation/BrooklynEntityDecorationResolver.java | 4 +- .../spi/creation/BrooklynYamlTypeInstantiator.java | 8 +- .../brooklyn/spi/creation/CampInternalUtils.java | 17 +- .../spi/creation/CampTypePlanTransformer.java | 3 +- .../brooklyn/CustomTypeConfigYamlRebindTest.java | 176 +++++++++++++++++++++ .../camp/brooklyn/CustomTypeConfigYamlTest.java | 22 +++ .../catalog/internal/BasicBrooklynCatalog.java | 6 +- .../config/internal/AbstractConfigMapImpl.java | 8 + .../core/mgmt/rebind/BasicEntityRebindSupport.java | 17 +- .../objs/AbstractConfigurationSupportInternal.java | 5 + .../brooklyn/core/objs/BrooklynObjectInternal.java | 4 + .../resolve/jackson/AsPropertyIfAmbiguous.java | 21 ++- .../jackson/BeanWithTypePlanTransformer.java | 19 ++- .../typereg/JavaClassNameTypePlanTransformer.java | 8 +- .../rebind/RebindManagerExceptionHandlerTest.java | 66 ++++++-- ...klynRegisteredTypeJacksonSerializationTest.java | 53 ++++++- .../resolve/jackson/PerverseSerializationTest.java | 3 +- 18 files changed, 393 insertions(+), 50 deletions(-)
