From: Dan Timoney <dtimoney@att.com>
Date: Wed, 28 Aug 2019 01:36:32 +0000 (+0000)
Subject: Merge "Roll elalto-fluorine version" into elalto-fluorine
X-Git-Tag: 0.5.3~2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=8f0ee69b21cb6035805f8e8e74d7237484c60cb0;hp=-c;p=ccsdk%2Fdistribution.git

Merge "Roll elalto-fluorine version" into elalto-fluorine
---

8f0ee69b21cb6035805f8e8e74d7237484c60cb0
diff --combined platform-logic/installer/pom.xml
index f49d1a57,088cdc76..240f2ea5
--- a/platform-logic/installer/pom.xml
+++ b/platform-logic/installer/pom.xml
@@@ -5,11 -5,11 +5,11 @@@
      <parent>
          <groupId>org.onap.ccsdk.distribution</groupId>
          <artifactId>distribution-platform-logic</artifactId>
-         <version>0.5.2-SNAPSHOT</version>
+         <version>0.5.3-SNAPSHOT</version>
      </parent>
  
      <artifactId>platform-logic-installer</artifactId>
-     <version>0.5.2-SNAPSHOT</version>
+     <version>0.5.3-SNAPSHOT</version>
      <packaging>pom</packaging>
  
      <name>ccsdk-distribution :: platform-logic :: ${project.artifactId}</name>
@@@ -40,13 -40,6 +40,13 @@@
              <groupId>org.onap.ccsdk.sli.core</groupId>
              <artifactId>sli-common</artifactId>
          </dependency>
 +        <!-- 1911: 8/22 We are missing org.osgi.framework.FrameworkUtil classes while activating DG -->
 +        <dependency>
 +            <groupId>org.apache.felix</groupId>
 +            <artifactId>org.apache.felix.framework</artifactId>
 +            <version>5.6.10</version>
 +            <scope>provided</scope>
 +        </dependency>
          <dependency>
              <groupId>org.antlr</groupId>
              <artifactId>antlr4</artifactId>