[maven-release-plugin] prepare release argeo-commons-1.1.1

[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 fffbb1118d09abdaf0409653b78cdbe9b1685f55..c6bc62feeb568c450ee9a115cbf52b4b6290522e 100644 (file)
--- a/security/runtime/org.argeo.security.core/pom.xml
+++ b/security/runtime/org.argeo.security.core/pom.xml
@@ -1,9 +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">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><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>
-               <version>0.2.0</version>
+               <version>1.1.1</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.security.core</artifactId>
@@ -25,16 +25,28 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <configuration>
                                        <instructions>
+                                               <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
                                                <Export-Package>
                                                        org.argeo.security.*
                                                </Export-Package>
-                                               <Import-Package>*,
+                                               <!-- We need to exclude some packages which are added by BND but cause 
+                                                       use package conflict with some deployments -->
+                                               <Import-Package>
                                                        org.springframework.context,
-                                                       org.argeo.server.json;resolution:=optional,
-                                                       org.springframework.ldap.core.support;resolution:=optional,
+                                                       org.springframework.beans.factory,
+                                                       org.argeo.jcr,
+                                                       org.xml.sax;version="0.0.0",
+                                                       javax.jcr.security,
+                                                       javax.jcr.nodetype,
+                                                       javax.jcr.version,
+                                                       javax.jcr.observation,
+                                                       javax.jcr.query,
+                                                       javax.jcr.lock,
+                                                       javax.jcr.retention,
+                                                       *
                                                </Import-Package>
                                        </instructions>
                                </configuration>
@@ -45,87 +57,81 @@
                <dependency>
                        <groupId>org.argeo.commons.basic</groupId>
                        <artifactId>org.argeo.basic.nodeps</artifactId>
-                       <version>0.2.0</version>
+                       <version>1.1.1</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons.server</groupId>
+                       <artifactId>org.argeo.server.jcr</artifactId>
+                       <version>1.1.1</version>
                </dependency>
 
+               <!-- Crypto -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.dep.osgi</groupId> -->
+               <!-- <artifactId>org.argeo.dep.osgi.bouncycastle.jdk15</artifactId> -->
+               <!-- </dependency> -->
                <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>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.commons.codec</artifactId>
                </dependency>
 
                <!-- Spring -->
                <dependency>
-                       <groupId>org.springframework.ldap</groupId>
-                       <artifactId>org.springframework.ldap</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.springframework.core</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>org.springframework.transaction</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.springframework.beans</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>org.springframework.jms</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.springframework.context</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.springframework.security</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.springframework.security.core</artifactId>
                </dependency>
-
-               <!-- Logging -->
-               <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.log4j</groupId>
-                       <artifactId>com.springsource.org.apache.log4j</artifactId>
-               </dependency>
                <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>com.springsource.slf4j.log4j</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.springframework.transaction</artifactId>
                </dependency>
-
-               <!-- JSON  -->
+               <!-- Logging -->
                <dependency>
-                       <groupId>org.codehaus.jackson</groupId>
-                       <artifactId>com.springsource.org.codehaus.jackson.mapper</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>slf4j.org.apache.commons.logging</artifactId>
                </dependency>
 
                <dependency>
-                       <groupId>com.springsource.json</groupId>
-                       <artifactId>com.springsource.json</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.antlr</groupId>
-                       <artifactId>com.springsource.org.antlr</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.log4j</artifactId>
+                       <optional>true</optional>
                </dependency>
 
-               <!-- JMS -->
-               <dependency>
-                       <groupId>org.argeo.dep.osgi</groupId>
-                       <artifactId>org.argeo.dep.osgi.activemq</artifactId>
-               </dependency>
+               <!-- TEST -->
                <dependency>
-                       <groupId>javax.jms</groupId>
-                       <artifactId>com.springsource.javax.jms</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>junit</artifactId>
+                       <scope>test</scope>
                </dependency>
-
-               <!-- TEST -->
                <dependency>
-                       <groupId>org.junit</groupId>
-                       <artifactId>com.springsource.junit</artifactId>
+                       <groupId>org.argeo.commons.basic</groupId>
+                       <artifactId>org.argeo.basic.dep.log4j</artifactId>
+                       <version>1.1.1</version>
+                       <type>pom</type>
                        <scope>test</scope>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons.server</groupId>
                        <artifactId>org.argeo.server.json</artifactId>
-                       <version>0.2.0</version>
+                       <version>1.1.1</version>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>com.springsource.json</artifactId>
                        <scope>test</scope>
                </dependency>
 
        </dependencies>
-</project>
+</project>
\ No newline at end of file