Bug 4035: Extract dom-config from core-api and broker-impl

[controller.git] / opendaylight / netconf / mdsal-netconf-connector / pom.xml

diff --git a/opendaylight/netconf/mdsal-netconf-connector/pom.xml b/opendaylight/netconf/mdsal-netconf-connector/pom.xml
index 809e729752fc38aab7014c224c1d3d372ab82878..31d2e7c1b36cd73f1ab4f8d7f4d3b0a22e879630 100644 (file)
--- a/opendaylight/netconf/mdsal-netconf-connector/pom.xml
+++ b/opendaylight/netconf/mdsal-netconf-connector/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>netconf-subsystem</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
   </parent>
   <artifactId>mdsal-netconf-connector</artifactId>
   <packaging>bundle</packaging>
@@ -24,6 +24,10 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>netconf-util</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>netconf-tcp</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
@@ -43,10 +47,15 @@
           <groupId>org.opendaylight.yangtools</groupId>
           <artifactId>object-cache-noop</artifactId>
       </dependency>
-      <dependency>
+    <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-core-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal-dom-config</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>commons.logback_settings</artifactId>
@@ -68,8 +77,8 @@
           <artifactId>config-api</artifactId>
       </dependency>
       <dependency>
-          <groupId>org.opendaylight.yangtools</groupId>
-          <artifactId>yang-data-operations</artifactId>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>ietf-netconf</artifactId>
       </dependency>
       <dependency>
           <groupId>org.opendaylight.controller</groupId>
@@ -92,7 +101,6 @@
           <artifactId>xmlunit</artifactId>
           <scope>test</scope>
       </dependency>
-
   </dependencies>
 
   <build>
@@ -106,41 +114,9 @@
           </instructions>
         </configuration>
       </plugin>
-      <!--FIXME extract yang plugin definition into parent-->
       <plugin>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yang-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>config</id>
-            <goals>
-              <goal>generate-sources</goal>
-            </goals>
-            <configuration>
-              <codeGenerators>
-                <generator>
-                  <codeGeneratorClass>org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator</codeGeneratorClass>
-                  <outputBaseDir>${jmxGeneratorPath}</outputBaseDir>
-                  <additionalConfiguration>
-                    <namespaceToPackage1>urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang</namespaceToPackage1>
-                  </additionalConfiguration>
-                </generator>
-                <generator>
-                  <codeGeneratorClass>org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
-                  <outputBaseDir>${salGeneratorPath}</outputBaseDir>
-                </generator>
-              </codeGenerators>
-              <inspectDependencies>true</inspectDependencies>
-            </configuration>
-          </execution>
-        </executions>
-        <dependencies>
-          <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>yang-jmx-generator-plugin</artifactId>
-            <version>${config.version}</version>
-          </dependency>
-        </dependencies>
       </plugin>
     </plugins>
   </build>