X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fnorthbound%2Ftopology%2Fpom.xml;h=007bdbebdcf053e3365e1462732257ac05b8b7b9;hp=c6963b8a7e2831e9df7a937c0ca57ff7c3503127;hb=2b4b6a40486a469d72f9421617a945fdca7fdf17;hpb=29f7cfb54b580928c7feac63abce028a7014b0d5

diff --git a/opendaylight/northbound/topology/pom.xml b/opendaylight/northbound/topology/pom.xml
index c6963b8a7e..007bdbebdc 100644
--- a/opendaylight/northbound/topology/pom.xml
+++ b/opendaylight/northbound/topology/pom.xml
@@ -8,7 +8,6 @@
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>topology.northbound</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
@@ -23,7 +22,7 @@
           <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal</artifactId>
-            <version>0.4.0-SNAPSHOT</version>
+            <version>0.5.0-SNAPSHOT</version>
           </dependency>
         </dependencies>
       </plugin>
@@ -40,30 +39,28 @@
               org.opendaylight.controller.containermanager,
               org.opendaylight.controller.northbound.commons,
               org.opendaylight.controller.northbound.commons.exception,
+              org.opendaylight.controller.northbound.commons.utils,
               org.opendaylight.controller.sal.core,
               org.opendaylight.controller.sal.packet,
+              org.opendaylight.controller.sal.authorization,
               org.opendaylight.controller.sal.packet.address,
               org.opendaylight.controller.sal.utils,
               org.opendaylight.controller.switchmanager,
+              org.opendaylight.controller.usermanager,
               org.opendaylight.controller.topologymanager,
               com.sun.jersey.spi.container.servlet,
               javax.ws.rs,
               javax.ws.rs.core,
+              javax.xml.bind,
               javax.xml.bind.annotation,
               org.slf4j,
-              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.apache.catalina.filters,
               !org.codehaus.enunciate.jaxrs
             </Import-Package>
-            <Web-ContextPath>/one/nb/v2/topology</Web-ContextPath>
+            <Web-ContextPath>/controller/nb/v2/topology</Web-ContextPath>
           </instructions>
-          </configuration>
+          <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
+        </configuration>
       </plugin>
     </plugins>
   </build>
@@ -73,30 +70,35 @@
       <artifactId>enunciate-core-annotations</artifactId>
       <version>${enunciate.version}</version>
     </dependency>
-	<dependency>
-	  <groupId>org.opendaylight.controller</groupId>
-	  <artifactId>containermanager</artifactId>
-	  <version>0.4.0-SNAPSHOT</version>
-	</dependency>
-	<dependency>
-	  <groupId>org.opendaylight.controller</groupId>
-	  <artifactId>commons.northbound</artifactId>
-	  <version>0.4.0-SNAPSHOT</version>
-	</dependency>
-	<dependency>
-	  <groupId>org.opendaylight.controller</groupId>
-	  <artifactId>sal</artifactId>
-	  <version>0.4.0-SNAPSHOT</version>
-	</dependency>
-	<dependency>
-	  <groupId>org.opendaylight.controller</groupId>
-	  <artifactId>topologymanager</artifactId>
-	  <version>0.4.0-SNAPSHOT</version>
-	</dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>containermanager</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>commons.northbound</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal</artifactId>
+      <version>0.5.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>topologymanager</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller.thirdparty</groupId>
       <artifactId>com.sun.jersey.jersey-servlet</artifactId>
       <version>1.17-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller.thirdparty</groupId>
+      <artifactId>org.apache.catalina.filters.CorsFilter</artifactId>
+      <version>7.0.42-SNAPSHOT</version>
+    </dependency>
   </dependencies>
 </project>