Merge "Add sorting to js select.create()"

[controller.git] / opendaylight / web / root / pom.xml

diff --git a/opendaylight/web/root/pom.xml b/opendaylight/web/root/pom.xml
index 872260b637762d320935100a9f5e9b67136fb561..6000efadc7444148ab5c51e7dcba9147e8e4840f 100644 (file)
--- a/opendaylight/web/root/pom.xml
+++ b/opendaylight/web/root/pom.xml
@@ -8,6 +8,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>web</artifactId>
   <version>0.4.0-SNAPSHOT</version>
@@ -28,7 +33,6 @@
               org.opendaylight.controller.sal.core,
               org.opendaylight.controller.sal.utils,
               org.opendaylight.controller.usermanager,
-              org.opendaylight.controller.usermanager.internal,
               org.opendaylight.controller.containermanager,
               com.google.gson,
               javax.annotation,
@@ -74,7 +78,8 @@
               org.springframework.web.servlet.view.json,
               org.springframework.web.filter,
               org.springframework.web.context,
-              org.springframework.util
+              org.springframework.util,
+              org.apache.catalina.filters
             </Import-Package>
             <Export-Package>
               org.opendaylight.controller.web
@@ -149,5 +154,10 @@
       <version>3.2.1.RELEASE</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller.thirdparty</groupId>
+      <artifactId>org.apache.catalina.filters.CorsFilter</artifactId>
+      <version>7.0.42-SNAPSHOT</version>
+    </dependency>
   </dependencies>
 </project>