commit 1be4e6e0b8054c3e27d05faf069abee5b819529e
author Brian O'Connor <bocon@onlab.us> Fri Sep 04 14:59:45 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Fri Sep 04 23:11:22 2015 +0000
tree 709bba999f3bec75d8b8f0bfa1469a66bcd5035f
parent 8969cbe4bc88d1590a9cf1ce34f96920c7775d87

Updating org.apache.felix.framework.security to release version 2.2.0.onos

Also, adding dependency in core/security on the artifact to pre-download it.

Change-Id: Iff78dc1c40e2757cfc14b3fa3e350a85397580be

core/security/pom.xml

diff --git a/core/security/pom.xml b/core/security/pom.xml
index eb1e4bc..67e74a1 100644
--- a/core/security/pom.xml
+++ b/core/security/pom.xml
@@ -43,6 +43,14 @@
             <groupId>org.apache.karaf.features</groupId>
             <artifactId>org.apache.karaf.features.core</artifactId>
         </dependency>
+        <!-- Adding dependency to pull the artifact from Maven Central.
+             Note: This is just needed for the onos-security feature. -->
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>org.apache.felix.framework.security</artifactId>
+            <version>2.2.0.onos</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>

features/features.xml

diff --git a/features/features.xml b/features/features.xml
index ad9a08d..dec0299 100644
--- a/features/features.xml
+++ b/features/features.xml
@@ -133,8 +133,7 @@
     <feature name="onos-security" version="@FEATURE-VERSION"
              description="Security-Mode ONOS">
         <feature>onos-api</feature>
-        <!-- FIXME Release when stable (before Drake) -->
-        <bundle>mvn:org.onosproject/org.apache.felix.framework.security/2.2.0.onos-SNAPSHOT</bundle>
+        <bundle>mvn:org.onosproject/org.apache.felix.framework.security/2.2.0.onos</bundle>
         <bundle>mvn:org.onosproject/onos-security/@ONOS-VERSION</bundle>
     </feature>