X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fnorthbound%2Fflowprogrammer%2Fpom.xml;h=c7e9a771c1d71f7c7913e2c26b1e9fe11264979b;hb=refs%2Fchanges%2F74%2F474%2F2;hp=14a77ae53daa8f375711072bc72baa44a62bdeba;hpb=29f7cfb54b580928c7feac63abce028a7014b0d5;p=controller.git

diff --git a/opendaylight/northbound/flowprogrammer/pom.xml b/opendaylight/northbound/flowprogrammer/pom.xml
index 14a77ae53d..c7e9a771c1 100644
--- a/opendaylight/northbound/flowprogrammer/pom.xml
+++ b/opendaylight/northbound/flowprogrammer/pom.xml
@@ -8,7 +8,6 @@
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>flowprogrammer.northbound</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
@@ -22,10 +21,10 @@
           <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal</artifactId>
-            <version>0.4.0-SNAPSHOT</version>
+            <version>0.5.0-SNAPSHOT</version>
           </dependency>
         </dependencies>
-      </plugin>    
+      </plugin>
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
@@ -41,14 +40,10 @@
               org.opendaylight.controller.switchmanager,
               org.opendaylight.controller.northbound.commons,
               org.opendaylight.controller.northbound.commons.exception,
-              com.sun.jersey.spi.spring.container.servlet,
-              org.springframework.web.context,
-              org.springframework.web,
-              org.springframework.web.servlet,
-              org.springframework.web.filter,
-              org.springframework.security.config,
-              org.springframework.security.web.authentication,
-              org.springframework.security.web.authentication.www,
+              org.opendaylight.controller.northbound.commons.utils,
+              org.opendaylight.controller.sal.authorization,
+              org.opendaylight.controller.usermanager,
+                          com.sun.jersey.spi.container.servlet,
               javax.ws.rs,
               javax.ws.rs.core,
               javax.xml.bind.annotation,
@@ -58,8 +53,9 @@
             </Import-Package>
             <Export-Package>
             </Export-Package>
-            <Web-ContextPath>/one/nb/v2/flow</Web-ContextPath>
+            <Web-ContextPath>/controller/nb/v2/flow</Web-ContextPath>
           </instructions>
+          <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
         </configuration>
       </plugin>
     </plugins>
@@ -74,7 +70,7 @@
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>switchmanager</artifactId>
       <version>0.4.0-SNAPSHOT</version>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>forwardingrulesmanager</artifactId>
@@ -83,7 +79,7 @@
     <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.codehaus.enunciate</groupId>
@@ -91,10 +87,10 @@
       <version>${enunciate.version}</version>
     </dependency>
     <dependency>
-	  <groupId>org.opendaylight.controller</groupId>
-	  <artifactId>commons.northbound</artifactId>
-	  <version>0.4.0-SNAPSHOT</version>
-	</dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>commons.northbound</artifactId>
+          <version>0.4.0-SNAPSHOT</version>
+        </dependency>
     <dependency>
       <groupId>org.opendaylight.controller.thirdparty</groupId>
       <artifactId>com.sun.jersey.jersey-servlet</artifactId>