Bug 698 - Confingured controller script to set max memory to 1 GB if not defined

[controller.git] / opendaylight / md-sal / topology-lldp-discovery / pom.xml

diff --git a/opendaylight/md-sal/topology-lldp-discovery/pom.xml b/opendaylight/md-sal/topology-lldp-discovery/pom.xml
index 90fd338c1239f3776e8945575c447f909051a4c4..590e8ea91a0349345124b3aa552942d036ca6352 100644 (file)
--- a/opendaylight/md-sal/topology-lldp-discovery/pom.xml
+++ b/opendaylight/md-sal/topology-lldp-discovery/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>
         <relativePath>../</relativePath>
     </parent>
     <groupId>org.opendaylight.controller.md</groupId>
@@ -12,7 +12,7 @@
     <scm>
         <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
-      <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+      <tag>HEAD</tag>
   </scm>
     <properties>
         <guava.version>14.0.1</guava.version>
@@ -28,27 +28,22 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-api</artifactId>
-            <version>1.0</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-base</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.controller.model</groupId>
             <artifactId>model-inventory</artifactId>
-            <version>1.0</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.xtend</groupId>
@@ -57,7 +52,6 @@
          <dependency>
                <groupId>equinoxSDK381</groupId>
                <artifactId>org.eclipse.osgi</artifactId>
-               <version>3.8.1.v20120830-144521</version>
              </dependency>
              <dependency>
             <groupId>commons-lang</groupId>
@@ -71,12 +65,10 @@
           <dependency>
                    <groupId>commons-codec</groupId>
                    <artifactId>commons-codec</artifactId>
-                   <version>1.7</version>
                  </dependency>
     <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal</artifactId>
-            <version>0.7.0</version>
         </dependency>
              
     </dependencies>