Bump version of netconf-subsystem to 0.2.2-SNAPSHOT.

Also clean up poms in netconf subsystem.

Change-Id: I419700edbdf4051ea4fed6cbffc1a558635a5548
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>

diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index 68f17281af4f4ad723b71c43a59c828f56135caa..77edba5b386cf410b3370d4458595d02d2b43a00 100644 (file)
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -76,6 +76,7 @@
     <!--versions for bits of the controller -->
     <controller.version>0.4.1-SNAPSHOT</controller.version>
     <config.version>0.2.1-SNAPSHOT</config.version>
     <!--versions for bits of the controller -->
     <controller.version>0.4.1-SNAPSHOT</controller.version>
     <config.version>0.2.1-SNAPSHOT</config.version>

+    <netconf.version>0.2.2-SNAPSHOT</netconf.version>

     <mdsal.version>1.0-SNAPSHOT</mdsal.version>
     <containermanager.version>0.5.1-SNAPSHOT</containermanager.version>
     <switchmanager.api.version>0.5.1-SNAPSHOT</switchmanager.api.version>
     <mdsal.version>1.0-SNAPSHOT</mdsal.version>
     <containermanager.version>0.5.1-SNAPSHOT</containermanager.version>
     <switchmanager.api.version>0.5.1-SNAPSHOT</switchmanager.api.version>

diff --git a/opendaylight/distribution/opendaylight/pom.xml b/opendaylight/distribution/opendaylight/pom.xml
index 05867335b5d8de3e6eec9bca3b870b3859be94a8..803d90253e40f3c652f44281dfb4d84b793783fd 100644 (file)
--- a/opendaylight/distribution/opendaylight/pom.xml
+++ b/opendaylight/distribution/opendaylight/pom.xml
@@ -188,37 +188,37 @@
         <dependency>
           <groupId>org.opendaylight.controller</groupId>
           <artifactId>netconf-api</artifactId>
         <dependency>
           <groupId>org.opendaylight.controller</groupId>
           <artifactId>netconf-api</artifactId>

-          <version>${config.version}</version>
+          <version>${netconf.version}</version>

         </dependency>
         <dependency>
           <groupId>org.opendaylight.controller</groupId>
           <artifactId>netconf-impl</artifactId>
         </dependency>
         <dependency>
           <groupId>org.opendaylight.controller</groupId>
           <artifactId>netconf-impl</artifactId>

-          <version>${config.version}</version>
+          <version>${netconf.version}</version>

         </dependency>
         <dependency>
           <groupId>org.opendaylight.controller</groupId>
           <artifactId>netconf-util</artifactId>
         </dependency>
         <dependency>
           <groupId>org.opendaylight.controller</groupId>
           <artifactId>netconf-util</artifactId>

-          <version>${config.version}</version>
+          <version>${netconf.version}</version>

         </dependency>
         <dependency>
           <groupId>org.opendaylight.controller</groupId>
           <artifactId>netconf-client</artifactId>
         </dependency>
         <dependency>
           <groupId>org.opendaylight.controller</groupId>
           <artifactId>netconf-client</artifactId>

-          <version>${config.version}</version>
+          <version>${netconf.version}</version>

         </dependency>
         <dependency>
           <groupId>org.opendaylight.controller</groupId>
           <artifactId>netconf-mapping-api</artifactId>
         </dependency>
         <dependency>
           <groupId>org.opendaylight.controller</groupId>
           <artifactId>netconf-mapping-api</artifactId>

-          <version>${config.version}</version>
+          <version>${netconf.version}</version>

         </dependency>
         <dependency>
           <groupId>org.opendaylight.controller</groupId>
           <artifactId>config-netconf-connector</artifactId>
         </dependency>
         <dependency>
           <groupId>org.opendaylight.controller</groupId>
           <artifactId>config-netconf-connector</artifactId>

-          <version>${config.version}</version>
+          <version>${netconf.version}</version>

         </dependency>
         <dependency>
           <groupId>org.opendaylight.controller</groupId>
           <artifactId>config-persister-impl</artifactId>
         </dependency>
         <dependency>
           <groupId>org.opendaylight.controller</groupId>
           <artifactId>config-persister-impl</artifactId>

-          <version>${config.version}</version>
+          <version>${netconf.version}</version>

         </dependency>
 
 
         </dependency>
 
 

diff --git a/opendaylight/netconf/config-netconf-connector/pom.xml b/opendaylight/netconf/config-netconf-connector/pom.xml
index f8bc7720d1d5681270e7cd0b45fa5c2bb679efbb..e3bcf504c034604139e5e21dc1481759f7473740 100755 (executable)
--- a/opendaylight/netconf/config-netconf-connector/pom.xml
+++ b/opendaylight/netconf/config-netconf-connector/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>netconf-subsystem</artifactId>
         <groupId>org.opendaylight.controller</groupId>
     <parent>
         <artifactId>netconf-subsystem</artifactId>
         <groupId>org.opendaylight.controller</groupId>

-        <version>0.2.1-SNAPSHOT</version>
+        <version>${netconf.version}</version>

     </parent>
     <artifactId>config-netconf-connector</artifactId>
     <name>${project.artifactId}</name>
     </parent>
     <artifactId>config-netconf-connector</artifactId>
     <name>${project.artifactId}</name>


@@ -20,7 +20,6 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-api</artifactId>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-api</artifactId>

-            <version>${project.version}</version>

         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>


@@ -32,28 +31,23 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>

-

             <artifactId>yang-jmx-generator</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>yang-jmx-generator</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>

-

             <artifactId>config-util</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-util</artifactId>
             <artifactId>config-util</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-util</artifactId>

-            <version>${project.version}</version>

         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>

-

             <artifactId>yang-store-api</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-mapping-api</artifactId>
             <artifactId>yang-store-api</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-mapping-api</artifactId>

-            <version>${project.version}</version>

         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>


@@ -63,47 +57,39 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-util</artifactId>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-util</artifactId>

-            <version>${project.version}</version>

             <scope>test</scope>
             <type>test-jar</type>
         </dependency>
 
         <dependency>
             <groupId>${project.groupId}</groupId>
             <scope>test</scope>
             <type>test-jar</type>
         </dependency>
 
         <dependency>
             <groupId>${project.groupId}</groupId>

-

             <artifactId>yang-test</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>yang-test</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>

-

             <artifactId>config-manager</artifactId>
             <artifactId>config-manager</artifactId>

-            <version>${config.version}</version>

             <scope>test</scope>
             <type>test-jar</type>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <scope>test</scope>
             <type>test-jar</type>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>

-

             <artifactId>config-manager</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-impl</artifactId>
             <artifactId>config-manager</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-impl</artifactId>

-            <version>${project.version}</version>

             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>

-

             <artifactId>yang-store-impl</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>mockito-configuration</artifactId>
             <artifactId>yang-store-impl</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>mockito-configuration</artifactId>

-            <version>${bgpcep.version}</version>

             <scope>test</scope>
         </dependency>
     </dependencies>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/opendaylight/netconf/config-persister-impl/pom.xml b/opendaylight/netconf/config-persister-impl/pom.xml
index a69c87f0a4d15106caf10a8b89a16720badeac9e..668d7d905b96055f23430f6f02a701483aeb3aa8 100644 (file)
--- a/opendaylight/netconf/config-persister-impl/pom.xml
+++ b/opendaylight/netconf/config-persister-impl/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>netconf-subsystem</artifactId>
         <groupId>org.opendaylight.controller</groupId>
     <parent>
         <artifactId>netconf-subsystem</artifactId>
         <groupId>org.opendaylight.controller</groupId>

-        <version>0.2.1-SNAPSHOT</version>
+        <version>${netconf.version}</version>

     </parent>
     <artifactId>config-persister-impl</artifactId>
     <name>${project.artifactId}</name>
     </parent>
     <artifactId>config-persister-impl</artifactId>
     <name>${project.artifactId}</name>


@@ -16,22 +16,18 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>config-persister-api</artifactId>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>config-persister-api</artifactId>

-            <version>0.2.1-SNAPSHOT</version>

         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-api</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-api</artifactId>

-            <version>${project.version}</version>

         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-client</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-client</artifactId>

-            <version>${project.version}</version>

         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-util</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-util</artifactId>

-            <version>${project.version}</version>

         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>


@@ -48,14 +44,12 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>config-persister-file-adapter</artifactId>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>config-persister-file-adapter</artifactId>

-            <version>0.2.1-SNAPSHOT</version>

         </dependency>
 
         <!-- test dependencies -->
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>mockito-configuration</artifactId>
         </dependency>
 
         <!-- test dependencies -->
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>mockito-configuration</artifactId>

-            <version>${bgpcep.version}</version>

             <scope>test</scope>
         </dependency>
     </dependencies>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/opendaylight/netconf/netconf-api/pom.xml b/opendaylight/netconf/netconf-api/pom.xml
index 5c18eddcf53d76fc0c41b609463d9f4c356391ba..8d800be2f781ed259fd82ea2b9de4f2ee90deb7c 100644 (file)
--- a/opendaylight/netconf/netconf-api/pom.xml
+++ b/opendaylight/netconf/netconf-api/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>netconf-subsystem</artifactId>
         <groupId>org.opendaylight.controller</groupId>
     <parent>
         <artifactId>netconf-subsystem</artifactId>
         <groupId>org.opendaylight.controller</groupId>

-        <version>0.2.1-SNAPSHOT</version>
+        <version>${netconf.version}</version>

     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>netconf-api</artifactId>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>netconf-api</artifactId>


@@ -17,12 +17,10 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>config-api</artifactId>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>config-api</artifactId>

-            <version>0.2.1-SNAPSHOT</version>

         </dependency>
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>framework</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>framework</artifactId>

-            <version>${bgpcep.version}</version>

         </dependency>
     </dependencies>
 
         </dependency>
     </dependencies>
 

diff --git a/opendaylight/netconf/netconf-client/pom.xml b/opendaylight/netconf/netconf-client/pom.xml
index d8dee68253201599ea71cc29b0c9a9492296bf26..f557a21aedc12b28c96a396ddc5953f05b28d6bd 100644 (file)
--- a/opendaylight/netconf/netconf-client/pom.xml
+++ b/opendaylight/netconf/netconf-client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>netconf-subsystem</artifactId>
         <groupId>org.opendaylight.controller</groupId>
     <parent>
         <artifactId>netconf-subsystem</artifactId>
         <groupId>org.opendaylight.controller</groupId>

-        <version>0.2.1-SNAPSHOT</version>
+        <version>${netconf.version}</version>

     </parent>
     <artifactId>netconf-client</artifactId>
     <name>${project.artifactId}</name>
     </parent>
     <artifactId>netconf-client</artifactId>
     <name>${project.artifactId}</name>


@@ -16,19 +16,15 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-util</artifactId>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-util</artifactId>

-            <version>${project.version}</version>

         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-api</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-api</artifactId>

-            <version>${project.version}</version>

         </dependency>
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>framework</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>framework</artifactId>

-            <version>${bgpcep.version}</version>

         </dependency>
         </dependency>

-

         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

diff --git a/opendaylight/netconf/netconf-impl/pom.xml b/opendaylight/netconf/netconf-impl/pom.xml
index 8e0d493c2702793fd010d71384f18c651b2f915b..2b3ddc1038b764f029af7ee199593538f616703d 100644 (file)
--- a/opendaylight/netconf/netconf-impl/pom.xml
+++ b/opendaylight/netconf/netconf-impl/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>netconf-subsystem</artifactId>
         <groupId>org.opendaylight.controller</groupId>
     <parent>
         <artifactId>netconf-subsystem</artifactId>
         <groupId>org.opendaylight.controller</groupId>

-        <version>0.2.1-SNAPSHOT</version>
+        <version>${netconf.version}</version>

     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>netconf-impl</artifactId>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>netconf-impl</artifactId>


@@ -18,34 +18,28 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-api</artifactId>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-api</artifactId>

-            <version>${project.version}</version>

         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-util</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-util</artifactId>

-            <version>${project.version}</version>

         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>config-util</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>config-util</artifactId>

-            <version>0.2.1-SNAPSHOT</version>

         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-mapping-api</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-mapping-api</artifactId>

-            <version>${project.version}</version>

         </dependency>
 
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>util</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>util</artifactId>

-            <version>${bgpcep.version}</version>

         </dependency>
 
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>framework</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>framework</artifactId>

-            <version>${bgpcep.version}</version>

         </dependency>
 
         <dependency>
         </dependency>
 
         <dependency>


@@ -65,7 +59,6 @@
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>mockito-configuration</artifactId>
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>mockito-configuration</artifactId>

-            <version>${bgpcep.version}</version>

             <scope>test</scope>
         </dependency>
         <dependency>
             <scope>test</scope>
         </dependency>
         <dependency>


@@ -76,27 +69,23 @@
 
         <dependency>
             <groupId>${project.groupId}</groupId>
 
         <dependency>
             <groupId>${project.groupId}</groupId>

-

             <artifactId>yang-store-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>xmlunit</groupId>
             <artifactId>xmlunit</artifactId>
             <artifactId>yang-store-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>xmlunit</groupId>
             <artifactId>xmlunit</artifactId>

-            <version>1.4</version>

             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-util</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-util</artifactId>

-            <version>${project.version}</version>

             <scope>test</scope>
             <type>test-jar</type>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-client</artifactId>
             <scope>test</scope>
             <type>test-jar</type>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-client</artifactId>

-            <version>${project.version}</version>

             <scope>test</scope>
         </dependency>
     </dependencies>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/opendaylight/netconf/netconf-it/pom.xml b/opendaylight/netconf/netconf-it/pom.xml
index fc777bc885ff538d8cf5db829c0e16b1fd0302b7..a64d7f3de5747c3b250757b7ad5810808c3e40b1 100644 (file)
--- a/opendaylight/netconf/netconf-it/pom.xml
+++ b/opendaylight/netconf/netconf-it/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>netconf-subsystem</artifactId>
         <groupId>org.opendaylight.controller</groupId>
     <parent>
         <artifactId>netconf-subsystem</artifactId>
         <groupId>org.opendaylight.controller</groupId>

-        <version>0.2.1-SNAPSHOT</version>
+        <version>${netconf.version}</version>

     </parent>
 
     <artifactId>netconf-it</artifactId>
     </parent>
 
     <artifactId>netconf-it</artifactId>


@@ -18,43 +18,36 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>config-api</artifactId>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>config-api</artifactId>

-            <version>${config.version}</version>

             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>config-util</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>config-util</artifactId>

-            <version>${config.version}</version>

             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>yang-store-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>yang-store-api</artifactId>

-            <version>${config.version}</version>

             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-api</artifactId>

-            <version>${project.version}</version>

             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>util</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>util</artifactId>

-            <version>${bgpcep.version}</version>

             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-client</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-client</artifactId>

-            <version>${project.version}</version>

             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>config-netconf-connector</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>config-netconf-connector</artifactId>

-            <version>${project.version}</version>

             <scope>test</scope>
         </dependency>
         <dependency>
             <scope>test</scope>
         </dependency>
         <dependency>


@@ -70,32 +63,27 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>config-persister-impl</artifactId>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>config-persister-impl</artifactId>

-            <version>${project.version}</version>

             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>config-manager</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>config-manager</artifactId>

-            <version>${config.version}</version>

             <scope>test</scope>
             <type>test-jar</type>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-impl</artifactId>
             <scope>test</scope>
             <type>test-jar</type>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-impl</artifactId>

-            <version>${project.version}</version>

             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-mapping-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-mapping-api</artifactId>

-            <version>${project.version}</version>

             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-util</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-util</artifactId>

-            <version>${project.version}</version>

             <scope>test</scope>
             <type>test-jar</type>
         </dependency>
             <scope>test</scope>
             <type>test-jar</type>
         </dependency>


@@ -107,25 +95,20 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>yang-store-impl</artifactId>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>yang-store-impl</artifactId>

-            <version>${config.version}</version>

             <scope>test</scope>
             <type>test-jar</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>logback-config</artifactId>
             <scope>test</scope>
             <type>test-jar</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>logback-config</artifactId>

-            <version>0.2.1-SNAPSHOT</version>

         </dependency>
         </dependency>

-

         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>

-

         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>mockito-configuration</artifactId>
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>mockito-configuration</artifactId>

-            <version>${bgpcep.version}</version>

             <scope>test</scope>
         </dependency>
     </dependencies>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/opendaylight/netconf/netconf-mapping-api/pom.xml b/opendaylight/netconf/netconf-mapping-api/pom.xml
index 5b6003f185c24a2a339568ce0db98710afb5a99d..a9928a6dc6baf9f42eb0670eda3423e3d691c8f2 100644 (file)
--- a/opendaylight/netconf/netconf-mapping-api/pom.xml
+++ b/opendaylight/netconf/netconf-mapping-api/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>netconf-subsystem</artifactId>
         <groupId>org.opendaylight.controller</groupId>
     <parent>
         <artifactId>netconf-subsystem</artifactId>
         <groupId>org.opendaylight.controller</groupId>

-        <version>0.2.1-SNAPSHOT</version>
+        <version>${netconf.version}</version>

     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>netconf-mapping-api</artifactId>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>netconf-mapping-api</artifactId>


@@ -18,7 +18,6 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-api</artifactId>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-api</artifactId>

-            <version>${project.version}</version>

         </dependency>
 
         <dependency>
         </dependency>
 
         <dependency>


@@ -50,4 +49,4 @@
             </plugin>
         </plugins>
     </build>
             </plugin>
         </plugins>
     </build>

-</project>
\ No newline at end of file
+</project>

diff --git a/opendaylight/netconf/netconf-util/pom.xml b/opendaylight/netconf/netconf-util/pom.xml
index f9b4fddb254f4452d9958d824f8e305ec6221806..0dbb45cbdf6210756c174d9db1033101b048b906 100644 (file)
--- a/opendaylight/netconf/netconf-util/pom.xml
+++ b/opendaylight/netconf/netconf-util/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>netconf-subsystem</artifactId>
         <groupId>org.opendaylight.controller</groupId>
     <parent>
         <artifactId>netconf-subsystem</artifactId>
         <groupId>org.opendaylight.controller</groupId>

-        <version>0.2.1-SNAPSHOT</version>
+        <version>${netconf.version}</version>

     </parent>
     <artifactId>netconf-util</artifactId>
     <name>${project.artifactId}</name>
     </parent>
     <artifactId>netconf-util</artifactId>
     <name>${project.artifactId}</name>


@@ -17,27 +17,22 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-api</artifactId>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-api</artifactId>

-            <version>${project.version}</version>

         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-mapping-api</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-mapping-api</artifactId>

-            <version>${project.version}</version>

         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>config-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>config-api</artifactId>

-            <version>0.2.1-SNAPSHOT</version>

         </dependency>
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>framework</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>framework</artifactId>

-            <version>${bgpcep.version}</version>

         </dependency>
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>util</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>util</artifactId>

-            <version>${bgpcep.version}</version>

         </dependency>
 
         <dependency>
         </dependency>
 
         <dependency>


@@ -55,7 +50,6 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-handler</artifactId>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-handler</artifactId>

-            <version>${netconf.netty.version}</version>

         </dependency>
     </dependencies>
 
         </dependency>
     </dependencies>
 

diff --git a/opendaylight/netconf/pom.xml b/opendaylight/netconf/pom.xml
index 1d7d55209466e0f5a4f43b0bcf0bbcc16817cdf4..840f557f51ae14fd41a737a38de07421ee70de14 100644 (file)
--- a/opendaylight/netconf/pom.xml
+++ b/opendaylight/netconf/pom.xml
@@ -9,8 +9,7 @@
         <relativePath>../commons/opendaylight</relativePath>
     </parent>
 
         <relativePath>../commons/opendaylight</relativePath>
     </parent>
 

-    <groupId>org.opendaylight.controller</groupId>
-    <version>0.2.1-SNAPSHOT</version>
+    <version>${netconf.version}</version>

     <artifactId>netconf-subsystem</artifactId>
     <packaging>pom</packaging>
     <name>${project.artifactId}</name>
     <artifactId>netconf-subsystem</artifactId>
     <packaging>pom</packaging>
     <name>${project.artifactId}</name>


@@ -75,6 +74,12 @@
                 <artifactId>config-manager</artifactId>
                 <version>${config.version}</version>
             </dependency>
                 <artifactId>config-manager</artifactId>
                 <version>${config.version}</version>
             </dependency>

+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>config-manager</artifactId>
+                <version>${config.version}</version>
+                <type>test-jar</type>
+            </dependency>

             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>yang-jmx-generator</artifactId>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>yang-jmx-generator</artifactId>


@@ -95,11 +100,78 @@
                 <artifactId>yang-store-impl</artifactId>
                 <version>${config.version}</version>
             </dependency>
                 <artifactId>yang-store-impl</artifactId>
                 <version>${config.version}</version>
             </dependency>

+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>yang-store-impl</artifactId>
+                <version>${config.version}</version>
+                <type>test-jar</type>
+            </dependency>

             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>yang-test</artifactId>
                 <version>${config.version}</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>yang-test</artifactId>
                 <version>${config.version}</version>
             </dependency>

+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>netconf-api</artifactId>
+                <version>${netconf.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>netconf-util</artifactId>
+                <version>${netconf.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>netconf-util</artifactId>
+                <version>${netconf.version}</version>
+                <type>test-jar</type>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>netconf-mapping-api</artifactId>
+                <version>${netconf.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>netconf-impl</artifactId>
+                <version>${netconf.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>config-persister-api</artifactId>
+                <version>${config.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>config-persister-file-adapter</artifactId>
+                <version>${config.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>netconf-client</artifactId>
+                <version>${netconf.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>xmlunit</groupId>
+                <artifactId>xmlunit</artifactId>
+                <version>1.4</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>config-netconf-connector</artifactId>
+                <version>${netconf.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>config-persister-impl</artifactId>
+                <version>${netconf.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>logback-config</artifactId>
+                <version>${config.version}</version>
+            </dependency>

         </dependencies>
     </dependencyManagement>
 
         </dependencies>
     </dependencyManagement>
 


@@ -135,15 +207,4 @@
 
         </pluginManagement>
     </build>
 
         </pluginManagement>
     </build>

-    <!--
-    <repositories>
-        <repository>
-            <id>opendaylight-snapshot</id>
-            <url>http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot</url>
-            <snapshots>
-                <updatePolicy>daily</updatePolicy>
-            </snapshots>
-        </repository>
-    </repositories>
-    -->

 </project>
 </project>