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 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 5333a7e6434bfa1f86eb0a40db49e5892532d667..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>
<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>
<artifactId>flows.web</artifactId>
<version>0.4.0-SNAPSHOT</version>
<packaging>bundle</packaging>
@@
-78,6
+77,7
@@
</Import-Package>
<Web-ContextPath>/controller/web/flows</Web-ContextPath>
</instructions>
</Import-Package>
<Web-ContextPath>/controller/web/flows</Web-ContextPath>
</instructions>
+ <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
</configuration>
</plugin>
</plugins>
</configuration>
</plugin>
</plugins>