X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=security%2Fdep%2Forg.argeo.security.dep.node%2Fpom.xml;h=5f1b072cb07fe0f75383c1ade85cc699101daeb7;hb=76b53a8fdeb0e9180f6ca41517022e0c322bac86;hp=1b38c1eab531c5fc571891ffcc0639d8df6a85a4;hpb=6c878278b0f233efe33531824d29b632ea4eef60;p=lgpl%2Fargeo-commons.git

diff --git a/security/dep/org.argeo.security.dep.node/pom.xml b/security/dep/org.argeo.security.dep.node/pom.xml
index 1b38c1eab..5f1b072cb 100644
--- a/security/dep/org.argeo.security.dep.node/pom.xml
+++ b/security/dep/org.argeo.security.dep.node/pom.xml
@@ -1,8 +1,9 @@
-<?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">
+<?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>
-		<version>1.1.2</version>
+		<version>1.1.6-SNAPSHOT</version>
 		<artifactId>dep</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
@@ -10,6 +11,15 @@
 	<name>Node Backend</name>
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<configuration>
+					<instructions>
+						<SLC-ModularDistribution>default</SLC-ModularDistribution>
+					</instructions>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.argeo.maven.plugins</groupId>
 				<artifactId>maven-argeo-osgi-plugin</artifactId>
@@ -26,24 +36,40 @@
 		</plugins>
 	</build>
 	<dependencies>
-		<!-- Base runtime -->
+		<!-- Default JCR repositories configurations -->
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.node.repo.jackrabbit</artifactId>
+			<version>1.1.6-SNAPSHOT</version>
+		</dependency>
+
+		<!-- OSGi Boot (and Equinox) -->
+		<dependency>
+			<groupId>org.argeo.commons.base</groupId>
+			<artifactId>org.argeo.osgi.boot</artifactId>
+			<version>1.1.6-SNAPSHOT</version>
+		</dependency>
+
+		<!-- Logging -->
 		<dependency>
-			<groupId>org.argeo.commons.osgi</groupId>
-			<artifactId>org.argeo.osgi.dep.stdruntime</artifactId>
-			<version>1.1.2</version>
+			<groupId>org.argeo.commons.base</groupId>
+			<artifactId>org.argeo.dep.log4j</artifactId>
+			<version>1.1.6-SNAPSHOT</version>
 			<type>pom</type>
 		</dependency>
 
-		<!-- Argeo Security -->
+		<!-- Argeo Server -->
 		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.core</artifactId>
-			<version>1.1.2</version>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.core</artifactId>
+			<version>1.1.6-SNAPSHOT</version>
 		</dependency>
+
+		<!-- Argeo Security -->
 		<dependency>
 			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.mvc</artifactId>
-			<version>1.1.2</version>
+			<artifactId>org.argeo.security.core</artifactId>
+			<version>1.1.6-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Xerces and Xalan -->
@@ -66,6 +92,16 @@
 			<artifactId>javax.mail</artifactId>
 		</dependency>
 
+		<!-- Bouncycastle (cryptography) -->
+		<dependency>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>bcprov</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>bcmail</artifactId>
+		</dependency>
+
 		<!-- Commons -->
 		<dependency>
 			<groupId>org.argeo.tp</groupId>
@@ -89,18 +125,6 @@
 			<groupId>org.argeo.tp</groupId>
 			<artifactId>org.springframework.context.support</artifactId>
 		</dependency>
-		<!-- <dependency> -->
-		<!-- <groupId>org.springframework</groupId> -->
-		<!-- <artifactId>org.springframework.orm</artifactId> -->
-		<!-- </dependency> -->
-		<!-- <dependency> -->
-		<!-- <groupId>org.springframework</groupId> -->
-		<!-- <artifactId>org.springframework.jdbc</artifactId> -->
-		<!-- </dependency> -->
-		<dependency>
-			<groupId>org.argeo.tp</groupId>
-			<artifactId>org.springframework.jms</artifactId>
-		</dependency>
 
 		<!-- Spring OSGi -->
 		<dependency>
@@ -112,40 +136,12 @@
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.server.jackrabbit</artifactId>
-			<version>1.1.2</version>
+			<version>1.1.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.security</groupId>
 			<artifactId>org.argeo.security.jackrabbit</artifactId>
-			<version>1.1.2</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.node.repo.jackrabbit</artifactId>
-			<version>1.1.2</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.node.repofactory.jackrabbit</artifactId>
-			<version>1.1.2</version>
-		</dependency>
-
-		<!-- Active MQ -->
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.dep.activemq</artifactId>
-			<version>1.1.2</version>
-			<type>pom</type>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.activemq</artifactId>
-			<version>1.1.2</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.activemq.broker</artifactId>
-			<version>1.1.2</version>
+			<version>1.1.6-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Scheduling -->
@@ -158,26 +154,26 @@
 		<dependency>
 			<groupId>org.argeo.commons.security</groupId>
 			<artifactId>org.argeo.security.dao.ldap</artifactId>
-			<version>1.1.2</version>
+			<version>1.1.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.security</groupId>
 			<artifactId>org.argeo.security.ldap</artifactId>
-			<version>1.1.2</version>
+			<version>1.1.6-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Security (Jackrabbit) -->
 		<dependency>
 			<groupId>org.argeo.commons.security</groupId>
 			<artifactId>org.argeo.security.dao.jackrabbit</artifactId>
-			<version>1.1.2</version>
+			<version>1.1.6-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Security (Standalone) -->
 		<dependency>
 			<groupId>org.argeo.commons.security</groupId>
 			<artifactId>org.argeo.security.dao.os</artifactId>
-			<version>1.1.2</version>
+			<version>1.1.6-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Web -->
@@ -192,82 +188,69 @@
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.server.dep.tomcat</artifactId>
-			<version>1.1.2</version>
+			<version>1.1.6-SNAPSHOT</version>
 			<type>pom</type>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.server.webextender</artifactId>
-			<version>1.1.2</version>
+			<version>1.1.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.server.jcr.mvc</artifactId>
-			<version>1.1.2</version>
+			<version>1.1.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.jackrabbit.webapp</artifactId>
-			<version>1.1.2</version>
+			<version>1.1.6-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Default Tomcat conf -->
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.server.tomcat</artifactId>
-			<version>1.1.2</version>
+			<version>1.1.6-SNAPSHOT</version>
 		</dependency>
 
-		<!-- LDAP server -->
+		<!-- DB drivers -->
 		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.dep.ads</artifactId>
-			<version>1.1.2</version>
-			<type>pom</type>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>org.h2</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.ads.server</artifactId>
-			<version>1.1.2</version>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>com.mysql.jdbc</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.ads</artifactId>
-			<version>1.1.2</version>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>org.postgresql.jdbc3</artifactId>
 		</dependency>
-		<!-- <dependency> -->
-		<!-- <groupId>org.argeo.commons.server</groupId> -->
-		<!-- <artifactId>org.argeo.server.json</artifactId> -->
-		<!-- <version>0.3.4-SNAPSHOT</version> -->
-		<!-- </dependency> -->
 
-		<!-- Hibernate -->
+		<!-- LDAP Apache Directory server -->
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.dep.hibernate</artifactId>
-			<version>1.1.2</version>
+			<artifactId>org.argeo.server.dep.ads</artifactId>
+			<version>1.1.6-SNAPSHOT</version>
 			<type>pom</type>
 		</dependency>
-
-		<!-- DB drivers -->
-		<dependency>
-			<groupId>org.argeo.tp</groupId>
-			<artifactId>org.h2</artifactId>
-		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp</groupId>
-			<artifactId>com.mysql.jdbc</artifactId>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.ads.server</artifactId>
+			<version>1.1.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp</groupId>
-			<artifactId>org.postgresql.jdbc3</artifactId>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.ads</artifactId>
+			<version>1.1.6-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Software development -->
 		<dependency>
-			<groupId>org.argeo.commons.basic</groupId>
+			<groupId>org.argeo.commons.base</groupId>
 			<artifactId>org.argeo.support.junit</artifactId>
-			<version>1.1.2</version>
+			<version>1.1.6-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 	<profiles>
@@ -296,9 +279,9 @@
 			<dependencies>
 				<!-- OSGi test -->
 				<dependency>
-					<groupId>org.argeo.commons.osgi</groupId>
+					<groupId>org.argeo.commons.base</groupId>
 					<artifactId>org.argeo.osgi.boot</artifactId>
-					<version>1.1.2</version>
+					<version>1.1.6-SNAPSHOT</version>
 					<scope>test</scope>
 				</dependency>
 			</dependencies>
@@ -319,7 +302,7 @@
 								</goals>
 								<configuration>
 									<includeTypes>jar</includeTypes>
-									<includeGroupIds>org.argeo.commons.basic,org.argeo.commons.osgi,org.argeo.commons.server,org.argeo.commons.security</includeGroupIds>
+									<includeGroupIds>org.argeo.commons.base,org.argeo.commons.server,org.argeo.commons.security</includeGroupIds>
 									<excludeArtifactIds>org.argeo.osgi.boot</excludeArtifactIds>
 									<outputDirectory>${project.build.directory}/node</outputDirectory>
 								</configuration>
@@ -338,7 +321,6 @@
 								</goals>
 								<configuration>
 									<name>argeo-node</name>
-									<copyright>2011 Argeo</copyright>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi</directory>
@@ -379,7 +361,7 @@
 								</goals>
 								<configuration>
 									<includeTypes>jar</includeTypes>
-									<excludeGroupIds>org.argeo.commons.basic,org.argeo.commons.osgi,org.argeo.commons.server,org.argeo.commons.security</excludeGroupIds>
+									<excludeGroupIds>org.argeo.commons.base,org.argeo.commons.server,org.argeo.commons.security</excludeGroupIds>
 									<excludeArtifactIds>org.eclipse.osgi</excludeArtifactIds>
 									<outputDirectory>${project.build.directory}/node-tp</outputDirectory>
 								</configuration>