projects
/
lgpl
/
argeo-commons.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[maven-release-plugin] copy for tag argeo-commons-0.1.2
[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 3fd7ae8890994d3638d2a57c6981dfd396516059..18e0c1b5392d0427093c8b4d98ee2ac2e5df7cb2 100644
(file)
--- a/
security/runtime/org.argeo.security.core/pom.xml
+++ b/
security/runtime/org.argeo.security.core/pom.xml
@@
-1,10
+1,9
@@
-<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>
<artifactId>runtime</artifactId>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.argeo.commons.security</groupId>
<artifactId>runtime</artifactId>
- <version>0.1.
1-SNAPSHOT
</version>
+ <version>0.1.
2
</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.argeo.security.core</artifactId>
<relativePath>..</relativePath>
</parent>
<artifactId>org.argeo.security.core</artifactId>
@@
-33,7
+32,8
@@
org.argeo.security.*
</Export-Package>
<Import-Package>*,
org.argeo.security.*
</Export-Package>
<Import-Package>*,
- org.argeo.server.json;resolution:=optional
+ org.argeo.server.json;resolution:=optional,
+ org.springframework.ldap.core.support;resolution:=optional
</Import-Package>
</instructions>
</configuration>
</Import-Package>
</instructions>
</configuration>
@@
-45,10
+45,18
@@
<dependency>
<groupId>org.argeo.dep.osgi</groupId>
<artifactId>org.argeo.dep.osgi.springframework.ldap</artifactId>
<dependency>
<groupId>org.argeo.dep.osgi</groupId>
<artifactId>org.argeo.dep.osgi.springframework.ldap</artifactId>
- <version>1.3.0.0003</version>
</dependency>
</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>
@@
-72,27
+80,29
@@
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>com.springsource.org.codehaus.jackson.mapper</artifactId>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>com.springsource.org.codehaus.jackson.mapper</artifactId>
- <version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.springsource.json</groupId>
<artifactId>com.springsource.json</artifactId>
</dependency>
<dependency>
<groupId>com.springsource.json</groupId>
<artifactId>com.springsource.json</artifactId>
- <version>1.0.1.RELEASE</version>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
<artifactId>com.springsource.org.antlr</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
<artifactId>com.springsource.org.antlr</artifactId>
</dependency>
-
-
<!-- TEST -->
<dependency>
<groupId>org.junit</groupId>
<artifactId>com.springsource.junit</artifactId>
<scope>test</scope>
</dependency>
<!-- TEST -->
<dependency>
<groupId>org.junit</groupId>
<artifactId>com.springsource.junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.argeo.commons.server</groupId>
+ <artifactId>org.argeo.server.json</artifactId>
+ <version>0.1.2</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
</dependencies>
</project>