X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=common%2Ffeatures%2Fsrc%2Fmain%2Ffeatures%2Ffeatures.xml;h=b5eb54d76c9ba9466c8a71f3572d661d01c03792;hb=e24fa950206ff7527b7692c3e78e2193ebe422f1;hp=9dfc93ea242890f596a3eb8853f79f734c490c1b;hpb=f88b82bbd54ceb9c0eaed63e3896272217769a79;p=yangtools.git

diff --git a/common/features/src/main/features/features.xml b/common/features/src/main/features/features.xml
index 9dfc93ea24..b5eb54d76c 100644
--- a/common/features/src/main/features/features.xml
+++ b/common/features/src/main/features/features.xml
@@ -7,40 +7,40 @@
  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>
-        <bundle>mvn:org.opendaylight.yangtools/yang-data-api/{{VERSION}}</bundle>
+          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/yang-data-util/{{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>
+        <bundle>mvn:org.opendaylight.yangtools/yang-data-util/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/yang-parser-api/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/yang-parser-impl/{{VERSION}}</bundle>
     </feature>