From: Robert Varga <robert.varga@pantheon.tech>
Date: Mon, 4 Jun 2018 00:03:24 +0000 (+0200)
Subject: odl-netconf-api should not repackage yang-model-api
X-Git-Tag: release/fluorine~66
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=ecf838daa83c668184b4309564f4f17fb2e58865;p=netconf.git

odl-netconf-api should not repackage yang-model-api

yang-model-api should be pulled in via odl-yangtools-parser-api,
do exactly that.

Change-Id: I854f6813a378cca691d992e009a55540368ec3bf
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---

diff --git a/features/netconf/odl-netconf-api/pom.xml b/features/netconf/odl-netconf-api/pom.xml
index df97d42061..6530110b4b 100644
--- a/features/netconf/odl-netconf-api/pom.xml
+++ b/features/netconf/odl-netconf-api/pom.xml
@@ -25,6 +25,13 @@
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yangtools-artifacts</artifactId>
+                <version>2.0.3</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
                 <artifactId>mdsal-model-artifacts</artifactId>
@@ -43,6 +50,12 @@
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>odl-yangtools-parser-api</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>odl-mdsal-models</artifactId>
diff --git a/features/netconf/odl-netconf-api/src/main/feature/feature.xml b/features/netconf/odl-netconf-api/src/main/feature/feature.xml
new file mode 100644
index 0000000000..d255e342bd
--- /dev/null
+++ b/features/netconf/odl-netconf-api/src/main/feature/feature.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright © 2018 Pantheon Technologies, s.r.o. and others.
+  ~
+  ~ This program and the accompanying materials are made available under the
+  ~ 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-netconf-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
+    <feature name="odl-netconf-api" version="${project.version}">
+        <feature version="[2.0.3,3)">odl-yangtools-parser-api</feature>
+    </feature>
+</features>