BUG-4309: include iana-afn-safi in model features

This fixes a failure to package iana-afn-safi.

Change-Id: I68d53a9c30041da0196d9513872c1a05a661b18f
Signed-off-by: Robert Varga <rovarga@cisco.com>
(cherry picked from commit 97e29e7c1cdd4fb4bdf63cdf83a4c5e0b4bcc6c8)

diff --git a/common/artifacts/pom.xml b/common/artifacts/pom.xml
index ba4d6e8fb42fb48cfa5c5056151257426eb785c4..63065f9f0ee0de440ff74796cf54d72bd21aa0c6 100644 (file)
--- a/common/artifacts/pom.xml
+++ b/common/artifacts/pom.xml
@@ -142,6 +142,11 @@
                 <artifactId>yang-maven-plugin-spi</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools.model</groupId>
+                <artifactId>iana-afn-safi</artifactId>
+                <version>2013.07.04.7.2-SNAPSHOT</version>
+            </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools.model</groupId>
                 <artifactId>iana-if-type-2014-05-08</artifactId>

diff --git a/common/features/pom.xml b/common/features/pom.xml
index 8806e912fedf6bf492a805e0a9e0dc76965f1a85..da388bb3ef9a2a9e7fcbab0c0ae92ccaa0f02b8b 100644 (file)
--- a/common/features/pom.xml
+++ b/common/features/pom.xml
@@ -34,6 +34,10 @@
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.yangtools.model</groupId>
+            <artifactId>iana-afn-safi</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>iana-if-type-2014-05-08</artifactId>

diff --git a/common/features/src/main/features/features.xml b/common/features/src/main/features/features.xml
index 6f85f8c33ba547a553e4d8c537722d2ede7f82c4..df4de03fa5f2c88128a84d3d8f5b140a71e53187 100644 (file)
--- a/common/features/src/main/features/features.xml
+++ b/common/features/src/main/features/features.xml
@@ -21,6 +21,7 @@
 
     <feature name='odl-yangtools-models' version='${project.version}' description='OpenDaylight :: Yangtools :: Models'>
         <feature version='${project.version}'>odl-yangtools-binding</feature>
+        <bundle>mvn:org.opendaylight.yangtools.model/iana-afn-safi/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.yangtools.model/iana-if-type-2014-05-08/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.yangtools.model/ietf-inet-types/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.yangtools.model/ietf-interfaces/{{VERSION}}</bundle>