X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fdep%2Forg.argeo.security.dep.node.rap%2Fpom.xml;h=134597f46b28a74d45e9f9d0110df06c89db2e6c;hb=f5087dfeb08ce6af4a41216ab166d0bbd97af7e5;hp=299a6b42a6859c8083470fc66f0da0f3b7affc3d;hpb=aa5c9a94278d980fef726926d70a6c85ba994b3a;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 299a6b42a..134597f46 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>1.1.5-SNAPSHOT</version>
+		<version>2.1.8-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>
@@ -30,38 +39,70 @@
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.jcr.ui.explorer</artifactId>
-			<version>1.1.5-SNAPSHOT</version>
+			<version>2.1.8-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.base</groupId>
 			<artifactId>org.argeo.osgi.ui.explorer</artifactId>
-			<version>1.1.5-SNAPSHOT</version>
+			<version>2.1.8-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.security</groupId>
 			<artifactId>org.argeo.security.ui.admin</artifactId>
-			<version>1.1.5-SNAPSHOT</version>
+			<version>2.1.8-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.security</groupId>
+			<artifactId>org.argeo.security.mvc</artifactId>
+			<version>2.1.8-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Basis -->
 		<dependency>
 			<groupId>org.argeo.commons.security</groupId>
 			<artifactId>org.argeo.security.dep.node</artifactId>
-			<version>1.1.5-SNAPSHOT</version>
+			<version>2.1.8-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>1.1.5-SNAPSHOT</version>
+			<version>2.1.8-SNAPSHOT</version>
 		</dependency>
 
-		<!-- For Tomcat deployment -->
+		<!-- For Tomcat deployment
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.server.rap.webapp</artifactId>
-			<version>1.1.5-SNAPSHOT</version>
+			<version>2.1.1.tp-SNAPSHOT</version>
 		</dependency>
+		 -->
 	</dependencies>
 	<profiles>
 		<profile>
@@ -91,7 +132,7 @@
 				<dependency>
 					<groupId>org.argeo.commons.base</groupId>
 					<artifactId>org.argeo.osgi.boot</artifactId>
-					<version>1.1.5-SNAPSHOT</version>
+					<version>2.1.8-SNAPSHOT</version>
 					<scope>test</scope>
 				</dependency>
 			</dependencies>
@@ -112,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>