Merge "Stop creating new Boolean, move to use valueOf method"

[controller.git] / opendaylight / protocol_plugins / openflow / pom.xml

diff --git a/opendaylight/protocol_plugins/openflow/pom.xml b/opendaylight/protocol_plugins/openflow/pom.xml
index 418c897b52134c6e20b3b57e44acd65b07b244cd..a7f4db8460ab02124b4adaa990570f873e7d7e3b 100644 (file)
--- a/opendaylight/protocol_plugins/openflow/pom.xml
+++ b/opendaylight/protocol_plugins/openflow/pom.xml
@@ -7,8 +7,12 @@
     <version>1.4.0-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</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>
+  </scm>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>protocol_plugins.openflow</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
@@ -18,7 +22,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
@@ -33,15 +37,17 @@
               org.opendaylight.controller.sal.inventory,
               org.opendaylight.controller.sal.match,
               org.opendaylight.controller.sal.utils,
+              org.opendaylight.controller.sal.connection,
               org.apache.commons.lang3.builder,
               org.apache.commons.lang3.tuple,
               org.apache.felix.dm,
               org.slf4j,
               org.eclipse.osgi.framework.console,
-                         org.osgi.framework
+              org.osgi.framework,
+              javax.net.ssl
             </Import-Package>
             <Export-Package>
-                         org.opendaylight.controller.protocol_plugin.openflow.internal
+              org.opendaylight.controller.protocol_plugin.openflow.internal
             </Export-Package>
             <Embed-Dependency>
               org.openflow.openflowj
@@ -53,6 +59,7 @@
               org.opendaylight.controller.protocol_plugin.openflow.internal.Activator
             </Bundle-Activator>
           </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
         </configuration>
       </plugin>
     </plugins>
@@ -61,7 +68,12 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
+      <version>0.5.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal.connection</artifactId>
+      <version>0.1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller.thirdparty</groupId>