Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "HostTracker StaticHost changes"
[controller.git]
/
opendaylight
/
northbound
/
flowprogrammer
/
pom.xml
diff --git
a/opendaylight/northbound/flowprogrammer/pom.xml
b/opendaylight/northbound/flowprogrammer/pom.xml
index 1bfd4ebf12fd9a7e286557708d2aded63e26cfb9..c7e9a771c1d71f7c7913e2c26b1e9fe11264979b 100644
(file)
--- a/
opendaylight/northbound/flowprogrammer/pom.xml
+++ b/
opendaylight/northbound/flowprogrammer/pom.xml
@@
-8,7
+8,6
@@
<relativePath>../../commons/opendaylight</relativePath>
</parent>
<relativePath>../../commons/opendaylight</relativePath>
</parent>
- <groupId>org.opendaylight.controller</groupId>
<artifactId>flowprogrammer.northbound</artifactId>
<version>0.4.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<artifactId>flowprogrammer.northbound</artifactId>
<version>0.4.0-SNAPSHOT</version>
<packaging>bundle</packaging>
@@
-22,10
+21,10
@@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal</artifactId>
- <version>0.
4
.0-SNAPSHOT</version>
+ <version>0.
5
.0-SNAPSHOT</version>
</dependency>
</dependencies>
</dependency>
</dependencies>
- </plugin>
+ </plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@@
-41,7
+40,10
@@
org.opendaylight.controller.switchmanager,
org.opendaylight.controller.northbound.commons,
org.opendaylight.controller.northbound.commons.exception,
org.opendaylight.controller.switchmanager,
org.opendaylight.controller.northbound.commons,
org.opendaylight.controller.northbound.commons.exception,
- com.sun.jersey.spi.container.servlet,
+ org.opendaylight.controller.northbound.commons.utils,
+ org.opendaylight.controller.sal.authorization,
+ org.opendaylight.controller.usermanager,
+ com.sun.jersey.spi.container.servlet,
javax.ws.rs,
javax.ws.rs.core,
javax.xml.bind.annotation,
javax.ws.rs,
javax.ws.rs.core,
javax.xml.bind.annotation,
@@
-53,6
+55,7
@@
</Export-Package>
<Web-ContextPath>/controller/nb/v2/flow</Web-ContextPath>
</instructions>
</Export-Package>
<Web-ContextPath>/controller/nb/v2/flow</Web-ContextPath>
</instructions>
+ <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
</configuration>
</plugin>
</plugins>
</configuration>
</plugin>
</plugins>
@@
-67,7
+70,7
@@
<groupId>org.opendaylight.controller</groupId>
<artifactId>switchmanager</artifactId>
<version>0.4.0-SNAPSHOT</version>
<groupId>org.opendaylight.controller</groupId>
<artifactId>switchmanager</artifactId>
<version>0.4.0-SNAPSHOT</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>forwardingrulesmanager</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>forwardingrulesmanager</artifactId>
@@
-76,7
+79,7
@@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal</artifactId>
<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.codehaus.enunciate</groupId>
</dependency>
<dependency>
<groupId>org.codehaus.enunciate</groupId>
@@
-84,10
+87,10
@@
<version>${enunciate.version}</version>
</dependency>
<dependency>
<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>
<dependency>
<groupId>org.opendaylight.controller.thirdparty</groupId>
<artifactId>com.sun.jersey.jersey-servlet</artifactId>