Brian O'Connor
Committed by Gerrit Code Review

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
...@@ -43,6 +43,14 @@ ...@@ -43,6 +43,14 @@
43 <groupId>org.apache.karaf.features</groupId> 43 <groupId>org.apache.karaf.features</groupId>
44 <artifactId>org.apache.karaf.features.core</artifactId> 44 <artifactId>org.apache.karaf.features.core</artifactId>
45 </dependency> 45 </dependency>
46 + <!-- Adding dependency to pull the artifact from Maven Central.
47 + Note: This is just needed for the onos-security feature. -->
48 + <dependency>
49 + <groupId>org.onosproject</groupId>
50 + <artifactId>org.apache.felix.framework.security</artifactId>
51 + <version>2.2.0.onos</version>
52 + <scope>provided</scope>
53 + </dependency>
46 </dependencies> 54 </dependencies>
47 55
48 <build> 56 <build>
......
...@@ -133,8 +133,7 @@ ...@@ -133,8 +133,7 @@
133 <feature name="onos-security" version="@FEATURE-VERSION" 133 <feature name="onos-security" version="@FEATURE-VERSION"
134 description="Security-Mode ONOS"> 134 description="Security-Mode ONOS">
135 <feature>onos-api</feature> 135 <feature>onos-api</feature>
136 - <!-- FIXME Release when stable (before Drake) --> 136 + <bundle>mvn:org.onosproject/org.apache.felix.framework.security/2.2.0.onos</bundle>
137 - <bundle>mvn:org.onosproject/org.apache.felix.framework.security/2.2.0.onos-SNAPSHOT</bundle>
138 <bundle>mvn:org.onosproject/onos-security/@ONOS-VERSION</bundle> 137 <bundle>mvn:org.onosproject/onos-security/@ONOS-VERSION</bundle>
139 </feature> 138 </feature>
140 139
......