X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dep%2Forg.argeo.security.dep.node.rap%2Fpom.xml;h=14bd5b919b390c394dbe00c4b9409724cd0d6de8;hb=86a5c06dc3f077e0d00b79e209e637e476ce0152;hp=9e0875511240da7600ab4eaba493793d3503b0ce;hpb=21a4ea1fb5380ce1dd763c1ea09067cdd2dfd0f3;p=lgpl%2Fargeo-commons.git

diff --git a/dep/org.argeo.security.dep.node.rap/pom.xml b/dep/org.argeo.security.dep.node.rap/pom.xml
index 9e0875511..14bd5b919 100644
--- a/dep/org.argeo.security.dep.node.rap/pom.xml
+++ b/dep/org.argeo.security.dep.node.rap/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.commons</groupId>
-		<version>2.1.12-SNAPSHOT</version>
+		<version>2.1.14-SNAPSHOT</version>
 		<artifactId>dep</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
@@ -35,69 +35,67 @@
 		</plugins>
 	</build>
 	<dependencies>
+		<!-- CMS kernel -->
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.cms</artifactId>
+			<version>2.1.14-SNAPSHOT</version>
+		</dependency>
+		
 		<!-- Applications -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.eclipse.ui.workbench</artifactId>
-			<version>2.1.12-SNAPSHOT</version>
+			<version>2.1.14-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.security.ui.admin</artifactId>
-			<version>2.1.12-SNAPSHOT</version>
+			<artifactId>org.argeo.eclipse.ui.workbench.rap</artifactId>
+			<version>2.1.14-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.security.mvc</artifactId>
-			<version>2.1.12-SNAPSHOT</version>
+			<artifactId>org.argeo.security.ui.admin</artifactId>
+			<version>2.1.14-SNAPSHOT</version>
 		</dependency>
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.commons</groupId> -->
+		<!-- <artifactId>org.argeo.security.mvc</artifactId> -->
+		<!-- <version>2.1.12-SNAPSHOT</version> -->
+		<!-- </dependency> -->
 
 		<!-- Basis -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.security.dep.node</artifactId>
-			<version>2.1.12-SNAPSHOT</version>
+			<version>2.1.14-SNAPSHOT</version>
 			<type>pom</type>
 			<exclusions>
-				<exclusion>
-					<groupId>org.argeo.commons</groupId>
-					<artifactId>org.argeo.security.dao.jackrabbit</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.argeo.commons</groupId>
-					<artifactId>org.argeo.security.dao.os</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.argeo.commons</groupId>
-					<artifactId>org.argeo.server.catalina.start</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.argeo.commons</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>
+				<!-- <exclusion> <groupId>org.argeo.commons</groupId> <artifactId>org.argeo.security.dao.jackrabbit</artifactId> 
+					</exclusion> -->
+				<!-- <exclusion> <groupId>org.argeo.commons</groupId> <artifactId>org.argeo.security.dao.os</artifactId> 
+					</exclusion> -->
 			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.security.ui.rap</artifactId>
-			<version>2.1.12-SNAPSHOT</version>
+			<version>2.1.14-SNAPSHOT</version>
 		</dependency>
 
-		<!-- For Tomcat deployment
+		<!-- Third parties -->
 		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.server.rap.webapp</artifactId>
-			<version>2.1.1.tp-SNAPSHOT</version>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>argeo-tp</artifactId>
+			<version>${version.argeo-distribution}</version>
 		</dependency>
-		 -->
+
+		<!-- RAP -->
+		<!-- <dependency> <groupId>org.argeo.commons</groupId> <artifactId>org.argeo.eclipse.dep.rap</artifactId> 
+			<version>2.1.12-SNAPSHOT</version> <type>pom</type> </dependency> -->
+		<!-- For Tomcat deployment <dependency> <groupId>org.argeo.commons</groupId> 
+			<artifactId>org.argeo.server.rap.webapp</artifactId> <version>2.1.1.tp-SNAPSHOT</version> 
+			</dependency> -->
 	</dependencies>
 	<profiles>
 		<profile>
@@ -122,72 +120,6 @@
 					</plugin>
 				</plugins>
 			</build>
-			<dependencies>
-				<!-- OSGi test -->
-				<dependency>
-					<groupId>org.argeo.commons</groupId>
-					<artifactId>org.argeo.osgi.boot</artifactId>
-					<version>2.1.12-SNAPSHOT</version>
-					<scope>test</scope>
-				</dependency>
-			</dependencies>
-		</profile>
-		<profile>
-			<id>rpmbuild</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>rpm-maven-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>rpm-node-rap</id>
-								<phase>package</phase>
-								<goals>
-									<goal>rpm</goal>
-								</goals>
-								<configuration>
-									<name>argeo-node-rap</name>
-									<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>
-											<groupname>root</groupname>
-											<filemode>644</filemode>
-											<directoryIncluded>false</directoryIncluded>
-											<dependency>
-												<includes>
-													<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>
-											</dependency>
-										</mapping>
-									</mappings>
-									<requires>
-										<require>argeo-node</require>
-										<require>argeo-node-eclipse</require>
-										<require>eclipse-rap</require>
-									</requires>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
 		</profile>
 	</profiles>
 </project>