Merge "Bug 2983: Added support for creation of multiple list entries"

diff --git a/features/akka/pom.xml b/features/akka/pom.xml
index 20f71402c3682d8279a1a8c9ce49a89064f8691f..743babf58981fb85044fb57c043b13d1142c371a 100644 (file)
--- a/features/akka/pom.xml
+++ b/features/akka/pom.xml
@@ -10,7 +10,7 @@
    <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../opendaylight/commons/opendaylight</relativePath>
    </parent>
    <artifactId>features-akka</artifactId>
@@ -20,11 +20,11 @@
       <features.file>features.xml</features.file>
       <!-- Optional TODO: Move these properties to your parent pom and possibly
             DependencyManagement section of your parent pom -->
-      <branding.version>1.1.0-SNAPSHOT</branding.version>
-      <karaf.resources.version>1.5.0-SNAPSHOT</karaf.resources.version>
+      <branding.version>1.2.0-SNAPSHOT</branding.version>
+      <karaf.resources.version>1.6.0-SNAPSHOT</karaf.resources.version>
       <karaf.version>3.0.3</karaf.version>
-      <feature.test.version>0.7.0-SNAPSHOT</feature.test.version>
-      <karaf.empty.version>1.5.0-SNAPSHOT</karaf.empty.version>
+      <feature.test.version>0.8.0-SNAPSHOT</feature.test.version>
+      <karaf.empty.version>1.6.0-SNAPSHOT</karaf.empty.version>
       <surefire.version>2.16</surefire.version>
    </properties>
    <dependencies>
@@ -42,21 +42,21 @@
         <dependency>
           <groupId>org.opendaylight.yangtools</groupId>
           <artifactId>features-yangtools</artifactId>
-          <version>0.7.0-SNAPSHOT</version>
+          <version>0.8.0-SNAPSHOT</version>
           <classifier>features</classifier>
           <type>xml</type>
         </dependency>
         <dependency>
           <groupId>org.opendaylight.controller</groupId>
           <artifactId>features-mdsal</artifactId>
-          <version>1.2.0-SNAPSHOT</version>
+          <version>1.3.0-SNAPSHOT</version>
           <classifier>features</classifier>
           <type>xml</type>
         </dependency>
         <dependency>
           <groupId>org.opendaylight.openflowplugin</groupId>
           <artifactId>features-openflowplugin</artifactId>
-          <version>0.1.0-SNAPSHOT</version>
+          <version>0.2.0-SNAPSHOT</version>
           <classifier>features</classifier>
           <type>xml</type>
         </dependency>

diff --git a/features/akka/src/main/resources/features.xml b/features/akka/src/main/resources/features.xml
index 8a3b4a2e25d038884c2d34e23b2bacbe94aec489..cc62e36f07a4fe8cc7e72fe910fdc19a8d29effe 100644 (file)
--- a/features/akka/src/main/resources/features.xml
+++ b/features/akka/src/main/resources/features.xml
@@ -18,9 +18,9 @@
     Necessary TODO: Add repo entries for the repositories of features you refer to
         in this feature file but do not define here.
         Examples:
-            <repository>mvn:org.opendaylight.yangtools/features-yangtools/0.7.0-SNAPSHOT/xml/features</repository>
-            <repository>mvn:org.opendaylight.controller/features-mdsal/1.2.0-SNAPSHOT/xml/features</repository>
-            <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/0.1.0-SNAPSHOT/xml/features</repository>
+            <repository>mvn:org.opendaylight.yangtools/features-yangtools/0.8.0-SNAPSHOT/xml/features</repository>
+            <repository>mvn:org.opendaylight.controller/features-mdsal/1.3.0-SNAPSHOT/xml/features</repository>
+            <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/0.2.0-SNAPSHOT/xml/features</repository>
     -->
     <feature name='odl-akka-all' version='${project.version}' description='OpenDaylight :: Akka :: All'>
         <!--
@@ -53,7 +53,7 @@
 
         * Basic MD-SAL Provider
         <feature name='odl-controller-provider' version='${project.version}' description='OpenDaylight :: controller :: Provider '>
-            <feature version='1.2.0-SNAPSHOT'>odl-mdsal-broker</feature>
+            <feature version='1.3.0-SNAPSHOT'>odl-mdsal-broker</feature>
             <feature version='${project.version}'>odl-controller-model</feature>
             <bundle>mvn:org.opendaylight.controller/controller-provider/${project.version}</bundle>
             ... whatever other bundles you need
@@ -61,15 +61,15 @@
 
         * Basic MD-SAL Model feature
         <feature name='odl-controller-model' version='${project.version}' description='OpenDaylight :: controller :: Model'>
-            <feature version='0.7.0-SNAPSHOT'>odl-yangtools-binding</feature>
-            <feature version='0.7.0-SNAPSHOT'>odl-yangtools-models</feature>
+            <feature version='0.8.0-SNAPSHOT'>odl-yangtools-binding</feature>
+            <feature version='0.8.0-SNAPSHOT'>odl-yangtools-models</feature>
             <bundle>mvn:org.opendaylight.controller/controller-model/${project.version}</bundle>
             ... whatever other bundles you need
         </feature>
 
         * Config Subsystem example - the config file is your config subsystem configuration
         <feature name='odl-controller-provider' version='${project.version}' description='OpenDaylight :: controller :: Provider'>
-            <feature version='1.2.0-SNAPSHOT'>odl-mdsal-broker</feature>
+            <feature version='1.3.0-SNAPSHOT'>odl-mdsal-broker</feature>
             <bundle>mvn:org.opendaylight.controller/controller-provider/${project.version}</bundle>
             <configfile finalname="etc/opendaylight/karaf/80-controller.xml">mvn:org.opendaylight.controller/controller-config/${project.version}/xml/config</configfile>
             ... whatever other bundles you need
@@ -77,7 +77,7 @@
 
         * Basic MD-SAL Provider that uses openflowplugin-flow-services (which brings along odl-mdsal-broker)
         <feature name='odl-controller-provider' version='${project.version}' description='OpenDaylight :: controller :: Provider'>
-            <feature version='0.1.0-SNAPSHOT'>odl-openflowplugin-flow-services</feature>
+            <feature version='0.2.0-SNAPSHOT'>odl-openflowplugin-flow-services</feature>
             <bundle>mvn:org.opendaylight.controller/controller-provider/${project.version}</bundle>
             ... whatever other bundles you need
         </feature>

diff --git a/features/config-netty/pom.xml b/features/config-netty/pom.xml
index 71b28415b5148791483c73b5a131838caa6d2754..8206ba573440a7eefda5a4e98fe1c987c2bdc31d 100644 (file)
--- a/features/config-netty/pom.xml
+++ b/features/config-netty/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-subsystem</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
     <relativePath>../../opendaylight/config/</relativePath>
   </parent>
   <artifactId>features-config-netty</artifactId>

diff --git a/features/config-persister/pom.xml b/features/config-persister/pom.xml
index 6fae0e76417d896dbc09bbf4a193170676befd8b..e46a2ff0348f88468c0bc70daf4a716f47ace163 100644 (file)
--- a/features/config-persister/pom.xml
+++ b/features/config-persister/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-subsystem</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
     <relativePath>../../opendaylight/config/</relativePath>
   </parent>
   <artifactId>features-config-persister</artifactId>

diff --git a/features/config/pom.xml b/features/config/pom.xml
index 683ce3dab1c38aac465f93b0870348c3a892a743..cd58cbbe56bfadcedf8072645cb73805671e6493 100644 (file)
--- a/features/config/pom.xml
+++ b/features/config/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-subsystem</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
     <relativePath>../../opendaylight/config/</relativePath>
   </parent>
   <artifactId>features-config</artifactId>
@@ -20,7 +20,7 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>opendaylight-karaf-empty</artifactId>
-      <version>1.5.0-SNAPSHOT</version>
+      <version>1.6.0-SNAPSHOT</version>
       <type>zip</type>
     </dependency>
     <dependency>

diff --git a/features/extras/pom.xml b/features/extras/pom.xml
index ee6d48009999a7b5d0da4d596e4bcde99a1a0c81..c6274a38e69d11e8c2f8183aed57a4096367ed78 100644 (file)
--- a/features/extras/pom.xml
+++ b/features/extras/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>commons.opendaylight</artifactId>
-        <version>1.5.0-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
         <relativePath>../../opendaylight/commons/opendaylight</relativePath>
     </parent>
     <artifactId>features-extras</artifactId>
@@ -20,10 +20,10 @@
         <features.file>features.xml</features.file>
         <!-- Optional TODO: Move these properties to your parent pom and possibly
               DependencyManagement section of your parent pom -->
-        <branding.version>1.1.0-SNAPSHOT</branding.version>
-        <karaf.resources.version>1.5.0-SNAPSHOT</karaf.resources.version>
+        <branding.version>1.2.0-SNAPSHOT</branding.version>
+        <karaf.resources.version>1.6.0-SNAPSHOT</karaf.resources.version>
         <karaf.version>3.0.3</karaf.version>
-        <karaf.empty.version>1.5.0-SNAPSHOT</karaf.empty.version>
+        <karaf.empty.version>1.6.0-SNAPSHOT</karaf.empty.version>
         <surefire.version>2.16</surefire.version>
     </properties>
     <dependencies>

diff --git a/features/mdsal/pom.xml b/features/mdsal/pom.xml
index 9222e13ebbec144c24e85bed3a861c59919ac27a..661438ab14d62b2898ff8b2ca9bf5b7fbe7f357a 100644 (file)
--- a/features/mdsal/pom.xml
+++ b/features/mdsal/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
     <relativePath>../../opendaylight/md-sal</relativePath>
   </parent>
   <artifactId>features-mdsal</artifactId>

diff --git a/features/netconf-connector/pom.xml b/features/netconf-connector/pom.xml
index b98f839979f32955ba0c0dac10a310a799541754..b974ce2ceeb984300b2e91fe170f624bae03c9f6 100644 (file)
--- a/features/netconf-connector/pom.xml
+++ b/features/netconf-connector/pom.xml
@@ -10,7 +10,7 @@
    <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
     <relativePath>../../opendaylight/md-sal</relativePath>
    </parent>
    <!--
@@ -21,7 +21,7 @@
   -->
    <artifactId>features-netconf-connector</artifactId>
    <!-- Optional TODO: Uncomment version if you are not using a parent pom.xml
-   <version>1.1.0-SNAPSHOT</version>
+   <version>1.2.0-SNAPSHOT</version>
    -->
    <packaging>jar</packaging>
    <properties>
@@ -42,21 +42,21 @@
         <dependency>
           <groupId>org.opendaylight.yangtools</groupId>
           <artifactId>features-yangtools</artifactId>
-          <version>0.7.0-SNAPSHOT</version>
+          <version>0.8.0-SNAPSHOT</version>
           <classifier>features</classifier>
           <type>xml</type>
         </dependency>
         <dependency>
           <groupId>org.opendaylight.controller</groupId>
           <artifactId>features-mdsal</artifactId>
-          <version>1.2.0-SNAPSHOT</version>
+          <version>1.3.0-SNAPSHOT</version>
           <classifier>features</classifier>
           <type>xml</type>
         </dependency>
         <dependency>
           <groupId>org.opendaylight.openflowplugin</groupId>
           <artifactId>features-openflowplugin</artifactId>
-          <version>0.1.0-SNAPSHOT</version>
+          <version>0.2.0-SNAPSHOT</version>
           <classifier>features</classifier>
           <type>xml</type>
         </dependency>
@@ -82,13 +82,13 @@
           <classifier>features</classifier>
           <type>xml</type>
         </dependency>
-        <dependency>
+        <!-- dependency>
           <groupId>org.opendaylight.aaa</groupId>
           <artifactId>features-aaa</artifactId>
           <version>${aaa.version}</version>
           <classifier>features</classifier>
           <type>xml</type>
-        </dependency>
+        </dependency -->
 
     <!--
       Necessary TODO: Put dependencies for bundles directly referenced

diff --git a/features/netconf-connector/src/main/resources/features.xml b/features/netconf-connector/src/main/resources/features.xml
index 16af44f20808a66857120d1cdadef61cff53c371..6805d82063ab83ab5b2aa540a8f11aa767f2e1c0 100644 (file)
--- a/features/netconf-connector/src/main/resources/features.xml
+++ b/features/netconf-connector/src/main/resources/features.xml
@@ -18,9 +18,9 @@
     Necessary TODO: Add repo entries for the repositories of features you refer to
         in this feature file but do not define here.
         Examples:
-            <repository>mvn:org.opendaylight.yangtools/features-yangtools/0.7.0-SNAPSHOT/xml/features</repository>
-            <repository>mvn:org.opendaylight.controller/features-mdsal/1.2.0-SNAPSHOT/xml/features</repository>
-            <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/0.1.0-SNAPSHOT/xml/features</repository>
+            <repository>mvn:org.opendaylight.yangtools/features-yangtools/0.8.0-SNAPSHOT/xml/features</repository>
+            <repository>mvn:org.opendaylight.controller/features-mdsal/1.3.0-SNAPSHOT/xml/features</repository>
+            <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/0.2.0-SNAPSHOT/xml/features</repository>
     -->
     <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
@@ -28,7 +28,7 @@
     <!-- FIXME: This introduces cycle between projects, which makes version updates
                 harder. Should be moved to different.
         -->
-    <repository>mvn:org.opendaylight.aaa/features-aaa/${aaa.version}/xml/features</repository>
+    <!-- repository>mvn:org.opendaylight.aaa/features-aaa/${aaa.version}/xml/features</repository -->
     <feature name='odl-netconf-connector-all' version='${project.version}' description='OpenDaylight :: Netconf Connector :: All'>
         <!--
             Necessary TODO:
@@ -59,7 +59,7 @@
 
         * Basic MD-SAL Provider
         <feature name='odl-controller-provider' version='${project.version}' description='OpenDaylight :: controller :: Provider '>
-            <feature version='1.2.0-SNAPSHOT'>odl-mdsal-broker</feature>
+            <feature version='1.3.0-SNAPSHOT'>odl-mdsal-broker</feature>
             <feature version='${project.version}'>odl-controller-model</feature>
             <bundle>mvn:org.opendaylight.controller/controller-provider/${project.version}</bundle>
             ... whatever other bundles you need
@@ -67,15 +67,15 @@
 
         * Basic MD-SAL Model feature
         <feature name='odl-controller-model' version='${project.version}' description='OpenDaylight :: controller :: Model'>
-            <feature version='0.7.0-SNAPSHOT'>odl-yangtools-binding</feature>
-            <feature version='0.7.0-SNAPSHOT'>odl-yangtools-models</feature>
+            <feature version='0.8.0-SNAPSHOT'>odl-yangtools-binding</feature>
+            <feature version='0.8.0-SNAPSHOT'>odl-yangtools-models</feature>
             <bundle>mvn:org.opendaylight.controller/controller-model/${project.version}</bundle>
             ... whatever other bundles you need
         </feature>
 
         * Config Subsystem example - the config file is your config subsystem configuration
         <feature name='odl-controller-provider' version='${project.version}' description='OpenDaylight :: controller :: Provider'>
-            <feature version='1.2.0-SNAPSHOT'>odl-mdsal-broker</feature>
+            <feature version='1.3.0-SNAPSHOT'>odl-mdsal-broker</feature>
             <bundle>mvn:org.opendaylight.controller/controller-provider/${project.version}</bundle>
             <configfile finalname="etc/opendaylight/karaf/80-controller.xml">mvn:org.opendaylight.controller/controller-config/${project.version}/xml/config</configfile>
             ... whatever other bundles you need
@@ -83,7 +83,7 @@
 
         * Basic MD-SAL Provider that uses openflowplugin-flow-services (which brings along odl-mdsal-broker)
         <feature name='odl-controller-provider' version='${project.version}' description='OpenDaylight :: controller :: Provider'>
-            <feature version='0.1.0-SNAPSHOT'>odl-openflowplugin-flow-services</feature>
+            <feature version='0.2.0-SNAPSHOT'>odl-openflowplugin-flow-services</feature>
             <bundle>mvn:org.opendaylight.controller/controller-provider/${project.version}</bundle>
             ... whatever other bundles you need
         </feature>
@@ -109,7 +109,7 @@
         <!-- FIXME: This introduces cycle between projects, which makes version updates
                     harder. Should be moved to different.
         -->
-        <feature version='${aaa.version}'>odl-aaa-netconf-plugin</feature>
+        <!-- feature version='${aaa.version}'>odl-aaa-netconf-plugin</feature -->
         <bundle>mvn:org.opendaylight.controller/netconf-ssh/${netconf.version}</bundle>
       </feature>
       <feature name='odl-netconf-tcp' version='${netconf.version}' description="OpenDaylight :: Netconf Connector :: TCP">

diff --git a/features/netconf/pom.xml b/features/netconf/pom.xml
index 8af370670639f461dcd5254465f7aa920cf501db..373f0095ce28d9db87e3b70df6e3716a30a65c86 100644 (file)
--- a/features/netconf/pom.xml
+++ b/features/netconf/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>netconf-subsystem</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
     <relativePath>../../opendaylight/netconf</relativePath>
   </parent>
   <artifactId>features-netconf</artifactId>

diff --git a/features/netconf/src/main/resources/features.xml b/features/netconf/src/main/resources/features.xml
index 80b2e36211952b2421002a4194c59d0dd554cfe0..4c3136f0a2fa40d838e5f5c0ac28cd9a6b502ca1 100644 (file)
--- a/features/netconf/src/main/resources/features.xml
+++ b/features/netconf/src/main/resources/features.xml
@@ -27,7 +27,7 @@
     <bundle>mvn:org.opendaylight.controller/ietf-netconf-monitoring-extension/${project.version}</bundle>
     <bundle>mvn:org.opendaylight.yangtools.model/ietf-inet-types/${ietf-inet-types.version}</bundle>
     <bundle>mvn:org.opendaylight.yangtools.model/ietf-yang-types/${ietf-yang-types.version}</bundle>
-    <bundle>mvn:org.opendaylight.yangtools.model/ietf-yang-types-20130715/2013.07.15.7-SNAPSHOT</bundle>
+    <bundle>mvn:org.opendaylight.yangtools.model/ietf-yang-types-20130715/2013.07.15.8-SNAPSHOT</bundle>
   </feature>
   <feature name='odl-netconf-mapping-api' version='${project.version}' description="OpenDaylight :: Netconf :: Mapping API">
     <feature version='${project.version}'>odl-netconf-api</feature>

diff --git a/features/pom.xml b/features/pom.xml
index 5aa9edc6696545402bc588b3ffd516a4a38b488d..99b54d06190a39bb02ff7a3dcfb7160b2e4c4414 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../opendaylight/commons/opendaylight</relativePath>
   </parent>
   <artifactId>features-controller</artifactId>

diff --git a/features/protocol-framework/pom.xml b/features/protocol-framework/pom.xml
index f663c1ce3e94b564907fec3ddf4847c8942722f5..7da19c58b55de00ae4f4b2ae020ae31665999d77 100644 (file)
--- a/features/protocol-framework/pom.xml
+++ b/features/protocol-framework/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../opendaylight/commons/opendaylight</relativePath>
   </parent>
   <artifactId>features-protocol-framework</artifactId>

diff --git a/features/restconf/pom.xml b/features/restconf/pom.xml
index 347a19a75af50cf293728f80f68ee8c0465a0dde..05fea9d259595da27873ef1dde276dae6ad20414 100644 (file)
--- a/features/restconf/pom.xml
+++ b/features/restconf/pom.xml
@@ -10,7 +10,7 @@
    <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
     <relativePath>../../opendaylight/md-sal</relativePath>
    </parent>
    <!--
@@ -22,7 +22,7 @@
    <artifactId>features-restconf</artifactId>
    <groupId>org.opendaylight.controller</groupId>
    <!-- Optional TODO: Uncomment version if you are not using a parent pom.xml
-   <version>1.1.0-SNAPSHOT</version>
+   <version>1.2.0-SNAPSHOT</version>
    -->
    <packaging>jar</packaging>
    <properties>
@@ -43,21 +43,21 @@
         <dependency>
           <groupId>org.opendaylight.yangtools</groupId>
           <artifactId>features-yangtools</artifactId>
-          <version>0.7.0-SNAPSHOT</version>
+          <version>0.8.0-SNAPSHOT</version>
           <classifier>features</classifier>
           <type>xml</type>
         </dependency>
         <dependency>
           <groupId>org.opendaylight.controller</groupId>
           <artifactId>features-mdsal</artifactId>
-          <version>1.2.0-SNAPSHOT</version>
+          <version>1.3.0-SNAPSHOT</version>
           <classifier>features</classifier>
           <type>xml</type>
         </dependency>
         <dependency>
           <groupId>org.opendaylight.openflowplugin</groupId>
           <artifactId>features-openflowplugin</artifactId>
-          <version>0.1.0-SNAPSHOT</version>
+          <version>0.2.0-SNAPSHOT</version>
           <classifier>features</classifier>
           <type>xml</type>
         </dependency>
@@ -109,13 +109,13 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <dependency>
+    <!-- dependency>
       <groupId>org.opendaylight.aaa</groupId>
       <artifactId>features-aaa</artifactId>
       <version>${aaa.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
-    </dependency>
+    </dependency -->
 
     <dependency>
       <groupId>org.opendaylight.controller</groupId>

diff --git a/features/restconf/src/main/resources/features.xml b/features/restconf/src/main/resources/features.xml
index 8060206b53753c435d39d666b5832f34040be280..87cab842d95a4ce41492e22adf8145f37a0ad15c 100644 (file)
--- a/features/restconf/src/main/resources/features.xml
+++ b/features/restconf/src/main/resources/features.xml
@@ -18,13 +18,13 @@
     Necessary TODO: Add repo entries for the repositories of features you refer to
         in this feature file but do not define here.
         Examples:
-            <repository>mvn:org.opendaylight.yangtools/features-yangtools/0.7.0-SNAPSHOT/xml/features</repository>
-            <repository>mvn:org.opendaylight.controller/features-mdsal/1.2.0-SNAPSHOT/xml/features</repository>
-            <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/0.1.0-SNAPSHOT/xml/features</repository>
+            <repository>mvn:org.opendaylight.yangtools/features-yangtools/0.8.0-SNAPSHOT/xml/features</repository>
+            <repository>mvn:org.opendaylight.controller/features-mdsal/1.3.0-SNAPSHOT/xml/features</repository>
+            <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/0.2.0-SNAPSHOT/xml/features</repository>
     -->
     <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.aaa/features-aaa/${aaa.version}/xml/features</repository>
+    <!-- repository>mvn:org.opendaylight.aaa/features-aaa/${aaa.version}/xml/features</repository -->
     <feature name='odl-restconf-all' version='${project.version}' description='OpenDaylight :: Restconf :: All'>
         <!--
             Necessary TODO:
@@ -53,7 +53,7 @@
 
         * Basic MD-SAL Provider
         <feature name='odl-controller-provider' version='${project.version}' description='OpenDaylight :: controller :: Provider '>
-            <feature version='1.2.0-SNAPSHOT'>odl-mdsal-broker</feature>
+            <feature version='1.3.0-SNAPSHOT'>odl-mdsal-broker</feature>
             <feature version='${project.version}'>odl-controller-model</feature>
             <bundle>mvn:org.opendaylight.controller/controller-provider/${project.version}</bundle>
             ... whatever other bundles you need
@@ -61,15 +61,15 @@
 
         * Basic MD-SAL Model feature
         <feature name='odl-controller-model' version='${project.version}' description='OpenDaylight :: controller :: Model'>
-            <feature version='0.7.0-SNAPSHOT'>odl-yangtools-binding</feature>
-            <feature version='0.7.0-SNAPSHOT'>odl-yangtools-models</feature>
+            <feature version='0.8.0-SNAPSHOT'>odl-yangtools-binding</feature>
+            <feature version='0.8.0-SNAPSHOT'>odl-yangtools-models</feature>
             <bundle>mvn:org.opendaylight.controller/controller-model/${project.version}</bundle>
             ... whatever other bundles you need
         </feature>
 
         * Config Subsystem example - the config file is your config subsystem configuration
         <feature name='odl-controller-provider' version='${project.version}' description='OpenDaylight :: controller :: Provider'>
-            <feature version='1.2.0-SNAPSHOT'>odl-mdsal-broker</feature>
+            <feature version='1.3.0-SNAPSHOT'>odl-mdsal-broker</feature>
             <bundle>mvn:org.opendaylight.controller/controller-provider/${project.version}</bundle>
             <configfile finalname="etc/opendaylight/karaf/80-controller.xml">mvn:org.opendaylight.controller/controller-config/${project.version}/xml/config</configfile>
             ... whatever other bundles you need
@@ -77,7 +77,7 @@
 
         * Basic MD-SAL Provider that uses openflowplugin-flow-services (which brings along odl-mdsal-broker)
         <feature name='odl-controller-provider' version='${project.version}' description='OpenDaylight :: controller :: Provider'>
-            <feature version='0.1.0-SNAPSHOT'>odl-openflowplugin-flow-services</feature>
+            <feature version='0.2.0-SNAPSHOT'>odl-openflowplugin-flow-services</feature>
             <bundle>mvn:org.opendaylight.controller/controller-provider/${project.version}</bundle>
             ... whatever other bundles you need
         </feature>
@@ -85,7 +85,7 @@
     -->
 
     <feature name='odl-restconf' version='${project.version}' description="OpenDaylight :: Restconf">
-        <feature version='${aaa.version}'>odl-aaa-authn</feature>
+        <!-- feature version='${aaa.version}'>odl-aaa-authn</feature -->
         <feature version='${mdsal.version}'>odl-restconf-noauth</feature>
     </feature>
     <feature name='odl-restconf-noauth' version='${project.version}' description="OpenDaylight :: Restconf">

diff --git a/itests/base-features-it/pom.xml b/itests/base-features-it/pom.xml
index dfb622eb7c1561ae37521ec9ea9fa9017917efad..a948ec78dd676146b2c69b043e2153ce9f23afc7 100644 (file)
--- a/itests/base-features-it/pom.xml
+++ b/itests/base-features-it/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>itests-controller</artifactId>
-        <version>1.5.0-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>base-features-it</artifactId>

diff --git a/itests/pom.xml b/itests/pom.xml
index 9021e634eaac991c9d39d38e008fc83f28e6d7ef..06ff0e57997e38c45740dec7b2ad032c7603e91c 100644 (file)
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../opendaylight/commons/opendaylight</relativePath>
   </parent>
   <artifactId>itests-controller</artifactId>

diff --git a/karaf/karaf-branding/pom.xml b/karaf/karaf-branding/pom.xml
index 7b2bd864f22171ee29e33c4ec641827962f5b269..759fd618df71cf65d136aeaabc0325b2d2892052 100644 (file)
--- a/karaf/karaf-branding/pom.xml
+++ b/karaf/karaf-branding/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>releasepom</artifactId>
-    <version>0.2.0-SNAPSHOT</version>
+    <version>0.3.0-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent>
   <artifactId>karaf.branding</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <name>OpenDaylight :: Karaf :: Branding</name>
 

diff --git a/karaf/karaf-parent/pom.xml b/karaf/karaf-parent/pom.xml
index 85e0c265b17e2402f17225e2f32f94fa081a132e..f613a9af450f2234599d618b8f4565ad8c4cbf7e 100644 (file)
--- a/karaf/karaf-parent/pom.xml
+++ b/karaf/karaf-parent/pom.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -21,8 +21,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <packaging>pom</packaging>
 
   <properties>
-    <branding.version>1.1.0-SNAPSHOT</branding.version>
-    <karaf.resources.version>1.5.0-SNAPSHOT</karaf.resources.version>
+    <branding.version>1.2.0-SNAPSHOT</branding.version>
+    <karaf.resources.version>1.6.0-SNAPSHOT</karaf.resources.version>
     <karaf.localFeature>standard</karaf.localFeature>
     <!--  Karaf Maven plugin 3.023 reinstalls already installed
           boot features to container, which could be observed

diff --git a/karaf/opendaylight-karaf-empty/pom.xml b/karaf/opendaylight-karaf-empty/pom.xml
index 4e4d4b058a33137cfb43ac1ac8c3922dc25e06d1..4c578c6a0d884aa964794d2ba99a3ef18dfb3356 100644 (file)
--- a/karaf/opendaylight-karaf-empty/pom.xml
+++ b/karaf/opendaylight-karaf-empty/pom.xml
@@ -3,13 +3,13 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>karaf-parent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../karaf-parent</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>opendaylight-karaf-empty</artifactId>
-  <version>1.5.0-SNAPSHOT</version>
+  <version>1.6.0-SNAPSHOT</version>
   <name>${project.artifactId}</name>
   <prerequisites>
     <maven>3.1.1</maven>

diff --git a/karaf/opendaylight-karaf-resources/pom.xml b/karaf/opendaylight-karaf-resources/pom.xml
index 0b2b8eff1ffe8e2e85deeddb84dafe066e8b8ce7..7a36e82705d76c740eff5656f7cc1e2d24656f1e 100644 (file)
--- a/karaf/opendaylight-karaf-resources/pom.xml
+++ b/karaf/opendaylight-karaf-resources/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../opendaylight/commons/opendaylight</relativePath>
   </parent>
   <artifactId>opendaylight-karaf-resources</artifactId>

diff --git a/karaf/opendaylight-karaf/pom.xml b/karaf/opendaylight-karaf/pom.xml
index 68238bbc120ea7f7b6074c1d1f4b76d6eaa42586..57d46572713eaa088d6de24e33da7bcf3f6ec7ac 100644 (file)
--- a/karaf/opendaylight-karaf/pom.xml
+++ b/karaf/opendaylight-karaf/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../opendaylight/commons/opendaylight</relativePath>
   </parent>
   <artifactId>distribution.opendaylight-karaf</artifactId>
@@ -90,7 +90,7 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>features-restconf</artifactId>
-      <version>1.2.0-SNAPSHOT</version>
+      <version>1.3.0-SNAPSHOT</version>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 1d37ae1b04a22898ec0311474358203d0bbcbb96..86ae052fdc3d0e814ef7072fdf092699c73d6123 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.parent</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../opendaylight/commons/parent</relativePath>
   </parent>
 

diff --git a/opendaylight/adsal/adsal-enunciate-parent/pom.xml b/opendaylight/adsal/adsal-enunciate-parent/pom.xml
index 11e36670790ef5152fa3a57673f22a0a50cd1a5e..1c6f99f8c1c029ed4ca82339a66a3c22c0b1145a 100644 (file)
--- a/opendaylight/adsal/adsal-enunciate-parent/pom.xml
+++ b/opendaylight/adsal/adsal-enunciate-parent/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>enunciate-parent</artifactId>
-        <version>1.5.0-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
         <relativePath>../../commons/enunciate-parent</relativePath>
     </parent>
 

diff --git a/opendaylight/adsal/appauth/pom.xml b/opendaylight/adsal/appauth/pom.xml
index 7c0c999a0f0be63c19fa5bf8ea77e357b6b48c63..00de90bb08314918e942969f048920e8eacac472 100644 (file)
--- a/opendaylight/adsal/appauth/pom.xml
+++ b/opendaylight/adsal/appauth/pom.xml
@@ -4,11 +4,11 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <artifactId>appauth</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>

diff --git a/opendaylight/adsal/arphandler/pom.xml b/opendaylight/adsal/arphandler/pom.xml
index d9e18ea6abd8f98d0a6100285a7f0d8c74db0cfe..34cecaf783990873da9ad8e13899c60cb7e84000 100644 (file)
--- a/opendaylight/adsal/arphandler/pom.xml
+++ b/opendaylight/adsal/arphandler/pom.xml
@@ -4,11 +4,11 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <artifactId>arphandler</artifactId>
-  <version>0.6.0-SNAPSHOT</version>
+  <version>0.7.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/clustering/integrationtest/pom.xml b/opendaylight/adsal/clustering/integrationtest/pom.xml
index ea18d61f0336bd01e58b4d42a49a859a80780874..e30eb6755163151d1c4877cf707d728dce17c03d 100644 (file)
--- a/opendaylight/adsal/clustering/integrationtest/pom.xml
+++ b/opendaylight/adsal/clustering/integrationtest/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.integrationtest</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
     <relativePath>../../commons/integrationtest</relativePath>
   </parent>
 
   <artifactId>clustering.services.integrationtest</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <properties>
     <sonar.jacoco.itReportPath>../../implementation/target/jacoco-it.exec</sonar.jacoco.itReportPath>
     <!-- Sonar jacoco plugin to get integration test coverage info -->

diff --git a/opendaylight/adsal/clustering/services/pom.xml b/opendaylight/adsal/clustering/services/pom.xml
index 550f580ebd0f7b8e4e2b2664fdb3bb034a58a308..ebe8436da8734e6be189a5b5ada53b66e43f03b1 100644 (file)
--- a/opendaylight/adsal/clustering/services/pom.xml
+++ b/opendaylight/adsal/clustering/services/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>clustering.services</artifactId>
-  <version>0.6.0-SNAPSHOT</version>
+  <version>0.7.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>

diff --git a/opendaylight/adsal/clustering/services_implementation/pom.xml b/opendaylight/adsal/clustering/services_implementation/pom.xml
index 36cd35d891b9fc4d1064af45690acb495b450613..d3b0578084579bcd26f83db16c3e6ec294f094f3 100644 (file)
--- a/opendaylight/adsal/clustering/services_implementation/pom.xml
+++ b/opendaylight/adsal/clustering/services_implementation/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>clustering.services-implementation</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <properties>
     <!-- Sonar properties using jacoco to retrieve integration test results -->

diff --git a/opendaylight/adsal/clustering/stub/pom.xml b/opendaylight/adsal/clustering/stub/pom.xml
index 7ab30110f3da7c0d3bf85a13d2873f8ee929c132..b2e845f41823c6caf82a47a9ebba208a163b1080 100644 (file)
--- a/opendaylight/adsal/clustering/stub/pom.xml
+++ b/opendaylight/adsal/clustering/stub/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>clustering.stub</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/clustering/test/pom.xml b/opendaylight/adsal/clustering/test/pom.xml
index 93407ea3d78a00a70f994977522099e40333a8bf..6e2c6dc0f9da4ebfe05cec6a6c6fc716284212e1 100644 (file)
--- a/opendaylight/adsal/clustering/test/pom.xml
+++ b/opendaylight/adsal/clustering/test/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>clustering.test</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/commons/httpclient/pom.xml b/opendaylight/adsal/commons/httpclient/pom.xml
index 93a537c00c9a5da7eea346dc8b552895cdd13503..16f05e0f38529ae2f8d0c70c0bf19423736183be 100644 (file)
--- a/opendaylight/adsal/commons/httpclient/pom.xml
+++ b/opendaylight/adsal/commons/httpclient/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>commons.httpclient</artifactId>
-  <version>0.2.0-SNAPSHOT</version>
+  <version>0.3.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>
@@ -70,7 +70,7 @@
           <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>checkstyle</artifactId>
-            <version>0.1.0-SNAPSHOT</version>
+            <version>0.2.0-SNAPSHOT</version>
           </dependency>
         </dependencies>
       </plugin>

diff --git a/opendaylight/adsal/commons/integrationtest/pom.xml b/opendaylight/adsal/commons/integrationtest/pom.xml
index e4d795d563b174960750f9fcb2b1b5c47d0e07c4..fbb1d0ea1d65ffb5ccf850842288291b233cf4db 100644 (file)
--- a/opendaylight/adsal/commons/integrationtest/pom.xml
+++ b/opendaylight/adsal/commons/integrationtest/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>commons.integrationtest</artifactId>
-  <version>0.6.0-SNAPSHOT</version>
+  <version>0.7.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <dependencies>
@@ -88,7 +88,7 @@
           <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>checkstyle</artifactId>
-            <version>0.1.0-SNAPSHOT</version>
+            <version>0.2.0-SNAPSHOT</version>
           </dependency>
         </dependencies>
       </plugin>

diff --git a/opendaylight/adsal/configuration/api/pom.xml b/opendaylight/adsal/configuration/api/pom.xml
index dec934bf6e13d0935bd60ea7fb8fc480bf10149f..00591e0fdd6f4e77f233829afc719b605fc6caa9 100644 (file)
--- a/opendaylight/adsal/configuration/api/pom.xml
+++ b/opendaylight/adsal/configuration/api/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>configuration</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/configuration/implementation/pom.xml b/opendaylight/adsal/configuration/implementation/pom.xml
index a35d2e94066c5978c3624c728d145bf2062bc6f1..8ea8997004d2ea928d24dba02008ae2a1d7de620 100644 (file)
--- a/opendaylight/adsal/configuration/implementation/pom.xml
+++ b/opendaylight/adsal/configuration/implementation/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>configuration.implementation</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/configuration/integrationtest/pom.xml b/opendaylight/adsal/configuration/integrationtest/pom.xml
index 238ff12249ce421309515441577e559dd912f688..5ae64e75d71456e38e24a545cc9d76be1bc3bc80 100644 (file)
--- a/opendaylight/adsal/configuration/integrationtest/pom.xml
+++ b/opendaylight/adsal/configuration/integrationtest/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.integrationtest</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
     <relativePath>../../commons/integrationtest</relativePath>
   </parent>
 
   <artifactId>configuration.integrationtest</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>ch.qos.logback</groupId>

diff --git a/opendaylight/adsal/connectionmanager/api/pom.xml b/opendaylight/adsal/connectionmanager/api/pom.xml
index aee485419c1789a1314fee22bc3523d41720bfda..21f4df1f9e971129aa92b309fbc5651c8b7b06f2 100644 (file)
--- a/opendaylight/adsal/connectionmanager/api/pom.xml
+++ b/opendaylight/adsal/connectionmanager/api/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>connectionmanager</artifactId>
-  <version>0.2.0-SNAPSHOT</version>
+  <version>0.3.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/connectionmanager/implementation/pom.xml b/opendaylight/adsal/connectionmanager/implementation/pom.xml
index b8293609a235937e13ca12b633a41ffdc670da01..0ae29a7a2d49a65db4411b93d3ef707455a014cf 100644 (file)
--- a/opendaylight/adsal/connectionmanager/implementation/pom.xml
+++ b/opendaylight/adsal/connectionmanager/implementation/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>connectionmanager.implementation</artifactId>
-  <version>0.2.0-SNAPSHOT</version>
+  <version>0.3.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/containermanager/api/pom.xml b/opendaylight/adsal/containermanager/api/pom.xml
index 31b209410d0f326f2cfd35eaa35fafe5233069aa..20687edb602b95ac444ef60c4659cd24c972432c 100644 (file)
--- a/opendaylight/adsal/containermanager/api/pom.xml
+++ b/opendaylight/adsal/containermanager/api/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>containermanager</artifactId>
-  <version>0.6.0-SNAPSHOT</version>
+  <version>0.7.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/containermanager/implementation/pom.xml b/opendaylight/adsal/containermanager/implementation/pom.xml
index b096ba6c01673f5cacaaf47dd614539a538ea72f..288977973f2ea39cfd26cb6db0d5344d5c3f593f 100644 (file)
--- a/opendaylight/adsal/containermanager/implementation/pom.xml
+++ b/opendaylight/adsal/containermanager/implementation/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>containermanager.implementation</artifactId>
-  <version>0.6.0-SNAPSHOT</version>
+  <version>0.7.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/containermanager/it.implementation/pom.xml b/opendaylight/adsal/containermanager/it.implementation/pom.xml
index e5ad7a7508705217b2401deb666b33b5e00f7d3b..241d9fbb87a70035bd7a5430eae71cd3c6668caa 100644 (file)
--- a/opendaylight/adsal/containermanager/it.implementation/pom.xml
+++ b/opendaylight/adsal/containermanager/it.implementation/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>containermanager.it.implementation</artifactId>
-  <version>0.6.0-SNAPSHOT</version>
+  <version>0.7.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/containermanager/shell/pom.xml b/opendaylight/adsal/containermanager/shell/pom.xml
index 065df2c8291d4961c7138e38d9e73fa11b16dddd..aa3c457694b353bd94a0268b5c645df3efc41934 100644 (file)
--- a/opendaylight/adsal/containermanager/shell/pom.xml
+++ b/opendaylight/adsal/containermanager/shell/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
   <artifactId>containermanager.shell</artifactId>

diff --git a/opendaylight/adsal/dummy-console/pom.xml b/opendaylight/adsal/dummy-console/pom.xml
index c8a1a22ae7bb946f496d25226e5e8b21dae92bf0..76aa58f0588cf20125d4c4d728aa51c16739bf50 100644 (file)
--- a/opendaylight/adsal/dummy-console/pom.xml
+++ b/opendaylight/adsal/dummy-console/pom.xml
@@ -4,11 +4,11 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <artifactId>dummy-console</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
+  <version>1.3.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <description>Dummy Console Interfaces for Equinox-specific CLI</description>
   <build>

diff --git a/opendaylight/adsal/features/adsal/pom.xml b/opendaylight/adsal/features/adsal/pom.xml
index 3bc35caa34b7de62ad14ddf7e29ee071d855982c..9ae56739b36884e029e2862d67175a2f2c7d790f 100644 (file)
--- a/opendaylight/adsal/features/adsal/pom.xml
+++ b/opendaylight/adsal/features/adsal/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../../opendaylight/commons/opendaylight</relativePath>
   </parent>
   <artifactId>features-adsal</artifactId>
@@ -31,7 +31,7 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>opendaylight-karaf-empty</artifactId>
-      <version>1.5.0-SNAPSHOT</version>
+      <version>1.6.0-SNAPSHOT</version>
       <type>zip</type>
     </dependency>
     <!-- Bundle dependencies -->

diff --git a/opendaylight/adsal/features/base/pom.xml b/opendaylight/adsal/features/base/pom.xml
index 86c9450b92ab8bdeb98a4842214594bcc1d2d06c..3042b6abe3c7cd4782d5f8d7ed2987592ff0807a 100644 (file)
--- a/opendaylight/adsal/features/base/pom.xml
+++ b/opendaylight/adsal/features/base/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../../opendaylight/commons/opendaylight</relativePath>
   </parent>
   <artifactId>features-base</artifactId>
@@ -448,7 +448,7 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>opendaylight-karaf-empty</artifactId>
-      <version>1.5.0-SNAPSHOT</version>
+      <version>1.6.0-SNAPSHOT</version>
       <type>zip</type>
     </dependency>
   </dependencies>

diff --git a/opendaylight/adsal/features/base/src/main/resources/features.xml b/opendaylight/adsal/features/base/src/main/resources/features.xml
index d6802acd0e909615a5009acbfc859bc8924b5404..182c047595333c1b8fcd9b2d9f076f8ebe4aee14 100644 (file)
--- a/opendaylight/adsal/features/base/src/main/resources/features.xml
+++ b/opendaylight/adsal/features/base/src/main/resources/features.xml
@@ -16,8 +16,8 @@
       <feature>odl-base-jackson</feature>
       <feature>odl-base-spring-security</feature>
    </feature>
-   <feature name="odl-base-dummy-console" description="Temporary Dummy Console" version="1.2.0-SNAPSHOT">
-      <bundle>mvn:org.opendaylight.controller/dummy-console/1.2.0-SNAPSHOT</bundle>
+   <feature name="odl-base-dummy-console" description="Temporary Dummy Console" version="1.3.0-SNAPSHOT">
+      <bundle>mvn:org.opendaylight.controller/dummy-console/1.3.0-SNAPSHOT</bundle>
    </feature>
    <feature name="odl-base-felix-dm" description="Felix Dependency Manager" version="${felix.dependencymanager.version}">
       <bundle>mvn:org.osgi/org.osgi.compendium/${osgi.compendium.version}</bundle>

diff --git a/opendaylight/adsal/features/controller/pom.xml b/opendaylight/adsal/features/controller/pom.xml
index 9e41561a7820cbe47ac61e535f2e0ad5410b8cba..c92e0bc69ec4954fd18bf3aed8b7a5adc9709c72 100644 (file)
--- a/opendaylight/adsal/features/controller/pom.xml
+++ b/opendaylight/adsal/features/controller/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../../opendaylight/commons/opendaylight</relativePath>
   </parent>
   <artifactId>controller-features</artifactId>

diff --git a/opendaylight/adsal/features/extras/pom.xml b/opendaylight/adsal/features/extras/pom.xml
index b86b0e28c3ece81658ce92a2290e0e5aa9dbcf8f..f8e04d1e1ab036111087b19f1a1d081ab7b8fa42 100644 (file)
--- a/opendaylight/adsal/features/extras/pom.xml
+++ b/opendaylight/adsal/features/extras/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../../opendaylight/commons/opendaylight</relativePath>
   </parent>
   <artifactId>extras-features</artifactId>

diff --git a/opendaylight/adsal/features/nsf/pom.xml b/opendaylight/adsal/features/nsf/pom.xml
index 1c18b60120e86d0a8acf60852a85a5fad7f2465b..150196f4fc8704f5d7d3d19ccaf003d46950af6a 100644 (file)
--- a/opendaylight/adsal/features/nsf/pom.xml
+++ b/opendaylight/adsal/features/nsf/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../../opendaylight/commons/opendaylight</relativePath>
   </parent>
   <artifactId>features-nsf</artifactId>
@@ -25,7 +25,7 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>opendaylight-karaf-empty</artifactId>
-      <version>1.5.0-SNAPSHOT</version>
+      <version>1.6.0-SNAPSHOT</version>
       <type>zip</type>
     </dependency>
     <!-- Feature Dependencies -->

diff --git a/opendaylight/adsal/forwarding/staticrouting/pom.xml b/opendaylight/adsal/forwarding/staticrouting/pom.xml
index 526c384750a9e4bf7337d1617f74e53526c10b15..d14b31235a480bbe39dd0a8e8fc60c497fbc3cd7 100644 (file)
--- a/opendaylight/adsal/forwarding/staticrouting/pom.xml
+++ b/opendaylight/adsal/forwarding/staticrouting/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>forwarding.staticrouting</artifactId>
-  <version>0.6.0-SNAPSHOT</version>
+  <version>0.7.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/forwardingrulesmanager/api/pom.xml b/opendaylight/adsal/forwardingrulesmanager/api/pom.xml
index fc3549a597474f1a3bec0b94884b405767e5c48c..b9a46f52a03b06e93d71a558322cfe976beb02d1 100644 (file)
--- a/opendaylight/adsal/forwardingrulesmanager/api/pom.xml
+++ b/opendaylight/adsal/forwardingrulesmanager/api/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>forwardingrulesmanager</artifactId>
-  <version>0.7.0-SNAPSHOT</version>
+  <version>0.8.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/forwardingrulesmanager/implementation/pom.xml b/opendaylight/adsal/forwardingrulesmanager/implementation/pom.xml
index 80a275c03cad9ee5bf671a39348627e21e92ca69..d51b98bfe7462544c43af438989d90a24d2fb949 100644 (file)
--- a/opendaylight/adsal/forwardingrulesmanager/implementation/pom.xml
+++ b/opendaylight/adsal/forwardingrulesmanager/implementation/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>forwardingrulesmanager.implementation</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/forwardingrulesmanager/integrationtest/pom.xml b/opendaylight/adsal/forwardingrulesmanager/integrationtest/pom.xml
index 0f9b3caea902970b91dcd026d2204c7e89d491d9..361506ac2700bd07fffaa73246de19ffa9054867 100644 (file)
--- a/opendaylight/adsal/forwardingrulesmanager/integrationtest/pom.xml
+++ b/opendaylight/adsal/forwardingrulesmanager/integrationtest/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.integrationtest</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
     <relativePath>../../commons/integrationtest</relativePath>
   </parent>
 
   <artifactId>forwardingrulesmanager.integrationtest</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <properties>
     <sonar.jacoco.itReportPath>../../implementation/target/jacoco-it.exec</sonar.jacoco.itReportPath>
     <!-- Sonar jacoco plugin to get integration test coverage info -->

diff --git a/opendaylight/adsal/hosttracker/api/pom.xml b/opendaylight/adsal/hosttracker/api/pom.xml
index 6bc28f03c3f6de2441e1a6e6df8535505858282f..8e5a18df85e93e7beaf303510ad268798a3fe31e 100644 (file)
--- a/opendaylight/adsal/hosttracker/api/pom.xml
+++ b/opendaylight/adsal/hosttracker/api/pom.xml
@@ -4,11 +4,11 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
   <artifactId>hosttracker</artifactId>
-  <version>0.6.0-SNAPSHOT</version>
+  <version>0.7.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/hosttracker/implementation/pom.xml b/opendaylight/adsal/hosttracker/implementation/pom.xml
index 64254e8b92602d6a6fedc87ed0db93408a8b6eac..50bb26783a42e403688d75f0da88d0f3f7a45c17 100644 (file)
--- a/opendaylight/adsal/hosttracker/implementation/pom.xml
+++ b/opendaylight/adsal/hosttracker/implementation/pom.xml
@@ -4,11 +4,11 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
   <artifactId>hosttracker.implementation</artifactId>
-  <version>0.6.0-SNAPSHOT</version>
+  <version>0.7.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <properties>

diff --git a/opendaylight/adsal/hosttracker/integrationtest/pom.xml b/opendaylight/adsal/hosttracker/integrationtest/pom.xml
index 63610cc3e33206be6d83785ba34428961140d3ed..a6a39e8fe77c987da244f61fe61ddd1e7aa00f3a 100644 (file)
--- a/opendaylight/adsal/hosttracker/integrationtest/pom.xml
+++ b/opendaylight/adsal/hosttracker/integrationtest/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.integrationtest</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
     <relativePath>../../commons/integrationtest</relativePath>
   </parent>
 
   <artifactId>hosttracker.integrationtest</artifactId>
-  <version>0.6.0-SNAPSHOT</version>
+  <version>0.7.0-SNAPSHOT</version>
   <properties>
     <sonar.jacoco.itReportPath>../../implementaiton/target/jacoco-it.exec</sonar.jacoco.itReportPath>
     <!-- Sonar jacoco plugin to get integration test coverage info -->

diff --git a/opendaylight/adsal/hosttracker/shell/pom.xml b/opendaylight/adsal/hosttracker/shell/pom.xml
index f336d654ac3bde6ddf628d47fe0c35d751ebf76e..2d5039cc10c43196ccf24a92c271be56e1159139 100644 (file)
--- a/opendaylight/adsal/hosttracker/shell/pom.xml
+++ b/opendaylight/adsal/hosttracker/shell/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
   <artifactId>hosttracker.shell</artifactId>

diff --git a/opendaylight/adsal/hosttracker_new/api/pom.xml b/opendaylight/adsal/hosttracker_new/api/pom.xml
index cdb3fd95b6ad5753b1c2d4eaf46a5002a1850777..8bb1612300b25513c83ad62d7ce7d66a73883421 100644 (file)
--- a/opendaylight/adsal/hosttracker_new/api/pom.xml
+++ b/opendaylight/adsal/hosttracker_new/api/pom.xml
@@ -4,11 +4,11 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
   <artifactId>hosttracker_new</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/hosttracker_new/implementation/pom.xml b/opendaylight/adsal/hosttracker_new/implementation/pom.xml
index 268465eed374c71ebcc7a3d6ba3ef294d974df71..1b03fc4902d7f5d1fa52e1d13e5849615caef6e9 100644 (file)
--- a/opendaylight/adsal/hosttracker_new/implementation/pom.xml
+++ b/opendaylight/adsal/hosttracker_new/implementation/pom.xml
@@ -4,11 +4,11 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
   <artifactId>hosttracker_new.implementation</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <properties>

diff --git a/opendaylight/adsal/karaf-tomcat-security/pom.xml b/opendaylight/adsal/karaf-tomcat-security/pom.xml
index d2dc040bba998d178c92355605e94d75db8b3b75..d40b7f5f7f5a35ba7b53843a0046ebd149a66c72 100644 (file)
--- a/opendaylight/adsal/karaf-tomcat-security/pom.xml
+++ b/opendaylight/adsal/karaf-tomcat-security/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>karaf-tomcat-security</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/logging/bridge/pom.xml b/opendaylight/adsal/logging/bridge/pom.xml
index 5ebbe4564ba23ae9784d925eda6bd47329b41c76..c9caabec6a210f2d10255821a6f938f2b4e529d0 100644 (file)
--- a/opendaylight/adsal/logging/bridge/pom.xml
+++ b/opendaylight/adsal/logging/bridge/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>logging.bridge</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>

diff --git a/opendaylight/adsal/northbound/archetype-app-northbound/pom.xml b/opendaylight/adsal/northbound/archetype-app-northbound/pom.xml
index 67c111f94de58ef1fefa51770ffde600701433c7..cc49fc9ca416b293b9e5e7cd23dc2a8dfa92fc59 100644 (file)
--- a/opendaylight/adsal/northbound/archetype-app-northbound/pom.xml
+++ b/opendaylight/adsal/northbound/archetype-app-northbound/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>app-northbound</artifactId>
-  <version>0.1.0-SNAPSHOT</version>
+  <version>0.2.0-SNAPSHOT</version>
   <packaging>maven-archetype</packaging>
 
   <name>app-northbound</name>

diff --git a/opendaylight/adsal/northbound/archetype-app-northbound/src/main/resources/archetype-resources/pom.xml b/opendaylight/adsal/northbound/archetype-app-northbound/src/main/resources/archetype-resources/pom.xml
index 73bdf0921b6a798700bf384264e7aeb045c4c2e9..521584605aa897b40b9a3d7c472988a172666bab 100644 (file)
--- a/opendaylight/adsal/northbound/archetype-app-northbound/src/main/resources/archetype-resources/pom.xml
+++ b/opendaylight/adsal/northbound/archetype-app-northbound/src/main/resources/archetype-resources/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
 

diff --git a/opendaylight/adsal/northbound/bundlescanner/api/pom.xml b/opendaylight/adsal/northbound/bundlescanner/api/pom.xml
index d94272b342eefe2cf4fbd8fd60abdc19afb289ba..c0acffddbe3744f499ed00f4d0100eb65c977a13 100644 (file)
--- a/opendaylight/adsal/northbound/bundlescanner/api/pom.xml
+++ b/opendaylight/adsal/northbound/bundlescanner/api/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>bundlescanner</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>

diff --git a/opendaylight/adsal/northbound/bundlescanner/implementation/pom.xml b/opendaylight/adsal/northbound/bundlescanner/implementation/pom.xml
index d4d57a1be9ea27efcff8f48efd0e73552df0f755..dbf2f9e742e135cb5c518cb58027c3a9eebc91e7 100644 (file)
--- a/opendaylight/adsal/northbound/bundlescanner/implementation/pom.xml
+++ b/opendaylight/adsal/northbound/bundlescanner/implementation/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>bundlescanner.implementation</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>

diff --git a/opendaylight/adsal/northbound/commons/pom.xml b/opendaylight/adsal/northbound/commons/pom.xml
index 8290bcdf38969fff515dd9b8d06835230ee30308..6dfcff24e1e4dbe59ce6ec7a6b3ba04817c8d613 100644 (file)
--- a/opendaylight/adsal/northbound/commons/pom.xml
+++ b/opendaylight/adsal/northbound/commons/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>commons.northbound</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/northbound/connectionmanager/pom.xml b/opendaylight/adsal/northbound/connectionmanager/pom.xml
index 7cc12484f2cf5d68d44c19d6dd20c590a91a0595..e1789bde4da2aa4321a82a1ff7abf5bec6a9e4d9 100644 (file)
--- a/opendaylight/adsal/northbound/connectionmanager/pom.xml
+++ b/opendaylight/adsal/northbound/connectionmanager/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>adsal-enunciate-parent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../adsal-enunciate-parent</relativePath>
   </parent>
 
   <artifactId>connectionmanager.northbound</artifactId>
-  <version>0.2.0-SNAPSHOT</version>
+  <version>0.3.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/northbound/containermanager/pom.xml b/opendaylight/adsal/northbound/containermanager/pom.xml
index 1bc170a6790613fa0383a6845fea9bea7d2488b9..4c3cea1f57b80f5ac56d7e1ad980575ecbfa340f 100644 (file)
--- a/opendaylight/adsal/northbound/containermanager/pom.xml
+++ b/opendaylight/adsal/northbound/containermanager/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>enunciate-parent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/enunciate-parent</relativePath>
   </parent>
 
   <artifactId>containermanager.northbound</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/northbound/controllermanager/pom.xml b/opendaylight/adsal/northbound/controllermanager/pom.xml
index 20cff42b8221a0374ddf5ba04bc70b33b31489df..20c0886dc3a83c215e019d09125c46ea1b46d03a 100644 (file)
--- a/opendaylight/adsal/northbound/controllermanager/pom.xml
+++ b/opendaylight/adsal/northbound/controllermanager/pom.xml
@@ -4,11 +4,11 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>adsal-enunciate-parent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../adsal-enunciate-parent</relativePath>
   </parent>
   <artifactId>controllermanager.northbound</artifactId>
-  <version>0.1.0-SNAPSHOT</version>
+  <version>0.2.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/northbound/flowprogrammer/pom.xml b/opendaylight/adsal/northbound/flowprogrammer/pom.xml
index 3c2aed13104412ad8dc2dab1635a89a3efb90dd4..e97816f4ca89456ab4aeb9d1d155d1515c541a14 100644 (file)
--- a/opendaylight/adsal/northbound/flowprogrammer/pom.xml
+++ b/opendaylight/adsal/northbound/flowprogrammer/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>adsal-enunciate-parent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../adsal-enunciate-parent</relativePath>
   </parent>
 
   <artifactId>flowprogrammer.northbound</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/northbound/hosttracker/pom.xml b/opendaylight/adsal/northbound/hosttracker/pom.xml
index 4dea525e0bd32596ed4287e2b45d4afcac8595ed..9acd6649fb41522aef61dec3a355cacbbb143aae 100644 (file)
--- a/opendaylight/adsal/northbound/hosttracker/pom.xml
+++ b/opendaylight/adsal/northbound/hosttracker/pom.xml
@@ -4,11 +4,11 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>adsal-enunciate-parent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../adsal-enunciate-parent</relativePath>
   </parent>
   <artifactId>hosttracker.northbound</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/northbound/httpservice-bridge/pom.xml b/opendaylight/adsal/northbound/httpservice-bridge/pom.xml
index 12ee95c983f5cbb2fac85c81c04d1edf606666c7..edd696436654a5d36c15b2e7c87f49dc00ccbd2d 100644 (file)
--- a/opendaylight/adsal/northbound/httpservice-bridge/pom.xml
+++ b/opendaylight/adsal/northbound/httpservice-bridge/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>httpservice-bridge</artifactId>
-  <version>0.1.0-SNAPSHOT</version>
+  <version>0.2.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <description>HttpService bridge web application</description>
 

diff --git a/opendaylight/adsal/northbound/integrationtest/pom.xml b/opendaylight/adsal/northbound/integrationtest/pom.xml
index df0d1139afa73fe0acff6a13d9e0e65b757a3c6b..59eec0eba5e52a44316b60b1134e001bcbdc5382 100644 (file)
--- a/opendaylight/adsal/northbound/integrationtest/pom.xml
+++ b/opendaylight/adsal/northbound/integrationtest/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.integrationtest</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
     <relativePath>../../commons/integrationtest</relativePath>
   </parent>
 
   <artifactId>northbound.integrationtest</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>ch.qos.logback</groupId>

diff --git a/opendaylight/adsal/northbound/java-client/pom.xml b/opendaylight/adsal/northbound/java-client/pom.xml
index bf6a55afbbf23dae55cd91ebce04540ecb4e50ba..46f8e9006a12902f5bcb25dab9cec423421126d2 100644 (file)
--- a/opendaylight/adsal/northbound/java-client/pom.xml
+++ b/opendaylight/adsal/northbound/java-client/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>enunciate-parent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/enunciate-parent</relativePath>
   </parent>
 
   <artifactId>northbound.client</artifactId>
-  <version>0.1.0-SNAPSHOT</version>
+  <version>0.2.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>

diff --git a/opendaylight/adsal/northbound/jolokia/pom.xml b/opendaylight/adsal/northbound/jolokia/pom.xml
index b078e486a8d6f55381fcd0274920f1b017af5a06..158003a403e967004be0762cc803b2d6015e3171 100644 (file)
--- a/opendaylight/adsal/northbound/jolokia/pom.xml
+++ b/opendaylight/adsal/northbound/jolokia/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>jolokia-bridge</artifactId>
-  <version>0.1.0-SNAPSHOT</version>
+  <version>0.2.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <description>Jolokia bridge web application</description>
 

diff --git a/opendaylight/adsal/northbound/networkconfiguration/bridgedomain/pom.xml b/opendaylight/adsal/northbound/networkconfiguration/bridgedomain/pom.xml
index 659bfe9030ac6c9b1cb7428362b392506b9479ef..df2ba4e8ce4439ad91a864bd4cbf40aad3cffce7 100644 (file)
--- a/opendaylight/adsal/northbound/networkconfiguration/bridgedomain/pom.xml
+++ b/opendaylight/adsal/northbound/networkconfiguration/bridgedomain/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>adsal-enunciate-parent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../adsal-enunciate-parent</relativePath>
   </parent>
 
   <artifactId>networkconfig.bridgedomain.northbound</artifactId>
-  <version>0.1.0-SNAPSHOT</version>
+  <version>0.2.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/northbound/staticrouting/pom.xml b/opendaylight/adsal/northbound/staticrouting/pom.xml
index be84c618143e63b988f91454860b907d050b4521..c65f0369ba63c2174eff148a39cfa05520bf3d91 100644 (file)
--- a/opendaylight/adsal/northbound/staticrouting/pom.xml
+++ b/opendaylight/adsal/northbound/staticrouting/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>adsal-enunciate-parent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../adsal-enunciate-parent</relativePath>
   </parent>
 
   <artifactId>forwarding.staticrouting.northbound</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/northbound/statistics/pom.xml b/opendaylight/adsal/northbound/statistics/pom.xml
index 9e98a75c445df23dcc970dab9b563818c50ff487..8b54a9847ce16703225b506995a2c04a4e959037 100644 (file)
--- a/opendaylight/adsal/northbound/statistics/pom.xml
+++ b/opendaylight/adsal/northbound/statistics/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>adsal-enunciate-parent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../adsal-enunciate-parent</relativePath>
   </parent>
 
   <artifactId>statistics.northbound</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/northbound/subnets/pom.xml b/opendaylight/adsal/northbound/subnets/pom.xml
index 7a96bdc1ea74f50e6ba37b3d43f6345a9ed9b28f..5c3228b51e1cc5e619cb14b8a7dcb1383c0369e7 100644 (file)
--- a/opendaylight/adsal/northbound/subnets/pom.xml
+++ b/opendaylight/adsal/northbound/subnets/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>adsal-enunciate-parent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../adsal-enunciate-parent</relativePath>
   </parent>
 
   <artifactId>subnets.northbound</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/northbound/swagger-ui/pom.xml b/opendaylight/adsal/northbound/swagger-ui/pom.xml
index 8c1c8a1bdde865d266c4691e45923ed1b7cfac1c..e25a28c0f04693d1fa0e2f5a45dfe10e468d69eb 100644 (file)
--- a/opendaylight/adsal/northbound/swagger-ui/pom.xml
+++ b/opendaylight/adsal/northbound/swagger-ui/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>swagger-ui</artifactId>
-  <version>0.1.0-SNAPSHOT</version>
+  <version>0.2.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <properties>

diff --git a/opendaylight/adsal/northbound/switchmanager/pom.xml b/opendaylight/adsal/northbound/switchmanager/pom.xml
index c3c380444cb58d31737d4637bf9cf90fb1aaa5ce..4710fea1f571c95ab0fbf48bd40a7eef17a75ae5 100644 (file)
--- a/opendaylight/adsal/northbound/switchmanager/pom.xml
+++ b/opendaylight/adsal/northbound/switchmanager/pom.xml
@@ -4,11 +4,11 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>adsal-enunciate-parent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../adsal-enunciate-parent</relativePath>
   </parent>
   <artifactId>switchmanager.northbound</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/northbound/topology/pom.xml b/opendaylight/adsal/northbound/topology/pom.xml
index 62399c5f041c86a4943a582798b83b5100c7d489..21f73d53fb9897953014aa872abde5c92f3effa1 100644 (file)
--- a/opendaylight/adsal/northbound/topology/pom.xml
+++ b/opendaylight/adsal/northbound/topology/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>adsal-enunciate-parent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../adsal-enunciate-parent</relativePath>
   </parent>
 
   <artifactId>topology.northbound</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/northbound/usermanager/pom.xml b/opendaylight/adsal/northbound/usermanager/pom.xml
index b08995f56067abc1628889187d4131c9b97f9803..b13b7461483be457f9cc492f067d15c16d9583cd 100644 (file)
--- a/opendaylight/adsal/northbound/usermanager/pom.xml
+++ b/opendaylight/adsal/northbound/usermanager/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>enunciate-parent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/enunciate-parent</relativePath>
   </parent>
 
   <artifactId>usermanager.northbound</artifactId>
-  <version>0.1.0-SNAPSHOT</version>
+  <version>0.2.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/northboundtest/unit_test_suite/pom.xml b/opendaylight/adsal/northboundtest/unit_test_suite/pom.xml
index 9f33a4db5dcac1abcb8a7e3c1ca2370e1e02c2cd..3047bdd072cc513f6d760102770e86e2f4c34bf6 100644 (file)
--- a/opendaylight/adsal/northboundtest/unit_test_suite/pom.xml
+++ b/opendaylight/adsal/northboundtest/unit_test_suite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../../opendaylight/commons/opendaylight</relativePath>
   </parent>
   <scm>
@@ -16,7 +16,7 @@
 
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>northboundtest</artifactId>
-        <version>0.5.0-SNAPSHOT</version>
+        <version>0.6.0-SNAPSHOT</version>
         <packaging>bundle</packaging>
 
         <build>

diff --git a/opendaylight/adsal/pom.xml b/opendaylight/adsal/pom.xml
index 0a0f66a6079877b0aeb7afa8f4aa3a9cac343386..91f4ddd36cd259712dbdea32fe1f58a13380689e 100644 (file)
--- a/opendaylight/adsal/pom.xml
+++ b/opendaylight/adsal/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.parent</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../commons/parent</relativePath>
   </parent>
 

diff --git a/opendaylight/adsal/protocol_plugins/openflow/pom.xml b/opendaylight/adsal/protocol_plugins/openflow/pom.xml
index 7cb7602d4f580cb57c0d6846cad7763107b7161a..91cf49a87341060bfa3dadda7005f9b06fb6ce88 100644 (file)
--- a/opendaylight/adsal/protocol_plugins/openflow/pom.xml
+++ b/opendaylight/adsal/protocol_plugins/openflow/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>protocol_plugins.openflow</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/protocol_plugins/stub/pom.xml b/opendaylight/adsal/protocol_plugins/stub/pom.xml
index 1fb84a51edcc61c6a0b0eaf85ab54c15176be02c..801368ad6d201bde84867f680ea030117ac370e9 100644 (file)
--- a/opendaylight/adsal/protocol_plugins/stub/pom.xml
+++ b/opendaylight/adsal/protocol_plugins/stub/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>protocol_plugins.stub</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/routing/dijkstra_implementation/pom.xml b/opendaylight/adsal/routing/dijkstra_implementation/pom.xml
index 7f429ff96717b7aa94a1c044e665d6cc8e04f612..8df6db5bbf016f7000f61ae692ad90fd045411bd 100644 (file)
--- a/opendaylight/adsal/routing/dijkstra_implementation/pom.xml
+++ b/opendaylight/adsal/routing/dijkstra_implementation/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>routing.dijkstra_implementation</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/sal/api/pom.xml b/opendaylight/adsal/sal/api/pom.xml
index d5d6256bc9b64ab7c9da75a617b5df6757b47ead..2a618535b31fe81165105217a2f77767354b6cd6 100644 (file)
--- a/opendaylight/adsal/sal/api/pom.xml
+++ b/opendaylight/adsal/sal/api/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>sal</artifactId>
-  <version>0.9.0-SNAPSHOT</version>
+  <version>0.10.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/sal/connection/api/pom.xml b/opendaylight/adsal/sal/connection/api/pom.xml
index fe07526960a99031fe26800f8824252b292986a6..f9f52584c82b10997e71023b6e0186995879615d 100644 (file)
--- a/opendaylight/adsal/sal/connection/api/pom.xml
+++ b/opendaylight/adsal/sal/connection/api/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>sal.connection</artifactId>
-  <version>0.2.0-SNAPSHOT</version>
+  <version>0.3.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/sal/connection/implementation/pom.xml b/opendaylight/adsal/sal/connection/implementation/pom.xml
index b3c99daee374ae2922a77d4e5457dc4cb35134e1..b09a51733b6592efc0f17d965620e8d33f086560 100644 (file)
--- a/opendaylight/adsal/sal/connection/implementation/pom.xml
+++ b/opendaylight/adsal/sal/connection/implementation/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>sal.connection.implementation</artifactId>
-  <version>0.2.0-SNAPSHOT</version>
+  <version>0.3.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/sal/implementation/pom.xml b/opendaylight/adsal/sal/implementation/pom.xml
index bce6e3b5473f3f1a95b202e7a8937a2f971bf0af..61c6acfc606e1d1e9a904de9dc77dabbe69dd061 100644 (file)
--- a/opendaylight/adsal/sal/implementation/pom.xml
+++ b/opendaylight/adsal/sal/implementation/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>sal.implementation</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/sal/networkconfiguration/api/pom.xml b/opendaylight/adsal/sal/networkconfiguration/api/pom.xml
index bbeb2969d6a9edcb5339f2b8e40867f9a42b6b47..36706f02f6c2b5ec5b124ca21131fe8d7d562356 100644 (file)
--- a/opendaylight/adsal/sal/networkconfiguration/api/pom.xml
+++ b/opendaylight/adsal/sal/networkconfiguration/api/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>sal.networkconfiguration</artifactId>
-  <version>0.1.0-SNAPSHOT</version>
+  <version>0.2.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/sal/networkconfiguration/implementation/pom.xml b/opendaylight/adsal/sal/networkconfiguration/implementation/pom.xml
index df8c6d2169fdc2902abc9de903a3af0030404824..da2bc97e0c6d5feae3d2eec3076eb9764d4396d7 100644 (file)
--- a/opendaylight/adsal/sal/networkconfiguration/implementation/pom.xml
+++ b/opendaylight/adsal/sal/networkconfiguration/implementation/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>sal.networkconfiguration.implementation</artifactId>
-  <version>0.1.0-SNAPSHOT</version>
+  <version>0.2.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/samples/clustersession/pom.xml b/opendaylight/adsal/samples/clustersession/pom.xml
index 2a5e07af84c26fb54f3ae2d252331a850b817a0d..977a324569f967010465fd849d22bb6f37bd4df7 100644 (file)
--- a/opendaylight/adsal/samples/clustersession/pom.xml
+++ b/opendaylight/adsal/samples/clustersession/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>clustersession</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>clustering.services</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
+      <version>0.7.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>

diff --git a/opendaylight/adsal/samples/loadbalancer/pom.xml b/opendaylight/adsal/samples/loadbalancer/pom.xml
index e1b480771b0b0f7813dc4dc7007bccdbdc1730e0..d8d72a2da8afdd8057a4331f4f794d1eadcc6625 100644 (file)
--- a/opendaylight/adsal/samples/loadbalancer/pom.xml
+++ b/opendaylight/adsal/samples/loadbalancer/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>samples.loadbalancer</artifactId>
-  <version>0.6.0-SNAPSHOT</version>
+  <version>0.7.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/samples/northbound/loadbalancer/pom.xml b/opendaylight/adsal/samples/northbound/loadbalancer/pom.xml
index b5ca85ee7d5cb8009bed7ba51fe5dc1381cdfa43..5c4322f8564f6312b58c5f583887631e612285e2 100644 (file)
--- a/opendaylight/adsal/samples/northbound/loadbalancer/pom.xml
+++ b/opendaylight/adsal/samples/northbound/loadbalancer/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>adsal-enunciate-parent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../adsal-enunciate-parent</relativePath>
   </parent>
 
   <artifactId>samples.loadbalancer.northbound</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/samples/simpleforwarding/pom.xml b/opendaylight/adsal/samples/simpleforwarding/pom.xml
index 4d7af2b8fd8a5079008d088dcb8ed6f1aa2f5930..a90fd6947fdb3cf0a1a4f9ca7ce70158cca7e2ad 100644 (file)
--- a/opendaylight/adsal/samples/simpleforwarding/pom.xml
+++ b/opendaylight/adsal/samples/simpleforwarding/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>samples.simpleforwarding</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/security/pom.xml b/opendaylight/adsal/security/pom.xml
index 436fda24da491fb6cdb4e571c0c552e246651089..4467aafa17c0ad75088635c9535b0b6f838697da 100644 (file)
--- a/opendaylight/adsal/security/pom.xml
+++ b/opendaylight/adsal/security/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>security</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/statisticsmanager/api/pom.xml b/opendaylight/adsal/statisticsmanager/api/pom.xml
index 00e23e0f5a7473a4cea8b8e20182badb542a9b76..a7c59df22f59f3a046a3ebf5cb9c1f6144c50f30 100644 (file)
--- a/opendaylight/adsal/statisticsmanager/api/pom.xml
+++ b/opendaylight/adsal/statisticsmanager/api/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>statisticsmanager</artifactId>
-  <version>0.6.0-SNAPSHOT</version>
+  <version>0.7.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/statisticsmanager/implementation/pom.xml b/opendaylight/adsal/statisticsmanager/implementation/pom.xml
index aa009fbf238f039cd560e93ddb54c3b7daaf46c9..f4334f3878700b6cff2112912d7f015b25c77ac7 100644 (file)
--- a/opendaylight/adsal/statisticsmanager/implementation/pom.xml
+++ b/opendaylight/adsal/statisticsmanager/implementation/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>statisticsmanager.implementation</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <properties>
     <!-- Sonar properties using jacoco to retrieve integration test results -->

diff --git a/opendaylight/adsal/statisticsmanager/integrationtest/pom.xml b/opendaylight/adsal/statisticsmanager/integrationtest/pom.xml
index 857921f14b9fbd90cbdcdf9160816c3060845253..00670cdf2572adfd30e33add32857f539bd52830 100644 (file)
--- a/opendaylight/adsal/statisticsmanager/integrationtest/pom.xml
+++ b/opendaylight/adsal/statisticsmanager/integrationtest/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.integrationtest</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
     <relativePath>../../commons/integrationtest</relativePath>
   </parent>
 
   <artifactId>statisticsmanager.integrationtest</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <properties>
     <sonar.jacoco.itReportPath>../../implementation/target/jacoco-it.exec</sonar.jacoco.itReportPath>
     <!-- Sonar jacoco plugin to get integration test coverage info -->

diff --git a/opendaylight/adsal/switchmanager/api/pom.xml b/opendaylight/adsal/switchmanager/api/pom.xml
index 3c23e29131a4017b649dc7d2356f137c15a2c416..a0824ce86f76a3d305cb9cb0043c87d83f2f359f 100644 (file)
--- a/opendaylight/adsal/switchmanager/api/pom.xml
+++ b/opendaylight/adsal/switchmanager/api/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>switchmanager</artifactId>
-  <version>0.8.0-SNAPSHOT</version>
+  <version>0.9.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <properties>

diff --git a/opendaylight/adsal/switchmanager/implementation/pom.xml b/opendaylight/adsal/switchmanager/implementation/pom.xml
index 911d5dd71f54c879707d061ac4df2a5d588f1c22..4aa92e621659e6b9a28242e8ba25c691e983902d 100644 (file)
--- a/opendaylight/adsal/switchmanager/implementation/pom.xml
+++ b/opendaylight/adsal/switchmanager/implementation/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>switchmanager.implementation</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <properties>

diff --git a/opendaylight/adsal/switchmanager/integrationtest/pom.xml b/opendaylight/adsal/switchmanager/integrationtest/pom.xml
index 158cd2ca8229e974a8f4b93ded4a670e92806fa7..bfaf52c8a8ecf1ca4389bb4fb90388f21ef74752 100644 (file)
--- a/opendaylight/adsal/switchmanager/integrationtest/pom.xml
+++ b/opendaylight/adsal/switchmanager/integrationtest/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.integrationtest</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
     <relativePath>../../commons/integrationtest</relativePath>
   </parent>
 
   <artifactId>switchmanager.integrationtest</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <properties>
     <sonar.jacoco.itReportPath>../../implementation/target/jacoco-it.exec</sonar.jacoco.itReportPath>
     <!-- Sonar jacoco plugin to get integration test coverage info -->

diff --git a/opendaylight/adsal/topologymanager/implementation/pom.xml b/opendaylight/adsal/topologymanager/implementation/pom.xml
index c7a6444e1ee5b327792bd20fd14d9d3f11d9cf58..9a056df4396599be3fd147343b951669cb94e7fd 100644 (file)
--- a/opendaylight/adsal/topologymanager/implementation/pom.xml
+++ b/opendaylight/adsal/topologymanager/implementation/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>topologymanager</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/topologymanager/integrationtest/pom.xml b/opendaylight/adsal/topologymanager/integrationtest/pom.xml
index 028e775ee0b3f140a2b4e95c3aede6ee35253519..20fdc0b1ae84efcc594c04e7a5b3f3461115cdda 100644 (file)
--- a/opendaylight/adsal/topologymanager/integrationtest/pom.xml
+++ b/opendaylight/adsal/topologymanager/integrationtest/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.integrationtest</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
     <relativePath>../../commons/integrationtest</relativePath>
   </parent>
 
   <artifactId>topologymanager.integrationtest</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <properties>
     <sonar.jacoco.itReportPath>../../implementaiton/target/jacoco-it.exec</sonar.jacoco.itReportPath>
     <!-- Sonar jacoco plugin to get integration test coverage info -->

diff --git a/opendaylight/adsal/topologymanager/shell/pom.xml b/opendaylight/adsal/topologymanager/shell/pom.xml
index a5b21f62244b092738fa031264233acf869f0979..bc9d63078c27bfcb9d1d4c2fca9f4bb90080ee2c 100644 (file)
--- a/opendaylight/adsal/topologymanager/shell/pom.xml
+++ b/opendaylight/adsal/topologymanager/shell/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
   <artifactId>topologymanager.shell</artifactId>

diff --git a/opendaylight/adsal/usermanager/api/pom.xml b/opendaylight/adsal/usermanager/api/pom.xml
index 76f293b1976e30109f309b3b9c504b70c29de124..a1dcca44ac8c5eea2021f28b0cb629db26a3dd42 100644 (file)
--- a/opendaylight/adsal/usermanager/api/pom.xml
+++ b/opendaylight/adsal/usermanager/api/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>usermanager</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/usermanager/implementation/pom.xml b/opendaylight/adsal/usermanager/implementation/pom.xml
index fd8a3978376fc7b0fa19d49062e488664d736401..f272482af5d9e8239aea8f0bd42eea29efd8b7ad 100644 (file)
--- a/opendaylight/adsal/usermanager/implementation/pom.xml
+++ b/opendaylight/adsal/usermanager/implementation/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>usermanager.implementation</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/web/brandfragment/pom.xml b/opendaylight/adsal/web/brandfragment/pom.xml
index 0c76146c50f4cfb5c1f3a518701ca46f2e9ba1dc..171ac3f47fa7c2e04356875903d41c74a42418e5 100644 (file)
--- a/opendaylight/adsal/web/brandfragment/pom.xml
+++ b/opendaylight/adsal/web/brandfragment/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>commons.opendaylight</artifactId>
-        <version>1.5.0-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
         <relativePath>../../../commons/opendaylight</relativePath>
     </parent>
   <scm>
@@ -17,7 +17,7 @@
 
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>web.brandfragment</artifactId>
-    <version>0.5.0-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <build>

diff --git a/opendaylight/adsal/web/devices/pom.xml b/opendaylight/adsal/web/devices/pom.xml
index 062812b867dd948d4224b75370bb504f244713dd..56ad7e7a39b25d0c594f65109b69e5dbbe1e8738 100644 (file)
--- a/opendaylight/adsal/web/devices/pom.xml
+++ b/opendaylight/adsal/web/devices/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>devices.web</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/web/flows/pom.xml b/opendaylight/adsal/web/flows/pom.xml
index 4b1d54781a90c3778e504904138e1f43bf9b5497..14fe753a2f36b464aa90f88beca26e5c0f17fdd5 100644 (file)
--- a/opendaylight/adsal/web/flows/pom.xml
+++ b/opendaylight/adsal/web/flows/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>flows.web</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/web/osgi-brandfragment/pom.xml b/opendaylight/adsal/web/osgi-brandfragment/pom.xml
index 78ad3f24c7a219c060d78e1946d72fa415a9bd4e..31e1bf805e7f4fe19a88e86c8621c3b259aa0005 100644 (file)
--- a/opendaylight/adsal/web/osgi-brandfragment/pom.xml
+++ b/opendaylight/adsal/web/osgi-brandfragment/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>osgi-brandfragment.web</artifactId>
-  <version>0.1.0-SNAPSHOT</version>
+  <version>0.2.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <description>OSGi management web application brand fragment</description>
 

diff --git a/opendaylight/adsal/web/root/pom.xml b/opendaylight/adsal/web/root/pom.xml
index 3d633b6c656dbab462cb118586ec2f358906cac0..992f9b3dc5ed6e1635f3b3ed290338329d7923a9 100644 (file)
--- a/opendaylight/adsal/web/root/pom.xml
+++ b/opendaylight/adsal/web/root/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>web</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/web/topology/pom.xml b/opendaylight/adsal/web/topology/pom.xml
index 0afe038086d2c8aa34af4f328c75dcb9d1b64754..70fa5993dcac907dc6955c143228e8cca5fdcda8 100644 (file)
--- a/opendaylight/adsal/web/topology/pom.xml
+++ b/opendaylight/adsal/web/topology/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>topology.web</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/adsal/web/troubleshoot/pom.xml b/opendaylight/adsal/web/troubleshoot/pom.xml
index 1ef5de11c4f1338c68441e30f2dda4e1240dc92b..2ee231d6ae018396864ceba3af2bf115537d56b6 100644 (file)
--- a/opendaylight/adsal/web/troubleshoot/pom.xml
+++ b/opendaylight/adsal/web/troubleshoot/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>troubleshoot.web</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/archetypes/odl-model-project/pom.xml b/opendaylight/archetypes/odl-model-project/pom.xml
index 4945eb2a66239ea9bcf5ddcab8bb846c3276459b..d15ea8853a606eeec3f24ef87255928a0f14355a 100644 (file)
--- a/opendaylight/archetypes/odl-model-project/pom.xml
+++ b/opendaylight/archetypes/odl-model-project/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>org.opendaylight.controller.archetypes</groupId>
   <artifactId>odl-model-project</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
+  <version>1.3.0-SNAPSHOT</version>
   <packaging>maven-archetype</packaging>
 
   <properties>

diff --git a/opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml b/opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml
index 0786b366cd979682d1623f6f685c5835d7048f77..f6f4a8756f149f8fb14154a3bb53bffafd89098c 100644 (file)
--- a/opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml
+++ b/opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml
@@ -11,8 +11,8 @@
     <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
     <nexus.repository.release>opendaylight.release</nexus.repository.release>
     <nexus.repository.snapshot>opendaylight.release</nexus.repository.snapshot>
-    <yang.version>0.7.0-SNAPSHOT</yang.version>
-    <yang.codegen.version>0.7.0-SNAPSHOT</yang.codegen.version>
+    <yang.version>0.8.0-SNAPSHOT</yang.version>
+    <yang.codegen.version>0.8.0-SNAPSHOT</yang.codegen.version>
     <bundle.plugin.version>2.3.7</bundle.plugin.version>
   </properties>
   <scm>

diff --git a/opendaylight/archetypes/opendaylight-configfile-archetype/pom.xml b/opendaylight/archetypes/opendaylight-configfile-archetype/pom.xml
index 45ec9ac717a26fca391a65bb4b2a89587e280296..0a984de6b475602b5eedcade107a7178db014d11 100644 (file)
--- a/opendaylight/archetypes/opendaylight-configfile-archetype/pom.xml
+++ b/opendaylight/archetypes/opendaylight-configfile-archetype/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>opendaylight-configfile-archetype</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
+  <version>1.3.0-SNAPSHOT</version>
   <packaging>maven-archetype</packaging>
 
 

diff --git a/opendaylight/archetypes/opendaylight-karaf-distro-archetype/pom.xml b/opendaylight/archetypes/opendaylight-karaf-distro-archetype/pom.xml
index ff2384fb27e5c3f3c05521fcfd6dc3c1ab025190..18e8ba13a453e4733f800799eddfb6524727a6d5 100644 (file)
--- a/opendaylight/archetypes/opendaylight-karaf-distro-archetype/pom.xml
+++ b/opendaylight/archetypes/opendaylight-karaf-distro-archetype/pom.xml
@@ -4,11 +4,11 @@
   <parent>
      <groupId>org.opendaylight.controller.archetypes</groupId>
      <artifactId>archetypes-parent</artifactId>
-     <version>0.2.0-SNAPSHOT</version>
+     <version>0.3.0-SNAPSHOT</version>
   </parent>
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>opendaylight-karaf-distro-archetype</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>maven-archetype</packaging>
 
   <name>distribution-karaf-archetype</name>

diff --git a/opendaylight/archetypes/opendaylight-karaf-distro-archetype/src/main/resources/archetype-resources/pom.xml b/opendaylight/archetypes/opendaylight-karaf-distro-archetype/src/main/resources/archetype-resources/pom.xml
index 3836906a20256ece5b60fe4c5d565c536cbdcb85..3607e1fcddf25a94494f3eaa3be55ff81090226b 100644 (file)
--- a/opendaylight/archetypes/opendaylight-karaf-distro-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/opendaylight/archetypes/opendaylight-karaf-distro-archetype/src/main/resources/archetype-resources/pom.xml
@@ -19,8 +19,8 @@
   <properties>
     <!-- Optional TODO: Move these properties to your parent pom and possibly
             DependencyManagement section of your parent pom -->
-    <branding.version>1.1.0-SNAPSHOT</branding.version>
-    <karaf.resources.version>1.5.0-SNAPSHOT</karaf.resources.version>
+    <branding.version>1.2.0-SNAPSHOT</branding.version>
+    <karaf.resources.version>1.6.0-SNAPSHOT</karaf.resources.version>
     <karaf.version>3.0.3</karaf.version>
   </properties>
 
@@ -81,7 +81,7 @@
       <dependency>
         <groupId>org.opendaylight.openflowplugin</groupId>
         <artifactId>features-openflowplugin</artifactId>
-        <version>0.1.0-SNAPSHOT</version>
+        <version>0.2.0-SNAPSHOT</version>
         <classifier>features</classifier>
         <type>xml</type>
         <scope>runtime</scope>

diff --git a/opendaylight/archetypes/opendaylight-karaf-features/pom.xml b/opendaylight/archetypes/opendaylight-karaf-features/pom.xml
index 12861604e86d336f6fe0a8ec92887123c18028d9..7403d692d1e5972bb08cc566501de7c40ab18038 100644 (file)
--- a/opendaylight/archetypes/opendaylight-karaf-features/pom.xml
+++ b/opendaylight/archetypes/opendaylight-karaf-features/pom.xml
@@ -5,11 +5,11 @@
   <parent>
      <groupId>org.opendaylight.controller.archetypes</groupId>
      <artifactId>archetypes-parent</artifactId>
-     <version>0.2.0-SNAPSHOT</version>
+     <version>0.3.0-SNAPSHOT</version>
   </parent>
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>opendaylight-karaf-features-archetype</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>maven-archetype</packaging>
 
   <name>opendaylight-karaf-features-archetype</name>

diff --git a/opendaylight/archetypes/opendaylight-karaf-features/src/main/resources/archetype-resources/pom.xml b/opendaylight/archetypes/opendaylight-karaf-features/src/main/resources/archetype-resources/pom.xml
index 5355e66945cca3b4d8d3777f2d7bacf888847550..8b8bc2584958841661984d8d303f29aca690f6b0 100644 (file)
--- a/opendaylight/archetypes/opendaylight-karaf-features/src/main/resources/archetype-resources/pom.xml
+++ b/opendaylight/archetypes/opendaylight-karaf-features/src/main/resources/archetype-resources/pom.xml
@@ -24,11 +24,11 @@
       <features.file>features.xml</features.file>
       <!-- Optional TODO: Move these properties to your parent pom and possibly
             DependencyManagement section of your parent pom -->
-      <branding.version>1.1.0-SNAPSHOT</branding.version>
-      <karaf.resources.version>1.5.0-SNAPSHOT</karaf.resources.version>
+      <branding.version>1.2.0-SNAPSHOT</branding.version>
+      <karaf.resources.version>1.6.0-SNAPSHOT</karaf.resources.version>
       <karaf.version>3.0.3</karaf.version>
-      <feature.test.version>1.5.0-SNAPSHOT</feature.test.version>
-      <karaf.empty.version>1.5.0-SNAPSHOT</karaf.empty.version>
+      <feature.test.version>1.6.0-SNAPSHOT</feature.test.version>
+      <karaf.empty.version>1.6.0-SNAPSHOT</karaf.empty.version>
       <surefire.version>2.16</surefire.version>
    </properties>
    <dependencies>
@@ -46,21 +46,21 @@
         <dependency>
           <groupId>org.opendaylight.yangtools</groupId>
           <artifactId>features-yangtools</artifactId>
-          <version>0.7.0-SNAPSHOT</version>
+          <version>0.8.0-SNAPSHOT</version>
           <classifier>features</classifier>
           <type>xml</type>
         </dependency>
         <dependency>
           <groupId>org.opendaylight.controller</groupId>
           <artifactId>features-mdsal</artifactId>
-          <version>1.2.0-SNAPSHOT</version>
+          <version>1.3.0-SNAPSHOT</version>
           <classifier>features</classifier>
           <type>xml</type>
         </dependency>
         <dependency>
           <groupId>org.opendaylight.openflowplugin</groupId>
           <artifactId>features-openflowplugin</artifactId>
-          <version>0.1.0-SNAPSHOT</version>
+          <version>0.2.0-SNAPSHOT</version>
           <classifier>features</classifier>
           <type>xml</type>
         </dependency>

diff --git a/opendaylight/archetypes/opendaylight-karaf-features/src/main/resources/archetype-resources/src/main/resources/features.xml b/opendaylight/archetypes/opendaylight-karaf-features/src/main/resources/archetype-resources/src/main/resources/features.xml
index 2acf5d15e0e237dee5d22753f1aef41dcf383239..1a1eb03d534db55c890c5c526a41cec2f87011a6 100644 (file)
--- a/opendaylight/archetypes/opendaylight-karaf-features/src/main/resources/archetype-resources/src/main/resources/features.xml
+++ b/opendaylight/archetypes/opendaylight-karaf-features/src/main/resources/archetype-resources/src/main/resources/features.xml
@@ -21,9 +21,9 @@
     Necessary TODO: Add repo entries for the repositories of features you refer to
         in this feature file but do not define here.
         Examples:
-            <repository>mvn:org.opendaylight.yangtools/features-yangtools/0.7.0-SNAPSHOT/xml/features</repository>
-            <repository>mvn:org.opendaylight.controller/features-mdsal/1.2.0-SNAPSHOT/xml/features</repository>
-            <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/0.1.0-SNAPSHOT/xml/features</repository>
+            <repository>mvn:org.opendaylight.yangtools/features-yangtools/0.8.0-SNAPSHOT/xml/features</repository>
+            <repository>mvn:org.opendaylight.controller/features-mdsal/1.3.0-SNAPSHOT/xml/features</repository>
+            <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/0.2.0-SNAPSHOT/xml/features</repository>
     -->
     <feature name='odl-${repoName}-all' version='${symbol_dollar}{project.version}' description='OpenDaylight :: ${repoName} :: All'>
         <!--
@@ -64,7 +64,7 @@
 
         * Basic MD-SAL Provider
         <feature name='odl-${repoName}-provider' version='${symbol_dollar}{project.version}' description='OpenDaylight :: ${repoName} :: Provider '>
-            <feature version='1.2.0-SNAPSHOT'>odl-mdsal-broker</feature>
+            <feature version='1.3.0-SNAPSHOT'>odl-mdsal-broker</feature>
             <feature version='${symbol_dollar}{project.version}'>odl-${repoName}-model</feature>
             <bundle>mvn:${groupId}/${repoName}-provider/${symbol_dollar}{project.version}</bundle>
             ... whatever other bundles you need
@@ -72,15 +72,15 @@
 
         * Basic MD-SAL Model feature
         <feature name='odl-${repoName}-model' version='${symbol_dollar}{project.version}' description='OpenDaylight :: ${repoName} :: Model'>
-            <feature version='0.7.0-SNAPSHOT'>odl-yangtools-binding</feature>
-            <feature version='0.7.0-SNAPSHOT'>odl-yangtools-models</feature>
+            <feature version='0.8.0-SNAPSHOT'>odl-yangtools-binding</feature>
+            <feature version='0.8.0-SNAPSHOT'>odl-yangtools-models</feature>
             <bundle>mvn:${groupId}/${repoName}-model/${symbol_dollar}{project.version}</bundle>
             ... whatever other bundles you need
         </feature>
 
         * Config Subsystem example - the config file is your config subsystem configuration
         <feature name='odl-${repoName}-provider' version='${symbol_dollar}{project.version}' description='OpenDaylight :: ${repoName} :: Provider'>
-            <feature version='1.2.0-SNAPSHOT'>odl-mdsal-broker</feature>
+            <feature version='1.3.0-SNAPSHOT'>odl-mdsal-broker</feature>
             <bundle>mvn:${groupId}/${repoName}-provider/${symbol_dollar}{project.version}</bundle>
             <configfile finalname="etc/opendaylight/karaf/80-${repoName}.xml">mvn:${groupId}/${repoName}-config/${symbol_dollar}{project.version}/xml/config</configfile>
             ... whatever other bundles you need
@@ -88,7 +88,7 @@
 
         * Basic MD-SAL Provider that uses openflowplugin-flow-services (which brings along odl-mdsal-broker)
         <feature name='odl-${repoName}-provider' version='${symbol_dollar}{project.version}' description='OpenDaylight :: ${repoName} :: Provider'>
-            <feature version='0.1.0-SNAPSHOT'>odl-openflowplugin-flow-services</feature>
+            <feature version='0.2.0-SNAPSHOT'>odl-openflowplugin-flow-services</feature>
             <bundle>mvn:${groupId}/${repoName}-provider/${symbol_dollar}{project.version}</bundle>
             ... whatever other bundles you need
         </feature>

diff --git a/opendaylight/archetypes/opendaylight-startup/pom.xml b/opendaylight/archetypes/opendaylight-startup/pom.xml
index abdb487446757c00629df56531289345bb933ba0..9d08cb119eccf28c64c9479fe35bcaae3c682061 100644 (file)
--- a/opendaylight/archetypes/opendaylight-startup/pom.xml
+++ b/opendaylight/archetypes/opendaylight-startup/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>opendaylight-startup-archetype</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>maven-archetype</packaging>
 
   <name>${project.artifactId}</name>

diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/api/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/api/pom.xml
index bdcec2ec01a75d520227b02a26beed3bb0710d30..8241dd97f183582dc94e1bc86f786740bea3411b 100644 (file)
--- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/api/pom.xml
+++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/api/pom.xml
@@ -10,7 +10,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.yangtools</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <version>0.8.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml
index 4afbedb76e44ada6766aa119c3b63c8f773d25ff..aab31b508df3ab7adc4e54044f0edb777c97679c 100644 (file)
--- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml
+++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>features-parent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
   <groupId>${groupId}</groupId>
@@ -24,8 +24,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <maven>3.1.1</maven>
   </prerequisites>
   <properties>
-    <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
-    <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
+    <mdsal.version>1.3.0-SNAPSHOT</mdsal.version>
+    <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>
   </properties>
   <dependencyManagement>

diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/impl/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/impl/pom.xml
index f9e77ed4b14302725170c73e86b2601bbda7c139..471bc788b8c604af9f584c2856543d91bf2ecdef 100644 (file)
--- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/impl/pom.xml
+++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/impl/pom.xml
@@ -14,7 +14,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-parent</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/karaf/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/karaf/pom.xml
index 486e3d39ba4ea58e610607517d61a9599272d707..96a66e097fa926c7018f20693cdd75897983cda0 100644 (file)
--- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/karaf/pom.xml
+++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/karaf/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>karaf-parent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
   <modelVersion>4.0.0</modelVersion>

diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml
index 6dfd614a295e275917cccc90bf53b50075f32bc3..7d57dfb7e4d81dfc6df1d4aca7eab8446f528e81 100644 (file)
--- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml
+++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml
@@ -10,7 +10,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
   </parent>
 
   <groupId>${groupId}</groupId>

diff --git a/opendaylight/archetypes/pom.xml b/opendaylight/archetypes/pom.xml
index 6d46aaec780236b227db3b0e1d2597fa52efcaf6..c93759139ff912c11a253babc0e7cc70a555a3d0 100644 (file)
--- a/opendaylight/archetypes/pom.xml
+++ b/opendaylight/archetypes/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../commons/opendaylight</relativePath>
   </parent>
   <scm>
@@ -15,7 +15,7 @@
   </scm>
   <groupId>org.opendaylight.controller.archetypes</groupId>
   <artifactId>archetypes-parent</artifactId>
-  <version>0.2.0-SNAPSHOT</version>
+  <version>0.3.0-SNAPSHOT</version>
   <packaging>pom</packaging>
     <distributionManagement>
     <!-- OpenDayLight Released artifact -->

diff --git a/opendaylight/commons/checkstyle/pom.xml b/opendaylight/commons/checkstyle/pom.xml
index fee517f08b8c37725ffc71167afe0893e0634b23..4009aaa5fd01d4d3316ea8268be085e28d892264 100644 (file)
--- a/opendaylight/commons/checkstyle/pom.xml
+++ b/opendaylight/commons/checkstyle/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>checkstyle</artifactId>
-  <version>0.1.0-SNAPSHOT</version>
+  <version>0.2.0-SNAPSHOT</version>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>

diff --git a/opendaylight/commons/concepts/pom.xml b/opendaylight/commons/concepts/pom.xml
index fa97e5fcac45668c3d727a2328a878a8a1111415..c1045a09558c85f22e4c9f5247c28ce6476cb3d3 100644 (file)
--- a/opendaylight/commons/concepts/pom.xml
+++ b/opendaylight/commons/concepts/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>concepts</artifactId>
-  <version>0.6.0-SNAPSHOT</version>
+  <version>0.7.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>
@@ -43,7 +43,7 @@
           <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>checkstyle</artifactId>
-            <version>0.1.0-SNAPSHOT</version>
+            <version>0.2.0-SNAPSHOT</version>
           </dependency>
         </dependencies>
       </plugin>

diff --git a/opendaylight/commons/enunciate-parent/pom.xml b/opendaylight/commons/enunciate-parent/pom.xml
index 2b89137733ee13c74b753f04c55f2e346a47e4a7..48a90e6f3c06e2059b4f22ab48a631f36f680519 100644 (file)
--- a/opendaylight/commons/enunciate-parent/pom.xml
+++ b/opendaylight/commons/enunciate-parent/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>commons.opendaylight</artifactId>
-        <version>1.5.0-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
         <relativePath>../opendaylight</relativePath>
     </parent>
 

diff --git a/opendaylight/commons/filter-valve/pom.xml b/opendaylight/commons/filter-valve/pom.xml
index 012b4a2529b49fcd365f7251dfd053f48dc73d65..b86904109f14a0a76abf9e382dd9ce8a960e5c94 100644 (file)
--- a/opendaylight/commons/filter-valve/pom.xml
+++ b/opendaylight/commons/filter-valve/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../opendaylight</relativePath>
   </parent>
   <artifactId>filter-valve</artifactId>

diff --git a/opendaylight/commons/liblldp/pom.xml b/opendaylight/commons/liblldp/pom.xml
index 148a4f3792a70eb77028b0af1f8c82c3af8cf6cb..1d9cbe3cd0f8d02f58fde1490cbefa06a9c8d5eb 100644 (file)
--- a/opendaylight/commons/liblldp/pom.xml
+++ b/opendaylight/commons/liblldp/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../opendaylight</relativePath>
   </parent>
 
   <artifactId>liblldp</artifactId>
-  <version>0.9.0-SNAPSHOT</version>
+  <version>0.10.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/commons/logback_settings/pom.xml b/opendaylight/commons/logback_settings/pom.xml
index f98b7a3a7ae645915834fa9662885d65578f48b7..f2f03d761bfc6ec95239d7325ca2466195f9d2fa 100644 (file)
--- a/opendaylight/commons/logback_settings/pom.xml
+++ b/opendaylight/commons/logback_settings/pom.xml
@@ -4,11 +4,11 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.parent</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
   <artifactId>commons.logback_settings</artifactId>
-  <version>0.1.0-SNAPSHOT</version>
+  <version>0.2.0-SNAPSHOT</version>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>

diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index eca08dde82a3726bd32dd35d62a241214346076a..47b2afe92d6ea276c3b01d94a0c825c2a0b62403 100644 (file)
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -4,30 +4,30 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath></relativePath>
   </parent>
 
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>commons.opendaylight</artifactId>
-  <version>1.5.0-SNAPSHOT</version>
+  <version>1.6.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
 
     <akka.version>2.3.9</akka.version>
-    <appauth.version>0.5.0-SNAPSHOT</appauth.version>
-    <archetype-app-northbound>0.1.0-SNAPSHOT</archetype-app-northbound>
-    <arphandler.version>0.6.0-SNAPSHOT</arphandler.version>
+    <appauth.version>0.6.0-SNAPSHOT</appauth.version>
+    <archetype-app-northbound>0.2.0-SNAPSHOT</archetype-app-northbound>
+    <arphandler.version>0.7.0-SNAPSHOT</arphandler.version>
     <!-- Plugin Versions -->
-    <bundlescanner.api.version>0.5.0-SNAPSHOT</bundlescanner.api.version>
-    <bundlescanner.implementation.version>0.5.0-SNAPSHOT</bundlescanner.implementation.version>
-    <bundlescanner.version>0.5.0-SNAPSHOT</bundlescanner.version>
-    <clustering.services.version>0.6.0-SNAPSHOT</clustering.services.version>
-    <clustering.services_implementation.version>0.5.0-SNAPSHOT</clustering.services_implementation.version>
-    <clustering.stub.version>0.5.0-SNAPSHOT</clustering.stub.version>
-    <clustering.test.version>0.5.0-SNAPSHOT</clustering.test.version>
-    <commmons.northbound.version>0.5.0-SNAPSHOT</commmons.northbound.version>
+    <bundlescanner.api.version>0.6.0-SNAPSHOT</bundlescanner.api.version>
+    <bundlescanner.implementation.version>0.6.0-SNAPSHOT</bundlescanner.implementation.version>
+    <bundlescanner.version>0.6.0-SNAPSHOT</bundlescanner.version>
+    <clustering.services.version>0.7.0-SNAPSHOT</clustering.services.version>
+    <clustering.services_implementation.version>0.6.0-SNAPSHOT</clustering.services_implementation.version>
+    <clustering.stub.version>0.6.0-SNAPSHOT</clustering.stub.version>
+    <clustering.test.version>0.6.0-SNAPSHOT</clustering.test.version>
+    <commmons.northbound.version>0.6.0-SNAPSHOT</commmons.northbound.version>
     <!-- Third Party Versions -->
     <codahale.metrics.version>3.0.1</codahale.metrics.version>
 
@@ -41,19 +41,19 @@
     <commons.tomcat.api>7.0.53.v201406060720</commons.tomcat.api>
     <commons.tomcat.util>7.0.53.v201406070630</commons.tomcat.util>
 
-    <commons.checkstyle.version>0.1.0-SNAPSHOT</commons.checkstyle.version>
-    <commons.httpclient.version>0.2.0-SNAPSHOT</commons.httpclient.version>
-    <commons.logback_settings.version>0.1.0-SNAPSHOT</commons.logback_settings.version>
+    <commons.checkstyle.version>0.2.0-SNAPSHOT</commons.checkstyle.version>
+    <commons.httpclient.version>0.3.0-SNAPSHOT</commons.httpclient.version>
+    <commons.logback_settings.version>0.2.0-SNAPSHOT</commons.logback_settings.version>
     <commons.net.version>3.0.1</commons.net.version>
-    <commons.opendaylight.commons.httpclient>0.2.0-SNAPSHOT</commons.opendaylight.commons.httpclient>
-    <commons.opendaylight.concepts.version>0.6.0-SNAPSHOT</commons.opendaylight.concepts.version>
-    <commons.opendaylight.version>1.5.0-SNAPSHOT</commons.opendaylight.version>
-    <commons.parent.version>1.1.0-SNAPSHOT</commons.parent.version>
-    <commons.httpclient.version>0.2.0-SNAPSHOT</commons.httpclient.version>
-    <concepts.version>0.6.0-SNAPSHOT</concepts.version>
+    <commons.opendaylight.commons.httpclient>0.3.0-SNAPSHOT</commons.opendaylight.commons.httpclient>
+    <commons.opendaylight.concepts.version>0.7.0-SNAPSHOT</commons.opendaylight.concepts.version>
+    <commons.opendaylight.version>1.6.0-SNAPSHOT</commons.opendaylight.version>
+    <commons.parent.version>1.2.0-SNAPSHOT</commons.parent.version>
+    <commons.httpclient.version>0.3.0-SNAPSHOT</commons.httpclient.version>
+    <concepts.version>0.7.0-SNAPSHOT</concepts.version>
     <concurrentlinkedhashmap.version>1.4</concurrentlinkedhashmap.version>
-    <config.version>0.3.0-SNAPSHOT</config.version>
-    <aaa.version>0.2.0-SNAPSHOT</aaa.version>
+    <config.version>0.4.0-SNAPSHOT</config.version>
+    <aaa.version>0.3.0-SNAPSHOT</aaa.version>
     <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
     <config.clustering.configfile>05-clustering.xml</config.clustering.configfile>
     <config.netty.configfile>00-netty.xml</config.netty.configfile>
@@ -64,87 +64,87 @@
     <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.5.0-SNAPSHOT</configuration.implementation.version>
-    <configuration.version>0.5.0-SNAPSHOT</configuration.version>
-    <connectionmanager.version>0.2.0-SNAPSHOT</connectionmanager.version>
-    <containermanager.it.version>0.6.0-SNAPSHOT</containermanager.it.version>
-    <containermanager.northbound.version>0.5.0-SNAPSHOT</containermanager.northbound.version>
-    <containermanager.shell.version>0.6.0-SNAPSHOT</containermanager.shell.version>
-    <containermanager.version>0.6.0-SNAPSHOT</containermanager.version>
-    <controllermanager.northbound.version>0.1.0-SNAPSHOT</controllermanager.northbound.version>
-    <devices.web.version>0.5.0-SNAPSHOT</devices.web.version>
-    <dummy-console.version>1.2.0-SNAPSHOT</dummy-console.version>
+    <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>
+    <containermanager.it.version>0.7.0-SNAPSHOT</containermanager.it.version>
+    <containermanager.northbound.version>0.6.0-SNAPSHOT</containermanager.northbound.version>
+    <containermanager.shell.version>0.7.0-SNAPSHOT</containermanager.shell.version>
+    <containermanager.version>0.7.0-SNAPSHOT</containermanager.version>
+    <controllermanager.northbound.version>0.2.0-SNAPSHOT</controllermanager.northbound.version>
+    <devices.web.version>0.6.0-SNAPSHOT</devices.web.version>
+    <dummy-console.version>1.3.0-SNAPSHOT</dummy-console.version>
     <config.statistics.manager.configfile>30-statistics-manager.xml</config.statistics.manager.configfile>
     <eclipse.jdt.core.compiler.batch.version>3.8.0.I20120518-2145</eclipse.jdt.core.compiler.batch.version>
 
     <!-- OpenEXI third party lib for netconf-->
     <exi.nagasena.version>0000.0002.0038.0</exi.nagasena.version>
     <felix.util.version>1.6.0</felix.util.version>
-    <features.test.version>1.5.0-SNAPSHOT</features.test.version>
-    <filtervalve.version>1.5.0-SNAPSHOT</filtervalve.version>
+    <features.test.version>1.6.0-SNAPSHOT</features.test.version>
+    <filtervalve.version>1.6.0-SNAPSHOT</filtervalve.version>
     <findbugs.maven.plugin.version>2.4.0</findbugs.maven.plugin.version>
-    <flowprogrammer.northbound.version>0.5.0-SNAPSHOT</flowprogrammer.northbound.version>
-    <flows.web.version>0.5.0-SNAPSHOT</flows.web.version>
-    <forwarding.staticrouting>0.6.0-SNAPSHOT</forwarding.staticrouting>
-    <forwarding.staticrouting.northbound.version>0.5.0-SNAPSHOT</forwarding.staticrouting.northbound.version>
-    <forwardingrulesmanager.implementation.version>0.5.0-SNAPSHOT</forwardingrulesmanager.implementation.version>
-    <forwardingrulesmanager.version>0.7.0-SNAPSHOT</forwardingrulesmanager.version>
-    <hosttracker.api.version>0.6.0-SNAPSHOT</hosttracker.api.version>
-    <hosttracker.implementation.version>0.6.0-SNAPSHOT</hosttracker.implementation.version>
-    <hosttracker.northbound.version>0.5.0-SNAPSHOT</hosttracker.northbound.version>
-    <hosttracker.shell.version>1.1.0-SNAPSHOT</hosttracker.shell.version>
-    <hosttracker_new.api.version>0.5.0-SNAPSHOT</hosttracker_new.api.version>
-    <hosttracker_new.implementation.version>0.5.0-SNAPSHOT</hosttracker_new.implementation.version>
-    <httpservice-bridge.northbound.version>0.1.0-SNAPSHOT</httpservice-bridge.northbound.version>
-    <ietf-inet-types.version>2010.09.24.7-SNAPSHOT</ietf-inet-types.version>
-    <ietf-restconf.version>2013.10.19.7-SNAPSHOT</ietf-restconf.version>
-    <ietf-topology.version>2013.10.21.7-SNAPSHOT</ietf-topology.version>
-    <ietf-yang-types.version>2010.09.24.7-SNAPSHOT</ietf-yang-types.version>
+    <flowprogrammer.northbound.version>0.6.0-SNAPSHOT</flowprogrammer.northbound.version>
+    <flows.web.version>0.6.0-SNAPSHOT</flows.web.version>
+    <forwarding.staticrouting>0.7.0-SNAPSHOT</forwarding.staticrouting>
+    <forwarding.staticrouting.northbound.version>0.6.0-SNAPSHOT</forwarding.staticrouting.northbound.version>
+    <forwardingrulesmanager.implementation.version>0.6.0-SNAPSHOT</forwardingrulesmanager.implementation.version>
+    <forwardingrulesmanager.version>0.8.0-SNAPSHOT</forwardingrulesmanager.version>
+    <hosttracker.api.version>0.7.0-SNAPSHOT</hosttracker.api.version>
+    <hosttracker.implementation.version>0.7.0-SNAPSHOT</hosttracker.implementation.version>
+    <hosttracker.northbound.version>0.6.0-SNAPSHOT</hosttracker.northbound.version>
+    <hosttracker.shell.version>1.2.0-SNAPSHOT</hosttracker.shell.version>
+    <hosttracker_new.api.version>0.6.0-SNAPSHOT</hosttracker_new.api.version>
+    <hosttracker_new.implementation.version>0.6.0-SNAPSHOT</hosttracker_new.implementation.version>
+    <httpservice-bridge.northbound.version>0.2.0-SNAPSHOT</httpservice-bridge.northbound.version>
+    <ietf-inet-types.version>2010.09.24.8-SNAPSHOT</ietf-inet-types.version>
+    <ietf-restconf.version>2013.10.19.8-SNAPSHOT</ietf-restconf.version>
+    <ietf-topology.version>2013.10.21.8-SNAPSHOT</ietf-topology.version>
+    <ietf-yang-types.version>2010.09.24.8-SNAPSHOT</ietf-yang-types.version>
     <jdepend.maven.plugin.version>2.0-beta-2</jdepend.maven.plugin.version>
     <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
-    <jolokia-bridge.version>0.1.0-SNAPSHOT</jolokia-bridge.version>
+    <jolokia-bridge.version>0.2.0-SNAPSHOT</jolokia-bridge.version>
     <jolokia.version>1.1.4</jolokia.version>
     <jsr311.api.version>1.1.1</jsr311.api.version>
     <jsr311.v2.api.version>2.0</jsr311.v2.api.version>
-    <karaf.branding.version>1.1.0-SNAPSHOT</karaf.branding.version>
+    <karaf.branding.version>1.2.0-SNAPSHOT</karaf.branding.version>
     <karaf.shell.version>${karaf.version}</karaf.shell.version>
     <leveldb.version>0.7</leveldb.version>
     <leveldbjni.version>1.8</leveldbjni.version>
     <lifecycle.mapping.version>1.0.0</lifecycle.mapping.version>
-    <logging.bridge.version>0.5.0-SNAPSHOT</logging.bridge.version>
+    <logging.bridge.version>0.6.0-SNAPSHOT</logging.bridge.version>
     <maven.plugin.api.version>3.0.5</maven.plugin.api.version>
     <mimepull.version>1.9.4</mimepull.version>
-    <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
-    <netconf.version>0.3.0-SNAPSHOT</netconf.version>
-    <networkconfig.bridgedomain.northbound.version>0.1.0-SNAPSHOT</networkconfig.bridgedomain.northbound.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>
-    <northbound.commons.version>0.5.0-SNAPSHOT</northbound.commons.version>
-    <northbound.hosttracker.version>1.5.0-SNAPSHOT</northbound.hosttracker.version>
-    <northbound.jolokia.version>1.5.0-SNAPSHOT</northbound.jolokia.version>
-    <opendaylight-l2-types.version>2013.08.27.7-SNAPSHOT</opendaylight-l2-types.version>
-    <osgi-brandfragment.web.version>0.1.0-SNAPSHOT</osgi-brandfragment.web.version>
+    <northbound.commons.version>0.6.0-SNAPSHOT</northbound.commons.version>
+    <northbound.hosttracker.version>1.6.0-SNAPSHOT</northbound.hosttracker.version>
+    <northbound.jolokia.version>1.6.0-SNAPSHOT</northbound.jolokia.version>
+    <opendaylight-l2-types.version>2013.08.27.8-SNAPSHOT</opendaylight-l2-types.version>
+    <osgi-brandfragment.web.version>0.2.0-SNAPSHOT</osgi-brandfragment.web.version>
     <parboiled.version>1.1.6</parboiled.version>
     <parboiled.scala.version>1.1.6</parboiled.scala.version>
     <propertymavenplugin.version>1.0-alpha-2</propertymavenplugin.version>
     <protobuf.version>2.5.0</protobuf.version>
-    <protocol-framework.version>0.6.0-SNAPSHOT</protocol-framework.version>
-    <protocol_plugins.openflow.version>0.5.0-SNAPSHOT</protocol_plugins.openflow.version>
-    <protocol_plugins.stub.version>0.5.0-SNAPSHOT</protocol_plugins.stub.version>
-    <routing.dijkstra_implementation.version>0.5.0-SNAPSHOT</routing.dijkstra_implementation.version>
-    <sal.connection.version>0.2.0-SNAPSHOT</sal.connection.version>
-    <sal.implementation.version>0.5.0-SNAPSHOT</sal.implementation.version>
-    <sal.networkconfiguration.version>0.1.0-SNAPSHOT</sal.networkconfiguration.version>
-    <sal.version>0.9.0-SNAPSHOT</sal.version>
+    <protocol-framework.version>0.7.0-SNAPSHOT</protocol-framework.version>
+    <protocol_plugins.openflow.version>0.6.0-SNAPSHOT</protocol_plugins.openflow.version>
+    <protocol_plugins.stub.version>0.6.0-SNAPSHOT</protocol_plugins.stub.version>
+    <routing.dijkstra_implementation.version>0.6.0-SNAPSHOT</routing.dijkstra_implementation.version>
+    <sal.connection.version>0.3.0-SNAPSHOT</sal.connection.version>
+    <sal.implementation.version>0.6.0-SNAPSHOT</sal.implementation.version>
+    <sal.networkconfiguration.version>0.2.0-SNAPSHOT</sal.networkconfiguration.version>
+    <sal.version>0.10.0-SNAPSHOT</sal.version>
     <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
-    <samples.loadbalancer>0.6.0-SNAPSHOT</samples.loadbalancer>
-    <samples.loadbalancer.northbound.version>0.5.0-SNAPSHOT</samples.loadbalancer.northbound.version>
-    <samples.simpleforwarding.version>0.5.0-SNAPSHOT</samples.simpleforwarding.version>
-    <sanitytest.version>0.5.0-SNAPSHOT</sanitytest.version>
+    <samples.loadbalancer>0.7.0-SNAPSHOT</samples.loadbalancer>
+    <samples.loadbalancer.northbound.version>0.6.0-SNAPSHOT</samples.loadbalancer.northbound.version>
+    <samples.simpleforwarding.version>0.6.0-SNAPSHOT</samples.simpleforwarding.version>
+    <sanitytest.version>0.6.0-SNAPSHOT</sanitytest.version>
     <scala.version>2.10</scala.version>
     <scala.micro.version>4</scala.micro.version>
-    <security.version>0.5.0-SNAPSHOT</security.version>
-    <karaf.security.version>0.5.0-SNAPSHOT</karaf.security.version>
+    <security.version>0.6.0-SNAPSHOT</security.version>
+    <karaf.security.version>0.6.0-SNAPSHOT</karaf.security.version>
     <shapeless.version>1.2.4</shapeless.version>
     <sitedeploy>dav:http://nexus.opendaylight.org/content/sites/site</sitedeploy>
     <sonar.branch>${user.name}-private-view</sonar.branch>
@@ -161,30 +161,30 @@
     <spring-security-karaf.version>3.1.4.RELEASE</spring-security-karaf.version>
     <spring-security.version>3.1.3.RELEASE</spring-security.version>
     <spring.version>3.1.3.RELEASE</spring.version>
-    <statistics.northbound.version>0.5.0-SNAPSHOT</statistics.northbound.version>
-    <statisticsmanager.implementation.version>0.5.0-SNAPSHOT</statisticsmanager.implementation.version>
-    <statisticsmanager.version>0.6.0-SNAPSHOT</statisticsmanager.version>
-    <subnets.northbound.version>0.5.0-SNAPSHOT</subnets.northbound.version>
+    <statistics.northbound.version>0.6.0-SNAPSHOT</statistics.northbound.version>
+    <statisticsmanager.implementation.version>0.6.0-SNAPSHOT</statisticsmanager.implementation.version>
+    <statisticsmanager.version>0.7.0-SNAPSHOT</statisticsmanager.version>
+    <subnets.northbound.version>0.6.0-SNAPSHOT</subnets.northbound.version>
     <surefire.version>2.15</surefire.version>
-    <switchmanager.api.version>0.8.0-SNAPSHOT</switchmanager.api.version>
-    <switchmanager.implementation.version>0.5.0-SNAPSHOT</switchmanager.implementation.version>
-    <switchmanager.northbound.version>0.5.0-SNAPSHOT</switchmanager.northbound.version>
+    <switchmanager.api.version>0.9.0-SNAPSHOT</switchmanager.api.version>
+    <switchmanager.implementation.version>0.6.0-SNAPSHOT</switchmanager.implementation.version>
+    <switchmanager.northbound.version>0.6.0-SNAPSHOT</switchmanager.northbound.version>
     <testvm.argLine>-Xmx1024m -XX:MaxPermSize=256m</testvm.argLine>
-    <topology.northbound.version>0.5.0-SNAPSHOT</topology.northbound.version>
-    <topology.web.version>0.5.0-SNAPSHOT</topology.web.version>
-    <topologymanager.version>0.5.0-SNAPSHOT</topologymanager.version>
-    <topologymanager.shell.version>1.1.0-SNAPSHOT</topologymanager.shell.version>
-    <troubleshoot.web.version>0.5.0-SNAPSHOT</troubleshoot.web.version>
+    <topology.northbound.version>0.6.0-SNAPSHOT</topology.northbound.version>
+    <topology.web.version>0.6.0-SNAPSHOT</topology.web.version>
+    <topologymanager.version>0.6.0-SNAPSHOT</topologymanager.version>
+    <topologymanager.shell.version>1.2.0-SNAPSHOT</topologymanager.shell.version>
+    <troubleshoot.web.version>0.6.0-SNAPSHOT</troubleshoot.web.version>
     <typesafe.config.version>1.2.0</typesafe.config.version>
     <uncommons.maths.version>1.2.2a</uncommons.maths.version>
-    <usermanager.implementation.version>0.5.0-SNAPSHOT</usermanager.implementation.version>
-    <usermanager.northbound.version>0.1.0-SNAPSHOT</usermanager.northbound.version>
-    <usermanager.version>0.5.0-SNAPSHOT</usermanager.version>
-    <nsf.version>0.5.0-SNAPSHOT</nsf.version>
-    <web.version>0.5.0-SNAPSHOT</web.version>
-    <yang-ext.version>2013.09.07.7-SNAPSHOT</yang-ext.version>
-    <yang-jmx-generator.version>1.1.0-SNAPSHOT</yang-jmx-generator.version>
-    <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
+    <usermanager.implementation.version>0.6.0-SNAPSHOT</usermanager.implementation.version>
+    <usermanager.northbound.version>0.2.0-SNAPSHOT</usermanager.northbound.version>
+    <usermanager.version>0.6.0-SNAPSHOT</usermanager.version>
+    <nsf.version>0.6.0-SNAPSHOT</nsf.version>
+    <web.version>0.6.0-SNAPSHOT</web.version>
+    <yang-ext.version>2013.09.07.8-SNAPSHOT</yang-ext.version>
+    <yang-jmx-generator.version>1.2.0-SNAPSHOT</yang-jmx-generator.version>
+    <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
     <sshd-core.version>0.14.0</sshd-core.version>
     <jmh.version>0.9.7</jmh.version>
     <lmax.version>3.3.0</lmax.version>
@@ -950,12 +950,12 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>httpservice-bridge</artifactId>
-        <version>0.1.0-SNAPSHOT</version>
+        <version>0.2.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>jolokia-bridge</artifactId>
-        <version>0.1.0-SNAPSHOT</version>
+        <version>0.2.0-SNAPSHOT</version>
       </dependency>
       <!-- Karaf Dependencies -->
       <dependency>
@@ -1259,7 +1259,7 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>commons.logback_settings</artifactId>
-        <version>0.1.0-SNAPSHOT</version>
+        <version>0.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
       <dependency>
@@ -1426,7 +1426,7 @@
             <dependency>
               <groupId>org.opendaylight.controller</groupId>
               <artifactId>commons.logback_settings</artifactId>
-              <version>0.1.0-SNAPSHOT</version>
+              <version>0.2.0-SNAPSHOT</version>
             </dependency>
           </dependencies>
           <executions>
@@ -1660,7 +1660,7 @@
           <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>checkstyle</artifactId>
-            <version>0.1.0-SNAPSHOT</version>
+            <version>0.2.0-SNAPSHOT</version>
           </dependency>
         </dependencies>
         <executions>

diff --git a/opendaylight/commons/parent/pom.xml b/opendaylight/commons/parent/pom.xml
index f8364ca535d4e20465b4737414a9a3115dacb565..2ade034ade724eca4f11fd79af6cd8033096d4a4 100644 (file)
--- a/opendaylight/commons/parent/pom.xml
+++ b/opendaylight/commons/parent/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>commons.parent</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>

diff --git a/opendaylight/commons/protocol-framework/pom.xml b/opendaylight/commons/protocol-framework/pom.xml
index 38b9d175f2c8a660a73ff8d1569449bb4ca84970..c56de0c8a48f3e2388d3eefd2416dd9a8bae203c 100644 (file)
--- a/opendaylight/commons/protocol-framework/pom.xml
+++ b/opendaylight/commons/protocol-framework/pom.xml
@@ -6,12 +6,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>protocol-framework</artifactId>
-  <version>0.6.0-SNAPSHOT</version>
+  <version>0.7.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <name>${project.artifactId}</name>
   <description>Common protocol framework</description>

diff --git a/opendaylight/config/config-api/pom.xml b/opendaylight/config/config-api/pom.xml
index d76bd50a3d646e49be9eca943a1b5e61b79f3304..433c13238f538ac613c08e54a0f1c7ca9a60b986 100644 (file)
--- a/opendaylight/config/config-api/pom.xml
+++ b/opendaylight/config/config-api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-subsystem</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>config-api</artifactId>

diff --git a/opendaylight/config/config-artifacts/pom.xml b/opendaylight/config/config-artifacts/pom.xml
index 430d6b41bc694a69516dbfdb63b699c235947e5f..7e1475baa21068474643af696c3f64d68e28e6ae 100644 (file)
--- a/opendaylight/config/config-artifacts/pom.xml
+++ b/opendaylight/config/config-artifacts/pom.xml
@@ -12,7 +12,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-artifacts</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <dependencyManagement>

diff --git a/opendaylight/config/config-manager/pom.xml b/opendaylight/config/config-manager/pom.xml
index 71f2cabb633ec20b079e24f25ec930af9ae5f1b0..0bc068083f7fc34755dc4f45ab12676cbb3e873f 100644 (file)
--- a/opendaylight/config/config-manager/pom.xml
+++ b/opendaylight/config/config-manager/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-subsystem</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>config-manager</artifactId>

diff --git a/opendaylight/config/config-module-archetype/pom.xml b/opendaylight/config/config-module-archetype/pom.xml
index 3e9162eb36b721046876c680ca5542ae83212087..92ff18129bfb96179b4a4118523c052f6ee050ba 100644 (file)
--- a/opendaylight/config/config-module-archetype/pom.xml
+++ b/opendaylight/config/config-module-archetype/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-subsystem</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>config-module-archetype</artifactId>

diff --git a/opendaylight/config/config-netty-config/pom.xml b/opendaylight/config/config-netty-config/pom.xml
index 1e7a027b5b8a2f13a36111cbc22efa6386d1adfa..380201128623d08636934aef0059eae621997ea0 100644 (file)
--- a/opendaylight/config/config-netty-config/pom.xml
+++ b/opendaylight/config/config-netty-config/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>config-subsystem</artifactId>
-        <version>0.3.0-SNAPSHOT</version>
+        <version>0.4.0-SNAPSHOT</version>
     </parent>
     <artifactId>config-netty-config</artifactId>
     <description>Configuration files for sal-rest-connector</description>

diff --git a/opendaylight/config/config-parent/pom.xml b/opendaylight/config/config-parent/pom.xml
index e6e2bb8478bcda319b31d070ea6ca294c1c21e7a..fa8a4385e300d0b995a0b66627ce89cdea94840c 100644 (file)
--- a/opendaylight/config/config-parent/pom.xml
+++ b/opendaylight/config/config-parent/pom.xml
@@ -11,20 +11,20 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.yangtools</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <version>0.8.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>config-parent</artifactId>
-  <version>0.3.0-SNAPSHOT</version>
+  <version>0.4.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
-    <config.version>0.3.0-SNAPSHOT</config.version>
-    <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
-    <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
+    <config.version>0.4.0-SNAPSHOT</config.version>
+    <mdsal.version>1.3.0-SNAPSHOT</mdsal.version>
+    <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
     <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
     <config.file>src/main/config/default-config.xml</config.file>
   </properties>

diff --git a/opendaylight/config/config-persister-api/pom.xml b/opendaylight/config/config-persister-api/pom.xml
index f83beb0c8b4463cdd2a24427753e53e811c5426a..d8969ef3d048bb3794ca15b9dcf6977ec9f1e019 100644 (file)
--- a/opendaylight/config/config-persister-api/pom.xml
+++ b/opendaylight/config/config-persister-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-subsystem</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>config-persister-api</artifactId>

diff --git a/opendaylight/config/config-persister-directory-xml-adapter/pom.xml b/opendaylight/config/config-persister-directory-xml-adapter/pom.xml
index 302b13fdf933bacb5e3c77a021517046ed0fe4cc..accf9600b4c384fbaf722939f4b526b40a09934f 100644 (file)
--- a/opendaylight/config/config-persister-directory-xml-adapter/pom.xml
+++ b/opendaylight/config/config-persister-directory-xml-adapter/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-subsystem</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>config-persister-directory-xml-adapter</artifactId>

diff --git a/opendaylight/config/config-persister-feature-adapter/pom.xml b/opendaylight/config/config-persister-feature-adapter/pom.xml
index d7d7889bf920f0261f8ecd24ac9ec86b14ba79bb..2bc25a39789e8e95475a7c0fe194c4a8cc0d9093 100644 (file)
--- a/opendaylight/config/config-persister-feature-adapter/pom.xml
+++ b/opendaylight/config/config-persister-feature-adapter/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>config-subsystem</artifactId>
-        <version>0.3.0-SNAPSHOT</version>
+        <version>0.4.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/opendaylight/config/config-persister-file-xml-adapter/pom.xml b/opendaylight/config/config-persister-file-xml-adapter/pom.xml
index 35df9e1999a497adb7a2f6053c6e903a76df4c65..afd5e406f7626b26df56e81d1bbe84c40dd023be 100644 (file)
--- a/opendaylight/config/config-persister-file-xml-adapter/pom.xml
+++ b/opendaylight/config/config-persister-file-xml-adapter/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-subsystem</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>config-persister-file-xml-adapter</artifactId>

diff --git a/opendaylight/config/config-plugin-parent/pom.xml b/opendaylight/config/config-plugin-parent/pom.xml
index 081df0c52de3e3b5b5fd44ad221c69516e703072..2663aa5ebdb61b67b4b29ddeecfa764351c87cbf 100644 (file)
--- a/opendaylight/config/config-plugin-parent/pom.xml
+++ b/opendaylight/config/config-plugin-parent/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-subsystem</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
   <artifactId>config-plugin-parent</artifactId>

diff --git a/opendaylight/config/config-util/pom.xml b/opendaylight/config/config-util/pom.xml
index 6a5950dc7e7bc5afef3bd0e257b5a564e7aa9b90..fa83b43de22b906aa2bf5c24858747f687812a75 100644 (file)
--- a/opendaylight/config/config-util/pom.xml
+++ b/opendaylight/config/config-util/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-subsystem</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>config-util</artifactId>

diff --git a/opendaylight/config/logback-config-loader/pom.xml b/opendaylight/config/logback-config-loader/pom.xml
index 94f7f8fc4932f0a7f7f6ac543b7cf607cf44455f..40adc0cffa497f07aeadecbafa7a61da5c293137 100644 (file)
--- a/opendaylight/config/logback-config-loader/pom.xml
+++ b/opendaylight/config/logback-config-loader/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-plugin-parent</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
     <relativePath>../config-plugin-parent</relativePath>
   </parent>
   <artifactId>logback-config-loader</artifactId>

diff --git a/opendaylight/config/logback-config/pom.xml b/opendaylight/config/logback-config/pom.xml
index d4537387aad1021913459ca14f6139d537f69dbf..82e1fa8ea33ff7f02c2b06957279f6b58cf04334 100644 (file)
--- a/opendaylight/config/logback-config/pom.xml
+++ b/opendaylight/config/logback-config/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-plugin-parent</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
     <relativePath>../config-plugin-parent</relativePath>
   </parent>
   <artifactId>logback-config</artifactId>

diff --git a/opendaylight/config/netconf-config-dispatcher/pom.xml b/opendaylight/config/netconf-config-dispatcher/pom.xml
index 0e0ec9372c760c7b138f0209747ba9c124a714ab..e91d6c3fc20b86d5862286846d68283898236275 100644 (file)
--- a/opendaylight/config/netconf-config-dispatcher/pom.xml
+++ b/opendaylight/config/netconf-config-dispatcher/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-plugin-parent</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
     <relativePath>../config-plugin-parent</relativePath>
   </parent>
 

diff --git a/opendaylight/config/netty-config-api/pom.xml b/opendaylight/config/netty-config-api/pom.xml
index 2d8145723d1b51f5be061b9ce384d84bdf563b01..440ca0f926ea479044648d31e9aab33e3bf294f2 100644 (file)
--- a/opendaylight/config/netty-config-api/pom.xml
+++ b/opendaylight/config/netty-config-api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-plugin-parent</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
     <relativePath>../config-plugin-parent</relativePath>
   </parent>
   <artifactId>netty-config-api</artifactId>

diff --git a/opendaylight/config/netty-event-executor-config/pom.xml b/opendaylight/config/netty-event-executor-config/pom.xml
index 31940b91fed2a5f59947a7a845950076e0ae6d0b..1876690f30cce4e952af7857e2c7022eb7c3d26c 100644 (file)
--- a/opendaylight/config/netty-event-executor-config/pom.xml
+++ b/opendaylight/config/netty-event-executor-config/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-plugin-parent</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
     <relativePath>../config-plugin-parent</relativePath>
   </parent>
   <artifactId>netty-event-executor-config</artifactId>

diff --git a/opendaylight/config/netty-threadgroup-config/pom.xml b/opendaylight/config/netty-threadgroup-config/pom.xml
index 0f645015e1c453fc2e0527c962d62645f6ea6651..7ee7bccec7187175aec98ed22868a0b40087a78d 100644 (file)
--- a/opendaylight/config/netty-threadgroup-config/pom.xml
+++ b/opendaylight/config/netty-threadgroup-config/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-plugin-parent</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
     <relativePath>../config-plugin-parent</relativePath>
   </parent>
   <artifactId>netty-threadgroup-config</artifactId>

diff --git a/opendaylight/config/netty-timer-config/pom.xml b/opendaylight/config/netty-timer-config/pom.xml
index 181c1d01513537f7ece1d9a5c868d47abfdfdc29..95cbbd54481cdfd71cba66cc56df96157e6cb9e2 100644 (file)
--- a/opendaylight/config/netty-timer-config/pom.xml
+++ b/opendaylight/config/netty-timer-config/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-plugin-parent</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
     <relativePath>../config-plugin-parent</relativePath>
   </parent>
   <artifactId>netty-timer-config</artifactId>

diff --git a/opendaylight/config/pom.xml b/opendaylight/config/pom.xml
index 6d14ad3957c6e03a51bd728b054ba6388d245075..7601f765f349767273c88effa52bc08d624e3998 100644 (file)
--- a/opendaylight/config/pom.xml
+++ b/opendaylight/config/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../commons/opendaylight</relativePath>
   </parent>
   <artifactId>config-subsystem</artifactId>
 
-  <version>0.3.0-SNAPSHOT</version>
+  <version>0.4.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>${project.artifactId}</name>
 

diff --git a/opendaylight/config/shutdown-api/pom.xml b/opendaylight/config/shutdown-api/pom.xml
index 659052e570898f70b2497eef4dfd236c9d666305..3b550702770868589575171795864c03bfcf4f09 100644 (file)
--- a/opendaylight/config/shutdown-api/pom.xml
+++ b/opendaylight/config/shutdown-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-plugin-parent</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
     <relativePath>../config-plugin-parent</relativePath>
   </parent>
   <artifactId>shutdown-api</artifactId>

diff --git a/opendaylight/config/shutdown-impl/pom.xml b/opendaylight/config/shutdown-impl/pom.xml
index f14c28532314f71ce7450437e5e338a9e2a52975..4a1ce2c35edb006bdefabd7843e119be9ae42571 100644 (file)
--- a/opendaylight/config/shutdown-impl/pom.xml
+++ b/opendaylight/config/shutdown-impl/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-plugin-parent</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
     <relativePath>../config-plugin-parent</relativePath>
   </parent>
   <artifactId>shutdown-impl</artifactId>

diff --git a/opendaylight/config/threadpool-config-api/pom.xml b/opendaylight/config/threadpool-config-api/pom.xml
index 9dc7bf59767d901556b0fc1e3a86d3b3282707c4..7c10031a48e969b34f573a49b0088af2373d2e54 100644 (file)
--- a/opendaylight/config/threadpool-config-api/pom.xml
+++ b/opendaylight/config/threadpool-config-api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-plugin-parent</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
     <relativePath>../config-plugin-parent</relativePath>
   </parent>
   <artifactId>threadpool-config-api</artifactId>

diff --git a/opendaylight/config/threadpool-config-impl/pom.xml b/opendaylight/config/threadpool-config-impl/pom.xml
index b875f5f3e4198f5d1dfe3b4ebe06c2cbca7d83ad..3d08bfff965f429378e910dd7000a99ba30b4fd5 100644 (file)
--- a/opendaylight/config/threadpool-config-impl/pom.xml
+++ b/opendaylight/config/threadpool-config-impl/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-plugin-parent</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
     <relativePath>../config-plugin-parent</relativePath>
   </parent>
   <artifactId>threadpool-config-impl</artifactId>

diff --git a/opendaylight/config/yang-jmx-generator-it/pom.xml b/opendaylight/config/yang-jmx-generator-it/pom.xml
index 6d2663ced5b6f56b72e38e2e14ea546ef270e7cc..02f3c0934828658f1de5f7570848b43c4703fafa 100644 (file)
--- a/opendaylight/config/yang-jmx-generator-it/pom.xml
+++ b/opendaylight/config/yang-jmx-generator-it/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-subsystem</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>yang-jmx-generator-it</artifactId>

diff --git a/opendaylight/config/yang-jmx-generator-plugin/pom.xml b/opendaylight/config/yang-jmx-generator-plugin/pom.xml
index ae190848c9f136543e30521a153ba24d7d42c64f..0b08ba3f5d19f88594ff3764f34b85dd7da4643e 100644 (file)
--- a/opendaylight/config/yang-jmx-generator-plugin/pom.xml
+++ b/opendaylight/config/yang-jmx-generator-plugin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-subsystem</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>yang-jmx-generator-plugin</artifactId>

diff --git a/opendaylight/config/yang-jmx-generator/pom.xml b/opendaylight/config/yang-jmx-generator/pom.xml
index bfeb3f0f7acd74605a2f39782e5ea9a991b22044..1b3397dbd399b9f52536f08025fab308273c3666 100644 (file)
--- a/opendaylight/config/yang-jmx-generator/pom.xml
+++ b/opendaylight/config/yang-jmx-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-subsystem</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 

diff --git a/opendaylight/config/yang-test-plugin/pom.xml b/opendaylight/config/yang-test-plugin/pom.xml
index 690f8d24e6746671c4032360885670f3ff2e2467..b437e77b9d7a115527ad06b5cc740f6f3716b61f 100644 (file)
--- a/opendaylight/config/yang-test-plugin/pom.xml
+++ b/opendaylight/config/yang-test-plugin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-plugin-parent</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
     <relativePath>../config-plugin-parent</relativePath>
   </parent>
   <artifactId>yang-test-plugin</artifactId>

diff --git a/opendaylight/config/yang-test/pom.xml b/opendaylight/config/yang-test/pom.xml
index f5c966d5a6e9472d8c98211b087a9131171b8d23..687e35fb25ed18e4261b054dd5cc5dab613c626e 100644 (file)
--- a/opendaylight/config/yang-test/pom.xml
+++ b/opendaylight/config/yang-test/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-plugin-parent</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
     <relativePath>../config-plugin-parent</relativePath>
   </parent>
 

diff --git a/opendaylight/md-sal/benchmark-data-store/pom.xml b/opendaylight/md-sal/benchmark-data-store/pom.xml
index b196c3180fc5c7429a338b66543d4307d0b51826..2a340d363a2e84d00b28e771c8b63e3d87b14c4c 100644 (file)
--- a/opendaylight/md-sal/benchmark-data-store/pom.xml
+++ b/opendaylight/md-sal/benchmark-data-store/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <artifactId>sal-parent</artifactId>
     <groupId>org.opendaylight.controller</groupId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/opendaylight/md-sal/md-sal-config/pom.xml b/opendaylight/md-sal/md-sal-config/pom.xml
index bd1586054dac5418cfa19c9e7e30bde9c6417087..9f815bc46c2a3ecf080bf55da530d850dbc7fe17 100644 (file)
--- a/opendaylight/md-sal/md-sal-config/pom.xml
+++ b/opendaylight/md-sal/md-sal-config/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>md-sal-config</artifactId>
   <description>Configuration files for md-sal</description>

diff --git a/opendaylight/md-sal/mdsal-artifacts/pom.xml b/opendaylight/md-sal/mdsal-artifacts/pom.xml
index d0b9f488733a603adcf8f01a4ecc16076b64a8fb..6b0a7329f6c4b4c38e34c139af2d3926199b7193 100644 (file)
--- a/opendaylight/md-sal/mdsal-artifacts/pom.xml
+++ b/opendaylight/md-sal/mdsal-artifacts/pom.xml
@@ -12,7 +12,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>mdsal-artifacts</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <dependencyManagement>

diff --git a/opendaylight/md-sal/messagebus-api/pom.xml b/opendaylight/md-sal/messagebus-api/pom.xml
index dda7af4f1858e110574f94198e04f04655c9fc59..d3586fb8ed6682cd4058e2712ceccff9216f91b3 100644 (file)
--- a/opendaylight/md-sal/messagebus-api/pom.xml
+++ b/opendaylight/md-sal/messagebus-api/pom.xml
@@ -14,7 +14,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>sal-parent</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>messagebus-api</artifactId>

diff --git a/opendaylight/md-sal/messagebus-config/pom.xml b/opendaylight/md-sal/messagebus-config/pom.xml
index 262a53e4ec5fe94d66a607a5cc3f369ce6034118..bbd334f75ed55c29733968183cff6626672c1be7 100644 (file)
--- a/opendaylight/md-sal/messagebus-config/pom.xml
+++ b/opendaylight/md-sal/messagebus-config/pom.xml
@@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>\r
     <groupId>org.opendaylight.controller</groupId>\r
     <artifactId>sal-parent</artifactId>\r
-    <version>1.2.0-SNAPSHOT</version>\r
+    <version>1.3.0-SNAPSHOT</version>\r
   </parent>\r
 \r
   <artifactId>messagebus-config</artifactId>\r

diff --git a/opendaylight/md-sal/messagebus-impl/pom.xml b/opendaylight/md-sal/messagebus-impl/pom.xml
index d43210d7c4482c34ce1f9559402501080a5ac199..472617ceb9384feced2e82c162cb903cc9379ddb 100644 (file)
--- a/opendaylight/md-sal/messagebus-impl/pom.xml
+++ b/opendaylight/md-sal/messagebus-impl/pom.xml
@@ -14,7 +14,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>\r
         <groupId>org.opendaylight.controller</groupId>\r
         <artifactId>sal-parent</artifactId>\r
-        <version>1.2.0-SNAPSHOT</version>\r
+        <version>1.3.0-SNAPSHOT</version>\r
     </parent>\r
 \r
     <artifactId>messagebus-impl</artifactId>\r
@@ -54,12 +54,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <dependency>\r
             <groupId>org.opendaylight.controller</groupId>\r
             <artifactId>messagebus-api</artifactId>\r
-            <version>1.2.0-SNAPSHOT</version>\r
+            <version>1.3.0-SNAPSHOT</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.opendaylight.controller</groupId>\r
             <artifactId>messagebus-spi</artifactId>\r
-            <version>1.2.0-SNAPSHOT</version>\r
+            <version>1.3.0-SNAPSHOT</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.opendaylight.controller</groupId>\r

diff --git a/opendaylight/md-sal/messagebus-impl/src/main/java/org/opendaylight/controller/messagebus/app/impl/EventSourceTopic.java b/opendaylight/md-sal/messagebus-impl/src/main/java/org/opendaylight/controller/messagebus/app/impl/EventSourceTopic.java
index 13e50b5ce57030b9a1a97864c02b2fe1613c33bd..c60562d3d4392dca7f5e1e3ca40da4e8bbe9961b 100644 (file)
--- a/opendaylight/md-sal/messagebus-impl/src/main/java/org/opendaylight/controller/messagebus/app/impl/EventSourceTopic.java
+++ b/opendaylight/md-sal/messagebus-impl/src/main/java/org/opendaylight/controller/messagebus/app/impl/EventSourceTopic.java
@@ -39,10 +39,7 @@ public class EventSourceTopic implements DataChangeListener {
     public EventSourceTopic(final NotificationPattern notificationPattern, final String nodeIdPattern, final EventSourceService eventSource) {
         this.notificationPattern = Preconditions.checkNotNull(notificationPattern);
         this.sourceService = eventSource;
-
-        // FIXME: regex should be the language of nodeIdPattern
-        final String regex = Util.wildcardToRegex(nodeIdPattern);
-        this.nodeIdPattern = Pattern.compile(regex);
+        this.nodeIdPattern = Pattern.compile(nodeIdPattern);
 
         this.topicId = new TopicId(Util.getUUIDIdent());
     }

diff --git a/opendaylight/md-sal/messagebus-impl/src/main/java/org/opendaylight/controller/messagebus/app/impl/EventSourceTopology.java b/opendaylight/md-sal/messagebus-impl/src/main/java/org/opendaylight/controller/messagebus/app/impl/EventSourceTopology.java
index 10b9ec83cde9080a5eb652ea69b65936973b0f60..b879eacda015b5d810ce535234dcbf1396f8d78c 100644 (file)
--- a/opendaylight/md-sal/messagebus-impl/src/main/java/org/opendaylight/controller/messagebus/app/impl/EventSourceTopology.java
+++ b/opendaylight/md-sal/messagebus-impl/src/main/java/org/opendaylight/controller/messagebus/app/impl/EventSourceTopology.java
@@ -168,7 +168,7 @@ public class EventSourceTopology implements EventAggregatorService, EventSourceR
 
         final NotificationPattern notificationPattern = new NotificationPattern(input.getNotificationPattern());
         final String nodeIdPattern = input.getNodeIdPattern().getValue();
-        final Pattern nodeIdPatternRegex = Pattern.compile(Util.wildcardToRegex(nodeIdPattern));
+        final Pattern nodeIdPatternRegex = Pattern.compile(nodeIdPattern);
         final EventSourceTopic eventSourceTopic = new EventSourceTopic(notificationPattern, nodeIdPattern, eventSourceService);
 
         registerTopic(eventSourceTopic);

diff --git a/opendaylight/md-sal/messagebus-impl/src/main/java/org/opendaylight/controller/messagebus/eventsources/netconf/NetconfEventSource.java b/opendaylight/md-sal/messagebus-impl/src/main/java/org/opendaylight/controller/messagebus/eventsources/netconf/NetconfEventSource.java
index 615fa34b7c4d302aa005cd5b236a6661e4c4c354..3dbdc98ea52dd1c68fc7f15b2afcc955fd7887d2 100644 (file)
--- a/opendaylight/md-sal/messagebus-impl/src/main/java/org/opendaylight/controller/messagebus/eventsources/netconf/NetconfEventSource.java
+++ b/opendaylight/md-sal/messagebus-impl/src/main/java/org/opendaylight/controller/messagebus/eventsources/netconf/NetconfEventSource.java
@@ -16,7 +16,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentSkipListSet;
 import java.util.concurrent.Future;
 import java.util.regex.Pattern;
 
@@ -25,7 +24,6 @@ import javax.xml.transform.dom.DOMResult;
 import javax.xml.transform.dom.DOMSource;
 
 import org.opendaylight.controller.md.sal.binding.api.DataChangeListener;
-import org.opendaylight.controller.md.sal.binding.api.MountPoint;
 import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent;
 import org.opendaylight.controller.md.sal.dom.api.DOMMountPoint;
 import org.opendaylight.controller.md.sal.dom.api.DOMNotification;
@@ -53,7 +51,6 @@ import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.common.RpcError.ErrorType;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
@@ -78,6 +75,7 @@ public class NetconfEventSource implements EventSource, DOMNotificationListener,
 
     private static final NodeIdentifier TOPIC_NOTIFICATION_ARG = new NodeIdentifier(TopicNotification.QNAME);
     private static final NodeIdentifier EVENT_SOURCE_ARG = new NodeIdentifier(QName.create(TopicNotification.QNAME, "node-id"));
+    private static final NodeIdentifier TOPIC_ID_ARG = new NodeIdentifier(QName.create(TopicNotification.QNAME, "topic-id"));
     private static final NodeIdentifier PAYLOAD_ARG = new NodeIdentifier(QName.create(TopicNotification.QNAME, "payload"));
 
     private static final NodeIdentifier STREAM_QNAME = new NodeIdentifier(QName.create(CreateSubscriptionInput.QNAME,"stream"));
@@ -88,74 +86,74 @@ public class NetconfEventSource implements EventSource, DOMNotificationListener,
 
     private final DOMMountPoint netconfMount;
     private final DOMNotificationPublishService domPublish;
-    private final Set<String> activeStreams = new ConcurrentSkipListSet<>();
 
     private final Map<String, String> urnPrefixToStreamMap;
-    private final ConcurrentHashMap<TopicId,ListenerRegistration<NetconfEventSource>> listenerRegistrationMap = new ConcurrentHashMap<>();
 
-    public NetconfEventSource(final Node node, final Map<String, String> streamMap, final DOMMountPoint netconfMount, final DOMNotificationPublishService publishService, final MountPoint bindingMount) {
+    private final ConcurrentHashMap<String, StreamNotificationTopicRegistration> streamNotifRegistrationMap = new ConcurrentHashMap<>();
+
+    public NetconfEventSource(final Node node, final Map<String, String> streamMap, final DOMMountPoint netconfMount, final DOMNotificationPublishService publishService) {
         this.netconfMount = netconfMount;
         this.node = node;
         this.nodeId = node.getNodeId().getValue();
         this.urnPrefixToStreamMap = streamMap;
         this.domPublish = publishService;
+        this.initializeStreamNotifRegistrationMap();
         LOG.info("NetconfEventSource [{}] created.", nodeId);
     }
 
+    private void initializeStreamNotifRegistrationMap(){
+        for(String streamName : this.urnPrefixToStreamMap.values()){
+            streamNotifRegistrationMap.put(streamName, new StreamNotificationTopicRegistration(streamName, this.nodeId, this.netconfMount, this));
+        }
+    }
+
     @Override
     public Future<RpcResult<JoinTopicOutput>> joinTopic(final JoinTopicInput input) {
+
         final NotificationPattern notificationPattern = input.getNotificationPattern();
         final List<SchemaPath> matchingNotifications = getMatchingNotifications(notificationPattern);
-        return registerNotificationListener(input.getTopicId(),matchingNotifications);
+        return registerTopic(input.getTopicId(),matchingNotifications);
+
     }
 
-    private synchronized Future<RpcResult<JoinTopicOutput>> registerNotificationListener(final TopicId topicId, final List<SchemaPath> notificationsToSubscribe){
-        if(listenerRegistrationMap.containsKey(topicId)){
-            final String errMessage = "Can not join topic twice. Topic " + topicId.getValue() + " has been joined to node " + this.nodeId;
-            return immediateFuture(RpcResultBuilder.<JoinTopicOutput>failed().withError(ErrorType.APPLICATION, errMessage).build());
-        }
-        ListenerRegistration<NetconfEventSource> registration = null;
-        JoinTopicStatus joinTopicStatus = JoinTopicStatus.Down;
-        final Optional<DOMNotificationService> notifyService = netconfMount.getService(DOMNotificationService.class);
+    private synchronized Future<RpcResult<JoinTopicOutput>> registerTopic(final TopicId topicId, final List<SchemaPath> notificationsToSubscribe){
 
-        if(notifyService.isPresent()) {
-            for (final SchemaPath qName : notificationsToSubscribe) {
-                startSubscription(qName);
+        JoinTopicStatus joinTopicStatus = JoinTopicStatus.Down;
+        if(notificationsToSubscribe != null && notificationsToSubscribe.isEmpty() == false){
+            final Optional<DOMNotificationService> notifyService = netconfMount.getService(DOMNotificationService.class);
+            if(notifyService.isPresent()){
+                int subscribedStreams = 0;
+                for(SchemaPath schemaNotification : notificationsToSubscribe){
+                    final Optional<String> streamName = resolveStream(schemaNotification.getLastComponent());
+                    if(streamName.isPresent()){
+                        LOG.info("Stream {} is activating, TopicId {}", streamName.get(), topicId.getValue() );
+                        StreamNotificationTopicRegistration streamReg = streamNotifRegistrationMap.get(streamName.get());
+                        streamReg.activateStream();
+                        for(SchemaPath notificationPath : notificationsToSubscribe){
+                            LOG.info("Notification listener is registering, Notification {}, TopicId {}", notificationPath, topicId.getValue() );
+                            streamReg.registerNotificationListenerTopic(notificationPath, topicId);
+                        }
+                        subscribedStreams = subscribedStreams + 1;
+                    }
+                }
+                if(subscribedStreams > 0){
+                    joinTopicStatus = JoinTopicStatus.Up;
+                }
             }
-            registration = notifyService.get().registerNotificationListener(this, notificationsToSubscribe);
         }
 
-        if(registration != null){
-            listenerRegistrationMap.put(topicId,registration);
-            joinTopicStatus = JoinTopicStatus.Up;
-        }
         final JoinTopicOutput output = new JoinTopicOutputBuilder().setStatus(joinTopicStatus).build();
         return immediateFuture(RpcResultBuilder.success(output).build());
-    }
 
-    private void startSubscription(final SchemaPath path) {
-        final String streamName = resolveStream(path.getLastComponent());
-        startSubscription(streamName);
     }
 
     private void resubscribeToActiveStreams() {
-        for (final String streamName : activeStreams) {
-            startSubscription(streamName);
-        }
-    }
-
-    private synchronized void startSubscription(final String streamName) {
-        if(streamIsActive(streamName) == false){
-            LOG.info("Stream {} is not active on node {}. Will subscribe.", streamName, nodeId);
-            final ContainerNode input = Builders.containerBuilder().withNodeIdentifier(new NodeIdentifier(CreateSubscriptionInput.QNAME))
-                    .withChild(ImmutableNodes.leafNode(STREAM_QNAME, streamName))
-                    .build();
-            netconfMount.getService(DOMRpcService.class).get().invokeRpc(CREATE_SUBSCRIPTION, input);
-            activeStreams.add(streamName);
+        for (StreamNotificationTopicRegistration streamReg : streamNotifRegistrationMap.values()){
+            streamReg.reActivateStream();
         }
     }
 
-    private String resolveStream(final QName qName) {
+    private Optional<String> resolveStream(final QName qName) {
         String streamName = null;
 
         for (final Map.Entry<String, String> entry : urnPrefixToStreamMap.entrySet()) {
@@ -166,28 +164,35 @@ public class NetconfEventSource implements EventSource, DOMNotificationListener,
                 break;
             }
         }
-
-        return streamName;
-    }
-
-    private boolean streamIsActive(final String streamName) {
-        return activeStreams.contains(streamName);
+        return Optional.fromNullable(streamName);
     }
 
     @Override
     public void onNotification(final DOMNotification notification) {
-        final ContainerNode topicNotification = Builders.containerBuilder()
-                .withNodeIdentifier(TOPIC_NOTIFICATION_ARG)
-                .withChild(ImmutableNodes.leafNode(EVENT_SOURCE_ARG, nodeId))
-                .withChild(encapsulate(notification))
-                .build();
-        try {
-            domPublish.putNotification(new TopicDOMNotification(topicNotification));
-        } catch (final InterruptedException e) {
-            throw Throwables.propagate(e);
+        SchemaPath notificationPath = notification.getType();
+        LOG.info("Notification {} has come.",notification.getType());
+        for(StreamNotificationTopicRegistration streamReg : streamNotifRegistrationMap.values()){
+            for(TopicId topicId : streamReg.getNotificationTopicIds(notificationPath)){
+                publishNotification(notification, topicId);
+                LOG.info("Notification {} has been published for TopicId {}",notification.getType(), topicId.getValue());
+            }
         }
     }
 
+    private void publishNotification(final DOMNotification notification, TopicId topicId){
+         final ContainerNode topicNotification = Builders.containerBuilder()
+                 .withNodeIdentifier(TOPIC_NOTIFICATION_ARG)
+                 .withChild(ImmutableNodes.leafNode(TOPIC_ID_ARG, topicId))
+                 .withChild(ImmutableNodes.leafNode(EVENT_SOURCE_ARG, nodeId))
+                 .withChild(encapsulate(notification))
+                 .build();
+         try {
+             domPublish.putNotification(new TopicDOMNotification(topicNotification));
+         } catch (final InterruptedException e) {
+             throw Throwables.propagate(e);
+         }
+    }
+
     private AnyXmlNode encapsulate(final DOMNotification body) {
         // FIXME: Introduce something like AnyXmlWithNormalizedNodeData in Yangtools
         final Document doc = XmlUtil.newDocument();
@@ -242,13 +247,17 @@ public class NetconfEventSource implements EventSource, DOMNotificationListener,
         final String regex = Util.wildcardToRegex(notificationPattern.getValue());
 
         final Pattern pattern = Pattern.compile(regex);
-        return Util.expandQname(getAvailableNotifications(), pattern);
+        List<SchemaPath> availableNotifications = getAvailableNotifications();
+        if(availableNotifications == null || availableNotifications.isEmpty()){
+            return null;
+        }
+        return Util.expandQname(availableNotifications, pattern);
     }
 
     @Override
     public void close() throws Exception {
-        for(ListenerRegistration<NetconfEventSource> registration : listenerRegistrationMap.values()){
-            registration.close();
+        for(StreamNotificationTopicRegistration streamReg : streamNotifRegistrationMap.values()){
+            streamReg.deactivateStream();
         }
     }
 
@@ -268,4 +277,84 @@ public class NetconfEventSource implements EventSource, DOMNotificationListener,
         return qNs;
     }
 
+    private class StreamNotificationTopicRegistration{
+
+        final private String streamName;
+        final private DOMMountPoint netconfMount;
+        final private String nodeId;
+        final private NetconfEventSource notificationListener;
+        private boolean active;
+
+        private ConcurrentHashMap<SchemaPath, ListenerRegistration<NetconfEventSource>> notificationRegistrationMap = new ConcurrentHashMap<>();
+        private ConcurrentHashMap<SchemaPath, ArrayList<TopicId>> notificationTopicMap = new ConcurrentHashMap<>();
+
+        public StreamNotificationTopicRegistration(final String streamName, final String nodeId, final DOMMountPoint netconfMount, NetconfEventSource notificationListener) {
+            this.streamName = streamName;
+            this.netconfMount = netconfMount;
+            this.nodeId = nodeId;
+            this.notificationListener = notificationListener;
+            this.active = false;
+        }
+
+        public boolean isActive() {
+            return active;
+        }
+
+        public void reActivateStream(){
+            if(this.isActive()){
+                LOG.info("Stream {} is reactivated active on node {}.", this.streamName, this.nodeId);
+                final ContainerNode input = Builders.containerBuilder().withNodeIdentifier(new NodeIdentifier(CreateSubscriptionInput.QNAME))
+                        .withChild(ImmutableNodes.leafNode(STREAM_QNAME, this.streamName))
+                        .build();
+                netconfMount.getService(DOMRpcService.class).get().invokeRpc(CREATE_SUBSCRIPTION, input);
+            }
+        }
+
+        public void activateStream() {
+            if(this.isActive() == false){
+                LOG.info("Stream {} is not active on node {}. Will subscribe.", this.streamName, this.nodeId);
+                final ContainerNode input = Builders.containerBuilder().withNodeIdentifier(new NodeIdentifier(CreateSubscriptionInput.QNAME))
+                        .withChild(ImmutableNodes.leafNode(STREAM_QNAME, this.streamName))
+                        .build();
+                netconfMount.getService(DOMRpcService.class).get().invokeRpc(CREATE_SUBSCRIPTION, input);
+                this.active = true;
+            } else {
+                LOG.info("Stream {} is now active on node {}", this.streamName, this.nodeId);
+            }
+        }
+
+        public void deactivateStream() {
+            for(ListenerRegistration<NetconfEventSource> reg : notificationRegistrationMap.values()){
+                reg.close();
+            }
+            this.active = false;
+        }
+
+        public String getStreamName() {
+            return streamName;
+        }
+
+        public ArrayList<TopicId> getNotificationTopicIds(SchemaPath notificationPath){
+            return notificationTopicMap.get(notificationPath);
+        }
+
+        public void registerNotificationListenerTopic(SchemaPath notificationPath, TopicId topicId){
+            final Optional<DOMNotificationService> notifyService = netconfMount.getService(DOMNotificationService.class);
+            if(notificationPath != null && notifyService.isPresent()){
+                ListenerRegistration<NetconfEventSource> registration = notifyService.get().registerNotificationListener(this.notificationListener,notificationPath);
+                notificationRegistrationMap.put(notificationPath, registration);
+                ArrayList<TopicId> topicIds = getNotificationTopicIds(notificationPath);
+                if(topicIds == null){
+                    topicIds = new ArrayList<>();
+                    topicIds.add(topicId);
+                } else {
+                    if(topicIds.contains(topicId) == false){
+                        topicIds.add(topicId);
+                    }
+                }
+                notificationTopicMap.put(notificationPath, topicIds);
+            }
+        }
+
+    }
 }

diff --git a/opendaylight/md-sal/messagebus-impl/src/main/java/org/opendaylight/controller/messagebus/eventsources/netconf/NetconfEventSourceManager.java b/opendaylight/md-sal/messagebus-impl/src/main/java/org/opendaylight/controller/messagebus/eventsources/netconf/NetconfEventSourceManager.java
index 7605a3eb346de6f35c7c801e0bae819baac6f3de..dd64e7707325527e6d4f8b1e0e99dc993a8f0c7f 100644 (file)
--- a/opendaylight/md-sal/messagebus-impl/src/main/java/org/opendaylight/controller/messagebus/eventsources/netconf/NetconfEventSourceManager.java
+++ b/opendaylight/md-sal/messagebus-impl/src/main/java/org/opendaylight/controller/messagebus/eventsources/netconf/NetconfEventSourceManager.java
@@ -9,16 +9,14 @@
 package org.opendaylight.controller.messagebus.eventsources.netconf;
 
 
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+
 import org.opendaylight.controller.config.yang.messagebus.app.impl.NamespaceToStream;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.DataChangeListener;
-import org.opendaylight.controller.md.sal.binding.api.MountPoint;
 import org.opendaylight.controller.md.sal.binding.api.MountPointService;
 import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope;
 import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent;
@@ -45,9 +43,12 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.base.Optional;
+import com.google.common.base.Preconditions;
+
 public final class NetconfEventSourceManager implements DataChangeListener, AutoCloseable {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(NetconfEventSourceManager.class);
+    private static final Logger LOG = LoggerFactory.getLogger(NetconfEventSourceManager.class);
     private static final TopologyKey NETCONF_TOPOLOGY_KEY = new TopologyKey(new TopologyId(TopologyNetconf.QNAME.getLocalName()));
     private static final InstanceIdentifier<Node> NETCONF_DEVICE_PATH = InstanceIdentifier.create(NetworkTopology.class)
                 .child(Topology.class, NETCONF_TOPOLOGY_KEY)
@@ -106,7 +107,7 @@ public final class NetconfEventSourceManager implements DataChangeListener, Auto
     private void initialize(final DataBroker dataBroker){
         Preconditions.checkNotNull(dataBroker);
         listenerRegistration = dataBroker.registerDataChangeListener(LogicalDatastoreType.OPERATIONAL, NETCONF_DEVICE_PATH, this, DataChangeScope.SUBTREE);
-        LOGGER.info("NetconfEventSourceManager initialized.");
+        LOG.info("NetconfEventSourceManager initialized.");
     }
 
     private Map<String,String> namespaceToStreamMapping(final List<NamespaceToStream> namespaceMapping) {
@@ -122,7 +123,7 @@ public final class NetconfEventSourceManager implements DataChangeListener, Auto
     @Override
     public void onDataChanged(final AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> event) {
 
-        LOGGER.debug("[DataChangeEvent<InstanceIdentifier<?>, DataObject>: {}]", event);
+        LOG.debug("[DataChangeEvent<InstanceIdentifier<?>, DataObject>: {}]", event);
         for (final Map.Entry<InstanceIdentifier<?>, DataObject> changeEntry : event.getCreatedData().entrySet()) {
             if (changeEntry.getValue() instanceof Node) {
                 nodeUpdated(changeEntry.getKey(),(Node) changeEntry.getValue());
@@ -144,11 +145,11 @@ public final class NetconfEventSourceManager implements DataChangeListener, Auto
             throw new IllegalStateException("Node is null");
         }
         if ( isNetconfNode(node) == false ) {
-            LOGGER.debug("OnDataChanged Event. Not a Netconf node.");
+            LOG.debug("OnDataChanged Event. Not a Netconf node.");
             return;
         }
         if ( isEventSource(node) == false ) {
-            LOGGER.debug("OnDataChanged Event. Node an EventSource node.");
+            LOG.debug("OnDataChanged Event. Node an EventSource node.");
             return;
         }
         if(node.getAugmentation(NetconfNode.class).getConnectionStatus() != ConnectionStatus.Connected ) {
@@ -162,13 +163,12 @@ public final class NetconfEventSourceManager implements DataChangeListener, Auto
 
     private void createEventSource(final InstanceIdentifier<?> key, final Node node) {
         final Optional<DOMMountPoint> netconfMount = domMounts.getMountPoint(domMountPath(node.getNodeId()));
-        final Optional<MountPoint> bindingMount = bindingMounts.getMountPoint(key);
-
-        if(netconfMount.isPresent() && bindingMount.isPresent()) {
 
+        if(netconfMount.isPresent()) {
             final NetconfEventSource netconfEventSource =
-                    new NetconfEventSource(node, streamMap, netconfMount.get(), publishService, bindingMount.get());
+                    new NetconfEventSource(node, streamMap, netconfMount.get(), publishService);
             final EventSourceRegistration<NetconfEventSource> registration = eventSourceRegistry.registerEventSource(netconfEventSource);
+            LOG.info("Event source {} has been registered",node.getNodeId().getValue());
             eventSourceRegistration.putIfAbsent(key, registration);
 
         }

diff --git a/opendaylight/md-sal/messagebus-impl/src/test/java/org/opendaylight/controller/messagebus/app/impl/NetconfEventSourceTest.java b/opendaylight/md-sal/messagebus-impl/src/test/java/org/opendaylight/controller/messagebus/app/impl/NetconfEventSourceTest.java
index ed9025780a949ab08ba900613a014e301f047a29..5e1a07062d38596724225bf22b1edf33b084df2d 100644 (file)
--- a/opendaylight/md-sal/messagebus-impl/src/test/java/org/opendaylight/controller/messagebus/app/impl/NetconfEventSourceTest.java
+++ b/opendaylight/md-sal/messagebus-impl/src/test/java/org/opendaylight/controller/messagebus/app/impl/NetconfEventSourceTest.java
@@ -7,12 +7,23 @@
  */
 package org.opendaylight.controller.messagebus.app.impl;
 
-import com.google.common.base.Optional;
-import com.google.common.util.concurrent.CheckedFuture;
+//import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import java.net.URI;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.controller.md.sal.binding.api.BindingService;
-import org.opendaylight.controller.md.sal.binding.api.MountPoint;
 import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent;
 import org.opendaylight.controller.md.sal.dom.api.DOMMountPoint;
 import org.opendaylight.controller.md.sal.dom.api.DOMNotificationPublishService;
@@ -39,21 +50,8 @@ import org.opendaylight.yangtools.yang.model.api.NotificationDefinition;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 
-import java.lang.reflect.Field;
-import java.net.URI;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
+import com.google.common.base.Optional;
+import com.google.common.util.concurrent.CheckedFuture;
 
 public class NetconfEventSourceTest {
 
@@ -67,21 +65,18 @@ public class NetconfEventSourceTest {
         streamMap.put("uriStr1", "string2");
         domMountPointMock = mock(DOMMountPoint.class);
         DOMNotificationPublishService domNotificationPublishServiceMock = mock(DOMNotificationPublishService.class);
-        MountPoint mountPointMock = mock(MountPoint.class);
 
         RpcConsumerRegistry rpcConsumerRegistryMock = mock(RpcConsumerRegistry.class);
         Optional<BindingService> onlyOptionalMock = (Optional<BindingService>) mock(Optional.class);
         NotificationsService notificationsServiceMock = mock(NotificationsService.class);
 
-        doReturn(onlyOptionalMock).when(mountPointMock).getService(RpcConsumerRegistry.class);
-        doReturn(rpcConsumerRegistryMock).when(onlyOptionalMock).get();
         doReturn(notificationsServiceMock).when(rpcConsumerRegistryMock).getRpcService(NotificationsService.class);
         org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node node
                 = mock(org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node.class);
         org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId nodeId
                 = new org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId("NodeId1");
         doReturn(nodeId).when(node).getNodeId();
-        netconfEventSource = new NetconfEventSource(node, streamMap, domMountPointMock, domNotificationPublishServiceMock, mountPointMock);
+        netconfEventSource = new NetconfEventSource(node, streamMap, domMountPointMock, domNotificationPublishServiceMock);
     }
 
     @Test
@@ -99,35 +94,6 @@ public class NetconfEventSourceTest {
         verify(dataObjectMock, times(2)).isConnected();
     }
 
-    @Test
-    public void onDataChangedResubscribeTest() throws Exception{
-
-        InstanceIdentifier brmIdent = InstanceIdentifier.create(Nodes.class)
-                .child(Node.class, new NodeKey(new NodeId("brm"))).augmentation(NetconfNode.class);
-
-        AsyncDataChangeEvent asyncDataChangeEventMock = mock(AsyncDataChangeEvent.class);
-        NetconfNode dataObjectMock = mock(NetconfNode.class);
-        Map<InstanceIdentifier, DataObject> dataChangeMap = new HashMap<>();
-        dataChangeMap.put(brmIdent, dataObjectMock);
-        doReturn(dataChangeMap).when(asyncDataChangeEventMock).getUpdatedData();
-        doReturn(new HashMap<InstanceIdentifier, DataObject>()).when(asyncDataChangeEventMock).getOriginalData();
-        doReturn(true).when(dataObjectMock).isConnected();
-
-        Set<String> localSet = getActiveStreams();
-        localSet.add("activeStream1");
-
-        Optional<DOMService> optionalMock = (Optional<DOMService>) mock(Optional.class);
-        doReturn(optionalMock).when(domMountPointMock).getService(DOMRpcService.class);
-        DOMRpcService domRpcServiceMock = mock(DOMRpcService.class);
-        doReturn(domRpcServiceMock).when(optionalMock).get();
-        CheckedFuture checkedFutureMock = mock(CheckedFuture.class);
-        doReturn(checkedFutureMock).when(domRpcServiceMock).invokeRpc(any(SchemaPath.class), any(ContainerNode.class));
-
-        netconfEventSource.onDataChanged(asyncDataChangeEventMock);
-        verify(dataObjectMock, times(1)).isConnected();
-        assertEquals("Size of set has not been set correctly.", 1, getActiveStreams().size());
-    }
-
     @Test
     public void joinTopicTest() throws Exception{
         joinTopicTestHelper();
@@ -160,8 +126,8 @@ public class NetconfEventSourceTest {
 
         DOMNotificationService domNotificationServiceMock = mock(DOMNotificationService.class);
         doReturn(domNotificationServiceMock).when(domNotificationServiceOptionalMock).get();
-        ListenerRegistration listenerRegistrationMock = mock(ListenerRegistration.class);
-        doReturn(listenerRegistrationMock).when(domNotificationServiceMock).registerNotificationListener(any(NetconfEventSource.class), any(List.class));
+        ListenerRegistration<NetconfEventSource> listenerRegistrationMock = (ListenerRegistration<NetconfEventSource>)mock(ListenerRegistration.class);
+        doReturn(listenerRegistrationMock).when(domNotificationServiceMock).registerNotificationListener(any(NetconfEventSource.class), any(SchemaPath.class));
 
         Optional<DOMService> optionalMock = (Optional<DOMService>) mock(Optional.class);
         doReturn(optionalMock).when(domMountPointMock).getService(DOMRpcService.class);
@@ -171,12 +137,4 @@ public class NetconfEventSourceTest {
         doReturn(checkedFutureMock).when(domRpcServiceMock).invokeRpc(any(SchemaPath.class), any(ContainerNode.class));
     }
 
-//TODO: create Test for NetConfEventSource#onNotification
-
-    private Set getActiveStreams() throws Exception{
-        Field nesField = NetconfEventSource.class.getDeclaredField("activeStreams");
-        nesField.setAccessible(true);
-        return (Set) nesField.get(netconfEventSource);
-    }
-
 }
\ No newline at end of file

diff --git a/opendaylight/md-sal/messagebus-impl/src/test/java/org/opendaylight/controller/messagebus/app/impl/UtilTest.java b/opendaylight/md-sal/messagebus-impl/src/test/java/org/opendaylight/controller/messagebus/app/impl/UtilTest.java
index a88c609a263317deb9ed4906893150f52390a219..7aebb8fbdd6ac14919c9b1c8d6d5ec8327559f5c 100644 (file)
--- a/opendaylight/md-sal/messagebus-impl/src/test/java/org/opendaylight/controller/messagebus/app/impl/UtilTest.java
+++ b/opendaylight/md-sal/messagebus-impl/src/test/java/org/opendaylight/controller/messagebus/app/impl/UtilTest.java
@@ -25,30 +25,6 @@ import org.opendaylight.yangtools.yang.model.api.SchemaPath;
  */
 public class UtilTest {
 
-    @Test
-    public void testWildcardToRegex() throws Exception {
-        // empty wildcard string
-        createAndAssertRegex("", "^$");
-
-        // wildcard string is a char to be replaced
-        createAndAssertRegex("*", "^.*$");
-        createAndAssertRegex("?", "^.$");
-        final String relevantChars = "()[]$^.{}|\\";
-        for (final char c : relevantChars.toCharArray()) {
-            final char oneChar[] = {c};
-            final String wildcardStr = new String(oneChar);
-            final String expectedRegex = "^\\" + c + "$";
-            createAndAssertRegex(wildcardStr, expectedRegex);
-        }
-
-        // wildcard string consists of more chars
-        createAndAssertRegex("a", "^a$");
-        createAndAssertRegex("aBc", "^aBc$");
-        createAndAssertRegex("a1b2C34", "^a1b2C34$");
-        createAndAssertRegex("*?()[]$^.{}|\\X", "^.*.\\(\\)\\[\\]\\$\\^\\.\\{\\}\\|\\\\X$");
-        createAndAssertRegex("a*BB?37|42$", "^a.*BB.37\\|42\\$$");
-    }
-
     @Test
     public void testResultFor() throws Exception {
         {
@@ -105,10 +81,6 @@ public class UtilTest {
         }
     }
 
-    private static void createAndAssertRegex(final String wildcardStr, final String expectedRegex) {
-        assertEquals("Incorrect regex string.", expectedRegex, Util.wildcardToRegex(wildcardStr));
-    }
-
     private static List<SchemaPath> createSchemaPathList() {
         final QName qname1 = QName.create("urn:odl:xxx", "2015-01-01", "localName");
         final QName qname2 = QName.create("urn:odl:yyy", "2015-01-01", "localName");

diff --git a/opendaylight/md-sal/messagebus-spi/pom.xml b/opendaylight/md-sal/messagebus-spi/pom.xml
index f31b37f6ed5f28bc452d57d78acad4cd687d946b..c63c627e0c496cd09bb81781a85cd77e43795d40 100644 (file)
--- a/opendaylight/md-sal/messagebus-spi/pom.xml
+++ b/opendaylight/md-sal/messagebus-spi/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>messagebus-spi</artifactId>

diff --git a/opendaylight/md-sal/model/model-inventory/pom.xml b/opendaylight/md-sal/model/model-inventory/pom.xml
index 00aa7761b9dfa6c10cc74ee501f66211935c94fc..7043ed0523657107005b93cea86b3c14391fc6a0 100644 (file)
--- a/opendaylight/md-sal/model/model-inventory/pom.xml
+++ b/opendaylight/md-sal/model/model-inventory/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.opendaylight.controller.model</groupId>
     <artifactId>model-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>model-inventory</artifactId>
   <packaging>bundle</packaging>

diff --git a/opendaylight/md-sal/model/model-topology/pom.xml b/opendaylight/md-sal/model/model-topology/pom.xml
index 09a063e88701c664e140ae3536b53e4cbc8e1a87..4fd0dd43bc0b9b86fc51a7b2125da0c62a5bc7c6 100644 (file)
--- a/opendaylight/md-sal/model/model-topology/pom.xml
+++ b/opendaylight/md-sal/model/model-topology/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.opendaylight.controller.model</groupId>
     <artifactId>model-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>model-topology</artifactId>
   <packaging>bundle</packaging>

diff --git a/opendaylight/md-sal/model/pom.xml b/opendaylight/md-sal/model/pom.xml
index ffedadc770e091e4a4ce2f29591c30d4ce624124..cc6d15a713cf37d497390147298644ff5c93557c 100644 (file)
--- a/opendaylight/md-sal/model/pom.xml
+++ b/opendaylight/md-sal/model/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <groupId>org.opendaylight.controller.model</groupId>
   <artifactId>model-parent</artifactId>

diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml
index bf0a08236244e069425327ac81ca66c200e71273..4610c4f59fd640fc4f11ade01f79d7b6a707b212 100644 (file)
--- a/opendaylight/md-sal/pom.xml
+++ b/opendaylight/md-sal/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>sal-parent</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
+  <version>1.3.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <modules>

diff --git a/opendaylight/md-sal/sal-akka-raft-example/pom.xml b/opendaylight/md-sal/sal-akka-raft-example/pom.xml
index 46fae5533e3eb73fd7dfe64bf77b242c78d04d77..8eb798b3c7d632d2c1ffb179fe5042f11c5cd029 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft-example/pom.xml
+++ b/opendaylight/md-sal/sal-akka-raft-example/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>sal-akka-raft-example</artifactId>
   <packaging>bundle</packaging>

diff --git a/opendaylight/md-sal/sal-akka-raft-example/src/main/java/opendaylight/controller/cluster/example/ClientActor.java b/opendaylight/md-sal/sal-akka-raft-example/src/main/java/org/opendaylight/controller/cluster/example/ClientActor.java
similarity index 100%
rename from opendaylight/md-sal/sal-akka-raft-example/src/main/java/opendaylight/controller/cluster/example/ClientActor.java
rename to opendaylight/md-sal/sal-akka-raft-example/src/main/java/org/opendaylight/controller/cluster/example/ClientActor.java

diff --git a/opendaylight/md-sal/sal-akka-raft-example/src/main/java/opendaylight/controller/cluster/example/ExampleActor.java b/opendaylight/md-sal/sal-akka-raft-example/src/main/java/org/opendaylight/controller/cluster/example/ExampleActor.java
similarity index 100%
rename from opendaylight/md-sal/sal-akka-raft-example/src/main/java/opendaylight/controller/cluster/example/ExampleActor.java
rename to opendaylight/md-sal/sal-akka-raft-example/src/main/java/org/opendaylight/controller/cluster/example/ExampleActor.java

diff --git a/opendaylight/md-sal/sal-akka-raft-example/src/main/java/opendaylight/controller/cluster/example/ExampleConfigParamsImpl.java b/opendaylight/md-sal/sal-akka-raft-example/src/main/java/org/opendaylight/controller/cluster/example/ExampleConfigParamsImpl.java
similarity index 100%
rename from opendaylight/md-sal/sal-akka-raft-example/src/main/java/opendaylight/controller/cluster/example/ExampleConfigParamsImpl.java
rename to opendaylight/md-sal/sal-akka-raft-example/src/main/java/org/opendaylight/controller/cluster/example/ExampleConfigParamsImpl.java

diff --git a/opendaylight/md-sal/sal-akka-raft-example/src/main/java/opendaylight/controller/cluster/example/ExampleRoleChangeListener.java b/opendaylight/md-sal/sal-akka-raft-example/src/main/java/org/opendaylight/controller/cluster/example/ExampleRoleChangeListener.java
similarity index 100%
rename from opendaylight/md-sal/sal-akka-raft-example/src/main/java/opendaylight/controller/cluster/example/ExampleRoleChangeListener.java
rename to opendaylight/md-sal/sal-akka-raft-example/src/main/java/org/opendaylight/controller/cluster/example/ExampleRoleChangeListener.java

diff --git a/opendaylight/md-sal/sal-akka-raft-example/src/main/java/opendaylight/controller/cluster/example/LogGenerator.java b/opendaylight/md-sal/sal-akka-raft-example/src/main/java/org/opendaylight/controller/cluster/example/LogGenerator.java
similarity index 100%
rename from opendaylight/md-sal/sal-akka-raft-example/src/main/java/opendaylight/controller/cluster/example/LogGenerator.java
rename to opendaylight/md-sal/sal-akka-raft-example/src/main/java/org/opendaylight/controller/cluster/example/LogGenerator.java

diff --git a/opendaylight/md-sal/sal-akka-raft-example/src/main/java/opendaylight/controller/cluster/example/Main.java b/opendaylight/md-sal/sal-akka-raft-example/src/main/java/org/opendaylight/controller/cluster/example/Main.java
similarity index 100%
rename from opendaylight/md-sal/sal-akka-raft-example/src/main/java/opendaylight/controller/cluster/example/Main.java
rename to opendaylight/md-sal/sal-akka-raft-example/src/main/java/org/opendaylight/controller/cluster/example/Main.java

diff --git a/opendaylight/md-sal/sal-akka-raft-example/src/main/java/opendaylight/controller/cluster/example/TestDriver.java b/opendaylight/md-sal/sal-akka-raft-example/src/main/java/org/opendaylight/controller/cluster/example/TestDriver.java
similarity index 100%
rename from opendaylight/md-sal/sal-akka-raft-example/src/main/java/opendaylight/controller/cluster/example/TestDriver.java
rename to opendaylight/md-sal/sal-akka-raft-example/src/main/java/org/opendaylight/controller/cluster/example/TestDriver.java

diff --git a/opendaylight/md-sal/sal-akka-raft-example/src/main/java/opendaylight/controller/cluster/example/messages/KeyValue.java b/opendaylight/md-sal/sal-akka-raft-example/src/main/java/org/opendaylight/controller/cluster/example/messages/KeyValue.java
similarity index 100%
rename from opendaylight/md-sal/sal-akka-raft-example/src/main/java/opendaylight/controller/cluster/example/messages/KeyValue.java
rename to opendaylight/md-sal/sal-akka-raft-example/src/main/java/org/opendaylight/controller/cluster/example/messages/KeyValue.java

diff --git a/opendaylight/md-sal/sal-akka-raft-example/src/main/java/opendaylight/controller/cluster/example/messages/KeyValueSaved.java b/opendaylight/md-sal/sal-akka-raft-example/src/main/java/org/opendaylight/controller/cluster/example/messages/KeyValueSaved.java
similarity index 100%
rename from opendaylight/md-sal/sal-akka-raft-example/src/main/java/opendaylight/controller/cluster/example/messages/KeyValueSaved.java
rename to opendaylight/md-sal/sal-akka-raft-example/src/main/java/org/opendaylight/controller/cluster/example/messages/KeyValueSaved.java

diff --git a/opendaylight/md-sal/sal-akka-raft-example/src/main/java/opendaylight/controller/cluster/example/messages/PrintRole.java b/opendaylight/md-sal/sal-akka-raft-example/src/main/java/org/opendaylight/controller/cluster/example/messages/PrintRole.java
similarity index 100%
rename from opendaylight/md-sal/sal-akka-raft-example/src/main/java/opendaylight/controller/cluster/example/messages/PrintRole.java
rename to opendaylight/md-sal/sal-akka-raft-example/src/main/java/org/opendaylight/controller/cluster/example/messages/PrintRole.java

diff --git a/opendaylight/md-sal/sal-akka-raft-example/src/main/java/opendaylight/controller/cluster/example/messages/PrintState.java b/opendaylight/md-sal/sal-akka-raft-example/src/main/java/org/opendaylight/controller/cluster/example/messages/PrintState.java
similarity index 100%
rename from opendaylight/md-sal/sal-akka-raft-example/src/main/java/opendaylight/controller/cluster/example/messages/PrintState.java
rename to opendaylight/md-sal/sal-akka-raft-example/src/main/java/org/opendaylight/controller/cluster/example/messages/PrintState.java

diff --git a/opendaylight/md-sal/sal-akka-raft-example/src/main/java/opendaylight/controller/cluster/example/messages/RegisterListener.java b/opendaylight/md-sal/sal-akka-raft-example/src/main/java/org/opendaylight/controller/cluster/example/messages/RegisterListener.java
similarity index 100%
rename from opendaylight/md-sal/sal-akka-raft-example/src/main/java/opendaylight/controller/cluster/example/messages/RegisterListener.java
rename to opendaylight/md-sal/sal-akka-raft-example/src/main/java/org/opendaylight/controller/cluster/example/messages/RegisterListener.java

diff --git a/opendaylight/md-sal/sal-akka-raft-example/src/main/java/opendaylight/controller/cluster/example/messages/SetNotifiers.java b/opendaylight/md-sal/sal-akka-raft-example/src/main/java/org/opendaylight/controller/cluster/example/messages/SetNotifiers.java
similarity index 100%
rename from opendaylight/md-sal/sal-akka-raft-example/src/main/java/opendaylight/controller/cluster/example/messages/SetNotifiers.java
rename to opendaylight/md-sal/sal-akka-raft-example/src/main/java/org/opendaylight/controller/cluster/example/messages/SetNotifiers.java

diff --git a/opendaylight/md-sal/sal-akka-raft/pom.xml b/opendaylight/md-sal/sal-akka-raft/pom.xml
index 0ec83c86b35071d5de765336c4c45b7c22140939..768bdbc9e0c6654e5faccabd6bccd6e88dc75f89 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft/pom.xml
+++ b/opendaylight/md-sal/sal-akka-raft/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>sal-akka-raft</artifactId>
   <packaging>bundle</packaging>

diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/AbstractRaftActorIntegrationTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/AbstractRaftActorIntegrationTest.java
index 977cf0ef5eb60fc905ef7ce35177b46d23ed265b..579dea26387059f30d7bbc0f0064d91f195006ad 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/AbstractRaftActorIntegrationTest.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/AbstractRaftActorIntegrationTest.java
@@ -9,6 +9,7 @@ package org.opendaylight.controller.cluster.raft;
 
 import static org.junit.Assert.assertEquals;
 import akka.actor.ActorRef;
+import akka.actor.InvalidActorNameException;
 import akka.actor.PoisonPill;
 import akka.actor.Props;
 import akka.actor.Terminated;
@@ -19,6 +20,7 @@ import com.google.common.base.Optional;
 import com.google.common.base.Predicate;
 import com.google.common.base.Supplier;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.util.concurrent.Uninterruptibles;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -186,9 +188,20 @@ public abstract class AbstractRaftActorIntegrationTest extends AbstractActorTest
         TestActorRef<MessageCollectorActor> collectorActor = factory.createTestActor(
                 MessageCollectorActor.props().withDispatcher(Dispatchers.DefaultDispatcherId()),
                         factory.generateActorId(id + "-collector"));
-        return factory.createTestActor(TestRaftActor.props(id,
-                peerAddresses != null ? peerAddresses : Collections.<String, String>emptyMap(),
-                        configParams, collectorActor), id);
+
+        InvalidActorNameException lastEx = null;
+        for(int i = 0; i < 10; i++) {
+            try {
+                return factory.createTestActor(TestRaftActor.props(id,
+                        peerAddresses != null ? peerAddresses : Collections.<String, String>emptyMap(),
+                                configParams, collectorActor), id);
+            } catch (InvalidActorNameException e) {
+                lastEx = e;
+                Uninterruptibles.sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
+            }
+        }
+
+        throw lastEx;
     }
 
     protected void killActor(TestActorRef<TestRaftActor> leaderActor) {

diff --git a/opendaylight/md-sal/sal-binding-api/pom.xml b/opendaylight/md-sal/sal-binding-api/pom.xml
index 690957ed0ba4d2db27ca27aff18749a2c22eafe0..dd1de8c146f9b01f67abada674bf91d201ea04f0 100644 (file)
--- a/opendaylight/md-sal/sal-binding-api/pom.xml
+++ b/opendaylight/md-sal/sal-binding-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>sal-binding-api</artifactId>
   <packaging>bundle</packaging>

diff --git a/opendaylight/md-sal/sal-binding-broker/pom.xml b/opendaylight/md-sal/sal-binding-broker/pom.xml
index b392eb240292351280ef2de81781d815835dc53e..eebd7b13f8527aee0a80c284b9bd56585f295268 100644 (file)
--- a/opendaylight/md-sal/sal-binding-broker/pom.xml
+++ b/opendaylight/md-sal/sal-binding-broker/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>sal-binding-broker-impl</artifactId>
   <packaging>bundle</packaging>

diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/NotificationInvoker.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/NotificationInvoker.java
index 08a147721f71ccad7569a7e61fce07cdc0bad17e..cdc6315e4930c7433f11e3fe8de3e3c7efea100a 100644 (file)
--- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/NotificationInvoker.java
+++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/NotificationInvoker.java
@@ -8,6 +8,7 @@
 package org.opendaylight.controller.md.sal.binding.compat;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.common.reflect.TypeToken;
 import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -28,7 +29,8 @@ final class NotificationInvoker implements org.opendaylight.controller.sal.bindi
     private NotificationInvoker(final NotificationListener listener) {
         delegate = listener;
         final Map<Class<? extends Notification>, InvokerContext> builder = new HashMap<>();
-        for(final Class<?> iface : listener.getClass().getInterfaces()) {
+        for(final TypeToken<?> ifaceToken : TypeToken.of(listener.getClass()).getTypes().interfaces()) {
+            Class<?> iface = ifaceToken.getRawType();
             if(NotificationListener.class.isAssignableFrom(iface) && BindingReflections.isBindingClass(iface)) {
                 @SuppressWarnings("unchecked")
                 final Class<? extends NotificationListener> listenerType = (Class<? extends NotificationListener>) iface;

diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMNotificationListenerAdapter.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMNotificationListenerAdapter.java
index 86822274efb2d6dfa9965e9e7b33863bec141164..cd3220e755306d2e379bfff647e38c2dcd34f042 100644 (file)
--- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMNotificationListenerAdapter.java
+++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMNotificationListenerAdapter.java
@@ -8,6 +8,7 @@
 package org.opendaylight.controller.md.sal.binding.impl;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.common.reflect.TypeToken;
 import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -60,7 +61,8 @@ class BindingDOMNotificationListenerAdapter implements DOMNotificationListener {
 
     public static Map<SchemaPath, NotificationListenerInvoker> createInvokerMapFor(final Class<? extends NotificationListener> implClz) {
         final Map<SchemaPath, NotificationListenerInvoker> builder = new HashMap<>();
-        for(final Class<?> iface : implClz.getInterfaces()) {
+        for(final TypeToken<?> ifaceToken : TypeToken.of(implClz).getTypes().interfaces()) {
+            Class<?> iface = ifaceToken.getRawType();
             if(NotificationListener.class.isAssignableFrom(iface) && BindingReflections.isBindingClass(iface)) {
                 @SuppressWarnings("unchecked")
                 final Class<? extends NotificationListener> listenerType = (Class<? extends NotificationListener>) iface;

diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/BackwardsCompatibleNotificationBrokerTest.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/BackwardsCompatibleNotificationBrokerTest.java
index 6a8dc5fde960400ea07aa68e44b0a23375d6df30..f43352d1018e3345dbbd7188d5fb4947b7bb630a 100644 (file)
--- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/BackwardsCompatibleNotificationBrokerTest.java
+++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/BackwardsCompatibleNotificationBrokerTest.java
@@ -10,6 +10,7 @@ package org.opendaylight.controller.md.sal.binding.impl.test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+import java.util.concurrent.TimeUnit;
 import org.opendaylight.controller.md.sal.binding.compat.HeliumNotificationProviderServiceAdapter;
 
 import com.google.common.collect.ImmutableList;
@@ -52,17 +53,23 @@ public class BackwardsCompatibleNotificationBrokerTest extends AbstractNotificat
         final CountDownLatch latch = new CountDownLatch(1);
         final TwoLevelListChanged testData = createTestData();
 
-        final NotifTestListener testNotifListener = new NotifTestListener(latch);
+        final NotifTestListenerChild testNotifListener = new NotifTestListenerChild(latch);
         final ListenerRegistration<NotificationListener> listenerRegistration =
                 notificationProviderService.registerNotificationListener(testNotifListener);
         notificationProviderService.publish(testData);
 
-        latch.await();
+        latch.await(500L, TimeUnit.MILLISECONDS);
         assertTrue(testNotifListener.getReceivedNotifications().size() == 1);
         assertEquals(testData, testNotifListener.getReceivedNotifications().get(0));
         listenerRegistration.close();
     }
 
+    private static class NotifTestListenerChild extends  NotifTestListener {
+
+        public NotifTestListenerChild(final CountDownLatch latch) {
+            super(latch);
+        }
+    }
     private static class NotifTestListener implements OpendaylightMdsalListTestListener {
         private List<TwoLevelListChanged> receivedNotifications = new ArrayList<>();
         private CountDownLatch latch;

diff --git a/opendaylight/md-sal/sal-binding-config/pom.xml b/opendaylight/md-sal/sal-binding-config/pom.xml
index 39aece42334aa2b431ef00e5ed686c1678083aba..d28faaeaf20283cb479054ea36dc6c5fbfd8a7c2 100644 (file)
--- a/opendaylight/md-sal/sal-binding-config/pom.xml
+++ b/opendaylight/md-sal/sal-binding-config/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>sal-binding-config</artifactId>
   <packaging>bundle</packaging>

diff --git a/opendaylight/md-sal/sal-binding-dom-it/pom.xml b/opendaylight/md-sal/sal-binding-dom-it/pom.xml
index d6a5e498b658a64356950c0f1de5238d018970a2..f7b03eadfd96da77134f70aec13aaf3d9800b8d8 100644 (file)
--- a/opendaylight/md-sal/sal-binding-dom-it/pom.xml
+++ b/opendaylight/md-sal/sal-binding-dom-it/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>sal-binding-dom-it</artifactId>
   <packaging>jar</packaging>

diff --git a/opendaylight/md-sal/sal-binding-it/pom.xml b/opendaylight/md-sal/sal-binding-it/pom.xml
index 7c6710fdbb74d19d397be079e9a9621674d5ab0e..31bcbfd0080eaba84eb1553c9580af8e6749f9a0 100644 (file)
--- a/opendaylight/md-sal/sal-binding-it/pom.xml
+++ b/opendaylight/md-sal/sal-binding-it/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>sal-binding-it</artifactId>
 

diff --git a/opendaylight/md-sal/sal-binding-util/pom.xml b/opendaylight/md-sal/sal-binding-util/pom.xml
index efe2e845072310ac52c0e818ef2d44d7c66cd3d4..efa17a10a8ecdf6e759ca5659641af4acf7f566f 100644 (file)
--- a/opendaylight/md-sal/sal-binding-util/pom.xml
+++ b/opendaylight/md-sal/sal-binding-util/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>sal-binding-util</artifactId>
   <packaging>bundle</packaging>

diff --git a/opendaylight/md-sal/sal-clustering-commons/pom.xml b/opendaylight/md-sal/sal-clustering-commons/pom.xml
index 35fa535da63b15d8ddd01be0f0ca9b91ea590918..6c6dd9d3622d3a23f1e61122e046dbb1e3bbbe2b 100644 (file)
--- a/opendaylight/md-sal/sal-clustering-commons/pom.xml
+++ b/opendaylight/md-sal/sal-clustering-commons/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>sal-clustering-commons</artifactId>

diff --git a/opendaylight/md-sal/sal-clustering-config/pom.xml b/opendaylight/md-sal/sal-clustering-config/pom.xml
index 57da717daf82b46bac1185f6ad537f3288034792..29d8ae41dfb6cea6eff73636b1ed2dfdad2857b7 100644 (file)
--- a/opendaylight/md-sal/sal-clustering-config/pom.xml
+++ b/opendaylight/md-sal/sal-clustering-config/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>sal-clustering-config</artifactId>
   <description>Configuration files for md-sal clustering</description>

diff --git a/opendaylight/md-sal/sal-common-api/pom.xml b/opendaylight/md-sal/sal-common-api/pom.xml
index 6af20c0fb886c74c2a03755a4489c1e157e3c43c..bd3df42c3821d4836e7312312124cd80cf8eb203 100644 (file)
--- a/opendaylight/md-sal/sal-common-api/pom.xml
+++ b/opendaylight/md-sal/sal-common-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>sal-common-api</artifactId>

diff --git a/opendaylight/md-sal/sal-common-impl/pom.xml b/opendaylight/md-sal/sal-common-impl/pom.xml
index 542a1f390522a23080fc157e291a81e4854c3613..56392dd922f69b6738a8d8d661f86c4151be6d27 100644 (file)
--- a/opendaylight/md-sal/sal-common-impl/pom.xml
+++ b/opendaylight/md-sal/sal-common-impl/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>sal-common-impl</artifactId>
   <packaging>bundle</packaging>

diff --git a/opendaylight/md-sal/sal-common-util/pom.xml b/opendaylight/md-sal/sal-common-util/pom.xml
index b285c991e5b53b254e007bf1d39fcb01efaffd6a..da0b47025a64864607e92e46bd6d560e2f30c8d0 100644 (file)
--- a/opendaylight/md-sal/sal-common-util/pom.xml
+++ b/opendaylight/md-sal/sal-common-util/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>sal-common-util</artifactId>
 

diff --git a/opendaylight/md-sal/sal-common/pom.xml b/opendaylight/md-sal/sal-common/pom.xml
index e5450b24871cf719aee6a1b56912f763d6ad6986..119ae52a6353a650a84dc0607871dadefa927086 100644 (file)
--- a/opendaylight/md-sal/sal-common/pom.xml
+++ b/opendaylight/md-sal/sal-common/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>sal-common</artifactId>
 

diff --git a/opendaylight/md-sal/sal-connector-api/pom.xml b/opendaylight/md-sal/sal-connector-api/pom.xml
index e45e24dd567038c8401876676a5945d6c19aff63..4a6d74e9ebb3d2da33c47af62d61d8e962b10bb9 100644 (file)
--- a/opendaylight/md-sal/sal-connector-api/pom.xml
+++ b/opendaylight/md-sal/sal-connector-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>sal-connector-api</artifactId>
 

diff --git a/opendaylight/md-sal/sal-distributed-datastore/pom.xml b/opendaylight/md-sal/sal-distributed-datastore/pom.xml
index 27788fc2eee0a09c1e56af2e788bd0be07aff319..91526eb3cd3a99f0c5eea8450b51123cd5112c8c 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/pom.xml
+++ b/opendaylight/md-sal/sal-distributed-datastore/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>sal-distributed-datastore</artifactId>
   <packaging>bundle</packaging>

diff --git a/opendaylight/md-sal/sal-dom-api/pom.xml b/opendaylight/md-sal/sal-dom-api/pom.xml
index 89fca50354a04f44983b2e5e8126209a3aae4a34..ef3b7929752e458a9de8f9f00da032d8c8405736 100644 (file)
--- a/opendaylight/md-sal/sal-dom-api/pom.xml
+++ b/opendaylight/md-sal/sal-dom-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>sal-core-api</artifactId>
   <packaging>bundle</packaging>

diff --git a/opendaylight/md-sal/sal-dom-broker/pom.xml b/opendaylight/md-sal/sal-dom-broker/pom.xml
index 477ddeabdf0ce6ee076335a001462f486b317fd6..2dafbe8c67c38374e456cd1546b0b03a4721b5f1 100644 (file)
--- a/opendaylight/md-sal/sal-dom-broker/pom.xml
+++ b/opendaylight/md-sal/sal-dom-broker/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>sal-broker-impl</artifactId>
   <packaging>bundle</packaging>

diff --git a/opendaylight/md-sal/sal-dom-spi/pom.xml b/opendaylight/md-sal/sal-dom-spi/pom.xml
index 6cc721e68ddc5f58f172a096fd4336b27504273b..2bb4a99b90633c7a7dfc4281dfe610450b769fdd 100644 (file)
--- a/opendaylight/md-sal/sal-dom-spi/pom.xml
+++ b/opendaylight/md-sal/sal-dom-spi/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>sal-core-spi</artifactId>
   <packaging>bundle</packaging>

diff --git a/opendaylight/md-sal/sal-dom-xsql-config/pom.xml b/opendaylight/md-sal/sal-dom-xsql-config/pom.xml
index d2d864cd4f932146a9af95fb5e7c7afb75f18a2e..3f22aced20b90a149fbf2630cbcbf841588e4e9e 100644 (file)
--- a/opendaylight/md-sal/sal-dom-xsql-config/pom.xml
+++ b/opendaylight/md-sal/sal-dom-xsql-config/pom.xml
@@ -12,7 +12,7 @@
   <parent>\r
     <artifactId>sal-parent</artifactId>\r
     <groupId>org.opendaylight.controller</groupId>\r
-    <version>1.2.0-SNAPSHOT</version>\r
+    <version>1.3.0-SNAPSHOT</version>\r
   </parent>\r
   <artifactId>sal-dom-xsql-config</artifactId>\r
   <description>Configuration files for md-sal</description>\r

diff --git a/opendaylight/md-sal/sal-dom-xsql/pom.xml b/opendaylight/md-sal/sal-dom-xsql/pom.xml
index f0e27cf2ac928642a40b0eb37a9d250d77bef4b5..1543cd99ac429fdfccf88df001557f3dbd70d15e 100644 (file)
--- a/opendaylight/md-sal/sal-dom-xsql/pom.xml
+++ b/opendaylight/md-sal/sal-dom-xsql/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>sal-dom-xsql</artifactId>
   <packaging>bundle</packaging>

diff --git a/opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml b/opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml
index 4a17273232eba234537ed1430733afab5dd08567..01de2b6f2a9e45835bb49b96bd854b8cdb8065ec 100644 (file)
--- a/opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml
+++ b/opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>sal-dummy-distributed-datastore</artifactId>
   <packaging>bundle</packaging>

diff --git a/opendaylight/md-sal/sal-inmemory-datastore/pom.xml b/opendaylight/md-sal/sal-inmemory-datastore/pom.xml
index 473b065b597707a04305d4430e01e4c5fa579def..a19cbb7eeb6acc830606bc95d83dafd25128a490 100644 (file)
--- a/opendaylight/md-sal/sal-inmemory-datastore/pom.xml
+++ b/opendaylight/md-sal/sal-inmemory-datastore/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>sal-inmemory-datastore</artifactId>

diff --git a/opendaylight/md-sal/sal-karaf-xsql/pom.xml b/opendaylight/md-sal/sal-karaf-xsql/pom.xml
index 14a87a23f78e303a7e6824607310b623ca5762b5..f06e8449c4fbfd05a5e7a6ef9ce289eb4816384d 100644 (file)
--- a/opendaylight/md-sal/sal-karaf-xsql/pom.xml
+++ b/opendaylight/md-sal/sal-karaf-xsql/pom.xml
@@ -23,7 +23,7 @@
     <parent>\r
     <artifactId>sal-parent</artifactId>\r
     <groupId>org.opendaylight.controller</groupId>\r
-    <version>1.2.0-SNAPSHOT</version>\r
+    <version>1.3.0-SNAPSHOT</version>\r
   </parent>\r
 \r
     <groupId>org.opendaylight.controller</groupId>\r
@@ -63,7 +63,7 @@
         <dependency>\r
             <groupId>org.opendaylight.controller</groupId>\r
             <artifactId>sal-dom-xsql</artifactId>\r
-            <version>1.2.0-SNAPSHOT</version>\r
+            <version>1.3.0-SNAPSHOT</version>\r
         </dependency>\r
     </dependencies>\r
 \r

diff --git a/opendaylight/md-sal/sal-netconf-connector/pom.xml b/opendaylight/md-sal/sal-netconf-connector/pom.xml
index 40cf5a39557fd84d94c9cef376685582b87885a9..fd4d38a1111a871cbc33cc005d2ad2bd95528bdf 100644 (file)
--- a/opendaylight/md-sal/sal-netconf-connector/pom.xml
+++ b/opendaylight/md-sal/sal-netconf-connector/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>sal-netconf-connector</artifactId>

diff --git a/opendaylight/md-sal/sal-remote/pom.xml b/opendaylight/md-sal/sal-remote/pom.xml
index d47cf4ca07609a903bfeb0812fdf9a4283199c22..eb4b34ee39bcd7d31a33105197cea6fbc62cbf37 100644 (file)
--- a/opendaylight/md-sal/sal-remote/pom.xml
+++ b/opendaylight/md-sal/sal-remote/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>sal-remote</artifactId>
   <packaging>bundle</packaging>

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/pom.xml b/opendaylight/md-sal/sal-remoterpc-connector/pom.xml
index ec5bb215bf991936c2f666c827d0292f048e0c80..c41cd7c7f744126ba16bd6b7c2807252fd50bbe0 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/pom.xml
+++ b/opendaylight/md-sal/sal-remoterpc-connector/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>sal-remoterpc-connector</artifactId>
   <packaging>bundle</packaging>

diff --git a/opendaylight/md-sal/sal-rest-connector-config/pom.xml b/opendaylight/md-sal/sal-rest-connector-config/pom.xml
index dc3dd8e476eb5b632da3d059e3ca5ca4b5ab60e4..7be6cecc8c928aa7dd0edf0378fd9f48146cd391 100644 (file)
--- a/opendaylight/md-sal/sal-rest-connector-config/pom.xml
+++ b/opendaylight/md-sal/sal-rest-connector-config/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>sal-rest-connector-config</artifactId>
   <description>Configuration files for sal-rest-connector</description>

diff --git a/opendaylight/md-sal/sal-rest-connector/pom.xml b/opendaylight/md-sal/sal-rest-connector/pom.xml
index 3fcecfd9296c91d4731506570ddb643738332ab0..4e50fdf99c0a5476df6f6f973ce609e351d36668 100644 (file)
--- a/opendaylight/md-sal/sal-rest-connector/pom.xml
+++ b/opendaylight/md-sal/sal-rest-connector/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>sal-rest-connector</artifactId>
   <packaging>bundle</packaging>
@@ -99,7 +99,7 @@
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-model-export</artifactId>
       <!-- FIXME: remove explicit version, once model export package is part of yangtools-artefacts -->
-      <version>0.7.0-SNAPSHOT</version>
+      <version>0.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>

diff --git a/opendaylight/md-sal/sal-rest-docgen-maven/pom.xml b/opendaylight/md-sal/sal-rest-docgen-maven/pom.xml
index f5595727682878e2b583ca3d3137df455700f62e..c7d0f69fb91d19ea37731a2d702bd5645295b874 100644 (file)
--- a/opendaylight/md-sal/sal-rest-docgen-maven/pom.xml
+++ b/opendaylight/md-sal/sal-rest-docgen-maven/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>sal-parent</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sal-rest-docgen-maven</artifactId>

diff --git a/opendaylight/md-sal/sal-rest-docgen/pom.xml b/opendaylight/md-sal/sal-rest-docgen/pom.xml
index 22a128c1b7d5dd06fe1e444051057e69d5888aca..4e371a5b42d7b9152eded93b5a8dd19f0b2ed15a 100644 (file)
--- a/opendaylight/md-sal/sal-rest-docgen/pom.xml
+++ b/opendaylight/md-sal/sal-rest-docgen/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>sal-rest-docgen</artifactId>

diff --git a/opendaylight/md-sal/sal-restconf-broker/pom.xml b/opendaylight/md-sal/sal-restconf-broker/pom.xml
index db2b06e71454b3e3ee4cccd000a021c5b137f845..b2fcc57447ba7f41cdaaa1a6211f26fa5d56a4dd 100644 (file)
--- a/opendaylight/md-sal/sal-restconf-broker/pom.xml
+++ b/opendaylight/md-sal/sal-restconf-broker/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>sal-restconf-broker</artifactId>
   <packaging>bundle</packaging>

diff --git a/opendaylight/md-sal/sal-test-model/pom.xml b/opendaylight/md-sal/sal-test-model/pom.xml
index 852e99e14605ced0935bcacd9fd795237f486cda..a09ad9cc8c50bc5c9437b156b1ba1f6d476ce9f4 100644 (file)
--- a/opendaylight/md-sal/sal-test-model/pom.xml
+++ b/opendaylight/md-sal/sal-test-model/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sal-parent</artifactId>
         <groupId>org.opendaylight.controller</groupId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml b/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml
index 33a8a92f9f7839a859803a646ad092f273c6074a..d6bd4886c784ee122a1253b3e0f13c4ea23b2bc0 100644 (file)
--- a/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml
+++ b/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <artifactId>clustering-it</artifactId>
         <groupId>org.opendaylight.controller.samples</groupId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
     <artifactId>clustering-it-config</artifactId>
   <packaging>jar</packaging>

diff --git a/opendaylight/md-sal/samples/clustering-test-app/model/pom.xml b/opendaylight/md-sal/samples/clustering-test-app/model/pom.xml
index 60eeba64c7d5bf664c68e60a2b32ccd20497c0fe..7fbff152e6a3f4d0203d3b82d07a33a42409421a 100644 (file)
--- a/opendaylight/md-sal/samples/clustering-test-app/model/pom.xml
+++ b/opendaylight/md-sal/samples/clustering-test-app/model/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>clustering-it</artifactId>
         <groupId>org.opendaylight.controller.samples</groupId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
     <artifactId>clustering-it-model</artifactId>
     <packaging>bundle</packaging>

diff --git a/opendaylight/md-sal/samples/clustering-test-app/pom.xml b/opendaylight/md-sal/samples/clustering-test-app/pom.xml
index 58246213316c8fb801df0fa25c95f2f6bdfc1e41..8fbca8e4a717539079d7ec5b9b547a1cfe33457f 100644 (file)
--- a/opendaylight/md-sal/samples/clustering-test-app/pom.xml
+++ b/opendaylight/md-sal/samples/clustering-test-app/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.controller.samples</groupId>
         <artifactId>sal-samples</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
     <artifactId>clustering-it</artifactId>
     <packaging>pom</packaging>

diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml b/opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml
index 31a1237a5bad0328ce89e87cb3fad72d24221310..424def29ce308801e9ddc83bf12785be8fb7ef48 100644 (file)
--- a/opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml
+++ b/opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>clustering-it</artifactId>
         <groupId>org.opendaylight.controller.samples</groupId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
     <artifactId>clustering-it-provider</artifactId>
     <packaging>bundle</packaging>

diff --git a/opendaylight/md-sal/samples/pom.xml b/opendaylight/md-sal/samples/pom.xml
index 378b03318a50992ff5b5d2e8c878b26a21e3ecd6..7a8232372c168c9b9bc2960eb23716d51997fbb8 100644 (file)
--- a/opendaylight/md-sal/samples/pom.xml
+++ b/opendaylight/md-sal/samples/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.opendaylight.controller.samples</groupId>

diff --git a/opendaylight/md-sal/samples/toaster-config/pom.xml b/opendaylight/md-sal/samples/toaster-config/pom.xml
index b0592b654de3159cb5d591426d88bfaaffea363e..915aa0c2c1811202f74e4569ee9c1362d07ce73f 100644 (file)
--- a/opendaylight/md-sal/samples/toaster-config/pom.xml
+++ b/opendaylight/md-sal/samples/toaster-config/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.controller.samples</groupId>
     <artifactId>sal-samples</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>toaster-config</artifactId>
   <description>Configuration files for toaster</description>

diff --git a/opendaylight/md-sal/samples/toaster-consumer/pom.xml b/opendaylight/md-sal/samples/toaster-consumer/pom.xml
index fb6828a2507e108ad073f387dc15d1922f98fa81..0fde7cb028ee071f16ecab3307b243d42f72f1d7 100644 (file)
--- a/opendaylight/md-sal/samples/toaster-consumer/pom.xml
+++ b/opendaylight/md-sal/samples/toaster-consumer/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>org.opendaylight.controller.samples</groupId>
     <artifactId>sal-samples</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>sample-toaster-consumer</artifactId>
   <packaging>bundle</packaging>
 
   <properties>
-    <sal-binding-api.version>1.2.0-SNAPSHOT</sal-binding-api.version>
+    <sal-binding-api.version>1.3.0-SNAPSHOT</sal-binding-api.version>
   </properties>
 
   <dependencies>

diff --git a/opendaylight/md-sal/samples/toaster-it/pom.xml b/opendaylight/md-sal/samples/toaster-it/pom.xml
index eb40d73bd17d863acdbed4895a5c5edf6a6e8a6e..8acf4dbbe984589376dbfb329d3db41885d47d47 100644 (file)
--- a/opendaylight/md-sal/samples/toaster-it/pom.xml
+++ b/opendaylight/md-sal/samples/toaster-it/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller.samples</groupId>
     <artifactId>sal-samples</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>sample-toaster-it</artifactId>
 

diff --git a/opendaylight/md-sal/samples/toaster-provider/pom.xml b/opendaylight/md-sal/samples/toaster-provider/pom.xml
index dd9810388d07824f123993b872c83858b8aa5997..95ae60fab1759fbf088a152633b3123707db0b5f 100644 (file)
--- a/opendaylight/md-sal/samples/toaster-provider/pom.xml
+++ b/opendaylight/md-sal/samples/toaster-provider/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>org.opendaylight.controller.samples</groupId>
     <artifactId>sal-samples</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>sample-toaster-provider</artifactId>
   <packaging>bundle</packaging>
 
   <properties>
-    <sal-binding-api.version>1.2.0-SNAPSHOT</sal-binding-api.version>
+    <sal-binding-api.version>1.3.0-SNAPSHOT</sal-binding-api.version>
   </properties>
 
   <dependencies>

diff --git a/opendaylight/md-sal/samples/toaster/pom.xml b/opendaylight/md-sal/samples/toaster/pom.xml
index ab761fd6bf383385c4c7401c3459839226cce559..777270f41648e9339e8dc2d46ed37dcc06895bf7 100644 (file)
--- a/opendaylight/md-sal/samples/toaster/pom.xml
+++ b/opendaylight/md-sal/samples/toaster/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller.samples</groupId>
     <artifactId>sal-samples</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>sample-toaster</artifactId>
   <packaging>bundle</packaging>

diff --git a/opendaylight/netconf/config-netconf-connector/pom.xml b/opendaylight/netconf/config-netconf-connector/pom.xml
index 3a949697e9047e4cf9bb3518e3e907db807cfd65..2093ace97a08aec24d02e26c3ae101412aa17917 100644 (file)
--- a/opendaylight/netconf/config-netconf-connector/pom.xml
+++ b/opendaylight/netconf/config-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>config-netconf-connector</artifactId>
   <packaging>bundle</packaging>

diff --git a/opendaylight/netconf/config-persister-impl/pom.xml b/opendaylight/netconf/config-persister-impl/pom.xml
index 9d0fdc0e87e86f70f6c9ff21cbf2514a5d7b0b73..5691e04b8f6020c2381826a33aff936a84046999 100644 (file)
--- a/opendaylight/netconf/config-persister-impl/pom.xml
+++ b/opendaylight/netconf/config-persister-impl/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>
     <relativePath>../</relativePath>
   </parent>
   <artifactId>config-persister-impl</artifactId>

diff --git a/opendaylight/netconf/ietf-netconf-monitoring-extension/pom.xml b/opendaylight/netconf/ietf-netconf-monitoring-extension/pom.xml
index edd711171f5434e27680a0cb72994b27af246e63..760261b1e40e3a39eb0ad5c831f7ec485a79bdb9 100644 (file)
--- a/opendaylight/netconf/ietf-netconf-monitoring-extension/pom.xml
+++ b/opendaylight/netconf/ietf-netconf-monitoring-extension/pom.xml
@@ -4,7 +4,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>ietf-netconf-monitoring-extension</artifactId>
   <packaging>bundle</packaging>

diff --git a/opendaylight/netconf/ietf-netconf-monitoring/pom.xml b/opendaylight/netconf/ietf-netconf-monitoring/pom.xml
index 2abed1bfe3361af79ff3ce4c92de1ee2b0bee2dc..e4819c0a444e01360c85c15716954e52d465890f 100644 (file)
--- a/opendaylight/netconf/ietf-netconf-monitoring/pom.xml
+++ b/opendaylight/netconf/ietf-netconf-monitoring/pom.xml
@@ -4,7 +4,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>ietf-netconf-monitoring</artifactId>
   <packaging>bundle</packaging>

diff --git a/opendaylight/netconf/ietf-netconf-notifications/pom.xml b/opendaylight/netconf/ietf-netconf-notifications/pom.xml
index 1ce3b031b7b72192d5e23af8e35864313194118a..763cb82c36b44d4b9764cf73e9c938a51db48c5c 100644 (file)
--- a/opendaylight/netconf/ietf-netconf-notifications/pom.xml
+++ b/opendaylight/netconf/ietf-netconf-notifications/pom.xml
@@ -12,7 +12,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>ietf-netconf-notifications</artifactId>
   <packaging>bundle</packaging>

diff --git a/opendaylight/netconf/ietf-netconf/pom.xml b/opendaylight/netconf/ietf-netconf/pom.xml
index 6ed7a5f13019de6f4de984b9312f6cf01c1eab4d..43ba3b17aa1f77888c044abb4b6710cd3f5fef7d 100644 (file)
--- a/opendaylight/netconf/ietf-netconf/pom.xml
+++ b/opendaylight/netconf/ietf-netconf/pom.xml
@@ -12,7 +12,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>ietf-netconf</artifactId>
     <packaging>bundle</packaging>

diff --git a/opendaylight/netconf/mdsal-netconf-connector/pom.xml b/opendaylight/netconf/mdsal-netconf-connector/pom.xml
index d58bd54ae55d58a5fc1d565468cbb77bc2840886..34cc5c4442d6574ff1b1e6077bbe2e2bbcdb3d39 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>

diff --git a/opendaylight/netconf/mdsal-netconf-monitoring/pom.xml b/opendaylight/netconf/mdsal-netconf-monitoring/pom.xml
index 3e78dd19e38d8e5db36c0b2ff1a2852aadc854f7..04585e183398a272d5cd8ba0de8b06b3d49c285b 100644 (file)
--- a/opendaylight/netconf/mdsal-netconf-monitoring/pom.xml
+++ b/opendaylight/netconf/mdsal-netconf-monitoring/pom.xml
@@ -4,7 +4,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-monitoring</artifactId>
   <packaging>bundle</packaging>

diff --git a/opendaylight/netconf/netconf-api/pom.xml b/opendaylight/netconf/netconf-api/pom.xml
index 965747c2ea2c205f9d45bacfed24d4a2e76d5826..d1c2af36ffe93b5f0b093067db511c0bf61cec0c 100644 (file)
--- a/opendaylight/netconf/netconf-api/pom.xml
+++ b/opendaylight/netconf/netconf-api/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>netconf-api</artifactId>
   <packaging>bundle</packaging>

diff --git a/opendaylight/netconf/netconf-artifacts/pom.xml b/opendaylight/netconf/netconf-artifacts/pom.xml
index d27ea558126ece253720b77832a9783a13f855ee..4cf8b0a5507905fd4dca971bf29da402b793f340 100644 (file)
--- a/opendaylight/netconf/netconf-artifacts/pom.xml
+++ b/opendaylight/netconf/netconf-artifacts/pom.xml
@@ -12,7 +12,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>netconf-artifacts</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <dependencyManagement>

diff --git a/opendaylight/netconf/netconf-auth/pom.xml b/opendaylight/netconf/netconf-auth/pom.xml
index 6f1fafff40f8f82fe58e8baa4070c44abfc1341b..ac5198a32520ac381ffafd46b3a7e9d083d22bd2 100644 (file)
--- a/opendaylight/netconf/netconf-auth/pom.xml
+++ b/opendaylight/netconf/netconf-auth/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>netconf-subsystem</artifactId>
-        <version>0.3.0-SNAPSHOT</version>
+        <version>0.4.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>netconf-auth</artifactId>

diff --git a/opendaylight/netconf/netconf-cli/pom.xml b/opendaylight/netconf/netconf-cli/pom.xml
index 27c9bd8d2c6a7b8ecb1758e38713ee6a5ec61c2d..c968f739737aeffd86602a0d1c493e5233089562 100644 (file)
--- a/opendaylight/netconf/netconf-cli/pom.xml
+++ b/opendaylight/netconf/netconf-cli/pom.xml
@@ -10,7 +10,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>netconf-cli</artifactId>
   <packaging>jar</packaging>

diff --git a/opendaylight/netconf/netconf-client/pom.xml b/opendaylight/netconf/netconf-client/pom.xml
index 4f79b9f7b6c2cb13421fb7552a006eebe67cc089..223ae0e6a424b5a12fefebd6c60e0e1f378ade54 100644 (file)
--- a/opendaylight/netconf/netconf-client/pom.xml
+++ b/opendaylight/netconf/netconf-client/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>netconf-client</artifactId>
   <packaging>bundle</packaging>

diff --git a/opendaylight/netconf/netconf-config/pom.xml b/opendaylight/netconf/netconf-config/pom.xml
index 77551f708018996708fb459d38dcab68b269fafb..d8cef8b74e4fc04b7593ac2eee6ab10d602238d3 100644 (file)
--- a/opendaylight/netconf/netconf-config/pom.xml
+++ b/opendaylight/netconf/netconf-config/pom.xml
@@ -12,7 +12,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>netconf-config</artifactId>
   <description>Configuration files for netconf</description>

diff --git a/opendaylight/netconf/netconf-connector-config/pom.xml b/opendaylight/netconf/netconf-connector-config/pom.xml
index f4e6e99ea0c8ae426e2ae99a721b012841f319f6..b3065da28d41313763fc1e64f862a583b4f89e3a 100644 (file)
--- a/opendaylight/netconf/netconf-connector-config/pom.xml
+++ b/opendaylight/netconf/netconf-connector-config/pom.xml
@@ -12,7 +12,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>netconf-connector-config</artifactId>
   <description>Configuration files for netconf-connector</description>

diff --git a/opendaylight/netconf/netconf-impl/pom.xml b/opendaylight/netconf/netconf-impl/pom.xml
index 5d880c52c9920d42d7c0a3a037201dd5797e7a13..5bb624e38c9489f49b54a7b78787f67b3d91c60a 100644 (file)
--- a/opendaylight/netconf/netconf-impl/pom.xml
+++ b/opendaylight/netconf/netconf-impl/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>netconf-impl</artifactId>
   <packaging>bundle</packaging>

diff --git a/opendaylight/netconf/netconf-it/pom.xml b/opendaylight/netconf/netconf-it/pom.xml
index 90c3e2fbdd2dbb45c91ac33e04fc9d320bde4278..4f722f4db44b058f49a9d774de02a9390b8710c5 100644 (file)
--- a/opendaylight/netconf/netconf-it/pom.xml
+++ b/opendaylight/netconf/netconf-it/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>netconf-it</artifactId>

diff --git a/opendaylight/netconf/netconf-mapping-api/pom.xml b/opendaylight/netconf/netconf-mapping-api/pom.xml
index 21e50cd2eaddfa416018d0e68a60821e3a124e80..ab8635b62df3d7a031d739ec2fa27d39043640fc 100644 (file)
--- a/opendaylight/netconf/netconf-mapping-api/pom.xml
+++ b/opendaylight/netconf/netconf-mapping-api/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>netconf-mapping-api</artifactId>
 

diff --git a/opendaylight/netconf/netconf-mdsal-config/pom.xml b/opendaylight/netconf/netconf-mdsal-config/pom.xml
index f3c931345f884ec5c87c571edbe2c95124a32ef9..923b69a61a533c4ed70f7e65f2c76a77c86a7f9c 100644 (file)
--- a/opendaylight/netconf/netconf-mdsal-config/pom.xml
+++ b/opendaylight/netconf/netconf-mdsal-config/pom.xml
@@ -12,7 +12,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>netconf-mdsal-config</artifactId>
   <description>Configuration files for netconf for mdsal</description>

diff --git a/opendaylight/netconf/netconf-monitoring/pom.xml b/opendaylight/netconf/netconf-monitoring/pom.xml
index abaf1acddf39640e8525869c431f71e31e068639..8071caff896bef6063571ffbb8d3efc2f2c9fed0 100644 (file)
--- a/opendaylight/netconf/netconf-monitoring/pom.xml
+++ b/opendaylight/netconf/netconf-monitoring/pom.xml
@@ -4,7 +4,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>netconf-monitoring</artifactId>
   <packaging>bundle</packaging>

diff --git a/opendaylight/netconf/netconf-netty-util/pom.xml b/opendaylight/netconf/netconf-netty-util/pom.xml
index 55a5630bedc4e93d0ad55ba4694c36cc90035c63..90b39f4d450d1f2525fad3690d9ccf9c4cad7d37 100644 (file)
--- a/opendaylight/netconf/netconf-netty-util/pom.xml
+++ b/opendaylight/netconf/netconf-netty-util/pom.xml
@@ -12,7 +12,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>netconf-netty-util</artifactId>
   <packaging>bundle</packaging>

diff --git a/opendaylight/netconf/netconf-notifications-api/pom.xml b/opendaylight/netconf/netconf-notifications-api/pom.xml
index a1fbe150ae07c9966990af7738d50d7650d3cf6d..3023a2d30e8e9942b12c4d4e91cd6da4c7e8690c 100644 (file)
--- a/opendaylight/netconf/netconf-notifications-api/pom.xml
+++ b/opendaylight/netconf/netconf-notifications-api/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <artifactId>netconf-subsystem</artifactId>
         <groupId>org.opendaylight.controller</groupId>
-        <version>0.3.0-SNAPSHOT</version>
+        <version>0.4.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>bundle</packaging>

diff --git a/opendaylight/netconf/netconf-notifications-impl/pom.xml b/opendaylight/netconf/netconf-notifications-impl/pom.xml
index 510d9f07e3ccaa304009d3014d98889ba74f978d..64255edc81f2770c88ba8ae979e5a5f4c336b1ab 100644 (file)
--- a/opendaylight/netconf/netconf-notifications-impl/pom.xml
+++ b/opendaylight/netconf/netconf-notifications-impl/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <artifactId>netconf-subsystem</artifactId>
         <groupId>org.opendaylight.controller</groupId>
-        <version>0.3.0-SNAPSHOT</version>
+        <version>0.4.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>bundle</packaging>

diff --git a/opendaylight/netconf/netconf-ssh/pom.xml b/opendaylight/netconf/netconf-ssh/pom.xml
index 03f7a2fac2fe05108825324ef059a26033d10ff3..b506a1e3c787be4a57719dbbc547a8a0d5a435a2 100644 (file)
--- a/opendaylight/netconf/netconf-ssh/pom.xml
+++ b/opendaylight/netconf/netconf-ssh/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>netconf-subsystem</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
   <artifactId>netconf-ssh</artifactId>
@@ -39,7 +39,7 @@
       <dependency>
           <groupId>org.opendaylight.controller</groupId>
           <artifactId>netty-config-api</artifactId>
-          <version>0.3.0-SNAPSHOT</version>
+          <version>0.4.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>

diff --git a/opendaylight/netconf/netconf-tcp/pom.xml b/opendaylight/netconf/netconf-tcp/pom.xml
index 0a3ea5485dd1e74ed84b4f28a6d11536691e4f16..033142ab9756caa272662911019692bb4d701a34 100644 (file)
--- a/opendaylight/netconf/netconf-tcp/pom.xml
+++ b/opendaylight/netconf/netconf-tcp/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>netconf-subsystem</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
   <artifactId>netconf-tcp</artifactId>

diff --git a/opendaylight/netconf/netconf-testtool/pom.xml b/opendaylight/netconf/netconf-testtool/pom.xml
index f15dcc341714c2e6f22e729bd585d094bb8a193f..0d98fcac77daa19df2493811e9fe9b54df6b427a 100644 (file)
--- a/opendaylight/netconf/netconf-testtool/pom.xml
+++ b/opendaylight/netconf/netconf-testtool/pom.xml
@@ -14,7 +14,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>netconf-testtool</artifactId>

diff --git a/opendaylight/netconf/netconf-usermanager/pom.xml b/opendaylight/netconf/netconf-usermanager/pom.xml
index 44e6c614725c18b48df15061e94d37ae4845924d..8f8059ae19d9913cba88045197bcb61a2e4f0d26 100644 (file)
--- a/opendaylight/netconf/netconf-usermanager/pom.xml
+++ b/opendaylight/netconf/netconf-usermanager/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>netconf-subsystem</artifactId>
-        <version>0.3.0-SNAPSHOT</version>
+        <version>0.4.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>netconf-usermanager</artifactId>

diff --git a/opendaylight/netconf/netconf-util/pom.xml b/opendaylight/netconf/netconf-util/pom.xml
index 5d82cf1ccd7cf9de7b8e45bfc9da5f289375dff5..b629e2861807a792057ff6b29b01dbce632a59fc 100644 (file)
--- a/opendaylight/netconf/netconf-util/pom.xml
+++ b/opendaylight/netconf/netconf-util/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>netconf-util</artifactId>
   <packaging>bundle</packaging>

diff --git a/opendaylight/netconf/pom.xml b/opendaylight/netconf/pom.xml
index ab92128dbd2a30e914d58cf1b4e53dedf6c1d995..e2d834fee87d047ae316568a422e31ef4c09ac20 100644 (file)
--- a/opendaylight/netconf/pom.xml
+++ b/opendaylight/netconf/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../commons/opendaylight</relativePath>
   </parent>
   <artifactId>netconf-subsystem</artifactId>
 
-  <version>0.3.0-SNAPSHOT</version>
+  <version>0.4.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>${project.artifactId}</name>
 

diff --git a/pom.xml b/pom.xml
index 068be09dcb5d9462be15f7d1bb6320c2b5bdfe9f..bde0e73a20eb6b07627ffebc9f46d10b4e070a02 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.parent</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>opendaylight/commons/parent</relativePath>
   </parent>
 
   <artifactId>releasepom</artifactId>
-  <version>0.2.0-SNAPSHOT</version>
+  <version>0.3.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>controller</name>
   <!-- Used by Sonar to set project name -->