rebuild test JARs for use with new major version, and update tests that so depend
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/d64ca16b Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/d64ca16b Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/d64ca16b Branch: refs/heads/master Commit: d64ca16b5c8b198183e3a870cbfe5a83f4197570 Parents: b539605 Author: Alex Heneveld <[email protected]> Authored: Mon Oct 30 22:45:03 2017 +0000 Committer: Alex Heneveld <[email protected]> Committed: Mon Oct 30 22:46:38 2017 +0000 ---------------------------------------------------------------------- .../BrooklynLauncherRebindCatalogOsgiTest.java | 11 ++++------- utils/common/dependencies/osgi/README.md | 2 ++ .../brooklyn-test-osgi-com-example-entities.jar | Bin 22115 -> 22125 bytes .../osgi/brooklyn-test-osgi-entities.jar | Bin 22878 -> 22889 bytes .../brooklyn-test-osgi-more-entities_0.1.0.jar | Bin 15983 -> 15996 bytes .../brooklyn-test-osgi-more-entities_0.2.0.jar | Bin 16958 -> 16957 bytes ...-test-osgi-more-entities_evil-twin_0.2.0.jar | Bin 14146 -> 14144 bytes 7 files changed, 6 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d64ca16b/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindCatalogOsgiTest.java ---------------------------------------------------------------------- diff --git a/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindCatalogOsgiTest.java b/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindCatalogOsgiTest.java index e925b33..119f341 100644 --- a/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindCatalogOsgiTest.java +++ b/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindCatalogOsgiTest.java @@ -72,7 +72,7 @@ public abstract class BrooklynLauncherRebindCatalogOsgiTest extends AbstractBroo OsgiTestResources.BROOKLYN_TEST_OSGI_ENTITIES_COM_EXAMPLE_VERSION); private static final Set<VersionedName> COM_EXAMPLE_BUNDLE_CATALOG_IDS = ImmutableSet.of( - new VersionedName("com.example.simpleTest", "0.0.0-SNAPSHOT")); + new VersionedName("com.example.simpleTest", "0.1.0")); /** * Whether we reuse OSGi Framework depends if we want it to feel like rebinding on a new machine @@ -485,12 +485,8 @@ public abstract class BrooklynLauncherRebindCatalogOsgiTest extends AbstractBroo promoteT2IfStandby(); } - // TODO bundle fails to start: - // missing requirement [com.example.brooklyn.test.resources.osgi.brooklyn-test-osgi-com-example-entities [147](R 147.0)] - // osgi.wiring.package; (&(osgi.wiring.package=org.apache.brooklyn.config)(version>=0.12.0)(!(version>=1.0.0))) - // Presumably because brooklyn-api is just on the classpath rather than in osgi. - // How did such tests work previously?! - @Test(groups="Broken") + // if fails with wiring error you might need to rebuild items in utils/common/dependencies/osgi/ + @Test public void testRebindGetsInitialOsgiCatalogWithJava() throws Exception { TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiTestResources.BROOKLYN_TEST_OSGI_ENTITIES_COM_EXAMPLE_PATH); @@ -707,4 +703,5 @@ public abstract class BrooklynLauncherRebindCatalogOsgiTest extends AbstractBroo String bundleBom = createCatalogYaml(ImmutableList.of(), ImmutableList.of(), catalogItems, randomNoise); return newTmpBundle(ImmutableMap.of(BasicBrooklynCatalog.CATALOG_BOM, bundleBom.getBytes(StandardCharsets.UTF_8)), bundleName); } + } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d64ca16b/utils/common/dependencies/osgi/README.md ---------------------------------------------------------------------- diff --git a/utils/common/dependencies/osgi/README.md b/utils/common/dependencies/osgi/README.md index bda2287..92aea6d 100644 --- a/utils/common/dependencies/osgi/README.md +++ b/utils/common/dependencies/osgi/README.md @@ -6,6 +6,8 @@ copied there when these projects are built, and the binaries are included in source control to speed up build times (as these projects do not change much). These projects are NOT built as part of the normal brooklyn build. +It typically only needs to be rebuilt on a major version +upgrade (due to OSGi rules) or when contents are changed. To rebuild all: http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d64ca16b/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-com-example-entities.jar ---------------------------------------------------------------------- diff --git a/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-com-example-entities.jar b/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-com-example-entities.jar index 3caa879..5e7256a 100644 Binary files a/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-com-example-entities.jar and b/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-com-example-entities.jar differ http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d64ca16b/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-entities.jar ---------------------------------------------------------------------- diff --git a/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-entities.jar b/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-entities.jar index 36caec6..835c394 100644 Binary files a/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-entities.jar and b/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-entities.jar differ http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d64ca16b/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.1.0.jar ---------------------------------------------------------------------- diff --git a/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.1.0.jar b/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.1.0.jar index 465f0ca..8d3f692 100644 Binary files a/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.1.0.jar and b/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.1.0.jar differ http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d64ca16b/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.2.0.jar ---------------------------------------------------------------------- diff --git a/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.2.0.jar b/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.2.0.jar index 3b76043..d19a48b 100644 Binary files a/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.2.0.jar and b/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.2.0.jar differ http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d64ca16b/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_evil-twin_0.2.0.jar ---------------------------------------------------------------------- diff --git a/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_evil-twin_0.2.0.jar b/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_evil-twin_0.2.0.jar index 5046d38..b528ff4 100644 Binary files a/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_evil-twin_0.2.0.jar and b/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_evil-twin_0.2.0.jar differ
