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 "Some methods should be final"
[controller.git]
/
opendaylight
/
northbound
/
usermanager
/
pom.xml
diff --git
a/opendaylight/northbound/usermanager/pom.xml
b/opendaylight/northbound/usermanager/pom.xml
index ed94369da3dece4f2bc0ba72b55e37e1789be812..9c5626cd2049685493e77f56c2525e9e632d6ccf 100644
(file)
--- a/
opendaylight/northbound/usermanager/pom.xml
+++ b/
opendaylight/northbound/usermanager/pom.xml
@@
-4,7
+4,7
@@
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.opendaylight</artifactId>
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.opendaylight</artifactId>
- <version>1.4.
1
-SNAPSHOT</version>
+ <version>1.4.
2
-SNAPSHOT</version>
<relativePath>../../commons/opendaylight</relativePath>
</parent>
<scm>
<relativePath>../../commons/opendaylight</relativePath>
</parent>
<scm>
@@
-15,7
+15,7
@@
</scm>
<artifactId>usermanager.northbound</artifactId>
</scm>
<artifactId>usermanager.northbound</artifactId>
- <version>0.0.
1
-SNAPSHOT</version>
+ <version>0.0.
2
-SNAPSHOT</version>
<packaging>bundle</packaging>
<build>
<plugins>
<packaging>bundle</packaging>
<build>
<plugins>
@@
-47,7
+47,8
@@
javax.xml.bind.annotation,
org.slf4j,
org.apache.catalina.filters,
javax.xml.bind.annotation,
org.slf4j,
org.apache.catalina.filters,
- org.codehaus.jackson.jaxrs,
+ com.fasterxml.jackson.jaxrs.base,
+ com.fasterxml.jackson.jaxrs.json,
!org.codehaus.enunciate.jaxrs
</Import-Package>
<Export-Package>
!org.codehaus.enunciate.jaxrs
</Import-Package>
<Export-Package>
@@
-64,27
+65,22
@@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal</artifactId>
- <version>${sal.version}</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>usermanager</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>usermanager</artifactId>
- <version>${usermanager.version}</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.northbound</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.northbound</artifactId>
- <version>${commons.northbound.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.enunciate</groupId>
<artifactId>enunciate-core-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.enunciate</groupId>
<artifactId>enunciate-core-annotations</artifactId>
- <version>${enunciate.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<scope>test</scope>
</dependency>
</dependencies>