Change default timeout to 30 sec.

[controller.git] / opendaylight / forwarding / staticrouting / pom.xml

diff --git a/opendaylight/forwarding/staticrouting/pom.xml b/opendaylight/forwarding/staticrouting/pom.xml
index 38f18bf67c8f231b1f023fa49a06e7d91762f905..ea22c4f1ca4c03952a419c67a05b2a16daea13db 100644 (file)
--- a/opendaylight/forwarding/staticrouting/pom.xml
+++ b/opendaylight/forwarding/staticrouting/pom.xml
@@ -8,7 +8,6 @@
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>forwarding.staticrouting</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
@@ -16,16 +15,16 @@
   <build>
     <plugins>
       <plugin>
-       <groupId>org.apache.felix</groupId>
-       <artifactId>maven-bundle-plugin</artifactId>
-       <version>2.3.6</version>
-       <extensions>true</extensions>
-       <configuration>
-         <instructions>
-           <Import-Package>
-                         org.opendaylight.controller.sal.utils,
-                         org.opendaylight.controller.sal.core,
-                         org.opendaylight.controller.configuration,
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.3.6</version>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Import-Package>
+              org.opendaylight.controller.sal.utils,
+              org.opendaylight.controller.sal.core,
+              org.opendaylight.controller.configuration,
               org.opendaylight.controller.forwardingrulesmanager,
               org.opendaylight.controller.hosttracker,
               org.opendaylight.controller.hosttracker.hostAware,
@@ -39,14 +38,15 @@
               org.apache.felix.dm,
               org.apache.commons.lang3.builder
             </Import-Package>
-           <Export-Package>
+            <Export-Package>
               org.opendaylight.controller.forwarding.staticrouting
             </Export-Package>
-               <Bundle-Activator>
-                 org.opendaylight.controller.forwarding.staticrouting.internal.Activator
-               </Bundle-Activator>
-         </instructions>
-       </configuration>
+            <Bundle-Activator>
+              org.opendaylight.controller.forwarding.staticrouting.internal.Activator
+            </Bundle-Activator>
+          </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
+        </configuration>
       </plugin>
     </plugins>
   </build>
@@ -70,17 +70,17 @@
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>configuration</artifactId>
       <version>0.4.0-SNAPSHOT</version>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.8.1</version>
       <scope>test</scope>
     </dependency>
-       <dependency>
-               <groupId>org.opendaylight.controller</groupId>
-               <artifactId>sal</artifactId>
-               <version>0.4.0-SNAPSHOT</version>
-       </dependency>    
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal</artifactId>
+      <version>0.5.0-SNAPSHOT</version>
+    </dependency>
   </dependencies>
 </project>