Remove netconf from commons/opendaylight pom

Change-Id: Id558bf0ac35c661be028eb9cea436b6728b414de
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>

diff --git a/karaf/opendaylight-karaf/pom.xml b/karaf/opendaylight-karaf/pom.xml
index bf3d7e241de4d9e5402573db86a383946d541123..831108accd3ff66a85891766c3c0616b55cfe393 100644 (file)
--- a/karaf/opendaylight-karaf/pom.xml
+++ b/karaf/opendaylight-karaf/pom.xml
@@ -74,12 +74,12 @@
       <scope>runtime</scope>
     </dependency>
     <!-- Netconf connector features. When this is included, users can test the netconf connector using netconf-testtool -->
-    <dependency>
+<!--     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>features-netconf-connector</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
-    </dependency>
+    </dependency> -->
   </dependencies>
 
   <build>

diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index 97fe038fb1b2eda34184dffe94e787c35b330ffa..3147b0493e8de9d9b3cd45e0fccfe983417cd76d 100644 (file)
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -59,11 +59,9 @@
     <config.netty.configfile>00-netty.xml</config.netty.configfile>
     <config.mdsal.configfile>01-md-sal.xml</config.mdsal.configfile>
     <config.xsql.configfile>04-xsql.xml</config.xsql.configfile>
-    <config.netconf.client.configfile>01-netconf.xml</config.netconf.client.configfile>
     <config.toaster.configfile>03-toaster-sample.xml</config.toaster.configfile>
-    <config.netconf.mdsal.configfile>08-mdsal-netconf.xml</config.netconf.mdsal.configfile>
     <config.restconf.configfile>10-rest-connector.xml</config.restconf.configfile>
-    <config.netconf.connector.configfile>99-netconf-connector.xml</config.netconf.connector.configfile>
+
     <configuration.implementation.version>0.6.0-SNAPSHOT</configuration.implementation.version>
     <configuration.version>0.6.0-SNAPSHOT</configuration.version>
     <connectionmanager.version>0.3.0-SNAPSHOT</connectionmanager.version>
@@ -115,7 +113,6 @@
     <maven.plugin.api.version>3.0.5</maven.plugin.api.version>
     <mimepull.version>1.9.4</mimepull.version>
     <mdsal.version>1.3.0-SNAPSHOT</mdsal.version>
-    <netconf.version>0.4.0-SNAPSHOT</netconf.version>
     <networkconfig.bridgedomain.northbound.version>0.2.0-SNAPSHOT</networkconfig.bridgedomain.northbound.version>
     <!-- ODL repository / plugin repository -->
     <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
@@ -155,7 +152,6 @@
     <sonar.language>java</sonar.language>
     <sonar.jacoco.reportPath>target/code-coverage/jacoco.exec</sonar.jacoco.reportPath>
     <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
-    <sonar.exclusions>**/org/opendaylight/controller/netconf/cli/**, **/org/opendaylight/controller/netconf/test/tool/**</sonar.exclusions>
     <sonar.skippedModules>org.openflow.openflowj,net.sf.jung2,org.opendaylight.controller.protobuff.messages</sonar.skippedModules>
     <spifly.version>1.0.0</spifly.version>
     <spring-osgi.version>1.2.1</spring-osgi.version>
@@ -209,13 +205,6 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>netconf-artifacts</artifactId>
-        <version>${netconf.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
 
       <dependency>
         <groupId>org.apache.sshd</groupId>
@@ -1295,14 +1284,6 @@
         <type>xml</type>
         <scope>runtime</scope>
       </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>features-netconf-connector</artifactId>
-        <version>${mdsal.version}</version>
-        <classifier>features</classifier>
-        <type>xml</type>
-        <scope>runtime</scope>
-      </dependency>
 
       <!-- JMH Benchmark dependencies -->
       <dependency>

diff --git a/opendaylight/netconf/messagebus-netconf/pom.xml b/opendaylight/netconf/messagebus-netconf/pom.xml
index 847327c93e107061158b13cae65b9d2a1ac209f5..4c06a763073192adfbc88bdacab171cd749b1e90 100644 (file)
--- a/opendaylight/netconf/messagebus-netconf/pom.xml
+++ b/opendaylight/netconf/messagebus-netconf/pom.xml
@@ -69,11 +69,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         </dependency>
 
         <!-- Testing Dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.test-framework.providers</groupId>
             <artifactId>jersey-test-framework-provider-grizzly2</artifactId>

diff --git a/opendaylight/netconf/pom.xml b/opendaylight/netconf/pom.xml
index f33eb112bf2d1e11423370ed840d04b6f19d834d..82082447ed56bf71abdd024fe8a0d9edf061c5b1 100644 (file)
--- a/opendaylight/netconf/pom.xml
+++ b/opendaylight/netconf/pom.xml
@@ -14,7 +14,17 @@
   <packaging>pom</packaging>
   <name>${project.artifactId}</name>
 
+  <properties>
+    <netconf.version>0.4.0-SNAPSHOT</netconf.version>
+    <config.netconf.client.configfile>01-netconf.xml</config.netconf.client.configfile>
+    <config.netconf.mdsal.configfile>08-mdsal-netconf.xml</config.netconf.mdsal.configfile>
+    <config.netconf.connector.configfile>99-netconf-connector.xml</config.netconf.connector.configfile>
+    <sonar.exclusions>**/org/opendaylight/controller/netconf/cli/**, **/org/opendaylight/controller/netconf/test/tool/**</sonar.exclusions>
+  </properties>
+
   <modules>
+    <module>netconf-artifacts</module>
+
     <module>netconf-api</module>
     <module>netconf-config</module>
     <module>netconf-impl</module>
@@ -39,8 +49,6 @@
     <module>features</module>
     <module>models</module>
     <module>tools</module>
-
-    <module>netconf-artifacts</module>
   </modules>
 
   <dependencies>
@@ -60,6 +68,26 @@
     </dependency>
   </dependencies>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>netconf-artifacts</artifactId>
+        <version>${project.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>features-netconf-connector</artifactId>
+        <version>${project.version}</version>
+        <classifier>features</classifier>
+        <type>xml</type>
+        <scope>runtime</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <build>
     <pluginManagement>
       <plugins>

diff --git a/pom.xml b/pom.xml
index 6ff7637298687a98d34b591dad4cea973ca9a184..21bae79df21f97ac4c3c6ea61b3256488657c832 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -20,8 +20,6 @@
     <module>opendaylight/md-sal</module>
     <!-- config -->
     <module>opendaylight/config</module>
-    <!-- netconf -->
-    <module>opendaylight/netconf</module>
 
     <module>opendaylight/model</module>