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 "Fix bug in hello message: module with more revisions."
[controller.git]
/
opendaylight
/
usermanager
/
api
/
pom.xml
diff --git
a/opendaylight/usermanager/api/pom.xml
b/opendaylight/usermanager/api/pom.xml
index 14a3059c60b3f214ac7f51abb6b24e1a181f2579..3b518cc5bc21eec1cff1f9fa12158fca14fe5eeb 100644
(file)
--- a/
opendaylight/usermanager/api/pom.xml
+++ b/
opendaylight/usermanager/api/pom.xml
@@
-47,18
+47,13
@@
org.apache.commons.lang3,
org.springframework.security.authentication,
org.springframework.security.core.authority,
org.apache.commons.lang3,
org.springframework.security.authentication,
org.springframework.security.core.authority,
- org.springframework.security.core.userdetails
+ org.springframework.security.core.userdetails,
+ javax.xml.bind.annotation
</Import-Package>
<Export-Package>
org.opendaylight.controller.usermanager,
</Import-Package>
<Export-Package>
org.opendaylight.controller.usermanager,
-<!--
- org.opendaylight.controller.usermanager.internal
- -->
</Export-Package>
<Bundle-Activator>
</Export-Package>
<Bundle-Activator>
-<!--
- org.opendaylight.controller.usermanager.internal.Activator
- -->
</Bundle-Activator>
</instructions>
<manifestLocation>${project.basedir}/META-INF</manifestLocation>
</Bundle-Activator>
</instructions>
<manifestLocation>${project.basedir}/META-INF</manifestLocation>
@@
-70,22
+65,18
@@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>containermanager</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>containermanager</artifactId>
- <version>0.5.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>clustering.services</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>clustering.services</artifactId>
- <version>0.4.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>configuration</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>configuration</artifactId>
- <version>0.4.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal</artifactId>
- <version>0.5.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
</dependency>
<dependency>
<groupId>junit</groupId>