Merge changes I393151af,I0a302cde

[controller.git] / opendaylight / md-sal / forwardingrules-manager / pom.xml

diff --git a/opendaylight/md-sal/forwardingrules-manager/pom.xml b/opendaylight/md-sal/forwardingrules-manager/pom.xml
index b025102e8caef74582e0391c8cfaad350d82719b..00cbc18e7e44ae7b0a8efbbfeb332374dc7b471b 100644 (file)
--- a/opendaylight/md-sal/forwardingrules-manager/pom.xml
+++ b/opendaylight/md-sal/forwardingrules-manager/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>sal-parent</artifactId>
-        <version>1.0</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <groupId>org.opendaylight.controller.md</groupId>
     <artifactId>forwardingrules-manager</artifactId>
@@ -13,7 +13,7 @@
         <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
         <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-      <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+      <tag>HEAD</tag>
   </scm>
   
         <build>
@@ -46,22 +46,19 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-api</artifactId>
-      <version>1.0</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>flow-management-compatibility</artifactId>
-      <version>1.0</version>
+      <version>1.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller.model</groupId>
       <artifactId>model-flow-service</artifactId>
-      <version>1.0</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller.model</groupId>
       <artifactId>model-flow-management</artifactId>
-      <version>1.0</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
@@ -70,7 +67,6 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-broker-impl</artifactId>
-      <version>1.0</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>