BUG-5222: use odlparent features as a dependency

Specify dependency=true for artifacts provided from odlparent. This
should lower the time we keep reinstalling features.

Change-Id: I1742b66e8929ce165adf9f1befc6649e240631bf
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/common/features/pom.xml b/common/features/pom.xml
index e2d99934cdd1d086688054adc25900b0b900d466..47992a433b81150f61d088375a5ef079972cfcc1 100644 (file)
--- a/common/features/pom.xml
+++ b/common/features/pom.xml
@@ -34,6 +34,13 @@
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>features-odlparent</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-api</artifactId>

diff --git a/common/features/src/main/features/features.xml b/common/features/src/main/features/features.xml
index 0a77b1ce883650cd2d503c6d062f46590fb2c530..b5eb54d76c9ba9466c8a71f3572d661d01c03792 100644 (file)
--- a/common/features/src/main/features/features.xml
+++ b/common/features/src/main/features/features.xml
@@ -7,36 +7,36 @@
  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<features name="odl-yangtools-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
+<features name="odl-yangtools-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.3.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-    
-       <feature name='odl-yangtools-yang-data' version='${project.version}' description='OpenDaylight :: Yangtools :: Data Binding'>
-        <feature version='${project.version}'>odl-yangtools-yang-parser</feature>
+          xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.3.0 http://karaf.apache.org/xmlns/features/v1.3.0">
+    <repository>mvn:org.opendaylight.odlparent/features-odlparent/{{VERSION}}/xml/features</repository>
+    <feature name='odl-yangtools-yang-data' version='${project.version}' description='OpenDaylight :: Yangtools :: Data Binding'>
+        <feature version='${project.version}' dependency="true">odl-yangtools-yang-parser</feature>
         <bundle>mvn:org.opendaylight.yangtools/yang-data-impl/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/xsd-regex/{{VERSION}}</bundle>
 
         <!-- GSON-based JSON codec. Can be split out -->
-        <bundle>mvn:com.google.code.gson/gson/{{VERSION}}</bundle>
+        <bundle dependency="true">mvn:com.google.code.gson/gson/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/yang-data-codec-gson/{{VERSION}}</bundle>
 
         <bundle>mvn:org.opendaylight.yangtools/yang-data-codec-xml/{{VERSION}}</bundle>
     </feature>
 
     <feature name='odl-yangtools-common' version='${project.version}' description='OpenDaylight :: Yangtools :: Common'>
-        <bundle>mvn:com.google.guava/guava/{{VERSION}}</bundle>
+        <feature version="[1.7.0, 2.0.0)" dependency="true">odl-guava-18</feature>
+        <feature version="[1.7.0, 2.0.0)" dependency="true">odl-triemap-0.2</feature>
         <bundle>mvn:org.opendaylight.yangtools/concepts/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/yang-common/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/util/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/object-cache-api/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/object-cache-guava/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/object-cache-noop/{{VERSION}}</bundle>
-        <bundle>mvn:com.github.romix/java-concurrent-hash-trie-map/{{VERSION}}</bundle>
     </feature>
 
     <feature name='odl-yangtools-yang-parser' version='${project.version}' description='OpenDaylight :: Yangtools :: YANG Parser'>
-        <feature version='${project.version}'>odl-yangtools-common</feature>
-        <bundle>mvn:org.antlr/antlr4-runtime/{{VERSION}}</bundle>
+        <feature version='${project.version}' dependency="true">odl-yangtools-common</feature>
+        <bundle dependency="true">mvn:org.antlr/antlr4-runtime/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/yang-model-api/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/yang-model-util/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/yang-data-api/{{VERSION}}</bundle>