X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=security%2Fdep%2Forg.argeo.security.dep.node%2Fpom.xml;h=8288517b06fcfd6362e4e06bd469faeec5f7d5df;hb=cba867a735d8de8f055b5ae158be3ed688573030;hp=33352351d0000fcadbd5fdbf485bf3beb7d09dee;hpb=a85d956fbb7afe93ae90883608f2580a20ec6426;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 33352351d..8288517b0 100644
--- a/security/dep/org.argeo.security.dep.node/pom.xml
+++ b/security/dep/org.argeo.security.dep.node/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>
-		<version>0.3.4-SNAPSHOT</version>
+		<version>2.1.1-SNAPSHOT</version>
 		<artifactId>dep</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
@@ -11,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>
@@ -22,116 +31,114 @@
 						</goals>
 						<phase>generate-resources</phase>
 					</execution>
-					<execution>
-						<id>check-osgi</id>
-						<phase>test</phase>
-						<goals>
-							<goal>equinox</goal>
-						</goals>
-						<configuration>
-							<onlyCheck>true</onlyCheck>
-						</configuration>
-					</execution>
 				</executions>
 			</plugin>
 		</plugins>
 	</build>
 	<dependencies>
-		<!-- Base runtime -->
+		<!-- Default JCR repositories configurations -->
 		<dependency>
-			<groupId>org.argeo.commons.osgi</groupId>
-			<artifactId>org.argeo.osgi.dep.stdruntime</artifactId>
-			<version>0.3.4-SNAPSHOT</version>
-			<type>pom</type>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.node.repo.jackrabbit</artifactId>
+			<version>2.1.1-SNAPSHOT</version>
 		</dependency>
 
-		<!-- Argeo Security -->
+		<!-- OSGi Boot (and Equinox) -->
 		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.core</artifactId>
-			<version>0.3.4-SNAPSHOT</version>
+			<groupId>org.argeo.commons.base</groupId>
+			<artifactId>org.argeo.osgi.boot</artifactId>
+			<version>2.1.1-SNAPSHOT</version>
 		</dependency>
+
+		<!-- Logging -->
 		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.mvc</artifactId>
-			<version>0.3.4-SNAPSHOT</version>
+			<groupId>org.argeo.commons.base</groupId>
+			<artifactId>org.argeo.dep.log4j</artifactId>
+			<version>2.1.1-SNAPSHOT</version>
+			<type>pom</type>
 		</dependency>
 
-		<!-- Xerces and Xalan -->
+		<!-- Argeo Server -->
 		<dependency>
-			<groupId>org.apache.xmlcommons</groupId>
-			<artifactId>com.springsource.org.apache.xmlcommons</artifactId>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.core</artifactId>
+			<version>2.1.1-SNAPSHOT</version>
 		</dependency>
+
+		<!-- Argeo Security -->
 		<dependency>
-			<groupId>org.apache.xalan</groupId>
-			<artifactId>com.springsource.org.apache.xalan</artifactId>
+			<groupId>org.argeo.commons.security</groupId>
+			<artifactId>org.argeo.security.core</artifactId>
+			<version>2.1.1-SNAPSHOT</version>
 		</dependency>
 
-		<!-- Javax -->
+		<!-- Xerces and Xalan -->
 		<dependency>
-			<groupId>javax.xml.soap</groupId>
-			<artifactId>com.springsource.javax.xml.soap</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>org.apache.xmlcommons</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>javax.activation</groupId>
-			<artifactId>com.springsource.javax.activation</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>org.apache.xalan</artifactId>
 		</dependency>
+
+		<!-- Javax -->
 		<dependency>
-			<groupId>javax.annotation</groupId>
-			<artifactId>com.springsource.javax.annotation</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>javax.annotation</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>javax.xml.ws</groupId>
-			<artifactId>com.springsource.javax.xml.ws</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>javax.mail</artifactId>
 		</dependency>
+
+		<!-- Bouncycastle (cryptography) -->
 		<dependency>
-			<groupId>javax.xml.bind</groupId>
-			<artifactId>com.springsource.javax.xml.bind</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>bcprov</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>javax.mail</groupId>
-			<artifactId>com.springsource.javax.mail</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>bcmail</artifactId>
 		</dependency>
 
 		<!-- Commons -->
 		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>com.springsource.org.apache.commons.vfs</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>org.apache.commons.vfs</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.dep.osgi</groupId>
-			<artifactId>org.argeo.dep.osgi.commons.exec</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>org.apache.commons.exec</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.dep.osgi</groupId>
-			<artifactId>org.argeo.dep.osgi.commons.cli</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>org.apache.commons.cli</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>com.springsource.org.apache.commons.dbcp</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>org.apache.commons.dbcp</artifactId>
 		</dependency>
 
-		<!-- Spring -->
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>org.springframework.context.support</artifactId>
-		</dependency>
+		<!-- Reporting -->
 		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>org.springframework.orm</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>jxl</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>org.springframework.jdbc</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>org.apache.pdfbox</artifactId>
 		</dependency>
+
+		<!-- Spring -->
 		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>org.springframework.jms</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>org.springframework.context.support</artifactId>
 		</dependency>
 
 		<!-- Spring OSGi -->
 		<dependency>
-			<groupId>org.springframework.osgi</groupId>
+			<groupId>org.argeo.tp</groupId>
 			<artifactId>org.springframework.osgi.extender</artifactId>
 		</dependency>
 
@@ -139,165 +146,149 @@
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.server.jackrabbit</artifactId>
-			<version>0.3.4-SNAPSHOT</version>
+			<version>2.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.security</groupId>
 			<artifactId>org.argeo.security.jackrabbit</artifactId>
-			<version>0.3.4-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.node.repo.jackrabbit</artifactId>
-			<version>0.3.4-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.node.repofactory.jackrabbit</artifactId>
-			<version>0.3.4-SNAPSHOT</version>
-		</dependency>
-
-		<!-- Active MQ -->
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.dep.activemq</artifactId>
-			<version>0.3.4-SNAPSHOT</version>
-			<type>pom</type>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.activemq</artifactId>
-			<version>0.3.4-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.activemq.broker</artifactId>
-			<version>0.3.4-SNAPSHOT</version>
+			<version>2.1.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Scheduling -->
 		<dependency>
-			<groupId>com.opensymphony.quartz</groupId>
-			<artifactId>com.springsource.org.quartz</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>org.quartz</artifactId>
 		</dependency>
 
 		<!-- Security (LDAP) -->
 		<dependency>
 			<groupId>org.argeo.commons.security</groupId>
 			<artifactId>org.argeo.security.dao.ldap</artifactId>
-			<version>0.3.4-SNAPSHOT</version>
+			<version>2.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.security</groupId>
 			<artifactId>org.argeo.security.ldap</artifactId>
-			<version>0.3.4-SNAPSHOT</version>
+			<version>2.1.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Security (Jackrabbit) -->
 		<dependency>
 			<groupId>org.argeo.commons.security</groupId>
 			<artifactId>org.argeo.security.dao.jackrabbit</artifactId>
-			<version>0.3.4-SNAPSHOT</version>
+			<version>2.1.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Security (Standalone) -->
 		<dependency>
 			<groupId>org.argeo.commons.security</groupId>
 			<artifactId>org.argeo.security.dao.os</artifactId>
-			<version>0.3.4-SNAPSHOT</version>
+			<version>2.1.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Web -->
 		<dependency>
-			<groupId>org.springframework.osgi</groupId>
+			<groupId>org.argeo.tp</groupId>
 			<artifactId>org.springframework.osgi.web.extender</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.osgi</groupId>
+			<groupId>org.argeo.tp</groupId>
 			<artifactId>org.springframework.osgi.web</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.server.dep.tomcat</artifactId>
-			<version>0.3.4-SNAPSHOT</version>
+			<version>2.1.1-SNAPSHOT</version>
 			<type>pom</type>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.server.webextender</artifactId>
-			<version>0.3.4-SNAPSHOT</version>
+			<version>2.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.server.jcr.mvc</artifactId>
-			<version>0.3.4-SNAPSHOT</version>
+			<version>2.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.jackrabbit.webapp</artifactId>
-			<version>0.3.4-SNAPSHOT</version>
+			<version>2.1.1-SNAPSHOT</version>
 		</dependency>
 
-		<!-- Default Tomcat conf -->
+		<!-- DB drivers -->
 		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.tomcat</artifactId>
-			<version>0.3.4-SNAPSHOT</version>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>org.h2</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>com.mysql.jdbc</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>org.postgresql.jdbc3</artifactId>
 		</dependency>
 
-		<!-- LDAP server -->
+		<!-- LDAP Apache Directory server -->
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.server.dep.ads</artifactId>
-			<version>0.3.4-SNAPSHOT</version>
+			<version>2.1.1-SNAPSHOT</version>
 			<type>pom</type>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.server.ads.server</artifactId>
-			<version>0.3.4-SNAPSHOT</version>
+			<version>2.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.server.ads</artifactId>
-			<version>0.3.4-SNAPSHOT</version>
-		</dependency>
-		<!-- <dependency> -->
-		<!-- <groupId>org.argeo.commons.server</groupId> -->
-		<!-- <artifactId>org.argeo.server.json</artifactId> -->
-		<!-- <version>0.3.4-SNAPSHOT</version> -->
-		<!-- </dependency> -->
-
-		<!-- Hibernate -->
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.dep.hibernate</artifactId>
-			<version>0.3.4-SNAPSHOT</version>
-			<type>pom</type>
-		</dependency>
-
-		<!-- DB drivers -->
-		<dependency>
-			<groupId>com.h2database</groupId>
-			<artifactId>com.springsource.org.h2</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.mysql.jdbc</groupId>
-			<artifactId>com.springsource.com.mysql.jdbc</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.postgresql</groupId>
-			<artifactId>com.springsource.org.postgresql.jdbc3</artifactId>
+			<version>2.1.1-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>0.3.4-SNAPSHOT</version>
+			<version>2.1.1-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 	<profiles>
+		<profile>
+			<id>check-osgi</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.argeo.maven.plugins</groupId>
+						<artifactId>maven-argeo-osgi-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>check-osgi</id>
+								<phase>test</phase>
+								<goals>
+									<goal>equinox</goal>
+								</goals>
+								<configuration>
+									<onlyCheck>true</onlyCheck>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+			<dependencies>
+				<!-- OSGi test -->
+				<dependency>
+					<groupId>org.argeo.commons.base</groupId>
+					<artifactId>org.argeo.osgi.boot</artifactId>
+					<version>2.1.1-SNAPSHOT</version>
+					<scope>test</scope>
+				</dependency>
+			</dependencies>
+		</profile>
 		<profile>
 			<id>rpmbuild</id>
 			<build>
@@ -314,7 +305,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>
@@ -333,7 +324,6 @@
 								</goals>
 								<configuration>
 									<name>argeo-node</name>
-									<copyright>2011 Argeo</copyright>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi</directory>
@@ -355,26 +345,6 @@
 							</execution>
 						</executions>
 					</plugin>
-					<plugin>
-						<artifactId>maven-antrun-plugin</artifactId>
-						<executions>
-							<execution>
-								<phase>install</phase>
-								<goals>
-									<goal>run</goal>
-								</goals>
-								<configuration>
-									<target>
-										<copy todir="${rpm.stagingRepository}" verbose="true">
-											<fileset dir="${project.build.directory}/rpm"
-												includes="*/RPMS/**/*.rpm" />
-											<flattenmapper />
-										</copy>
-									</target>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
 				</plugins>
 			</build>
 		</profile>
@@ -394,7 +364,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>
@@ -437,4 +407,4 @@
 			</build>
 		</profile>
 	</profiles>
-</project>
+</project>
\ No newline at end of file