Repository: brooklyn-server Updated Branches: refs/heads/master d5fbc654c -> 22f82ce32
Resolve release build failures due to optional JARs Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/d5e1c508 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/d5e1c508 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/d5e1c508 Branch: refs/heads/master Commit: d5e1c50808238ff393ad552ff0d4b29997f94c53 Parents: a9662df Author: Richard Downer <rich...@apache.org> Authored: Wed Apr 12 10:11:35 2017 +0100 Committer: Richard Downer <rich...@apache.org> Committed: Wed Apr 12 10:11:35 2017 +0100 ---------------------------------------------------------------------- .../camp/brooklyn/catalog/CatalogOsgiYamlEntityTest.java | 5 +++++ 1 file changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d5e1c508/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiYamlEntityTest.java ---------------------------------------------------------------------- diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiYamlEntityTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiYamlEntityTest.java index f492f12..53b27f1 100644 --- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiYamlEntityTest.java +++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiYamlEntityTest.java @@ -826,6 +826,9 @@ public class CatalogOsgiYamlEntityTest extends AbstractYamlTest { } private void addCatalogOSGiEntity(String symbolicName, String serviceType, boolean extraLib) { + TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH); + TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_OSGI_TEST_A_0_1_0_PATH); + addCatalogItems( "brooklyn.catalog:", " id: " + symbolicName, @@ -842,6 +845,8 @@ public class CatalogOsgiYamlEntityTest extends AbstractYamlTest { } private void addCatalogChildOSGiEntityWithServicesBlock(String symbolicName, String serviceType) { + TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH); + addCatalogItems( "brooklyn.catalog:", " id: " + symbolicName,
