[maven-release-plugin] prepare for next development iteration

[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 d818139ab2c897deea6c387269cf0468aac714b9..146fa435484b2242c3b17d02081fa5b9fc16a39d 100644 (file)
--- a/security/runtime/org.argeo.security.core/pom.xml
+++ b/security/runtime/org.argeo.security.core/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.commons.security</groupId>
                <artifactId>runtime</artifactId>
-               <version>0.2.2</version>
+               <version>0.3.5-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.security.core</artifactId>
@@ -25,23 +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,
-                                                       javax.jms;resolution:=optional,
-                                                       org.apache.activemq;resolution:=optional,
-                                                       org.apache.activemq.broker;resolution:=optional,
-                                                       org.apache.activemq.command;resolution:=optional,
-                                                       org.apache.activemq.security;resolution:=optional,
-                                                       org.springframework.jms.connection;resolution:=optional,
-                                                       org.springframework.ldap.core;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>
@@ -52,91 +57,71 @@
                <dependency>
                        <groupId>org.argeo.commons.basic</groupId>
                        <artifactId>org.argeo.basic.nodeps</artifactId>
-                       <version>0.2.2</version>
+                       <version>0.3.5-SNAPSHOT</version>
                </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.commons.server</groupId>
+                       <artifactId>org.argeo.server.jcr</artifactId>
+                       <version>0.3.5-SNAPSHOT</version>
                </dependency>
 
+               <!-- Crypto -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.dep.osgi</groupId> -->
+               <!-- <artifactId>org.argeo.dep.osgi.bouncycastle.jdk15</artifactId> -->
+               <!-- </dependency> -->
+
                <!-- Spring -->
                <dependency>
-                       <groupId>org.argeo.dep.osgi</groupId>
-                       <artifactId>org.argeo.dep.osgi.springframework.ldap</artifactId>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>org.springframework.beans</artifactId>
                </dependency>
                <dependency>
                        <groupId>org.springframework</groupId>
-                       <artifactId>org.springframework.transaction</artifactId>
+                       <artifactId>org.springframework.context</artifactId>
                </dependency>
                <dependency>
                        <groupId>org.springframework.security</groupId>
                        <artifactId>org.springframework.security.core</artifactId>
                </dependency>
-
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>org.springframework.transaction</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>
-               </dependency>
-
-               <!-- JSON -->
-               <dependency>
-                       <groupId>org.codehaus.jackson</groupId>
-                       <artifactId>com.springsource.org.codehaus.jackson.mapper</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>
-               </dependency>
-
-               <!-- JMS -->
-               <dependency>
-                       <groupId>org.argeo.dep.osgi</groupId>
-                       <artifactId>org.argeo.dep.osgi.activemq</artifactId>
-                       <optional>true</optional>
-               </dependency>
-               <dependency>
-                       <groupId>javax.jms</groupId>
-                       <artifactId>com.springsource.javax.jms</artifactId>
-                       <optional>true</optional>
-               </dependency>
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>org.springframework.jms</artifactId>
                        <optional>true</optional>
                </dependency>
 
-<!--           <dependency>-->
-<!--                   <groupId>org.apache.commons</groupId>-->
-<!--                   <artifactId>com.springsource.org.apache.commons.codec</artifactId>-->
-<!--           </dependency>-->
-
                <!-- TEST -->
                <dependency>
                        <groupId>org.junit</groupId>
                        <artifactId>com.springsource.junit</artifactId>
                        <scope>test</scope>
                </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons.basic</groupId>
+                       <artifactId>org.argeo.basic.dep.log4j</artifactId>
+                       <version>0.3.5-SNAPSHOT</version>
+                       <type>pom</type>
+                       <scope>test</scope>
+               </dependency>
                <dependency>
                        <groupId>org.argeo.commons.server</groupId>
                        <artifactId>org.argeo.server.json</artifactId>
-                       <version>0.2.2</version>
+                       <version>0.3.5-SNAPSHOT</version>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>com.springsource.json</groupId>
+                       <artifactId>com.springsource.json</artifactId>
                        <scope>test</scope>
                </dependency>