X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fcommons%2Fopendaylight%2Fpom.xml;h=93845a356d40c5be253b01c1a30e6c0fcd8080a8;hb=ced3f70572c426af15515ee27b979ff05c26e1aa;hp=2c71c40e3f1121a6aa4319cdc40da0ce61a69bb3;hpb=48350c456393c0fe530dc29642c7d95c11a8a70a;p=controller.git

diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index 2c71c40e3f..93845a356d 100644
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -4,21 +4,20 @@
   <prerequisites>
     <maven>3.0</maven>
   </prerequisites>
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>commons.opendaylight</artifactId>
-  <version>1.4.1</version>
+  <version>1.4.2-SNAPSHOT</version>
   <packaging>pom</packaging>
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.parent</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
   <scm>
     <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:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <properties>
@@ -57,11 +56,11 @@
     <testvm.argLine>-Xmx1024m -XX:MaxPermSize=256m</testvm.argLine>
     <guava.version>14.0.1</guava.version>
     <osgi.core.version>5.0.0</osgi.core.version>
-    <ietf-inet-types.version>2010.09.24.3</ietf-inet-types.version>
-    <ietf-yang-types.version>2010.09.24.3</ietf-yang-types.version>
-    <ietf-topology.version>2013.10.21.1</ietf-topology.version>
-    <opendaylight-l2-types.version>2013.08.27.3</opendaylight-l2-types.version>
-    <yang-ext.version>2013.09.07.3</yang-ext.version>
+    <ietf-inet-types.version>2010.09.24.4-SNAPSHOT</ietf-inet-types.version>
+    <ietf-yang-types.version>2010.09.24.4-SNAPSHOT</ietf-yang-types.version>
+    <ietf-topology.version>2013.10.21.2-SNAPSHOT</ietf-topology.version>
+    <opendaylight-l2-types.version>2013.08.27.4-SNAPSHOT</opendaylight-l2-types.version>
+    <yang-ext.version>2013.09.07.4-SNAPSHOT</yang-ext.version>
     <javassist.version>3.17.1-GA</javassist.version>
     <releaseplugin.version>2.3.2</releaseplugin.version>
     <commons.lang.version>3.1</commons.lang.version>
@@ -69,40 +68,40 @@
     <enforcer.version>1.3.1</enforcer.version>
     <bundle.plugin.version>2.3.7</bundle.plugin.version>
     <junit.version>4.8.1</junit.version>
-    <yangtools.version>0.6.1</yangtools.version>
+    <yangtools.version>0.6.2-SNAPSHOT</yangtools.version>
     <!--versions for bits of the controller -->
-    <controller.version>0.4.1</controller.version>
-    <hosttracker.api.version>0.5.1</hosttracker.api.version>
-    <hosttracker_new.api.version>0.4.1</hosttracker_new.api.version>
-    <hosttracker.implementation.version>0.5.1</hosttracker.implementation.version>
-    <arphandler.version>0.5.1</arphandler.version>
-    <forwarding.staticrouting>0.5.1</forwarding.staticrouting>
-    <samples.loadbalancer>0.5.1</samples.loadbalancer>
-    <config.version>0.2.3</config.version>
-    <netconf.version>0.2.3</netconf.version>
-    <mdsal.version>1.0</mdsal.version>
-    <containermanager.version>0.5.1</containermanager.version>
-    <containermanager.it.version>0.5.1</containermanager.it.version>
-    <switchmanager.api.version>0.7.0</switchmanager.api.version>
-    <connectionmanager.version>0.1.1</connectionmanager.version>
-    <sal.version>0.7.0</sal.version>
-    <sal.networkconfiguration.version>0.0.2</sal.networkconfiguration.version>
-    <sal.connection.version>0.1.1</sal.connection.version>
-    <networkconfig.bridgedomain.northbound.version>0.0.2</networkconfig.bridgedomain.northbound.version>
-    <commons.httpclient.version>0.1.1</commons.httpclient.version>
-    <concepts.version>0.5.1</concepts.version>
-    <protocol-framework.version>0.4.0</protocol-framework.version>
+    <controller.version>0.4.2-SNAPSHOT</controller.version>
+    <hosttracker.api.version>0.5.2-SNAPSHOT</hosttracker.api.version>
+    <hosttracker_new.api.version>0.4.2-SNAPSHOT</hosttracker_new.api.version>
+    <hosttracker.implementation.version>0.5.2-SNAPSHOT</hosttracker.implementation.version>
+    <arphandler.version>0.5.2-SNAPSHOT</arphandler.version>
+    <forwarding.staticrouting>0.5.2-SNAPSHOT</forwarding.staticrouting>
+    <samples.loadbalancer>0.5.2-SNAPSHOT</samples.loadbalancer>
+    <config.version>0.2.4-SNAPSHOT</config.version>
+    <netconf.version>0.2.4-SNAPSHOT</netconf.version>
+    <mdsal.version>1.1-SNAPSHOT</mdsal.version>
+    <containermanager.version>0.5.2-SNAPSHOT</containermanager.version>
+    <containermanager.it.version>0.5.2-SNAPSHOT</containermanager.it.version>
+    <switchmanager.api.version>0.7.1-SNAPSHOT</switchmanager.api.version>
+    <connectionmanager.version>0.1.2-SNAPSHOT</connectionmanager.version>
+    <sal.version>0.7.1-SNAPSHOT</sal.version>
+    <sal.networkconfiguration.version>0.0.3-SNAPSHOT</sal.networkconfiguration.version>
+    <sal.connection.version>0.1.2-SNAPSHOT</sal.connection.version>
+    <networkconfig.bridgedomain.northbound.version>0.0.3-SNAPSHOT</networkconfig.bridgedomain.northbound.version>
+    <commons.httpclient.version>0.1.2-SNAPSHOT</commons.httpclient.version>
+    <concepts.version>0.5.2-SNAPSHOT</concepts.version>
+    <protocol-framework.version>0.5.0-SNAPSHOT</protocol-framework.version>
     <netty.version>4.0.10.Final</netty.version>
     <commons.io.version>2.4</commons.io.version>
-    <bundlescanner.version>0.4.1</bundlescanner.version>
-    <usermanager.version>0.4.1</usermanager.version>
-    <forwardingrulesmanager.version>0.5.0</forwardingrulesmanager.version>
-    <statisticsmanager.version>0.5.0</statisticsmanager.version>
-    <clustering.services.version>0.5.0</clustering.services.version>
-    <configuration.version>0.4.1</configuration.version>
-    <topologymanager.version>0.4.1</topologymanager.version>
-    <protocol_plugin.stub.version>0.4.1</protocol_plugin.stub.version>
-    <clustering.stub.version>0.4.1</clustering.stub.version>
+    <bundlescanner.version>0.4.2-SNAPSHOT</bundlescanner.version>
+    <usermanager.version>0.4.2-SNAPSHOT</usermanager.version>
+    <forwardingrulesmanager.version>0.5.1-SNAPSHOT</forwardingrulesmanager.version>
+    <statisticsmanager.version>0.5.1-SNAPSHOT</statisticsmanager.version>
+    <clustering.services.version>0.5.1-SNAPSHOT</clustering.services.version>
+    <configuration.version>0.4.2-SNAPSHOT</configuration.version>
+    <topologymanager.version>0.4.2-SNAPSHOT</topologymanager.version>
+    <protocol_plugin.stub.version>0.4.2-SNAPSHOT</protocol_plugin.stub.version>
+    <clustering.stub.version>0.4.2-SNAPSHOT</clustering.stub.version>
     <!-- Third party version -->
     <jersey-servlet.version>1.17</jersey-servlet.version>
     <corsfilter.version>7.0.42</corsfilter.version>
@@ -645,7 +644,7 @@
       <dependency>
         <groupId>org.opendaylight.controller.thirdparty</groupId>
         <artifactId>ganymed</artifactId>
-        <version>1.0</version>
+        <version>1.1-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>com.google.code.findbugs</groupId>
@@ -722,6 +721,11 @@
             <artifactId>netty-common</artifactId>
             <version>${netty.version}</version>
         </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-codec-http</artifactId>
+            <version>${netty.version}</version>
+        </dependency>
 
       <!-- yangtools dependencies -->
       <dependency>
@@ -754,6 +758,12 @@
        <artifactId>yang-model-api</artifactId>
        <version>${yangtools.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yang-model-util</artifactId>
+        <version>${yangtools.version}</version>
+      </dependency>
+
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>hosttracker</artifactId>
@@ -789,11 +799,6 @@
         <artifactId>clustering.stub</artifactId>
         <version>${clustering.stub.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>configuration</artifactId>
-        <version>${controller.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>configuration.implementation</artifactId>
@@ -953,7 +958,7 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>osgi-brandfragment.web</artifactId>
-        <version>0.0.1</version>
+        <version>0.0.2-SNAPSHOT</version>
       </dependency>
 
       <!--  Neutron -->
@@ -1037,12 +1042,12 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>httpservice-bridge</artifactId>
-        <version>0.0.1</version>
+        <version>0.0.2-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>jolokia-bridge</artifactId>
-        <version>0.0.1</version>
+        <version>0.0.2-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
@@ -1052,12 +1057,12 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>usermanager.northbound</artifactId>
-        <version>0.0.1</version>
+        <version>0.0.2-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>controllermanager.northbound</artifactId>
-        <version>0.0.1</version>
+        <version>0.0.2-SNAPSHOT</version>
       </dependency>
       <!-- Debug and logging -->
       <dependency>
@@ -1134,7 +1139,7 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>commons.logback_settings</artifactId>
-        <version>0.0.1</version>
+        <version>0.0.2-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
       <dependency>
@@ -1432,7 +1437,6 @@
               <artifactId>netty-timer-config</artifactId>
               <version>${config.version}</version>
           </dependency>
-
           <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>configuration</artifactId>
@@ -1661,7 +1665,7 @@
           <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>checkstyle</artifactId>
-            <version>0.0.2</version>
+            <version>0.0.3-SNAPSHOT</version>
           </dependency>
         </dependencies>
         <executions>
@@ -1878,7 +1882,7 @@
             <dependency>
               <groupId>org.opendaylight.controller</groupId>
               <artifactId>commons.logback_settings</artifactId>
-              <version>0.0.1</version>
+              <version>0.0.2-SNAPSHOT</version>
             </dependency>
           </dependencies>
         </plugin>