Merge "Bug 7182 related: Remove M2E lifecycle mapping"

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index a54a33e0b64f79d620e94ee875b596101e32a3c9..42397cd02953388bbbe309666cc59d54d5680a8f 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -14,13 +14,13 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.9.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
     <groupId>org.opendaylight.openflowjava</groupId>
     <artifactId>openflowjava-artifacts</artifactId>
-    <version>0.9.0-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <dependencyManagement>

diff --git a/features/features-openflowjava/pom.xml b/features/features-openflowjava/pom.xml
index e14cb2aee163aff94b04613b235f305b07168cd6..ceab13841c5e00fdc4bca501b362c2532198f169 100644 (file)
--- a/features/features-openflowjava/pom.xml
+++ b/features/features-openflowjava/pom.xml
@@ -4,20 +4,20 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>features-parent</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.9.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.openflowjava</groupId>
   <artifactId>features-openflowjava</artifactId>
-  <version>0.9.0-SNAPSHOT</version>
+  <version>0.10.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <properties>
-    <config.version>0.6.0-SNAPSHOT</config.version>
-    <controller.mdsal.version>1.5.0-SNAPSHOT</controller.mdsal.version>
-    <mdsal.version>2.2.0-SNAPSHOT</mdsal.version>
-    <mdsal.model.version>0.10.0-SNAPSHOT</mdsal.model.version>
+    <config.version>0.7.0-SNAPSHOT</config.version>
+    <controller.mdsal.version>1.6.0-SNAPSHOT</controller.mdsal.version>
+    <mdsal.version>2.3.0-SNAPSHOT</mdsal.version>
+    <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
   </properties>
 
   <dependencyManagement>
@@ -35,7 +35,7 @@
       <dependency>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-artifacts</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.9.0-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

diff --git a/features/features4-openflowjava/pom.xml b/features/features4-openflowjava/pom.xml
index a5a28e6def2441dc0740abb3d5c1a60a0d184d65..63278712e4e99bb137077c83b34d7fe9b2b701e2 100644 (file)
--- a/features/features4-openflowjava/pom.xml
+++ b/features/features4-openflowjava/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.9.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.openflowjava</groupId>
   <artifactId>features4-openflowjava</artifactId>
-  <version>0.9.0-SNAPSHOT</version>
+  <version>0.10.0-SNAPSHOT</version>
   <packaging>feature</packaging>
 
   <dependencies>

diff --git a/features/odl-openflowjava-all/pom.xml b/features/odl-openflowjava-all/pom.xml
index 67a750e42b9813f41cfcdc27e63ed539e89921bc..7369a077d21508625e74cc09752d79f6cfeb127f 100644 (file)
--- a/features/odl-openflowjava-all/pom.xml
+++ b/features/odl-openflowjava-all/pom.xml
@@ -7,13 +7,13 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.9.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.openflowjava</groupId>
     <artifactId>odl-openflowjava-all</artifactId>
-    <version>0.9.0-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>OpenDaylight :: Openflow Java :: All</name>

diff --git a/features/odl-openflowjava-protocol/pom.xml b/features/odl-openflowjava-protocol/pom.xml
index e709f7523852005939482a3e045728c7c5562c6a..c87fc8474680b23b9786ff8ada3e8ade20d44317 100644 (file)
--- a/features/odl-openflowjava-protocol/pom.xml
+++ b/features/odl-openflowjava-protocol/pom.xml
@@ -7,23 +7,23 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.9.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.openflowjava</groupId>
     <artifactId>odl-openflowjava-protocol</artifactId>
-    <version>0.9.0-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>OpenDaylight :: Openflow Java :: Protocol</name>
 
     <properties>
-        <config.version>0.6.0-SNAPSHOT</config.version>
-        <controller.mdsal.version>1.5.0-SNAPSHOT</controller.mdsal.version>
-        <mdsal.version>2.2.0-SNAPSHOT</mdsal.version>
-        <mdsal.model.version>0.10.0-SNAPSHOT</mdsal.model.version>
-        <odlparent.netty>1.8.0-SNAPSHOT</odlparent.netty>
+        <config.version>0.7.0-SNAPSHOT</config.version>
+        <controller.mdsal.version>1.6.0-SNAPSHOT</controller.mdsal.version>
+        <mdsal.version>2.3.0-SNAPSHOT</mdsal.version>
+        <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
+        <odlparent.netty>1.9.0-SNAPSHOT</odlparent.netty>
     </properties>
 
 

diff --git a/features/pom.xml b/features/pom.xml
index a1ef0fd94b0b851ab34479acf432108cb58ff152..01f496b0ee4caaa6f65a239574ebd79d8c8b49b0 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.9.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.openflowjava</groupId>
   <artifactId>features-aggregator</artifactId>
-  <version>0.9.0-SNAPSHOT</version>
+  <version>0.10.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <modules>

diff --git a/openflow-protocol-api/pom.xml b/openflow-protocol-api/pom.xml
index 7eb1582107f3d12f8b3da651590bd5ef274d0dea..6576cec145d142425f60aa7015510f1533670cda 100644 (file)
--- a/openflow-protocol-api/pom.xml
+++ b/openflow-protocol-api/pom.xml
@@ -4,12 +4,12 @@
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>0.10.0-SNAPSHOT</version>
+        <version>0.11.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.openflowjava</groupId>
     <artifactId>openflow-protocol-api</artifactId>
-    <version>0.9.0-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Openflow Protocol Library - API</name>
     <scm>
@@ -18,8 +18,8 @@
     </scm>
 
     <properties>
-      <mdsal.version>2.2.0-SNAPSHOT</mdsal.version>
-      <mdsal.model.version>0.10.0-SNAPSHOT</mdsal.model.version>
+      <mdsal.version>2.3.0-SNAPSHOT</mdsal.version>
+      <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
     </properties>
 
     <dependencyManagement>

diff --git a/openflow-protocol-impl/pom.xml b/openflow-protocol-impl/pom.xml
index c97c7acb60808169db07135e6843ce08321b126a..19258fa872c9e9c71c29d6c8394808d4b98055b2 100644 (file)
--- a/openflow-protocol-impl/pom.xml
+++ b/openflow-protocol-impl/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.opendaylight.openflowjava</groupId>
         <artifactId>openflowjava-parent</artifactId>
-        <version>0.9.0-SNAPSHOT</version>
+        <version>0.10.0-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
     <artifactId>openflow-protocol-impl</artifactId>
@@ -52,12 +52,12 @@
                                 </generator>
                                 <generator>
                                     <codeGeneratorClass>
-                                        org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl
+                                        org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl
                                     </codeGeneratorClass>
                                     <outputBaseDir>${salGeneratorPath}</outputBaseDir>
                                 </generator>
                                 <generator>
-                                    <codeGeneratorClass>org.opendaylight.yangtools.yang.unified.doc.generator.maven.DocumentationGeneratorImpl</codeGeneratorClass>
+                                    <codeGeneratorClass>org.opendaylight.mdsal.binding.yang.unified.doc.generator.maven.DocumentationGeneratorImpl</codeGeneratorClass>
                                     <outputBaseDir>${project.build.directory}/site/models</outputBaseDir>
                                 </generator>
                             </codeGenerators>

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/UdpHandlerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/UdpHandlerTest.java
index ff36181f6d98d8f15e1417361803be9dc2f8a719..72bbe8e08151a571de51050662fea80628d41c7c 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/UdpHandlerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/UdpHandlerTest.java
@@ -7,6 +7,7 @@
  */
 package org.opendaylight.openflowjava.protocol.impl.core.connection;
 
+import com.google.common.util.concurrent.ListenableFuture;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.util.concurrent.ExecutionException;
@@ -19,16 +20,20 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.opendaylight.openflowjava.protocol.impl.core.UdpChannelInitializer;
 import org.opendaylight.openflowjava.protocol.impl.core.UdpHandler;
-
-import com.google.common.util.concurrent.ListenableFuture;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author madamjak
  *
  */
 public class UdpHandlerTest {
-    @Mock UdpChannelInitializer udpChannelInitializerMock;
-    UdpHandler udpHandler;
+
+    private static final Logger LOG = LoggerFactory.getLogger(UdpHandlerTest.class);
+
+    @Mock
+    private UdpChannelInitializer udpChannelInitializerMock;
+    private UdpHandler udpHandler;
     /**
      * Mock init
      */
@@ -44,12 +49,12 @@ public class UdpHandlerTest {
      * @throws IOException
      */
     @Test
-    public void testWithEmptyAddress() throws InterruptedException, ExecutionException, IOException {
+    public void testWithEmptyAddress() throws Exception {
         udpHandler = new UdpHandler(null, 0);
         udpHandler.setChannelInitializer(udpChannelInitializerMock);
         Assert.assertTrue("Wrong - start server", startupServer(false));
         try {
-            Assert.assertTrue(udpHandler.getIsOnlineFuture().get(1500,TimeUnit.MILLISECONDS).booleanValue());
+            Assert.assertTrue(udpHandler.getIsOnlineFuture().get(1500, TimeUnit.MILLISECONDS));
         } catch (TimeoutException e) {
             Assert.fail("Wrong - getIsOnlineFuture timed out");
         }
@@ -64,12 +69,12 @@ public class UdpHandlerTest {
      * @throws IOException
      */
     @Test
-    public void testWithEmptyAddressOnEpoll() throws InterruptedException, ExecutionException, IOException {
+    public void testWithEmptyAddressOnEpoll() throws Exception {
         udpHandler = new UdpHandler(null, 0);
         udpHandler.setChannelInitializer(udpChannelInitializerMock);
         Assert.assertTrue("Wrong - start server", startupServer(true));
         try {
-            Assert.assertTrue(udpHandler.getIsOnlineFuture().get(1500,TimeUnit.MILLISECONDS).booleanValue());
+            Assert.assertTrue(udpHandler.getIsOnlineFuture().get(1500,TimeUnit.MILLISECONDS));
         } catch (TimeoutException e) {
             Assert.fail("Wrong - getIsOnlineFuture timed out");
         }
@@ -84,13 +89,13 @@ public class UdpHandlerTest {
      * @throws IOException
      */
     @Test
-    public void testWithAddressAndPort() throws InterruptedException, ExecutionException, IOException{
+    public void testWithAddressAndPort() throws Exception{
         int port = 9874;
         udpHandler = new UdpHandler(InetAddress.getLocalHost(), port);
         udpHandler.setChannelInitializer(udpChannelInitializerMock);
         Assert.assertTrue("Wrong - start server", startupServer(false));
         try {
-            Assert.assertTrue(udpHandler.getIsOnlineFuture().get(1500,TimeUnit.MILLISECONDS).booleanValue());
+            Assert.assertTrue(udpHandler.getIsOnlineFuture().get(1500,TimeUnit.MILLISECONDS));
         } catch (TimeoutException e) {
             Assert.fail("Wrong - getIsOnlineFuture timed out");
         }
@@ -105,13 +110,13 @@ public class UdpHandlerTest {
      * @throws IOException
      */
     @Test
-    public void testWithAddressAndPortOnEpoll() throws InterruptedException, ExecutionException, IOException{
+    public void testWithAddressAndPortOnEpoll() throws Exception {
         int port = 9874;
         udpHandler = new UdpHandler(InetAddress.getLocalHost(), port);
         udpHandler.setChannelInitializer(udpChannelInitializerMock);
         Assert.assertTrue("Wrong - start server", startupServer(true));
         try {
-            Assert.assertTrue(udpHandler.getIsOnlineFuture().get(1500,TimeUnit.MILLISECONDS).booleanValue());
+            Assert.assertTrue(udpHandler.getIsOnlineFuture().get(1500,TimeUnit.MILLISECONDS));
         } catch (TimeoutException e) {
             Assert.fail("Wrong - getIsOnlineFuture timed out");
         }
@@ -119,25 +124,28 @@ public class UdpHandlerTest {
         shutdownServer();
     }
 
-    private Boolean startupServer(boolean isEpollEnabled) throws InterruptedException, IOException, ExecutionException {
+    private Boolean startupServer(final boolean isEpollEnabled) throws InterruptedException, IOException, ExecutionException {
         ListenableFuture<Boolean> online = udpHandler.getIsOnlineFuture();
         /**
          * Test EPoll based native transport if isEpollEnabled is true.
          * Else use Nio based transport.
          */
         udpHandler.initiateEventLoopGroups(null, isEpollEnabled);
-            (new Thread(udpHandler)).start();
-            int retry = 0;
-            while (online.isDone() != true && retry++ < 20) {
-                Thread.sleep(100);
-            }
-        return online.isDone() ;
+        (new Thread(udpHandler)).start();
+
+        boolean startedSuccessfully = false;
+        try {
+            startedSuccessfully = online.get(10, TimeUnit.SECONDS);
+        } catch (TimeoutException e) {
+            LOG.warn("Timeout while waiting for UDP handler to start", e);
+        }
+
+        return online.isDone();
     }
 
-    private void shutdownServer() throws InterruptedException, ExecutionException {
+    private void shutdownServer() throws InterruptedException, ExecutionException, TimeoutException {
         ListenableFuture<Boolean> shutdownRet = udpHandler.shutdown() ;
-        while ( shutdownRet.isDone() != true )
-            Thread.sleep(100) ;
-        Assert.assertTrue("Wrong - shutdown failed", shutdownRet.get());
+        final Boolean shutdownSucceeded = shutdownRet.get(10, TimeUnit.SECONDS);
+        Assert.assertTrue("Wrong - shutdown failed", shutdownSucceeded);
     }
 }

diff --git a/openflow-protocol-it/pom.xml b/openflow-protocol-it/pom.xml
index b93ba9e62468bc09f704edd26bb5d3f795ffbd80..d55f9a1514fd573f2a1d7d48de221a744e2e9122 100644 (file)
--- a/openflow-protocol-it/pom.xml
+++ b/openflow-protocol-it/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.opendaylight.openflowjava</groupId>
         <artifactId>openflowjava-parent</artifactId>
-        <version>0.9.0-SNAPSHOT</version>
+        <version>0.10.0-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
     <artifactId>openflow-protocol-it</artifactId>

diff --git a/openflow-protocol-spi/pom.xml b/openflow-protocol-spi/pom.xml
index 2e7057b660113e59049f96b1d4870839442fa880..0679503e96b6c754d55c22c51373703bf1f1dcff 100644 (file)
--- a/openflow-protocol-spi/pom.xml
+++ b/openflow-protocol-spi/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.opendaylight.openflowjava</groupId>
         <artifactId>openflowjava-parent</artifactId>
-        <version>0.9.0-SNAPSHOT</version>
+        <version>0.10.0-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
     <artifactId>openflow-protocol-spi</artifactId>
@@ -50,12 +50,12 @@
                                 </generator>
                                 <generator>
                                     <codeGeneratorClass>
-                                        org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl
+                                        org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl
                                     </codeGeneratorClass>
                                     <outputBaseDir>${salGeneratorPath}</outputBaseDir>
                                 </generator>
                                 <generator>
-                                    <codeGeneratorClass>org.opendaylight.yangtools.yang.unified.doc.generator.maven.DocumentationGeneratorImpl</codeGeneratorClass>
+                                    <codeGeneratorClass>org.opendaylight.mdsal.binding.yang.unified.doc.generator.maven.DocumentationGeneratorImpl</codeGeneratorClass>
                                     <outputBaseDir>${project.build.directory}/site/models</outputBaseDir>
                                 </generator>
                             </codeGenerators>

diff --git a/openflowjava-blueprint-config/pom.xml b/openflowjava-blueprint-config/pom.xml
index c3e6c6ca4a2d708ee03cf60fe933b278fcc3731b..d3a9b9d5fbb0f1840defed4c767ca929b808190a 100644 (file)
--- a/openflowjava-blueprint-config/pom.xml
+++ b/openflowjava-blueprint-config/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.openflowjava</groupId>
         <artifactId>openflowjava-parent</artifactId>
-        <version>0.9.0-SNAPSHOT</version>
+        <version>0.10.0-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
     <artifactId>openflowjava-blueprint-config</artifactId>

diff --git a/openflowjava-config/pom.xml b/openflowjava-config/pom.xml
index 1f7bc3e0554364193f9102422ce1aa8ea4662e2f..dc0b29b6b27f012a28f03bffd25115917c108c6b 100644 (file)
--- a/openflowjava-config/pom.xml
+++ b/openflowjava-config/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.openflowjava</groupId>
         <artifactId>openflowjava-parent</artifactId>
-        <version>0.9.0-SNAPSHOT</version>
+        <version>0.10.0-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
     <artifactId>openflowjava-config</artifactId>

diff --git a/openflowjava-util/pom.xml b/openflowjava-util/pom.xml
index 27ffc9bc5bcb0d24f60fc60a1f079bbd344d6c43..e9b4465a00cd02f0220d57adf0b70654605ac66f 100644 (file)
--- a/openflowjava-util/pom.xml
+++ b/openflowjava-util/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.openflowjava</groupId>
         <artifactId>openflowjava-parent</artifactId>
-        <version>0.9.0-SNAPSHOT</version>
+        <version>0.10.0-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
     <packaging>bundle</packaging>

diff --git a/parent/pom.xml b/parent/pom.xml
index 931ecda0fbb6874420e49c788d1afff71a3f5721..20a352de4efbc02935fd0da0058bdb87d125cd9b 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -4,13 +4,13 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.9.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.openflowjava</groupId>
     <artifactId>openflowjava-parent</artifactId>
-    <version>0.9.0-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>openflowjava</name> <!-- Used by Sonar to set project name -->
     <description>
@@ -51,13 +51,13 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jmxGeneratorPath>${project.build.directory}/yang-gen-config</jmxGeneratorPath>
-        <karaf.distro.empty.version>1.8.0-SNAPSHOT</karaf.distro.empty.version>
+        <karaf.distro.empty.version>1.9.0-SNAPSHOT</karaf.distro.empty.version>
         <salGeneratorPath>${project.build.directory}/yang-gen-sal</salGeneratorPath>
 
-        <config.version>0.6.0-SNAPSHOT</config.version>
-        <controller.mdsal.version>1.5.0-SNAPSHOT</controller.mdsal.version>
-        <mdsal.model.version>0.10.0-SNAPSHOT</mdsal.model.version>
-        <yangtools.version>1.1.0-SNAPSHOT</yangtools.version>
+        <config.version>0.7.0-SNAPSHOT</config.version>
+        <controller.mdsal.version>1.6.0-SNAPSHOT</controller.mdsal.version>
+        <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
+        <yangtools.version>1.2.0-SNAPSHOT</yangtools.version>
         <argparse4j.version>0.7.0</argparse4j.version>
     </properties>
 

diff --git a/pom.xml b/pom.xml
index 0ed9835234a8cb4e727cbb5773d04213b61fcb64..e3eda8b0ce395f3feeaa2c52f1d533bfe88ed184 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.openflowjava</groupId>
         <artifactId>openflowjava-parent</artifactId>
-        <version>0.9.0-SNAPSHOT</version>
+        <version>0.10.0-SNAPSHOT</version>
         <relativePath>parent</relativePath>
     </parent>
 

diff --git a/simple-client/pom.xml b/simple-client/pom.xml
index 76dd357561e0b863de93d4e6c3eb20cb5f3ca844..87665c7617ee508080f002880b03e253160e72a0 100644 (file)
--- a/simple-client/pom.xml
+++ b/simple-client/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.opendaylight.openflowjava</groupId>
         <artifactId>openflowjava-parent</artifactId>
-        <version>0.9.0-SNAPSHOT</version>
+        <version>0.10.0-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
     <artifactId>simple-client</artifactId>