You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2022/09/09 13:27:14 UTC
[brooklyn-server] 01/01: Merge branch 'catalog-item-url'
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit dac93bf36179e6d080bb1f1eeff3cf1da8b24557
Merge: 16f6c500bd 71bddda40e
Author: Alex Heneveld <al...@cloudsoft.io>
AuthorDate: Fri Sep 9 14:27:04 2022 +0100
Merge branch 'catalog-item-url'
.../brooklyn/camp/brooklyn/RebindOsgiTest.java | 4 +-
.../camp/brooklyn/ReferencedOsgiYamlTest.java | 24 ++++++++
.../catalog/internal/BasicBrooklynCatalog.java | 66 +++++++++++++++------
.../brooklyn/core/typereg/BundleUpgradeParser.java | 6 +-
.../BrooklynLauncherRebindCatalogOsgiTest.java | 4 +-
utils/common/dependencies/osgi/beans/pom.xml | 25 ++------
.../dependencies/osgi/com-example-entities/pom.xml | 25 ++------
.../src/main/resources/catalog.bom | 3 +
.../resources/{catalog.bom => yaml-ref-item.yaml} | 9 +--
.../{catalog.bom => yaml-ref-this-catalog.bom} | 8 +--
utils/common/dependencies/osgi/entities/pom.xml | 25 ++------
.../dependencies/osgi/more-entities-v1/pom.xml | 25 ++------
.../osgi/more-entities-v2-evil-twin/pom.xml | 23 ++-----
.../dependencies/osgi/more-entities-v2/pom.xml | 24 ++------
.../osgi/{more-entities-v1 => parent}/pom.xml | 24 +++-----
.../brooklyn-test-osgi-com-example-entities.jar | Bin 22125 -> 24110 bytes
.../brooklyn/osgi/brooklyn-test-osgi-entities.jar | Bin 22889 -> 23515 bytes
.../brooklyn-test-osgi-more-entities_0.1.0.jar | Bin 15996 -> 16624 bytes
.../brooklyn-test-osgi-more-entities_0.2.0.jar | Bin 16957 -> 17611 bytes
...lyn-test-osgi-more-entities_evil-twin_0.2.0.jar | Bin 14144 -> 14805 bytes
20 files changed, 122 insertions(+), 173 deletions(-)