From 895f0b6b299b40bf9c94fc74c36baecca7f74003 Mon Sep 17 00:00:00 2001
From: Lorand Jakab <lojakab@cisco.com>
Date: Tue, 12 May 2015 18:35:26 +0300
Subject: [PATCH] Beryllium version bump

Change-Id: Ic13e9bbee5f14dc50770e4818c7c1f5511d4cbe1
Signed-off-by: Lorand Jakab <lojakab@cisco.com>
---
 artifacts/pom.xml                      |  2 +-
 commons/build_tools/pom.xml            |  2 +-
 commons/parent/pom.xml                 | 56 +++++++++++++-------------
 commons/unittest_tools/pom.xml         |  2 +-
 distribution-karaf/pom.xml             |  4 +-
 features/pom.xml                       |  4 +-
 mappingservice/api/pom.xml             |  2 +-
 mappingservice/clusterdao/pom.xml      |  2 +-
 mappingservice/config/pom.xml          |  8 ++--
 mappingservice/implementation/pom.xml  |  2 +-
 mappingservice/integrationtest/pom.xml |  8 ++--
 mappingservice/netconf/pom.xml         |  2 +-
 mappingservice/neutron/pom.xml         |  2 +-
 mappingservice/northbound/pom.xml      |  2 +-
 mappingservice/pom.xml                 |  3 +-
 mappingservice/shell/pom.xml           |  2 +-
 mappingservice/southbound/pom.xml      |  2 +-
 mappingservice/yangmodel/pom.xml       |  4 +-
 pom.xml                                |  2 +-
 19 files changed, 55 insertions(+), 56 deletions(-)

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index fb8753a79..3a082755c 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.lispflowmapping</groupId>
   <artifactId>lispflowmapping-artifacts</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
+  <version>1.3.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <dependencyManagement>
diff --git a/commons/build_tools/pom.xml b/commons/build_tools/pom.xml
index 3fe4f40dc..e916da852 100644
--- a/commons/build_tools/pom.xml
+++ b/commons/build_tools/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.lispflowmapping</groupId>
     <artifactId>lispflowmapping-commons</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
   <artifactId>common.build.tools</artifactId>
diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 1447ddb6e..e5ebafa8d 100644
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -15,47 +15,47 @@
          for plugin configuration etc. -->
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.lispflowmapping</groupId>
   <artifactId>lispflowmapping-commons</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
+  <version>1.3.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Parent POM</name>
   <description></description>
 
   <properties>
-    <branding.version>1.1.0-SNAPSHOT</branding.version>
+    <branding.version>1.2.0-SNAPSHOT</branding.version>
     <build.suffix>1.0.0</build.suffix>
-    <clustering.services.version>0.6.0-SNAPSHOT</clustering.services.version>
-    <config.version>0.3.0-SNAPSHOT</config.version>
-    <feature.test.version>0.7.0-SNAPSHOT</feature.test.version>
+    <clustering.services.version>0.7.0-SNAPSHOT</clustering.services.version>
+    <config.version>0.4.0-SNAPSHOT</config.version>
+    <feature.test.version>0.8.0-SNAPSHOT</feature.test.version>
     <forwardingrulesmanager.version>0.5.0</forwardingrulesmanager.version>
     <ietf-inet-types.version>2010.09.24.7-SNAPSHOT</ietf-inet-types.version>
     <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
-    <karaf.empty.version>1.5.0-SNAPSHOT</karaf.empty.version>
-    <karaf.resources.version>1.5.0-SNAPSHOT</karaf.resources.version>
-    <lispflowmapping.version>1.2.0-SNAPSHOT</lispflowmapping.version>
-    <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
-    <neutron.version>0.5.0-SNAPSHOT</neutron.version>
+    <karaf.empty.version>1.6.0-SNAPSHOT</karaf.empty.version>
+    <karaf.resources.version>1.6.0-SNAPSHOT</karaf.resources.version>
+    <lispflowmapping.version>1.3.0-SNAPSHOT</lispflowmapping.version>
+    <mdsal.version>1.3.0-SNAPSHOT</mdsal.version>
+    <neutron.version>0.6.0-SNAPSHOT</neutron.version>
     <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
-    <nsf.version>0.5.0-SNAPSHOT</nsf.version>
-    <sal.version>0.9.0-SNAPSHOT</sal.version>
+    <nsf.version>0.6.0-SNAPSHOT</nsf.version>
+    <sal.version>0.10.0-SNAPSHOT</sal.version>
     <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
     <sonar.jacoco.itReportPath>target/jacoco-it.exec</sonar.jacoco.itReportPath>
     <sonar.jacoco.reportPath>target/jacoco.exec</sonar.jacoco.reportPath>
     <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
     <statisticsmanager.version>0.5.0</statisticsmanager.version>
     <xtend.dstdir>src/main/xtend-gen</xtend.dstdir>
-    <yang-jmx-generator.version>1.1.0-SNAPSHOT</yang-jmx-generator.version>
+    <yang-jmx-generator.version>1.2.0-SNAPSHOT</yang-jmx-generator.version>
     <yang.binding.version>0.6.1</yang.binding.version>
     <yang.codegen.version>0.6.1</yang.codegen.version>
     <yang.src.path>src/main/yang</yang.src.path>
     <yang.version>0.6.1</yang.version>
     <yangtools.binding.version>0.6.1</yangtools.binding.version>
-    <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
+    <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
   </properties>
 
   <dependencyManagement>
@@ -91,17 +91,17 @@
       <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.opendaylight.controller</groupId>
         <artifactId>commons.northbound</artifactId>
-        <version>0.5.0-SNAPSHOT</version>
+        <version>0.6.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>config-api</artifactId>
-        <version>0.3.0-SNAPSHOT</version>
+        <version>0.4.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
@@ -111,12 +111,12 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>config-util</artifactId>
-        <version>0.3.0-SNAPSHOT</version>
+        <version>0.4.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>containermanager</artifactId>
-        <version>0.6.0-SNAPSHOT</version>
+        <version>0.7.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
@@ -175,7 +175,7 @@
       <dependency>
         <groupId>org.opendaylight.neutron</groupId>
         <artifactId>neutron-spi</artifactId>
-        <version>0.5.0-SNAPSHOT</version>
+        <version>0.6.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
@@ -192,7 +192,7 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>sal</artifactId>
-        <version>0.9.0-SNAPSHOT</version>
+        <version>0.10.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
@@ -232,7 +232,7 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>threadpool-config-impl</artifactId>
-        <version>0.3.0-SNAPSHOT</version>
+        <version>0.4.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.lispflowmapping</groupId>
@@ -303,17 +303,17 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yang-binding</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
+        <version>0.8.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yang-common</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
+        <version>0.8.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yang-data-api</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
+        <version>0.8.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
@@ -323,12 +323,12 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yang-data-util</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
+        <version>0.8.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yang-model-api</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
+        <version>0.8.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
diff --git a/commons/unittest_tools/pom.xml b/commons/unittest_tools/pom.xml
index 90785112e..d89d9e2de 100644
--- a/commons/unittest_tools/pom.xml
+++ b/commons/unittest_tools/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.lispflowmapping</groupId>
     <artifactId>lispflowmapping-commons</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
   <artifactId>common.unittest.tools</artifactId>
diff --git a/distribution-karaf/pom.xml b/distribution-karaf/pom.xml
index 457e2e2e3..c2d30e239 100644
--- a/distribution-karaf/pom.xml
+++ b/distribution-karaf/pom.xml
@@ -10,13 +10,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <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>
   <groupId>org.opendaylight.lispflowmapping</groupId>
   <artifactId>distribution-karaf</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
+  <version>1.3.0-SNAPSHOT</version>
   <name>LISP Flow Mapping Project - Karaf Distribution</name>
   <properties>
     <karaf.localFeature>odl-lispflowmapping-all</karaf.localFeature>
diff --git a/features/pom.xml b/features/pom.xml
index 6f44d0733..ef1ddd7a1 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.lispflowmapping</groupId>
     <artifactId>lispflowmapping-all</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>features-lispflowmapping</artifactId>
   <packaging>jar</packaging>
@@ -119,7 +119,7 @@
     <dependency>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>features-test</artifactId>
-      <version>1.5.0-SNAPSHOT</version>
+      <version>1.6.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/mappingservice/api/pom.xml b/mappingservice/api/pom.xml
index 427e2648d..f94085f7d 100644
--- a/mappingservice/api/pom.xml
+++ b/mappingservice/api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.lispflowmapping</groupId>
     <artifactId>mappingservice-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>mappingservice.api</artifactId>
   <packaging>bundle</packaging>
diff --git a/mappingservice/clusterdao/pom.xml b/mappingservice/clusterdao/pom.xml
index 4fb2928d2..7772c9e97 100644
--- a/mappingservice/clusterdao/pom.xml
+++ b/mappingservice/clusterdao/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.lispflowmapping</groupId>
     <artifactId>mappingservice-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>mappingservice.clusterdao</artifactId>
   <packaging>bundle</packaging>
diff --git a/mappingservice/config/pom.xml b/mappingservice/config/pom.xml
index 722f548d1..77f929e3d 100644
--- a/mappingservice/config/pom.xml
+++ b/mappingservice/config/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.lispflowmapping</groupId>
     <artifactId>mappingservice-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>mappingservice.config</artifactId>
   <packaging>bundle</packaging>
@@ -41,17 +41,17 @@
         <plugin>
           <groupId>org.opendaylight.yangtools</groupId>
           <artifactId>yang-maven-plugin</artifactId>
-          <version>0.7.0-SNAPSHOT</version>
+          <version>0.8.0-SNAPSHOT</version>
           <dependencies>
             <dependency>
               <groupId>org.opendaylight.controller</groupId>
               <artifactId>yang-jmx-generator-plugin</artifactId>
-              <version>0.3.0-SNAPSHOT</version>
+              <version>0.4.0-SNAPSHOT</version>
             </dependency>
             <dependency>
               <groupId>org.opendaylight.yangtools</groupId>
               <artifactId>maven-sal-api-gen-plugin</artifactId>
-              <version>0.7.0-SNAPSHOT</version>
+              <version>0.8.0-SNAPSHOT</version>
               <type>jar</type>
             </dependency>
           </dependencies>
diff --git a/mappingservice/implementation/pom.xml b/mappingservice/implementation/pom.xml
index 3b7b95726..071209d65 100644
--- a/mappingservice/implementation/pom.xml
+++ b/mappingservice/implementation/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.lispflowmapping</groupId>
     <artifactId>mappingservice-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>mappingservice.implementation</artifactId>
   <packaging>bundle</packaging>
diff --git a/mappingservice/integrationtest/pom.xml b/mappingservice/integrationtest/pom.xml
index 29a15d100..6f5464817 100644
--- a/mappingservice/integrationtest/pom.xml
+++ b/mappingservice/integrationtest/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.integrationtest</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
     <relativePath></relativePath>
   </parent>
   <groupId>org.opendaylight.lispflowmapping</groupId>
   <artifactId>mappingservice.integrationtest</artifactId>
   <name>LISP Flow Mapping Integration Tests</name>
-  <version>1.2.0-SNAPSHOT</version>
+  <version>1.3.0-SNAPSHOT</version>
   <properties>
     <exam.version>3.0.0</exam.version>
     <sonar.jacoco.itReportPath>target/jacoco-it.exec</sonar.jacoco.itReportPath>
@@ -18,7 +18,7 @@
     <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
     <!-- Dependency Versions -->
     <junit.version>4.8.1</junit.version>
-    <lispflowmapping.version>1.2.0-SNAPSHOT</lispflowmapping.version>
+    <lispflowmapping.version>1.3.0-SNAPSHOT</lispflowmapping.version>
     <url.version>1.5.0</url.version>
   </properties>
   <dependencies>
@@ -309,7 +309,7 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>commons.integrationtest</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
+      <version>0.7.0-SNAPSHOT</version>
       <type>pom</type>
       <exclusions>
         <exclusion>
diff --git a/mappingservice/netconf/pom.xml b/mappingservice/netconf/pom.xml
index cb4a8e44f..5e30a6401 100644
--- a/mappingservice/netconf/pom.xml
+++ b/mappingservice/netconf/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.lispflowmapping</groupId>
     <artifactId>mappingservice-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>mappingservice.netconf</artifactId>
   <packaging>bundle</packaging>
diff --git a/mappingservice/neutron/pom.xml b/mappingservice/neutron/pom.xml
index 6cc270cb8..721f2fa0b 100644
--- a/mappingservice/neutron/pom.xml
+++ b/mappingservice/neutron/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.lispflowmapping</groupId>
     <artifactId>mappingservice-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>mappingservice.neutron</artifactId>
   <packaging>bundle</packaging>
diff --git a/mappingservice/northbound/pom.xml b/mappingservice/northbound/pom.xml
index 695095471..3da097635 100644
--- a/mappingservice/northbound/pom.xml
+++ b/mappingservice/northbound/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.lispflowmapping</groupId>
     <artifactId>mappingservice-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>mappingservice.northbound</artifactId>
   <packaging>bundle</packaging>
diff --git a/mappingservice/pom.xml b/mappingservice/pom.xml
index 785365f6f..25aa68692 100644
--- a/mappingservice/pom.xml
+++ b/mappingservice/pom.xml
@@ -4,8 +4,7 @@
   <parent>
     <groupId>org.opendaylight.lispflowmapping</groupId>
     <artifactId>lispflowmapping-all</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
-    <!-- <relativePath>../commons/parent</relativePath> -->
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>mappingservice-parent</artifactId>
   <packaging>pom</packaging>
diff --git a/mappingservice/shell/pom.xml b/mappingservice/shell/pom.xml
index 03a7041e8..23aabe7b8 100644
--- a/mappingservice/shell/pom.xml
+++ b/mappingservice/shell/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.lispflowmapping</groupId>
     <artifactId>mappingservice-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>mappingservice.shell</artifactId>
   <packaging>bundle</packaging>
diff --git a/mappingservice/southbound/pom.xml b/mappingservice/southbound/pom.xml
index 8971e0076..7a5f4e286 100644
--- a/mappingservice/southbound/pom.xml
+++ b/mappingservice/southbound/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.lispflowmapping</groupId>
     <artifactId>mappingservice-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>mappingservice.southbound</artifactId>
   <packaging>bundle</packaging>
diff --git a/mappingservice/yangmodel/pom.xml b/mappingservice/yangmodel/pom.xml
index 5cb460381..1868289bf 100644
--- a/mappingservice/yangmodel/pom.xml
+++ b/mappingservice/yangmodel/pom.xml
@@ -10,14 +10,14 @@ 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.lispflowmapping</groupId>
   <artifactId>mappingservice.yangmodel</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
+  <version>1.3.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <name>LISP Flow Mapping YANG Model</name>
 
diff --git a/pom.xml b/pom.xml
index ecfd412be..8ed27118d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.lispflowmapping</groupId>
     <artifactId>lispflowmapping-commons</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
     <relativePath>commons/parent</relativePath>
   </parent>
 
-- 
2.36.6