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 5653ff682b41cc85ea4e36eb1e0665f7a05726de Merge: 3b56db7 aebee7b Author: Duncan Grant <[email protected]> AuthorDate: Thu Nov 12 10:41:09 2020 +0000 Merge remote-tracking branch 'upstream/master' into winrmtaskfactory .../BrooklynComponentTemplateResolver.java | 17 +- .../creation/BrooklynEntityDecorationResolver.java | 3 +- .../spi/dsl/methods/BrooklynDslCommon.java | 27 +- .../brooklyn/CustomTypeConfigYamlOsgiTest.java | 6 + .../camp/brooklyn/CustomTypeConfigYamlTest.java | 339 +++++++++++++++------ .../brooklyn/spi/dsl/DslSerializationTest.java | 22 +- .../core/objs/proxy/InternalEntityFactory.java | 53 ++-- .../core/resolve/jackson/BeanWithTypeUtils.java | 169 +++++++++- .../jackson/BrooklynJacksonSerializationUtils.java | 1 + ...BrooklynRegisteredTypeJacksonSerialization.java | 9 + .../core/resolve/jackson/WrappedValue.java | 2 + .../jackson/WrappedValuesSerialization.java | 35 ++- .../core/typereg/BasicBrooklynTypeRegistry.java | 28 +- .../brooklyn/entity/group/AbstractGroupImpl.java | 10 +- .../core/flags/BrooklynTypeNameResolution.java | 7 + .../brooklyn/util/core/flags/TypeCoercions.java | 29 +- .../brooklyn/util/core/task/ValueResolver.java | 18 +- .../core/resolve/jackson/MapperTestFixture.java | 12 + .../jackson/WrappedValuesSerializationTest.java | 17 +- .../util/core/internal/ssh/RecordingSshTool.java | 8 +- .../JcloudsTypeCoercionsWithBuilderTest.java | 2 +- .../java/org/apache/brooklyn/util/guava/Maybe.java | 14 +- .../org/apache/brooklyn/util/guava/TypeTokens.java | 13 + .../org/apache/brooklyn/util/time/Duration.java | 2 + .../apache/brooklyn/util/guava/TypeTokensTest.java | 40 +++ 25 files changed, 712 insertions(+), 171 deletions(-)
