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 "Update to new version of ADSAL components and its dependencies proposed by...
[controller.git]
/
opendaylight
/
usermanager
/
api
/
pom.xml
diff --git
a/opendaylight/usermanager/api/pom.xml
b/opendaylight/usermanager/api/pom.xml
index c301f8da2c4f0720548e65ac128d7409ef0c5528..f7064a3c6dee8ee5bd9b01b599ed4858bbcc9372 100644
(file)
--- a/
opendaylight/usermanager/api/pom.xml
+++ b/
opendaylight/usermanager/api/pom.xml
@@
-47,7
+47,8
@@
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,
@@
-75,7
+76,7
@@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>clustering.services</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>clustering.services</artifactId>
- <version>0.
4.1
-SNAPSHOT</version>
+ <version>0.
5.0
-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
@@
-85,46
+86,36
@@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal</artifactId>
- <version>0.
5.1
-SNAPSHOT</version>
+ <version>0.
7.0
-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- </dependency>
<dependency>
<groupId>equinoxSDK381</groupId>
<artifactId>javax.servlet</artifactId>
<dependency>
<groupId>equinoxSDK381</groupId>
<artifactId>javax.servlet</artifactId>
- <version>3.0.0.v201112011016</version>
</dependency>
<!-- Spring security -->
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
</dependency>
<!-- Spring security -->
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
- <version>${spring-security.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
- <version>${spring-security.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId>
- <version>${spring-security.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-taglibs</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-taglibs</artifactId>
- <version>${spring-security.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>org.springframework.transaction</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>org.springframework.transaction</artifactId>
- <version>${spring-security.version}</version>
</dependency>
</dependencies>
</project>
</dependency>
</dependencies>
</project>