GitHub user ahgittin opened a pull request:
https://github.com/apache/brooklyn-server/pull/743
Version new rules
Implements the behaviour discussed on ML re version syntax.
Places where OSGi syntax is required (ie registering/searching OSGi
bundles) convert to the OSGi syntax. Everywhere else uses the version string
exactly as supplied by the caller. Places where mappings to OSGi are not
unique result in warnings.
The fixes the issue described in #672, and `catalog.bom` files can (should)
now use familiar maven/semver versions (`#.#.#-qual`) which most people seem to
use everywhere else. This is converted to OSGi syntax (`#.#.#.qual`) when
creating the bundle, or comparing with installed bundles, but that's all hidden
from users (unless they go deep into OSGi).
You _can_ supply OSGi syntax (or even crazy things like `v1`) in the
`catalog.bom`, and the syntax supplied is exactly what will be used in the
Brooklyn catalog. There will be warnings if it does not follow the recommended
syntax but they can be ignored.
This builds on (and closes) #737 and #740, depending whether people want to
review those independently or in the context of this.
Merge https://github.com/apache/brooklyn-docs/pull/198 once this is merged.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/ahgittin/brooklyn-server version-new-rules
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/brooklyn-server/pull/743.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #743
----
commit 36ffdeeca0ac5290727b3bf5d2a7267664e9638a
Author: Alex Heneveld <[email protected]>
Date: 2017-06-16T08:49:44Z
remove REST reference to removed method
commit 3860c3498d63a9a9d880480363c7947599d40a7c
Author: Alex Heneveld <[email protected]>
Date: 2017-06-16T10:53:33Z
new utilities for registered type (catalog item id) naming syntax
commit 607fc853aa395915e15d527405b7a7a8a6e97b48
Author: Alex Heneveld <[email protected]>
Date: 2017-06-16T12:24:28Z
move many things to use RegisteredTypeNaming rather than hokey
`looksLikeVersionedId`
commit eb08f8ec0d65b59bb2c4201a98632aa070ddac97
Author: Alex Heneveld <[email protected]>
Date: 2017-06-16T12:38:45Z
notes on related methods for looking up catalog items flexibly
commit c9d03c93e35eb5417ca6168207f4b0ddc3de9e7c
Author: Alex Heneveld <[email protected]>
Date: 2017-06-16T12:46:20Z
remove deprecated CAMP ServiceTypeResolver
changed a while ago to EntitySpecResolver; removes references to catalog
items and hokey lookup
commit db77f4e14d07fe9e23fb464fb23302afc1fba2f0
Author: Alex Heneveld <[email protected]>
Date: 2017-06-20T08:37:29Z
fix tests that relied on removed deprecated behaviour
commit dc4942a345dc2fbd5125a34131addb632e634fe8
Author: Alex Heneveld <[email protected]>
Date: 2017-06-20T08:51:42Z
Merge branch 'master' into version-id
commit 5b2cc48685ee606207257e74fd8a61f13f876a00
Author: Alex Heneveld <[email protected]>
Date: 2017-06-20T15:48:25Z
prefer versions which comply with recommendations, heuristics elsewhere
expand tests. some obscure ordering items are different now.
commit cc703928e1a2bd9c97795acab9a747a3733eb4a2
Author: Alex Heneveld <[email protected]>
Date: 2017-06-20T15:49:57Z
tidy version comparator, removing old code
commit 45cb10a57af9e4aba0e7d624f1af6bfb25e5cee2
Author: Alex Heneveld <[email protected]>
Date: 2017-06-21T16:04:04Z
add lots of text explaining BrooklynVersionSyntax, update comparator,
tests, and usages
commit ed98e27e934ddf54d6c1c80b4a61afaab1225e47
Author: Alex Heneveld <[email protected]>
Date: 2017-06-21T17:26:43Z
add routines to convert brooklyn/osgi versions
and bundle finder supports either, and does the conversion for you
commit b46188e60e62247f8ffbe09c11acf37aaee69fad
Author: Alex Heneveld <[email protected]>
Date: 2017-06-21T17:33:06Z
This closes #737
commit 5a7b64a751abdfbd3d75f20232a2c2a4dbb28feb
Author: Alex Heneveld <[email protected]>
Date: 2017-06-21T17:33:14Z
Merge branch 'version-new-rules' into version-new-rules-prep
commit c5c5afc385341620f199737ddae3d2efaeb3a0a4
Author: Alex Heneveld <[email protected]>
Date: 2017-06-22T13:11:22Z
This closes #737
commit d8c03c82a14f2d82c4280067322604bc0982a976
Author: Alex Heneveld <[email protected]>
Date: 2017-06-22T13:11:38Z
This closes #740
commit 89fb13955eef518f53e3c3330a20191c89a3cf2e
Author: Alex Heneveld <[email protected]>
Date: 2017-06-22T12:17:32Z
record underlying supplied version in VersionedName
support for persistence, and test
commit 701a1d7fb70203fd6a0503c369b16674972344ac
Author: Alex Heneveld <[email protected]>
Date: 2017-06-22T12:18:28Z
update OsgiBundleWithUrl to act like versioned name, and uses of
VersionedName
OSGi versions are taken at the very last moment, allowing us to preserve
brooklyn-recommended syntax throughout nearly all our code; and lookups/matches
in OSGi space compare the OSGi-target
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
