Incrementing versions by 0.1.0 for post-helium master branch 75/11775/2
authorMichal Rehak <mirehak@cisco.com>
Tue, 7 Oct 2014 11:43:25 +0000 (13:43 +0200)
committermichal rehak <mirehak@cisco.com>
Tue, 7 Oct 2014 11:45:14 +0000 (11:45 +0000)
+ 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>
24 files changed:
applications/pom.xml
applications/table-miss-enforcer/pom.xml
distribution/base/pom.xml
distribution/cbench/pom.xml
distribution/karaf/pom.xml
drop-test-karaf/pom.xml
drop-test/pom.xml
extension/openflowjava-extension-nicira-api/pom.xml
extension/openflowjava-extension-nicira/pom.xml
extension/openflowplugin-extension-api/pom.xml
extension/openflowplugin-extension-nicira/pom.xml
extension/pom.xml
extension/test-extension/pom.xml
features/pom.xml
features/src/main/resources/features.xml
openflowplugin-api/pom.xml
openflowplugin-controller-config/pom.xml
openflowplugin-it/pom.xml
openflowplugin/pom.xml
pom.xml
samples/learning-switch/pom.xml
samples/sample-consumer/pom.xml
test-common/pom.xml
test-provider/pom.xml

index d2e886e1dcf6114185958808beb878fc94f6316e..22ed667b5e7f7bcd664fd304e74995f2cb01c872 100644 (file)
@@ -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>
index b0f5f5d69a2ee5ebb0326fcd00ad3f6488ecee08..dad06bdbae7cf96d0055f347a61eceff0a566b7e 100644 (file)
@@ -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>
index 4725c99f66b22b2443a7df1ef58f9e65614f72a9..3824dda769612550b8271a05ffb89dd77721232c 100644 (file)
@@ -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 -->
index 73d4eb97e75cd3fbd244d8be4ccbcacdc470ba09..6474afc97a37e03812b1dbd4afcdd3c7548dbc86 100644 (file)
@@ -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>
 
index 3e6745b81a5558079e619b187fe1235784ef523e..a267387bbc76eba5e71333a3a477b25bb210b523 100644 (file)
@@ -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>
index 4569bf190436b5b695c0b97b6c262392acfb9167..2aab1e2c387bb857db4a77cb48d1c08f47280497 100644 (file)
@@ -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>
index fb5becaff59d0db8c4a11f6969e90a71cc625879..5da0a710182d73e286b070fded9652fd145ab94f 100644 (file)
@@ -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>
index 47f83336c27fca90d64c1eddcd319047d6cd351f..2f9e9a7e0d5eb10da11969df75e81c935c3c7b6c 100644 (file)
@@ -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>
index 290fd7f7f5bc04e37eea721158bf31b1cd040232..b31fad14e6cd3f29c9ff04677550dda2bd3b094d 100644 (file)
@@ -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>
index 5edb6702fa421ef7ccc4f40ff730d1c5bab87d7d..968cd8d910e4e67138c6847dca3e3f98d2b66f87 100644 (file)
@@ -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>
 
index 4f10299907a7826ac35113b957109848603783bb..808f0a80a007396ae4c34ac42653b483a17c1a62 100644 (file)
@@ -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>
 
index 6c8c9109b8dcd11cb79e09fdb6e9fd21f769a4fa..00487329602bd2255642616b32307d8d81a9ce4b 100644 (file)
@@ -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>
index aa10c1ea3caa9c43c6ba9a1e6d286015f54d23e2..dfd60c0c701e67ad36e319c3f0b7149cfc444c80 100644 (file)
@@ -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>
index 7615003c7a65a695f0796db07b051782ee1aaaa2..482fa36885d6c62f90b10ab26121776feaa9c9e3 100644 (file)
@@ -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>
       <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>
index 999d8a75dbc324e8a886920843c57997286b812c..9a3d39bcf83a13428839b554d3e633ee5f511afd 100644 (file)
@@ -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>
index 86c38810123bc8c2e6d8b8aa6d25640ee27510a2..5eddb5ca7a69d0ebee937fb9109cd94317ecf333 100644 (file)
@@ -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>
 
index 93bbfa1a490b12d2df99a5d6afc3af5d6b5b1ea1..b762dc674c40e486332a878c58ef492fef07d6df 100644 (file)
@@ -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>
index 06cee83c42d6d524e38c3b6ca4772f5eb5001aa0..ccfb159ca41756c4543fc9caec5b9d48fcdd7af2 100644 (file)
@@ -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>
 
index 571d5e9c2a41ea54f271487196e8bbdf55f43cd3..eef4182aa81c61a7804a62db4158d37ab9ba62d4 100644 (file)
@@ -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>
 
     <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 3c649f79132a6a662a7b73cd5428961ad644e141..5123b1e80117b0da3d675770d10e7600271d37d1 100644 (file)
--- 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>
 
     <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>
         <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>
index abc17b3e810f5352743f33fdba4b43f249cb7a95..0d9345241737267e96e10ca279f2fecdf4ddb0a6 100644 (file)
@@ -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>
 
index 860c3a549d505419a092d41135ca9174688633a3..fdfb1558aab4e9ed72d63bc5158c7d5b9a1db9dc 100644 (file)
@@ -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>
index 107987f097b5f3484a68ad29513890f322e63f97..5309c6d40cd838831e34b8e07fcf27de5afccab4 100644 (file)
@@ -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>
index 19d88d301844844533012b88de70665756412439..c63174911659252cb4b45b1419a1904d0e5338b4 100644 (file)
@@ -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>