Merge "Add config classifier to netconf-mdsal-config jar"

diff --git a/features/mdsal/pom.xml b/features/mdsal/pom.xml
index bd0a99d9cae3f00373a7c9044823d913a96bfc8c..35d5dc21b394b93abf73c45ce6fe44e3dbe9ce7b 100644 (file)
--- a/features/mdsal/pom.xml
+++ b/features/mdsal/pom.xml
@@ -260,7 +260,13 @@
           <groupId>org.opendaylight.controller</groupId>
           <artifactId>mdsal-netconf-monitoring</artifactId>
       </dependency>
-
+      <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>netconf-mdsal-config</artifactId>
+          <version>${netconf.version}</version>
+          <type>xml</type>
+          <classifier>config</classifier>
+      </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-netconf-connector</artifactId>

diff --git a/features/netconf/pom.xml b/features/netconf/pom.xml
index 28c0e0a230091debe2bd608d9da76ca7bc81700f..8af370670639f461dcd5254465f7aa920cf501db 100644 (file)
--- a/features/netconf/pom.xml
+++ b/features/netconf/pom.xml
@@ -38,10 +38,6 @@
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>netconf-config</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>netconf-mdsal-config</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>netconf-auth</artifactId>