X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dep%2Forg.argeo.dep.cms.client%2Fpom.xml;h=179f7ba63ddbae3a71b40515054397e10454a117;hb=446df3b194bb69057640cd96ac2d6add2bac6bca;hp=a6cee58a0863b7f5399c7972364319e2e2f6a3d4;hpb=7018ca21edd0a7afde7c9944913c1a0e16cfedf6;p=lgpl%2Fargeo-commons.git

diff --git a/dep/org.argeo.dep.cms.client/pom.xml b/dep/org.argeo.dep.cms.client/pom.xml
index a6cee58a0..179f7ba63 100644
--- a/dep/org.argeo.dep.cms.client/pom.xml
+++ b/dep/org.argeo.dep.cms.client/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.commons</groupId>
-		<version>2.1.41-SNAPSHOT</version>
+		<version>2.1.46-SNAPSHOT</version>
 		<artifactId>dep</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
@@ -16,12 +16,12 @@
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.util</artifactId>
-			<version>2.1.41-SNAPSHOT</version>
+			<version>2.1.46-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.server.jcr</artifactId>
-			<version>2.1.41-SNAPSHOT</version>
+			<artifactId>org.argeo.jcr</artifactId>
+			<version>2.1.46-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Third Parties -->
@@ -109,10 +109,6 @@
 			<groupId>org.argeo.tp.equinox</groupId>
 			<artifactId>org.eclipse.osgi.util</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.equinox</groupId>
-			<artifactId>org.eclipse.osgi</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.equinox</groupId>
 			<artifactId>org.eclipse.equinox.util</artifactId>
@@ -208,7 +204,7 @@
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.osgi.boot</artifactId>
-			<version>2.1.41-SNAPSHOT</version>
+			<version>2.1.46-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
@@ -235,6 +231,7 @@
 									<excludeTransitive>true</excludeTransitive>
 									<includeTypes>jar</includeTypes>
 									<includeScope>runtime</includeScope>
+									<useRepositoryLayout>true</useRepositoryLayout>
 								</configuration>
 							</execution>
 							<execution>
@@ -250,6 +247,7 @@
 									<excludeTransitive>true</excludeTransitive>
 									<includeTypes>jar</includeTypes>
 									<includeScope>runtime</includeScope>
+									<useRepositoryLayout>true</useRepositoryLayout>
 								</configuration>
 							</execution>
 						</executions>
@@ -272,16 +270,24 @@
 											<username>root</username>
 											<groupname>root</groupname>
 											<filemode>644</filemode>
-											<directoryIncluded>false</directoryIncluded>
+											<directoryIncluded>true</directoryIncluded>
 											<sources>
 												<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>
+											<filemode>644</filemode>
+											<directoryIncluded>true</directoryIncluded>
+											<artifact />
+										</mapping>
 									</mappings>
 									<requires>
 										<require>argeo-cms-client-tp</require>
@@ -322,7 +328,7 @@
 												<source>
 													<location>${project.build.directory}/lib-tp</location>
 													<includes>
-														<include>*.jar</include>
+														<include>**/*.jar</include>
 													</includes>
 												</source>
 											</sources>