protocol.openflow_netty cleanup

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

diff --git a/opendaylight/protocol_plugins/openflow_netty/pom.xml b/opendaylight/protocol_plugins/openflow_netty/pom.xml
index 25849addfbbfa0b93afb1a571962bb910465433b..970e1504a6e6223a871f8fb020b5008f58153255 100644 (file)
--- a/opendaylight/protocol_plugins/openflow_netty/pom.xml
+++ b/opendaylight/protocol_plugins/openflow_netty/pom.xml
@@ -8,41 +8,9 @@
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <artifactId>protocol_plugins.openflow_netty</artifactId>
-  <version>0.4.0-SNAPSHOT</version>
+  <version>0.1.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
-  <profiles>
-    <profile>
-      <id>jenkins</id>
-      <activation>
-        <property>
-          <name>env.BUILD_NUMBER</name>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>cobertura-maven-plugin</artifactId>
-            <version>2.5.1</version>
-            <configuration>
-              <formats>
-                <format>xml</format>
-              </formats>
-            </configuration>
-            <executions>
-              <execution>
-                <phase>package</phase>
-                <goals>
-                  <goal>cobertura</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
   <build>
     <plugins>
       <plugin>
@@ -55,6 +23,7 @@
             <Import-Package>
               org.opendaylight.controller.sal.packet,
               org.opendaylight.controller.sal.action,
+              org.opendaylight.controller.sal.connection,
               org.opendaylight.controller.sal.discovery,
               org.opendaylight.controller.sal.topology,
               org.opendaylight.controller.sal.core,
@@ -63,7 +32,6 @@
               org.opendaylight.controller.sal.inventory,
               org.opendaylight.controller.sal.match,
               org.opendaylight.controller.sal.utils,
-              org.opendaylight.controller.protocol_plugin.openflow.core,
               org.apache.commons.lang3.builder,
               org.apache.commons.lang3.tuple,
               org.apache.felix.dm,
@@ -74,18 +42,17 @@
               org.jboss.netty.*
             </Import-Package>
             <Export-Package>
-              org.opendaylight.controller.protocol_plugin.openflow.core.internal,
-              org.opendaylight.controller.protocol_plugin.openflow.core
+              org.opendaylight.controller.protocol_plugin.openflow.core.internal;-split-package:=merge-first,
+              org.opendaylight.controller.protocol_plugin.openflow.core;-split-package:=merge-first,
             </Export-Package>
             <Embed-Dependency>
-              org.openflow.openflowj_netty,org.jboss.netty;type=!pom;inline=false
+              org.openflow.openflowj_netty,org.jboss.netty;protocol_plugins.openflow;type=!pom;inline=false
             </Embed-Dependency>
             <Embed-Transitive>
               false
             </Embed-Transitive>
             <Bundle-Activator>
-              <!--  TODO : UNCOMMENT THIS TO START NETTY-PLUGIN DURING RUNTIME  -->
-              org.opendaylight.controller.protocol_plugin.openflow.internal.Activator
+              org.opendaylight.controller.protocol_plugin.openflow.internal.EnhancedActivator
             </Bundle-Activator>
           </instructions>
         </configuration>
@@ -96,13 +63,27 @@
     <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>
+    <!-- Make sure this comes before protocol_plugins.openflow Maven
+         honors the classpath order to reliable builds and here we
+         want to make sure that the openflowJ embedded is picking the
+         netty one over the non-netty enabled-->
     <dependency>
       <groupId>org.opendaylight.controller.thirdparty</groupId>
       <artifactId>org.openflow.openflowj_netty</artifactId>
       <version>1.0.2-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>protocol_plugins.openflow</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -114,6 +95,5 @@
       <artifactId>netty</artifactId>
       <version>3.2.6.Final</version>
     </dependency>
-
   </dependencies>
 </project>