X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fsamples%2Fnorthbound%2Floadbalancer%2Fpom.xml;h=dc23940d55ae6cf4ef30a96ac0b35dd2bdab1bb8;hb=541d0a36997f292bb037a2199463431eee538358;hp=2b9b1c448d34a56641930c15d1a98f1e09b81516;hpb=e1a5967bce30bdb19f18908ac7d4af39f7e2c67c;p=controller.git

diff --git a/opendaylight/samples/northbound/loadbalancer/pom.xml b/opendaylight/samples/northbound/loadbalancer/pom.xml
index 2b9b1c448d..dc23940d55 100644
--- a/opendaylight/samples/northbound/loadbalancer/pom.xml
+++ b/opendaylight/samples/northbound/loadbalancer/pom.xml
@@ -7,7 +7,6 @@
     <version>1.4.0-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>samples.loadbalancer.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>
@@ -34,36 +33,29 @@
         <configuration>
           <instructions>
             <Import-Package>
-				org.opendaylight.controller.samples.loadbalancer,
- 				org.opendaylight.controller.samples.loadbalancer.entities,
-				org.opendaylight.controller.samples.loadbalancer.internal,
-				org.opendaylight.controller.samples.loadbalancer.policies,
-				org.opendaylight.controller.hosttracker,
-				org.opendaylight.controller.sal.core,
-				org.opendaylight.controller.sal.utils,
-				org.opendaylight.controller.containermanager,
-				org.opendaylight.controller.switchmanager,
-				org.apache.commons.logging,
-				com.sun.jersey.spi.container.servlet,
-				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,
-				javax.ws.rs,
-				javax.ws.rs.core,
-				javax.xml.bind.annotation,
-				javax.xml.bind,
-				org.slf4j,
-				!org.codehaus.enunciate.jaxrs
+              org.opendaylight.controller.samples.loadbalancer,
+              org.opendaylight.controller.samples.loadbalancer.entities,
+              org.opendaylight.controller.samples.loadbalancer.internal,
+              org.opendaylight.controller.samples.loadbalancer.policies,
+              org.opendaylight.controller.hosttracker,
+              org.opendaylight.controller.sal.core,
+              org.opendaylight.controller.sal.utils,
+              org.opendaylight.controller.containermanager,
+              org.opendaylight.controller.switchmanager,
+              org.apache.commons.logging,
+              com.sun.jersey.spi.container.servlet,
+              org.opendaylight.controller.northbound.commons,
+              org.opendaylight.controller.northbound.commons.exception,
+              javax.ws.rs,
+              javax.ws.rs.core,
+              javax.xml.bind.annotation,
+              javax.xml.bind,
+              org.slf4j,
+              !org.codehaus.enunciate.jaxrs
             </Import-Package>
             <Web-ContextPath>/one/nb/v2/lb</Web-ContextPath>
           </instructions>
+          <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
         </configuration>
       </plugin>
     </plugins>
@@ -88,17 +80,17 @@
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>samples.loadbalancer</artifactId>
       <version>0.4.0-SNAPSHOT</version>
-    </dependency>
-	<dependency>
+      </dependency>
+    <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
-	</dependency> 
+      <version>0.5.0-SNAPSHOT</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.codehaus.enunciate</groupId>
       <artifactId>enunciate-core-annotations</artifactId>