Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BROOKLYN-409: add test #489

Merged
merged 1 commit into from Dec 20, 2016
Merged

BROOKLYN-409: add test #489

merged 1 commit into from Dec 20, 2016

Conversation

aledsage
Copy link
Contributor

Includes new osgi test bundle with prefix "com.example.brooklyn"

Without that new osgi bundle, the test might only pass because of the "white-listing" of org.apache.brooklyn prefixes. As the comment in the relevant pom.xml says, it's ok to use this mavenId that we don't own because the artifact is only used for test purposes. It is never part of a release.


For BROOKLYN-409, this test shows that it is already fixed in master! I believe it was fixed in this commit:

commit a72d1f20ed78504a9b690df1467465b781ac917a
Author: Aled Sage <aled.sage@gmail.com>
Date:   Mon Nov 7 17:11:45 2016 +0000

    BROOKLYN-379: entity type includes OSGi prefix

Copy link
Member

@neykov neykov left a comment

Choose a reason for hiding this comment

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

Some minor changes - good to merge as is.

" item:",
" services:",
" - type: " + TestEntity.class.getName());
addCatalogItems(yaml1);
Copy link
Member

Choose a reason for hiding this comment

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

addCatalogItems supports String... catalogYaml - no need to join them above.

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.3.2</version>
Copy link
Member

Choose a reason for hiding this comment

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

The version is already defined (albeit a different one) in parent pom, remove from there.
Same for below.

Includes new osgi test bundle with prefix "com.example.brooklyn"
@aledsage
Copy link
Contributor Author

Thanks @neykov - changes incorporated, and squashed into single commit. Merging now.

@asfgit asfgit merged commit ed560a7 into apache:master Dec 20, 2016
asfgit pushed a commit that referenced this pull request Dec 20, 2016
@aledsage aledsage deleted the BROOKLYN-409 branch December 20, 2016 10:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants