Merge "Address @XmlSeeAlso limitation. Provide the ability to inject the JAXB types...

[controller.git] / opendaylight / northbound / flowprogrammer / pom.xml

diff --git a/opendaylight/northbound/flowprogrammer/pom.xml b/opendaylight/northbound/flowprogrammer/pom.xml
index 0a873ca0651013728d404a71798d670ac8b03eb2..addf857aa10d5af113b3a41be643eebb92fa5784 100644 (file)
--- a/opendaylight/northbound/flowprogrammer/pom.xml
+++ b/opendaylight/northbound/flowprogrammer/pom.xml
@@ -7,6 +7,11 @@
     <version>1.4.0-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
+  <scm>
+    <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
+    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+    <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
+  </scm>
 
   <artifactId>flowprogrammer.northbound</artifactId>
   <version>0.4.0-SNAPSHOT</version>
@@ -24,7 +29,7 @@
             <version>0.5.0-SNAPSHOT</version>
           </dependency>
         </dependencies>
-      </plugin>    
+      </plugin>
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
@@ -43,17 +48,20 @@
               org.opendaylight.controller.northbound.commons.utils,
               org.opendaylight.controller.sal.authorization,
               org.opendaylight.controller.usermanager,
-                         com.sun.jersey.spi.container.servlet,                            
+              com.sun.jersey.spi.container.servlet,
+              org.apache.catalina.filters,
               javax.ws.rs,
               javax.ws.rs.core,
               javax.xml.bind.annotation,
               javax.xml.bind,
               org.slf4j,
+              org.codehaus.jackson.jaxrs,
               !org.codehaus.enunciate.jaxrs
             </Import-Package>
             <Export-Package>
             </Export-Package>
-            <Web-ContextPath>/controller/nb/v2/flow</Web-ContextPath>
+            <Web-ContextPath>/controller/nb/v2/flowprogrammer</Web-ContextPath>
+            <Jaxrs-Resources>,${classes;ANNOTATION;javax.ws.rs.Path}</Jaxrs-Resources>
           </instructions>
           <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
         </configuration>
@@ -64,13 +72,13 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>containermanager</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
+      <version>0.5.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>switchmanager</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
-    </dependency>    
+      <version>0.5.0-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>forwardingrulesmanager</artifactId>
@@ -87,14 +95,19 @@
       <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>
       <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>