Skip to content

Modular catalog.bom#834

Merged
asfgit merged 2 commits intoapache:masterfrom
tbouron:update/reuse-bom
Sep 29, 2017
Merged

Modular catalog.bom#834
asfgit merged 2 commits intoapache:masterfrom
tbouron:update/reuse-bom

Conversation

@tbouron
Copy link
Copy Markdown
Member

@tbouron tbouron commented Sep 20, 2017

UPDATE: This is based on #842 for the mvn: syntax to work

This reuses each bundle's catalog.bom file to build global catalog.bom. It replaces karaf/init/src/main/resources/catalog-classes.bom by karaf/init/src/main/resources/catalog.bom

It avoids the duplication of bom files and keep all the metadata (title, description, iconUrl, etc) under the same module that contains the actual Java entity.

Those changes spans across brooklyn-server, brooklyn-library and brooklyn-dist. To be tested with:

@tbouron tbouron force-pushed the update/reuse-bom branch 2 times, most recently from 90056af to a3959d1 Compare September 25, 2017 11:02
@ahgittin
Copy link
Copy Markdown
Contributor

@tbouron conflicts should be trivial to resolve if you git merge #842 here (or rebase on that if that's easier)

@ahgittin
Copy link
Copy Markdown
Contributor

#842 is merged so simply merging master in to this should fix things without too much irritation

@tbouron
Copy link
Copy Markdown
Member Author

tbouron commented Sep 26, 2017

Indeed, just rebased on latest master @ahgittin

Copy link
Copy Markdown
Member

@m4rkmckenna m4rkmckenna left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Thanks @tbouron

@asfgit asfgit merged commit dc82022 into apache:master Sep 29, 2017
asfgit pushed a commit that referenced this pull request Sep 29, 2017
@tbouron tbouron deleted the update/reuse-bom branch September 29, 2017 10:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants