You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2017/06/30 14:03:01 UTC
[13/27] brooklyn-server git commit: Merge branch 'version-new-rules'
into version-new-rules-prep
Merge branch 'version-new-rules' into version-new-rules-prep
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/5a7b64a7
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/5a7b64a7
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/5a7b64a7
Branch: refs/heads/master
Commit: 5a7b64a751abdfbd3d75f20232a2c2a4dbb28feb
Parents: b46188e ed98e27
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Jun 21 18:33:14 2017 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Jun 21 18:33:14 2017 +0100
----------------------------------------------------------------------
.../apache/brooklyn/core/BrooklynVersion.java | 5 +
.../catalog/internal/BasicBrooklynCatalog.java | 20 +-
.../internal/CatalogItemDtoAbstract.java | 4 +-
.../core/typereg/RegisteredTypeNaming.java | 52 ++---
.../brooklyn/util/core/ClassLoaderUtils.java | 5 +-
.../apache/brooklyn/util/core/osgi/Osgis.java | 18 +-
.../internal/CatalogItemComparatorTest.java | 9 +-
.../catalog/internal/CatalogVersioningTest.java | 1 +
.../core/typereg/RegisteredTypeNamingTest.java | 57 ++---
.../util/core/ClassLoaderUtilsTest.java | 2 +-
.../core/xstream/OsgiClassPrefixerTest.java | 2 +-
.../apache/brooklyn/util/osgi/OsgiUtils.java | 4 +
.../util/text/BrooklynVersionSyntax.java | 188 ++++++++++++++++
.../util/text/NaturalOrderComparator.java | 39 +++-
.../brooklyn/util/text/VersionComparator.java | 212 ++++++-------------
.../brooklyn/util/osgi/OsgiUtilsTest.java | 3 +
.../brooklyn/util/osgi/VersionedNameTest.java | 3 +-
.../util/text/BrooklynVersionSyntaxTest.java | 98 +++++++++
.../util/text/ComparableVersionTest.java | 5 +-
.../util/text/NaturalOrderComparatorTest.java | 63 ++++--
.../util/text/VersionComparatorTest.java | 65 +++---
21 files changed, 582 insertions(+), 273 deletions(-)
----------------------------------------------------------------------