X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=security%2Fdep%2Forg.argeo.security.dep.node.rap%2Fpom.xml;h=ed13472cb08417ed35a90fc9b663ccc9768fecd7;hb=4d4713b376a8f38c996e2e0d3a199bbc42bfd8ef;hp=778ec2718c1283accaa159048e282d386f53cd5e;hpb=a707002d2ac4cb3728876187b0d80445ab33acb5;p=lgpl%2Fargeo-commons.git

diff --git a/security/dep/org.argeo.security.dep.node.rap/pom.xml b/security/dep/org.argeo.security.dep.node.rap/pom.xml
index 778ec2718..ed13472cb 100644
--- a/security/dep/org.argeo.security.dep.node.rap/pom.xml
+++ b/security/dep/org.argeo.security.dep.node.rap/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.commons.security</groupId>
-		<version>0.3.4</version>
+		<version>2.1.5-SNAPSHOT</version>
 		<artifactId>dep</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
@@ -10,6 +10,15 @@
 	<name>Node Eclipse RAP</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>
@@ -21,16 +30,6 @@
 						</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>
@@ -40,40 +39,104 @@
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.jcr.ui.explorer</artifactId>
-			<version>0.3.4</version>
+			<version>2.1.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.commons.osgi</groupId>
+			<groupId>org.argeo.commons.base</groupId>
 			<artifactId>org.argeo.osgi.ui.explorer</artifactId>
-			<version>0.3.4</version>
+			<version>2.1.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.security</groupId>
 			<artifactId>org.argeo.security.ui.admin</artifactId>
-			<version>0.3.4</version>
+			<version>2.1.5-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.security</groupId>
+			<artifactId>org.argeo.security.mvc</artifactId>
+			<version>2.1.5-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Basis -->
 		<dependency>
 			<groupId>org.argeo.commons.security</groupId>
 			<artifactId>org.argeo.security.dep.node</artifactId>
-			<version>0.3.4</version>
+			<version>2.1.5-SNAPSHOT</version>
 			<type>pom</type>
+			<exclusions>
+				<exclusion>
+					<groupId>org.argeo.commons.security</groupId>
+					<artifactId>org.argeo.security.dao.jackrabbit</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.argeo.commons.security</groupId>
+					<artifactId>org.argeo.security.dao.os</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.argeo.commons.server</groupId>
+					<artifactId>org.argeo.server.catalina.start</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.argeo.commons.server</groupId>
+					<artifactId>org.argeo.server.webextender</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.argeo.tp</groupId>
+					<artifactId>org.apache.jasper</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.argeo.tp</groupId>
+					<artifactId>org.springframework.osgi.web.extender</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.security</groupId>
 			<artifactId>org.argeo.security.ui.rap</artifactId>
-			<version>0.3.4</version>
+			<version>2.1.5-SNAPSHOT</version>
 		</dependency>
 
-		<!-- For Tomcat deployment -->
+		<!-- For Tomcat deployment
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.server.rap.webapp</artifactId>
-			<version>0.3.4</version>
+			<version>2.1.1.tp-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.5-SNAPSHOT</version>
+					<scope>test</scope>
+				</dependency>
+			</dependencies>
+		</profile>
 		<profile>
 			<id>rpmbuild</id>
 			<build>
@@ -90,8 +153,20 @@
 								</goals>
 								<configuration>
 									<name>argeo-node-rap</name>
-									<copyright>2011 Argeo</copyright>
 									<mappings>
+										<!-- <mapping> -->
+										<!-- <directory>/etc/argeo-node-rap</directory> -->
+										<!-- <username>root</username> -->
+										<!-- <groupname>root</groupname> -->
+										<!-- <filemode>644</filemode> -->
+										<!-- <configuration>true</configuration> -->
+										<!-- <directoryIncluded>false</directoryIncluded> -->
+										<!-- <sources> -->
+										<!-- <source> -->
+										<!-- <location>src/main/rpm/etc/argeo-node-rap</location> -->
+										<!-- </source> -->
+										<!-- </sources> -->
+										<!-- </mapping> -->
 										<mapping>
 											<directory>/usr/share/osgi/rap</directory>
 											<username>root</username>
@@ -100,7 +175,7 @@
 											<directoryIncluded>false</directoryIncluded>
 											<dependency>
 												<includes>
-													<include>org.argeo.commons.eclipse:org.argeo.eclipse.ui.rap</include>
+													<include>org.argeo.commons.base:org.argeo.eclipse.ui.rap</include>
 													<include>org.argeo.commons.server:org.argeo.server.rap.webapp</include>
 													<include>org.argeo.commons.security:org.argeo.security.ui.rap</include>
 												</includes>