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 0698f135e38af0691b2379e5b1b27b25c95dee7d Merge: f7aec33 9b1a8d6 Author: Alex Heneveld <[email protected]> AuthorDate: Fri Oct 2 00:15:57 2020 +0100 This closes #1113 .../BrooklynComponentTemplateResolver.java | 2 +- .../creation/BrooklynEntityDecorationResolver.java | 2 +- ...apache.brooklyn.core.plan.PlanToSpecTransformer | 4 + ...ooklyn.core.typereg.BrooklynTypePlanTransformer | 4 + .../brooklyn/CustomTypeConfigYamlOsgiTest.java | 70 +++++++++++++++++ .../camp/brooklyn/CustomTypeConfigYamlTest.java | 53 +++++++------ .../catalog/CatalogOsgiYamlEntityTest.java | 6 +- .../brooklyn/catalog/CatalogYamlEntityTest.java | 23 +++++- .../catalog/internal/BasicBrooklynCatalog.java | 26 +++++-- .../jackson/BeanWithTypePlanTransformer.java | 10 ++- .../core/resolve/jackson/BeanWithTypeUtils.java | 13 ++-- ...BrooklynRegisteredTypeJacksonSerialization.java | 35 +++++---- .../typereg/RegisteredTypeLoadingContexts.java | 11 ++- .../core/typereg/TypePlanTransformers.java | 3 + ...rooklyn.api.internal.ApiObjectsFactoryInterface | 4 + ...g.apache.brooklyn.api.location.LocationResolver | 4 + ...apache.brooklyn.core.plan.PlanToSpecTransformer | 4 + ...brooklyn.core.resolve.entity.EntitySpecResolver | 4 + ...ooklyn.core.typereg.BrooklynTypePlanTransformer | 4 + .../resources/OSGI-INF/blueprint/blueprint.xml | 7 ++ .../BrooklynMiscJacksonSerializationTest.java | 8 +- ...klynRegisteredTypeJacksonSerializationTest.java | 2 +- .../resolve/jackson/PerverseSerializationTest.java | 2 +- .../jackson/WrappedValuesSerializationTest.java | 6 +- ...g.apache.brooklyn.api.location.LocationResolver | 4 + ...g.apache.brooklyn.api.location.LocationResolver | 4 + ...g.apache.brooklyn.api.location.LocationResolver | 4 + ...brooklyn.core.resolve.entity.EntitySpecResolver | 4 + .../META-INF/services/org.testng.ITestNGListener | 24 +++++- utils/common/dependencies/osgi/beans/pom.xml | 84 +++++++++++++++++++++ .../org/apache/brooklyn/test/osgi/SampleBean.java | 26 +++++++ .../osgi/beans/src/main/resources/catalog.bom | 14 ++-- .../brooklyn/util/osgi/OsgiTestResources.java | 6 +- .../brooklyn/osgi/brooklyn-osgi-test-a_0.1.0.txt | 2 +- .../brooklyn/osgi/brooklyn-test-osgi-beans.jar | Bin 0 -> 11696 bytes ...st-a_0.1.0.txt => brooklyn-test-osgi-beans.txt} | 8 +- .../brooklyn/osgi/brooklyn-test-osgi-entities.txt | 4 +- .../brooklyn-test-osgi-more-entities_0.1.0.txt | 4 +- .../brooklyn-test-osgi-more-entities_0.2.0.txt | 4 +- ...lyn-test-osgi-more-entities_evil-twin_0.2.0.txt | 4 +- .../org.apache.brooklyn.util.osgi.SystemFramework | 4 + 41 files changed, 420 insertions(+), 87 deletions(-)
