X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dep%2Forg.argeo.dep.cms.platform%2Fpom.xml;h=6609512b74a931afd2bdaa4a9b6ac20fba4d3c4b;hb=3e10aa9a4fd178ed289d463e5af33a4d94bd16c4;hp=611d6c2891379f0536e6c926afdedd0d586489e5;hpb=776da4727eff56cab3129d644caefc58275ee6f8;p=lgpl%2Fargeo-commons.git

diff --git a/dep/org.argeo.dep.cms.platform/pom.xml b/dep/org.argeo.dep.cms.platform/pom.xml
index 611d6c289..6609512b7 100644
--- a/dep/org.argeo.dep.cms.platform/pom.xml
+++ b/dep/org.argeo.dep.cms.platform/pom.xml
@@ -1,10 +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">
+<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</groupId>
-		<version>2.1.31-SNAPSHOT</version>
+		<version>2.1.48-SNAPSHOT</version>
 		<artifactId>dep</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
@@ -16,37 +15,28 @@
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.dep.cms.node</artifactId>
-			<version>${version.argeo-commons}</version>
+			<version>2.1.48-SNAPSHOT</version>
+			<type>pom</type>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.security.core</artifactId>
-			<version>2.1.31-SNAPSHOT</version>
+			<artifactId>org.argeo.cms.ui.workbench</artifactId>
+			<version>2.1.48-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.security.ui</artifactId>
-			<version>${version.argeo-commons}</version>
+			<artifactId>org.argeo.ext.rap.ui.workbench</artifactId>
+			<version>2.1.48-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.eclipse.ui.workbench</artifactId>
-			<version>${version.argeo-commons}</version>
+			<artifactId>org.argeo.cms.ui.workbench</artifactId>
+			<version>2.1.48-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.security.ui.admin</artifactId>
-			<version>${version.argeo-commons}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.eclipse.ui.workbench.rap</artifactId>
-			<version>${version.argeo-commons}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.security.ui.rap</artifactId>
-			<version>${version.argeo-commons}</version>
+			<artifactId>org.argeo.cms.ui.workbench.rap</artifactId>
+			<version>2.1.48-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Misc Third Parties -->
@@ -78,7 +68,10 @@
 			<groupId>org.argeo.tp.misc</groupId>
 			<artifactId>org.quartz-scheduler.quartz.jobs</artifactId>
 		</dependency>
-
+		<dependency>
+			<groupId>org.argeo.tp.javax</groupId>
+			<artifactId>javax.mail</artifactId>
+		</dependency>
 
 		<!-- RAP Workbench -->
 		<dependency>
@@ -195,6 +188,7 @@
 									<excludeTransitive>true</excludeTransitive>
 									<includeTypes>jar</includeTypes>
 									<includeScope>runtime</includeScope>
+									<useRepositoryLayout>true</useRepositoryLayout>
 								</configuration>
 							</execution>
 							<execution>
@@ -210,6 +204,7 @@
 									<excludeTransitive>true</excludeTransitive>
 									<includeTypes>jar</includeTypes>
 									<includeScope>runtime</includeScope>
+									<useRepositoryLayout>true</useRepositoryLayout>
 								</configuration>
 							</execution>
 						</executions>
@@ -237,11 +232,18 @@
 												<source>
 													<location>${project.build.directory}/lib-argeo</location>
 													<includes>
-														<include>*.jar</include>
+														<include>**/*.jar</include>
 													</includes>
 												</source>
 											</sources>
 										</mapping>
+										<mapping>
+											<directory>/usr/share/osgi/org/argeo/commons/${project.artifactId}/${project.version}</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<directoryIncluded>false</directoryIncluded>
+											<artifact />
+										</mapping>
 									</mappings>
 									<requires>
 										<require>argeo-cms-node</require>
@@ -282,7 +284,7 @@
 												<source>
 													<location>${project.build.directory}/lib-tp</location>
 													<includes>
-														<include>*.jar</include>
+														<include>**/*.jar</include>
 													</includes>
 												</source>
 											</sources>