X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dep%2Forg.argeo.dep.cms.platform%2Fpom.xml;h=d94f372dfb9ecc7b6a81dc38b699bf86b3f48dd5;hb=9c1e0062044a1dcf34d34c7cda840334e56a289c;hp=e7bbe3a2cf54a78623b02bd1352af5e328ded009;hpb=a1fed2e9fc16a051a468a58d399dbcb85be0eca2;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 e7bbe3a2c..d94f372df 100644
--- a/dep/org.argeo.dep.cms.platform/pom.xml
+++ b/dep/org.argeo.dep.cms.platform/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.commons</groupId>
-		<version>2.1.41-SNAPSHOT</version>
+		<version>2.1.70-SNAPSHOT</version>
 		<artifactId>dep</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
@@ -15,37 +15,23 @@
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.dep.cms.node</artifactId>
-			<version>2.1.41-SNAPSHOT</version>
+			<version>2.1.70-SNAPSHOT</version>
+			<type>pom</type>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.security.core</artifactId>
-			<version>2.1.41-SNAPSHOT</version>
+			<artifactId>org.argeo.cms.ui.workbench</artifactId>
+			<version>2.1.70-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.security.ui</artifactId>
-			<version>2.1.41-SNAPSHOT</version>
+			<artifactId>org.argeo.cms.ui.workbench.rap</artifactId>
+			<version>2.1.70-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.eclipse.ui.workbench</artifactId>
-			<version>2.1.41-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.security.ui.admin</artifactId>
-			<version>2.1.41-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.eclipse.ui.workbench.rap</artifactId>
-			<version>2.1.41-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.security.ui.rap</artifactId>
-			<version>2.1.41-SNAPSHOT</version>
+			<artifactId>org.argeo.ext.rap.ui.workbench</artifactId>
+			<version>2.1.70-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Misc Third Parties -->
@@ -69,14 +55,14 @@
 			<groupId>org.argeo.tp.apache.ant</groupId>
 			<artifactId>org.apache.ant.launch</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>org.quartz-scheduler.quartz</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>org.quartz-scheduler.quartz.jobs</artifactId>
-		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.tp.misc</groupId> -->
+<!-- 			<artifactId>org.quartz-scheduler.quartz</artifactId> -->
+<!-- 		</dependency> -->
+<!-- 		<dependency> -->
+<!-- 			<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>
@@ -197,6 +183,7 @@
 									<excludeTransitive>true</excludeTransitive>
 									<includeTypes>jar</includeTypes>
 									<includeScope>runtime</includeScope>
+									<useRepositoryLayout>true</useRepositoryLayout>
 								</configuration>
 							</execution>
 							<execution>
@@ -212,6 +199,7 @@
 									<excludeTransitive>true</excludeTransitive>
 									<includeTypes>jar</includeTypes>
 									<includeScope>runtime</includeScope>
+									<useRepositoryLayout>true</useRepositoryLayout>
 								</configuration>
 							</execution>
 						</executions>
@@ -239,11 +227,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>
@@ -284,7 +279,7 @@
 												<source>
 													<location>${project.build.directory}/lib-tp</location>
 													<includes>
-														<include>*.jar</include>
+														<include>**/*.jar</include>
 													</includes>
 												</source>
 											</sources>