BUG-868: remove deprecated use of QName constructors

[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..a8fceec2bfc435f2a4d3d01332ed720f3f9b588a 100644 (file)
--- a/opendaylight/protocol_plugins/openflow/pom.xml
+++ b/opendaylight/protocol_plugins/openflow/pom.xml
@@ -4,26 +4,45 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.2-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>protocol_plugins.openflow</artifactId>
-  <version>0.4.0-SNAPSHOT</version>
+  <version>0.4.2-SNAPSHOT</version>
   <packaging>bundle</packaging>
+  <dependencies>
+    <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>org.eclipse.osgi</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal.connection</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller.thirdparty</groupId>
+      <artifactId>org.openflow.openflowj</artifactId>
+    </dependency>
+  </dependencies>
 
   <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.packet,
+            <Import-Package>org.opendaylight.controller.sal.packet,
               org.opendaylight.controller.sal.action,
               org.opendaylight.controller.sal.discovery,
               org.opendaylight.controller.sal.topology,
@@ -33,46 +52,28 @@
               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
-            </Import-Package>
-            <Export-Package>
-                         org.opendaylight.controller.protocol_plugin.openflow.internal
-            </Export-Package>
-            <Embed-Dependency>
-              org.openflow.openflowj
-            </Embed-Dependency>
-            <Embed-Transitive>
-              false
-            </Embed-Transitive>
-            <Bundle-Activator>
-              org.opendaylight.controller.protocol_plugin.openflow.internal.Activator
-            </Bundle-Activator>
+              org.osgi.framework,
+              javax.net.ssl</Import-Package>
+            <Export-Package>org.opendaylight.controller.protocol_plugin.openflow.internal</Export-Package>
+            <Embed-Dependency>org.openflow.openflowj</Embed-Dependency>
+            <Embed-Transitive>false</Embed-Transitive>
+            <Bundle-Activator>org.opendaylight.controller.protocol_plugin.openflow.internal.Activator</Bundle-Activator>
           </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
         </configuration>
       </plugin>
     </plugins>
   </build>
-  <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller.thirdparty</groupId>
-      <artifactId>org.openflow.openflowj</artifactId>
-      <version>1.0.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
+  <scm>
+    <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
+    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+    <tag>HEAD</tag>
+    <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
+  </scm>
 </project>