Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix raw references to Promise
[controller.git]
/
opendaylight
/
northbound
/
networkconfiguration
/
neutron
/
pom.xml
diff --git
a/opendaylight/northbound/networkconfiguration/neutron/pom.xml
b/opendaylight/northbound/networkconfiguration/neutron/pom.xml
index bc0ab2b78aac9248a79fbd4d344658091f598ed7..8111e69c19bb0b7874387da1ecea394381f1bd5c 100644
(file)
--- a/
opendaylight/northbound/networkconfiguration/neutron/pom.xml
+++ b/
opendaylight/northbound/networkconfiguration/neutron/pom.xml
@@
-4,15
+4,12
@@
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.opendaylight</artifactId>
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.opendaylight</artifactId>
- <version>1.
4.2
-SNAPSHOT</version>
+ <version>1.
5.0
-SNAPSHOT</version>
<relativePath>../../../commons/opendaylight</relativePath>
</parent>
<artifactId>networkconfig.neutron.northbound</artifactId>
<relativePath>../../../commons/opendaylight</relativePath>
</parent>
<artifactId>networkconfig.neutron.northbound</artifactId>
- <version>0.
4.2
-SNAPSHOT</version>
+ <version>0.
5.0
-SNAPSHOT</version>
<packaging>bundle</packaging>
<packaging>bundle</packaging>
- <properties>
- <enunciate.version>1.26.2</enunciate.version>
- </properties>
<dependencies>
<dependency>
<groupId>com.sun.jersey</groupId>
<dependencies>
<dependency>
<groupId>com.sun.jersey</groupId>
@@
-57,7
+54,6
@@
<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>
<extensions>true</extensions>
<configuration>
<instructions>
<extensions>true</extensions>
<configuration>
<instructions>
@@
-70,6
+66,7
@@
org.eclipse.persistence.jaxb.rs,
com.sun.jersey.spi.container.servlet,
javax.ws.rs,
org.eclipse.persistence.jaxb.rs,
com.sun.jersey.spi.container.servlet,
javax.ws.rs,
+ javax.ws.rs.ext,
javax.ws.rs.core,
javax.xml.bind.annotation,
javax.xml.bind,
javax.ws.rs.core,
javax.xml.bind.annotation,
javax.xml.bind,
@@
-83,16
+80,6
@@
<plugin>
<groupId>org.codehaus.enunciate</groupId>
<artifactId>maven-enunciate-plugin</artifactId>
<plugin>
<groupId>org.codehaus.enunciate</groupId>
<artifactId>maven-enunciate-plugin</artifactId>
- <configuration>
- <configFile>enunciate.xml</configFile>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>docs</goal>
- </goals>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
</plugin>
</plugins>
</build>