brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [1/2] brooklyn-server git commit: Fix feature install bundle version issue
Date Thu, 20 Jul 2017 13:24:18 GMT
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 <andrew.kennedy@cloudsoftcorp.com>
Authored: Thu Jul 20 13:57:04 2017 +0100
Committer: Andrew Donald Kennedy <andrew.kennedy@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");


Mime
View raw message