[brooklyn-server] branch master updated (bdb817ee31 -> 3aff7a0425)

[iu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

iuliana pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git


    from bdb817ee31 Merge pull request #1313 from ahgittin/dynamic-multigroup-set-bucket-id
     new 403d79bc43 better freemarker parsing
     new 4362c06f2b more flexible AbstractBlueprintTest and catalog loading of items with java type
     new bbf187270c support brooklyn.tags on locations
     new fa1cb3bead add highlights and fix some producer log/references in policy for invoking effector on sensor change
     new da81b9a5c9 add Instant support to our use of Freemarker
     new e998c35700 jackson support for mgmt and entities (all BrooklynObject instances)
     new 41a793b30a allow entity.name from freemarker (same as entity.displayName)
     new b850d836cf allow UpdatingNotUp for SoftwareProcess to be referenced
     new 55ed611fe2 support coercion where map contains a type field and caller wants a type
     new ef83ca6743 tidy catalog
     new 3aff7a0425 Merge pull request #1315 from ahgittin/misc-improvements

The 13590 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:
 .../camp/brooklyn/ConfigTypeCoercionYamlTest.java  |  16 +-
 .../camp/brooklyn/CustomTypeConfigYamlTest.java    |  12 +-
 .../brooklyn/camp/brooklyn/LocationsYamlTest.java  |  52 ++++
 .../catalog/internal/BasicBrooklynCatalog.java     |   2 +-
 .../core/location/BasicLocationRegistry.java       |   4 +
 .../core/resolve/jackson/BeanWithTypeUtils.java    |  14 +-
 .../jackson/BrooklynJacksonSerializationUtils.java |  19 ++
 ...BrooklynRegisteredTypeJacksonSerialization.java |   6 +-
 .../resolve/jackson/CommonTypesSerialization.java  | 238 ++++++++++++++---
 .../typereg/JavaClassNameTypePlanTransformer.java  |  22 +-
 .../policy/InvokeEffectorOnSensorChange.java       |  27 +-
 .../util/core/json/BrooklynObjectsJsonMapper.java  |   4 +
 .../brooklyn/util/core/text/TemplateProcessor.java | 296 +++++++++++++++------
 core/src/main/resources/catalog.bom                |   8 +-
 .../util/core/text/TemplateProcessorTest.java      |  24 ++
 .../launcher/blueprints/AbstractBlueprintTest.java |  91 ++++++-
 .../brooklyn/rest/resources/ActivityRestTest.java  |   1 +
 .../util/json/BrooklynJacksonSerializerTest.java   | 109 ++++++++
 .../entity/software/base/SoftwareProcessImpl.java  |   3 -
 19 files changed, 775 insertions(+), 173 deletions(-)