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 855f00b366263f9b1b1edde6481493f165acbd1e Merge: c8fe395117 51ea8b0cb3 Author: Alex Heneveld <[email protected]> AuthorDate: Fri Nov 4 17:13:38 2022 +0000 Merge branch 'workflow-tidy' .../brooklyn/camp/brooklyn/AbstractYamlTest.java | 8 +- .../camp/brooklyn/AddChildrenEffectorYamlTest.java | 5 +- .../camp/brooklyn/CustomTypeConfigYamlTest.java | 5 +- .../brooklyn/CustomTypeInitializerYamlTest.java | 77 +++++----- .../brooklyn/camp/brooklyn/WorkflowYamlTest.java | 21 ++- .../core/resolve/jackson/BeanWithTypeUtils.java | 5 +- .../core/resolve/jackson/BrooklynJacksonType.java | 7 + .../core/workflow/WorkflowExecutionContext.java | 2 +- .../core/workflow/WorkflowStepResolution.java | 2 +- .../core/workflow/steps/LoadWorkflowStep.java | 105 +++++++++++++ .../core/workflow/steps/SetSensorWorkflowStep.java | 2 +- .../workflow/steps/SetVariableWorkflowStep.java | 168 +++++++++++++-------- .../core/workflow/steps/SshWorkflowStep.java | 1 + .../apache/brooklyn/util/core/ResourceUtils.java | 11 ++ .../resolve/jackson/BrooklynJacksonTypeTest.java | 5 +- ...klynRegisteredTypeJacksonSerializationTest.java | 16 +- .../core/test/BrooklynAppUnitTestSupport.java | 17 +++ .../brooklyn/core/workflow/WorkflowBasicTest.java | 7 +- .../workflow/WorkflowInputOutputExtensionTest.java | 138 ++++++++++++++--- karaf/init/src/main/resources/catalog.bom | 7 +- .../org/apache/brooklyn/util/stream/Streams.java | 14 +- 21 files changed, 459 insertions(+), 164 deletions(-)
