From: Michal Rehak <mirehak@cisco.com>
Date: Tue, 7 Oct 2014 11:43:25 +0000 (+0200)
Subject: Incrementing versions by 0.1.0 for post-helium master branch
X-Git-Tag: release/lithium~761
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=96de1bbf22b4497b287766cbf3e5dc6bae8387c9;p=openflowplugin.git

Incrementing versions by 0.1.0 for post-helium master branch

+ temporarily disabled dlux in features (pom.xml, features.xml) in order
  to avoid cyrcular dependency during release

Change-Id: Ibc5c80c3252e1e3e52816b3ffc25ac3e5559e250
Signed-off-by: Michal Rehak <mirehak@cisco.com>
---

diff --git a/applications/pom.xml b/applications/pom.xml
index d2e886e1dc..22ed667b5e 100644
--- a/applications/pom.xml
+++ b/applications/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.opendaylight.openflowplugin</groupId>
     <artifactId>openflowplugin-parent</artifactId>
-    <version>0.0.3-SNAPSHOT</version>
+    <version>0.1.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.opendaylight.openflowplugin</groupId>
   <artifactId>applications</artifactId>
-  <version>0.0.3-SNAPSHOT</version>
+  <version>0.1.0-SNAPSHOT</version>
   <name>applications</name>
   <url>http://maven.apache.org</url>
   <packaging>pom</packaging>
diff --git a/applications/table-miss-enforcer/pom.xml b/applications/table-miss-enforcer/pom.xml
index b0f5f5d69a..dad06bdbae 100644
--- a/applications/table-miss-enforcer/pom.xml
+++ b/applications/table-miss-enforcer/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.openflowplugin</groupId>
     <artifactId>applications</artifactId>
-    <version>0.0.3-SNAPSHOT</version>
+    <version>0.1.0-SNAPSHOT</version>
   </parent>
   <groupId>org.opendaylight.openflowplugin.applications</groupId>
   <artifactId>table-miss-enforcer</artifactId>
diff --git a/distribution/base/pom.xml b/distribution/base/pom.xml
index 4725c99f66..3824dda769 100644
--- a/distribution/base/pom.xml
+++ b/distribution/base/pom.xml
@@ -7,7 +7,7 @@ see https://git.opendaylight.org/gerrit/#/c/390/
   <parent>
     <groupId>org.opendaylight.openflowplugin</groupId>
     <artifactId>openflowplugin-parent</artifactId>
-    <version>0.0.3-SNAPSHOT</version>
+    <version>0.1.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
@@ -71,7 +71,7 @@ see https://git.opendaylight.org/gerrit/#/c/390/
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>openflowplugin-controller-config</artifactId>
-      <version>0.0.3-SNAPSHOT</version>
+      <version>0.1.0-SNAPSHOT</version>
     </dependency>
 
     <!-- test-common -->
diff --git a/distribution/cbench/pom.xml b/distribution/cbench/pom.xml
index 73d4eb97e7..6474afc97a 100644
--- a/distribution/cbench/pom.xml
+++ b/distribution/cbench/pom.xml
@@ -7,7 +7,7 @@ see https://git.opendaylight.org/gerrit/#/c/390/
   <parent>
     <groupId>org.opendaylight.openflowplugin</groupId>
     <artifactId>openflowplugin-parent</artifactId>
-    <version>0.0.3-SNAPSHOT</version>
+    <version>0.1.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
diff --git a/distribution/karaf/pom.xml b/distribution/karaf/pom.xml
index 3e6745b81a..a267387bbc 100644
--- a/distribution/karaf/pom.xml
+++ b/distribution/karaf/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.openflowplugin</groupId>
     <artifactId>openflowplugin-parent</artifactId>
-    <version>0.0.3-SNAPSHOT</version>
+    <version>0.1.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
   <artifactId>openflowplugin-karaf</artifactId>
@@ -13,8 +13,8 @@
     <maven>3.0</maven>
   </prerequisites>
   <properties>
-    <branding.version>1.0.0-SNAPSHOT</branding.version>
-    <karaf.resources.version>1.4.2-SNAPSHOT</karaf.resources.version>
+    <branding.version>1.1.0-SNAPSHOT</branding.version>
+    <karaf.resources.version>1.5.0-SNAPSHOT</karaf.resources.version>
   </properties>
 
   <dependencies>
diff --git a/drop-test-karaf/pom.xml b/drop-test-karaf/pom.xml
index 4569bf1904..2aab1e2c38 100644
--- a/drop-test-karaf/pom.xml
+++ b/drop-test-karaf/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.openflowplugin</groupId>
         <artifactId>openflowplugin-parent</artifactId>
-        <version>0.0.3-SNAPSHOT</version>
+        <version>0.1.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>drop-test-karaf</artifactId>
diff --git a/drop-test/pom.xml b/drop-test/pom.xml
index fb5becaff5..5da0a71018 100644
--- a/drop-test/pom.xml
+++ b/drop-test/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.opendaylight.openflowplugin</groupId>
         <artifactId>openflowplugin-parent</artifactId>
-        <version>0.0.3-SNAPSHOT</version>
+        <version>0.1.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>drop-test</artifactId>
diff --git a/extension/openflowjava-extension-nicira-api/pom.xml b/extension/openflowjava-extension-nicira-api/pom.xml
index 47f83336c2..2f9e9a7e0d 100644
--- a/extension/openflowjava-extension-nicira-api/pom.xml
+++ b/extension/openflowjava-extension-nicira-api/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opendaylight.openflowplugin</groupId>
         <artifactId>openflowplugin-extension-parent</artifactId>
-        <version>0.0.3-SNAPSHOT</version>
+        <version>0.1.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>openflowjava-extension-nicira-api</artifactId>
diff --git a/extension/openflowjava-extension-nicira/pom.xml b/extension/openflowjava-extension-nicira/pom.xml
index 290fd7f7f5..b31fad14e6 100644
--- a/extension/openflowjava-extension-nicira/pom.xml
+++ b/extension/openflowjava-extension-nicira/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.openflowplugin</groupId>
         <artifactId>openflowplugin-extension-parent</artifactId>
-        <version>0.0.3-SNAPSHOT</version>
+        <version>0.1.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>openflowjava-extension-nicira</artifactId>
diff --git a/extension/openflowplugin-extension-api/pom.xml b/extension/openflowplugin-extension-api/pom.xml
index 5edb6702fa..968cd8d910 100644
--- a/extension/openflowplugin-extension-api/pom.xml
+++ b/extension/openflowplugin-extension-api/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opendaylight.openflowplugin</groupId>
         <artifactId>openflowplugin-extension-parent</artifactId>
-        <version>0.0.3-SNAPSHOT</version>
+        <version>0.1.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/extension/openflowplugin-extension-nicira/pom.xml b/extension/openflowplugin-extension-nicira/pom.xml
index 4f10299907..808f0a80a0 100644
--- a/extension/openflowplugin-extension-nicira/pom.xml
+++ b/extension/openflowplugin-extension-nicira/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.openflowplugin</groupId>
         <artifactId>openflowplugin-extension-parent</artifactId>
-        <version>0.0.3-SNAPSHOT</version>
+        <version>0.1.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/extension/pom.xml b/extension/pom.xml
index 6c8c9109b8..0048732960 100644
--- a/extension/pom.xml
+++ b/extension/pom.xml
@@ -6,13 +6,13 @@
     <parent>
         <groupId>org.opendaylight.openflowplugin</groupId>
         <artifactId>openflowplugin-parent</artifactId>
-        <version>0.0.3-SNAPSHOT</version>
+        <version>0.1.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
     <properties>
-        <yangtools.version>0.6.2-SNAPSHOT</yangtools.version>
-        <ofjava.version>0.5-SNAPSHOT</ofjava.version>
+        <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
+        <ofjava.version>0.6.0-SNAPSHOT</ofjava.version>
     </properties>
 
     <artifactId>openflowplugin-extension-parent</artifactId>
diff --git a/extension/test-extension/pom.xml b/extension/test-extension/pom.xml
index aa10c1ea3c..dfd60c0c70 100644
--- a/extension/test-extension/pom.xml
+++ b/extension/test-extension/pom.xml
@@ -5,13 +5,13 @@
   <parent>
     <groupId>org.opendaylight.openflowplugin</groupId>
     <artifactId>openflowplugin-extension-parent</artifactId>
-    <version>0.0.3-SNAPSHOT</version>
+    <version>0.1.0-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
   <artifactId>test-extension</artifactId>
   
   <properties>
-        <yangtools.version>0.6.2-SNAPSHOT</yangtools.version>
+        <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
     </properties>
   
   <packaging>bundle</packaging>
diff --git a/features/pom.xml b/features/pom.xml
index 7615003c7a..482fa36885 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.openflowplugin</groupId>
     <artifactId>openflowplugin-parent</artifactId>
-    <version>0.0.3-SNAPSHOT</version>
+    <version>0.1.0-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
   <artifactId>features-openflowplugin</artifactId>
@@ -13,8 +13,8 @@
 
   <properties>
     <features.file>features.xml</features.file>
-    <karaf.empty.distro.version>1.4.2-SNAPSHOT</karaf.empty.distro.version>
-    <yangtools.version>0.6.2-SNAPSHOT</yangtools.version>
+    <karaf.empty.distro.version>1.5.0-SNAPSHOT</karaf.empty.distro.version>
+    <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
   </properties>
 
   <dependencies>
@@ -47,13 +47,14 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.dlux</groupId>
-      <artifactId>features-dlux</artifactId>
-      <version>${dlux.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
+    <!-- TODO: temporary disabled during release process in order to avoid circular dependency to dlux -->
+    <!-- <dependency> -->
+    <!--   <groupId>org.opendaylight.dlux</groupId> -->
+    <!--   <artifactId>features-dlux</artifactId> -->
+    <!--   <version>${dlux.version}</version> -->
+    <!--   <classifier>features</classifier> -->
+    <!--   <type>xml</type> -->
+    <!-- </dependency> -->
 
     <!-- bundle dependencies -->
     <dependency>
diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index 999d8a75db..9a3d39bcf8 100644
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -7,7 +7,8 @@
     <repository>mvn:org.opendaylight.controller/features-restconf/${mdsal.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-flow/${mdsal.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.openflowjava/features-openflowjava/${openflowjava.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.dlux/features-dlux/${dlux.version}/xml/features</repository>
+    <!-- TODO: temporary disabled during release process in order to avoid circular dependency to dlux -->
+    <!-- <repository>mvn:org.opendaylight.dlux/features-dlux/${dlux.version}/xml/features</repository> -->
 
     <feature name='odl-openflowplugin-all' description="OpenDaylight :: Openflow Plugin :: All" version='${project.version}'>
         <feature version="${project.version}">odl-openflowplugin-southbound</feature>
@@ -36,7 +37,8 @@
     </feature>
     <feature name='odl-openflowplugin-flow-services-ui' description="OpenDaylight :: Openflow Plugin :: Flow Services :: UI" version='${project.version}'>
         <feature version="${project.version}">odl-openflowplugin-flow-services-rest</feature>
-        <feature version="${dlux.version}">odl-dlux-core</feature>
+        <!-- TODO: temporary disabled during release process in order to avoid circular dependency to dlux -->
+        <!-- <feature version="${dlux.version}">odl-dlux-core</feature> -->
         <feature version="${mdsal.version}">odl-mdsal-apidocs</feature>
         <feature version="${mdsal.version}">odl-mdsal-xsql</feature>
     </feature>
diff --git a/openflowplugin-api/pom.xml b/openflowplugin-api/pom.xml
index 86c3881012..5eddb5ca7a 100644
--- a/openflowplugin-api/pom.xml
+++ b/openflowplugin-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.openflowplugin</groupId>
         <artifactId>openflowplugin-parent</artifactId>
-        <version>0.0.3-SNAPSHOT</version>
+        <version>0.1.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/openflowplugin-controller-config/pom.xml b/openflowplugin-controller-config/pom.xml
index 93bbfa1a49..b762dc674c 100644
--- a/openflowplugin-controller-config/pom.xml
+++ b/openflowplugin-controller-config/pom.xml
@@ -12,7 +12,7 @@
     <parent>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>openflowplugin-parent</artifactId>
-      <version>0.0.3-SNAPSHOT</version>
+      <version>0.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>openflowplugin-controller-config</artifactId>
diff --git a/openflowplugin-it/pom.xml b/openflowplugin-it/pom.xml
index 06cee83c42..ccfb159ca4 100644
--- a/openflowplugin-it/pom.xml
+++ b/openflowplugin-it/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.opendaylight.openflowplugin</groupId>
         <artifactId>openflowplugin-parent</artifactId>
-        <version>0.0.3-SNAPSHOT</version>
+        <version>0.1.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/openflowplugin/pom.xml b/openflowplugin/pom.xml
index 571d5e9c2a..eef4182aa8 100644
--- a/openflowplugin/pom.xml
+++ b/openflowplugin/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.openflowplugin</groupId>
         <artifactId>openflowplugin-parent</artifactId>
-        <version>0.0.3-SNAPSHOT</version>
+        <version>0.1.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
@@ -12,11 +12,11 @@
     <packaging>bundle</packaging>
 
     <properties>
-        <yangtools.version>0.6.2-SNAPSHOT</yangtools.version>
-        <yangtools.generator.version>0.6.2-SNAPSHOT</yangtools.generator.version>
-        <yangtools.binding.version>0.6.2-SNAPSHOT</yangtools.binding.version>
+        <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
+        <yangtools.generator.version>0.7.0-SNAPSHOT</yangtools.generator.version>
+        <yangtools.binding.version>0.7.0-SNAPSHOT</yangtools.binding.version>
         <jmxGeneratorPath>${project.build.directory}/generated-sources/config</jmxGeneratorPath>
-        <sal-binding-api.version>1.1-SNAPSHOT</sal-binding-api.version>
+        <sal-binding-api.version>1.2.0-SNAPSHOT</sal-binding-api.version>
     </properties>
 
     <build>
diff --git a/pom.xml b/pom.xml
index 3c649f7913..5123b1e801 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>1.4.2-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
     <prerequisites>
@@ -12,7 +12,7 @@
     </prerequisites>
     <groupId>org.opendaylight.openflowplugin</groupId>
     <artifactId>openflowplugin-parent</artifactId>
-    <version>0.0.3-SNAPSHOT</version>
+    <version>0.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <scm>
@@ -42,21 +42,21 @@
 
     <properties>
       <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-      <mdsal.version>1.1-SNAPSHOT</mdsal.version>
+      <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
       <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
-      <openflowjava.version>0.5-SNAPSHOT</openflowjava.version>
-      <controller.model.version>1.1-SNAPSHOT</controller.model.version>
-      <sal.api.version>0.8.1-SNAPSHOT</sal.api.version>
-      <sal.connection.api.version>0.1.2-SNAPSHOT</sal.connection.api.version>
-      <sal.common.util.version>1.1-SNAPSHOT</sal.common.util.version>
-      <netconf.parent.version>0.2.5-SNAPSHOT</netconf.parent.version>
-      <config.parent.version>0.2.5-SNAPSHOT</config.parent.version>
+      <openflowjava.version>0.6.0-SNAPSHOT</openflowjava.version>
+      <controller.model.version>1.2.0-SNAPSHOT</controller.model.version>
+      <sal.api.version>0.9.0-SNAPSHOT</sal.api.version>
+      <sal.connection.api.version>0.2.0-SNAPSHOT</sal.connection.api.version>
+      <sal.common.util.version>1.2.0-SNAPSHOT</sal.common.util.version>
+      <netconf.parent.version>0.3.0-SNAPSHOT</netconf.parent.version>
+      <config.parent.version>0.3.0-SNAPSHOT</config.parent.version>
       <build.helper.version>1.8</build.helper.version>
       <xtend.dstdir>src/main/xtend-gen</xtend.dstdir>
       <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
       <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
       <exi.nagasena.version>0000.0002.0038.0</exi.nagasena.version>
-      <controller.distribution.version>0.1.2-SNAPSHOT</controller.distribution.version>
+      <controller.distribution.version>0.2.0-SNAPSHOT</controller.distribution.version>
 
       <!-- Sonar config -->
       <sonar-jacoco-listeners.version>2.4</sonar-jacoco-listeners.version>
@@ -65,9 +65,9 @@
       <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
       <sonar.profile>Sonar way with Findbugs</sonar.profile>
 
-      <karaf.distro.empty.version>1.4.2-SNAPSHOT</karaf.distro.empty.version>
-      <yang.binding.version>0.6.2-SNAPSHOT</yang.binding.version>
-      <dlux.version>0.1.0-SNAPSHOT</dlux.version>
+      <karaf.distro.empty.version>1.5.0-SNAPSHOT</karaf.distro.empty.version>
+      <yang.binding.version>0.7.0-SNAPSHOT</yang.binding.version>
+      <dlux.version>0.2.0-SNAPSHOT</dlux.version>
     </properties>
 
     <dependencyManagement>
@@ -228,7 +228,7 @@
         <dependency>
           <groupId>org.opendaylight.controller.thirdparty</groupId>
           <artifactId>ganymed</artifactId>
-          <version>1.1-SNAPSHOT</version>
+          <version>1.2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>xml-apis</groupId>
diff --git a/samples/learning-switch/pom.xml b/samples/learning-switch/pom.xml
index abc17b3e81..0d93452417 100644
--- a/samples/learning-switch/pom.xml
+++ b/samples/learning-switch/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.openflowplugin</groupId>
         <artifactId>openflowplugin-parent</artifactId>
-        <version>0.0.3-SNAPSHOT</version>
+        <version>0.1.0-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 
diff --git a/samples/sample-consumer/pom.xml b/samples/sample-consumer/pom.xml
index 860c3a549d..fdfb1558aa 100644
--- a/samples/sample-consumer/pom.xml
+++ b/samples/sample-consumer/pom.xml
@@ -4,12 +4,12 @@
     <parent>
         <groupId>org.opendaylight.openflowplugin</groupId>
         <artifactId>openflowplugin-parent</artifactId>
-        <version>0.0.3-SNAPSHOT</version>
+        <version>0.1.0-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 
     <artifactId>sample-consumer</artifactId>
-    <version>0.0.3-SNAPSHOT</version>
+    <version>0.1.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <build>
diff --git a/test-common/pom.xml b/test-common/pom.xml
index 107987f097..5309c6d40c 100644
--- a/test-common/pom.xml
+++ b/test-common/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.openflowplugin</groupId>
         <artifactId>openflowplugin-parent</artifactId>
-        <version>0.0.3-SNAPSHOT</version>
+        <version>0.1.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>test-common</artifactId>
diff --git a/test-provider/pom.xml b/test-provider/pom.xml
index 19d88d3018..c631749116 100644
--- a/test-provider/pom.xml
+++ b/test-provider/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.opendaylight.openflowplugin</groupId>
         <artifactId>openflowplugin-parent</artifactId>
-        <version>0.0.3-SNAPSHOT</version>
+        <version>0.1.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>test-provider</artifactId>