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 "Silent false positive, and enhance real error message"
[controller.git]
/
opendaylight
/
northbound
/
switchmanager
/
pom.xml
diff --git
a/opendaylight/northbound/switchmanager/pom.xml
b/opendaylight/northbound/switchmanager/pom.xml
index 719688305ebac17f1655281f30cd62672f47d3df..8ca712fffc875dee7576128eecab295027b32685 100644
(file)
--- a/
opendaylight/northbound/switchmanager/pom.xml
+++ b/
opendaylight/northbound/switchmanager/pom.xml
@@
-34,7
+34,7
@@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>
2.3.6
</version>
+ <version>
${bundle.plugin.version}
</version>
<extensions>true</extensions>
<configuration>
<instructions>
<extensions>true</extensions>
<configuration>
<instructions>
@@
-57,9
+57,12
@@
javax.xml.bind,
org.slf4j,
org.apache.catalina.filters,
javax.xml.bind,
org.slf4j,
org.apache.catalina.filters,
+ org.codehaus.jackson.jaxrs,
+ org.codehaus.jackson.annotate,
!org.codehaus.enunciate.jaxrs
</Import-Package>
!org.codehaus.enunciate.jaxrs
</Import-Package>
- <Web-ContextPath>/controller/nb/v2/switch</Web-ContextPath>
+ <Web-ContextPath>/controller/nb/v2/switchmanager</Web-ContextPath>
+ <Jaxrs-Resources>,${classes;ANNOTATION;javax.ws.rs.Path}</Jaxrs-Resources>
</instructions>
<manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
</configuration>
</instructions>
<manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
</configuration>
@@
-76,7
+79,7
@@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>containermanager</artifactId>
<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>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>