Merged
Conversation
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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.bomfiles 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 thecatalog.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 apache/brooklyn-docs#198 once this is merged.