Merge changes I02c2af4b,If6adaabc,I559b92ff

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

diff --git a/opendaylight/web/flows/pom.xml b/opendaylight/web/flows/pom.xml
index 62c8922eadedc851a9c25c57a61db8ef5b61bbe0..eefaea3ca589912ddfdda531e95a28f8d5841e27 100644 (file)
--- a/opendaylight/web/flows/pom.xml
+++ b/opendaylight/web/flows/pom.xml
@@ -8,7 +8,6 @@
                <version>1.4.0-SNAPSHOT</version>
                <relativePath>../../commons/opendaylight</relativePath>
        </parent>
-       <groupId>org.opendaylight.controller</groupId>
        <artifactId>flows.web</artifactId>
        <version>0.4.0-SNAPSHOT</version>
        <packaging>bundle</packaging>
@@ -73,29 +72,12 @@
                                                        org.springframework.web.servlet,
                                                        org.springframework.web.servlet.config,
                                                        org.springframework.web.servlet.view,
-
                                                        org.springframework.web.filter,
-                                                       org.springframework.web.context,
-                                                       org.springframework.security.core,
-                                                       org.springframework.security.core.userdetails,
-                                                       org.springframework.security.core.authority,
-                                                       org.springframework.security.core.context,
-                                                       org.springframework.security.authentication,
-                                                       org.springframework.security.config,
-                                                       org.springframework.security.config.authentication,
-                                                       org.springframework.security.taglibs.authz,
-                                                       org.springframework.security.web,
-                                                       org.springframework.security.web.context,
-                                                       org.springframework.security.web.authentication,
-                                                       org.springframework.security.web.authentication.www,
-                                                       org.springframework.security.provisioning,
-                                                       org.springframework.security.web.util,
-                                                       org.springframework.security.web.authentication.rememberme,
-                                                       org.springframework.security.web.authentication.logout,
-                                                       org.springframework.dao\r
+                                                       org.springframework.web.context                                                 \r
                                                </Import-Package>
-                                               <Web-ContextPath>/one/flows</Web-ContextPath>
+                                               <Web-ContextPath>/controller/web/flows</Web-ContextPath>
                                        </instructions>
+          <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
                                </configuration>
                        </plugin>
                </plugins>
@@ -124,7 +106,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.opendaylight.controller</groupId>