Merge "Stop overriding method just to call super."
[controller.git] / opendaylight / sal / implementation / pom.xml
index 57ccc4a9d7df6c8b39db1bebe741556b99e454ad..b44e85553d146339344b2b8d179e9ee03f7a9187 100644 (file)
@@ -7,8 +7,12 @@
     <version>1.4.0-SNAPSHOT</version>\r
     <relativePath>../../commons/opendaylight</relativePath>\r
   </parent>\r
+  <scm>\r
+    <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>\r
+    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>\r
+    <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>\r
+  </scm>\r
 \r
-  <groupId>org.opendaylight.controller</groupId>\r
   <artifactId>sal.implementation</artifactId>\r
   <version>0.4.0-SNAPSHOT</version>\r
   <packaging>bundle</packaging>\r
@@ -18,7 +22,7 @@
       <plugin>\r
         <groupId>org.apache.felix</groupId>\r
         <artifactId>maven-bundle-plugin</artifactId>\r
-        <version>2.3.6</version>\r
+        <version>${bundle.plugin.version}</version>\r
         <extensions>true</extensions>\r
         <configuration>\r
           <instructions>\r
               org.opendaylight.controller.sal.utils,\r
               org.apache.felix.dm,\r
               org.eclipse.osgi.framework.console,\r
-                         org.osgi.framework\r
+              org.osgi.framework\r
             </Import-Package>\r
             <Export-Package>\r
             </Export-Package>\r
-               <Bundle-Activator>\r
-             org.opendaylight.controller.sal.implementation.internal.Activator\r
-               </Bundle-Activator>\r
+            <Bundle-Activator>\r
+              org.opendaylight.controller.sal.implementation.internal.Activator\r
+            </Bundle-Activator>\r
           </instructions>\r
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>\r
         </configuration>\r
       </plugin>\r
     </plugins>\r