X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dep%2Forg.argeo.dep.cms.client%2Fpom.xml;h=6e8d4b9377086f1979a6448573489bbedf7698ff;hb=e70bfdd4ade70ca4a68352d0d51d844a05dbdc58;hp=e802ff2948a09d0073273d7b84e951faae142dfa;hpb=b38e375ea95041712aa34fc5bdbaa00c8c7e15e0;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 e802ff294..6e8d4b937 100644
--- a/dep/org.argeo.dep.cms.client/pom.xml
+++ b/dep/org.argeo.dep.cms.client/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.32-SNAPSHOT</version>
+		<version>2.1.55-SNAPSHOT</version>
 		<artifactId>dep</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
@@ -16,12 +15,12 @@
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.util</artifactId>
-			<version>2.1.32-SNAPSHOT</version>
+			<version>2.1.55-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.server.jcr</artifactId>
-			<version>2.1.32-SNAPSHOT</version>
+			<artifactId>org.argeo.jcr</artifactId>
+			<version>2.1.55-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Third Parties -->
@@ -109,10 +108,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>
@@ -149,6 +144,14 @@
 			<groupId>org.argeo.tp.equinox</groupId>
 			<artifactId>org.eclipse.equinox.app</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.equinox</groupId>
+			<artifactId>org.eclipse.equinox.ds</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.equinox</groupId>
+			<artifactId>org.eclipse.equinox.metatype</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.apache.felix</groupId>
 			<artifactId>org.apache.felix.gogo.runtime</artifactId>
@@ -190,11 +193,17 @@
 			<artifactId>org.apache.jackrabbit.jcr2spi</artifactId>
 		</dependency>
 
+		<!-- Required by Jackrabbit 2.12 -->
+		<dependency>
+			<groupId>org.argeo.tp.misc</groupId>
+			<artifactId>com.google.guava</artifactId>
+		</dependency>
+
 		<!-- Test only -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.osgi.boot</artifactId>
-			<version>2.1.32-SNAPSHOT</version>
+			<version>2.1.55-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
@@ -221,6 +230,7 @@
 									<excludeTransitive>true</excludeTransitive>
 									<includeTypes>jar</includeTypes>
 									<includeScope>runtime</includeScope>
+									<useRepositoryLayout>true</useRepositoryLayout>
 								</configuration>
 							</execution>
 							<execution>
@@ -236,6 +246,7 @@
 									<excludeTransitive>true</excludeTransitive>
 									<includeTypes>jar</includeTypes>
 									<includeScope>runtime</includeScope>
+									<useRepositoryLayout>true</useRepositoryLayout>
 								</configuration>
 							</execution>
 						</executions>
@@ -263,11 +274,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-client-tp</require>
@@ -308,7 +326,7 @@
 												<source>
 													<location>${project.build.directory}/lib-tp</location>
 													<includes>
-														<include>*.jar</include>
+														<include>**/*.jar</include>
 													</includes>
 												</source>
 											</sources>