You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sv...@apache.org on 2017/07/20 13:24:18 UTC
[1/2] brooklyn-server git commit: Fix feature install bundle version
issue
Repository: brooklyn-server
Updated Branches:
refs/heads/master ef5e60f69 -> 033b8733b
Fix feature install bundle version issue
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/28096d3c
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/28096d3c
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/28096d3c
Branch: refs/heads/master
Commit: 28096d3c4af18b5055d84e81b420e111d941a62b
Parents: 8180161
Author: Andrew Donald Kennedy <an...@cloudsoftcorp.com>
Authored: Thu Jul 20 13:57:04 2017 +0100
Committer: Andrew Donald Kennedy <an...@cloudsoftcorp.com>
Committed: Thu Jul 20 13:57:04 2017 +0100
----------------------------------------------------------------------
.../brooklyn/core/catalog/internal/BasicBrooklynCatalog.java | 3 ++-
.../org/apache/brooklyn/core/mgmt/ha/OsgiArchiveInstaller.java | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/28096d3c/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
index 30c2f0b..9eea402 100644
--- a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
+++ b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
@@ -1364,7 +1364,8 @@ public class BasicBrooklynCatalog implements BrooklynCatalog {
log.debug("Wrapping supplied BOM as "+vn);
Manifest mf = new Manifest();
mf.getMainAttributes().putValue(Constants.BUNDLE_SYMBOLICNAME, vn.getSymbolicName());
- mf.getMainAttributes().putValue(Constants.BUNDLE_VERSION, vn.getOsgiVersionString() );
+ mf.getMainAttributes().putValue(Constants.BUNDLE_VERSION, vn.getOsgiVersionString());
+ mf.getMainAttributes().putValue(Constants.BUNDLE_MANIFESTVERSION, "2");
mf.getMainAttributes().putValue(Attributes.Name.MANIFEST_VERSION.toString(), OSGI_MANIFEST_VERSION_VALUE);
mf.getMainAttributes().putValue(BROOKLYN_WRAPPED_BOM_BUNDLE, Boolean.TRUE.toString());
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/28096d3c/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/OsgiArchiveInstaller.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/OsgiArchiveInstaller.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/OsgiArchiveInstaller.java
index bd51767..231bb07 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/OsgiArchiveInstaller.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/OsgiArchiveInstaller.java
@@ -227,10 +227,10 @@ class OsgiArchiveInstaller {
manifestNeedsUpdating = true;
}
if (!matchSetOrFail("MANIFEST.MF in archive", discoveredManifest.getMainAttributes().getValue(Constants.BUNDLE_SYMBOLICNAME),
- discoveredManifest.getMainAttributes().getValue(Constants.BUNDLE_VERSION) )) {
+ discoveredManifest.getMainAttributes().getValue(Constants.BUNDLE_VERSION))) {
manifestNeedsUpdating = true;
discoveredManifest.getMainAttributes().putValue(Constants.BUNDLE_SYMBOLICNAME, inferredMetadata.getSymbolicName());
- discoveredManifest.getMainAttributes().putValue(Constants.BUNDLE_VERSION, inferredMetadata.getOsgiVersionString() );
+ discoveredManifest.getMainAttributes().putValue(Constants.BUNDLE_VERSION, inferredMetadata.getOsgiVersionString());
}
if (Strings.isBlank(inferredMetadata.getSymbolicName())) {
throw new IllegalArgumentException("Missing bundle symbolic name in BOM or MANIFEST");
[2/2] brooklyn-server git commit: Closes #769
Posted by sv...@apache.org.
Closes #769
Fix feature install bundle version issue
Fixes issue with installing bundles, causing the following error:
```
karaf@brooklyn()> feature:install -r jclouds-api-route53
Error executing command: Unable to build resource for brooklyn:fo9y9ghsab: Unsupported 'Bundle-ManifestVersion' value: 1
```
Sets `Bundle-ManifestVersion` to 2 for Brooklyn generated bundles.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/033b8733
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/033b8733
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/033b8733
Branch: refs/heads/master
Commit: 033b8733b993d74ca653fd874353d17e4ef83d96
Parents: ef5e60f 28096d3
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Thu Jul 20 16:24:12 2017 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Thu Jul 20 16:24:12 2017 +0300
----------------------------------------------------------------------
.../brooklyn/core/catalog/internal/BasicBrooklynCatalog.java | 3 ++-
.../org/apache/brooklyn/core/mgmt/ha/OsgiArchiveInstaller.java | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------