Merge branch 'version-new-rules' into osgi-auto-wrap-yaml
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/12ea23be Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/12ea23be Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/12ea23be Branch: refs/heads/master Commit: 12ea23be517e92c9c9691b3015d2f981c9228430 Parents: 21e93d2 e742da7 Author: Alex Heneveld <[email protected]> Authored: Wed Jun 28 12:28:07 2017 +0100 Committer: Alex Heneveld <[email protected]> Committed: Wed Jun 28 12:28:07 2017 +0100 ---------------------------------------------------------------------- .../BrooklynComponentTemplateResolver.java | 2 +- ...lyn.spi.creation.service.ServiceTypeResolver | 19 ------------- .../catalog/internal/BasicBrooklynCatalog.java | 4 +-- .../core/typereg/RegisteredTypeNaming.java | 3 +- .../util/text/BrooklynVersionSyntax.java | 29 ++++++++++---------- .../util/text/NaturalOrderComparator.java | 2 ++ .../brooklyn/util/text/VersionComparator.java | 13 ++++----- 7 files changed, 28 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/12ea23be/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java ----------------------------------------------------------------------
