projects
/
lgpl
/
argeo-commons.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix issues with security dependencies
[lgpl/argeo-commons.git]
/
security
/
runtime
/
org.argeo.security.core
/
pom.xml
diff --git
a/security/runtime/org.argeo.security.core/pom.xml
b/security/runtime/org.argeo.security.core/pom.xml
index 5f9cc85c515489de17521052d6e2723097f2c555..b6edaf87d55f582e1f591c8b5d3d334dde9698bf 100644
(file)
--- a/
security/runtime/org.argeo.security.core/pom.xml
+++ b/
security/runtime/org.argeo.security.core/pom.xml
@@
-1,4
+1,5
@@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.argeo.commons.security</groupId>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.argeo.commons.security</groupId>
@@
-47,7
+48,16
@@
<artifactId>org.argeo.dep.osgi.springframework.ldap</artifactId>
</dependency>
<artifactId>org.argeo.dep.osgi.springframework.ldap</artifactId>
</dependency>
+
<!-- Security -->
<!-- Security -->
+ <dependency>
+ <!--
+ Force inclusion of commons.lang to prevent v2.1.0 to be taken by
+ Spring Security
+ -->
+ <groupId>org.apache.commons</groupId>
+ <artifactId>com.springsource.org.apache.commons.lang</artifactId>
+ </dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>org.springframework.security</artifactId>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>org.springframework.security</artifactId>