X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dep%2Forg.argeo.dep.cms.client%2Fpom.xml;h=ec63ecae4766d87b17728623e2a09e8d336bb002;hb=97d99658fb8a7b5a1045cd790502480c783c8d65;hp=f9371b177a238fe6a7fad217fbc2c9a47cf0a641;hpb=241709fc790719d650253ef57bd158fb6e806325;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 f9371b177..ec63ecae4 100644
--- a/dep/org.argeo.dep.cms.client/pom.xml
+++ b/dep/org.argeo.dep.cms.client/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.commons</groupId>
-		<version>2.1.39-SNAPSHOT</version>
+		<version>2.1.74-SNAPSHOT</version>
 		<artifactId>dep</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
@@ -15,12 +15,12 @@
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.util</artifactId>
-			<version>2.1.39-SNAPSHOT</version>
+			<version>2.1.74-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.server.jcr</artifactId>
-			<version>2.1.39-SNAPSHOT</version>
+			<artifactId>org.argeo.jcr</artifactId>
+			<version>2.1.74-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Third Parties -->
@@ -60,6 +60,14 @@
 			<groupId>org.argeo.tp.bouncycastle</groupId>
 			<artifactId>bcpkix</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.apache</groupId>
+			<artifactId>org.apache.httpcomponents.httpcore</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.apache</groupId>
+			<artifactId>org.apache.httpcomponents.httpclient</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.apache.commons</groupId>
 			<artifactId>org.apache.commons.io</artifactId>
@@ -108,10 +116,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>
@@ -138,15 +142,35 @@
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.equinox</groupId>
-			<artifactId>org.eclipse.equinox.console</artifactId>
+			<artifactId>org.eclipse.equinox.event</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.equinox</groupId>
-			<artifactId>org.eclipse.equinox.event</artifactId>
+			<artifactId>org.eclipse.equinox.app</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.equinox</groupId>
-			<artifactId>org.eclipse.equinox.app</artifactId>
+			<artifactId>org.eclipse.equinox.ds</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.equinox</groupId>
+			<artifactId>org.eclipse.equinox.metatype</artifactId>
+		</dependency>
+
+		<!-- SSH -->
+		<dependency>
+			<groupId>org.argeo.tp.apache</groupId>
+			<artifactId>org.apache.mina.core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.apache</groupId>
+			<artifactId>org.apache.sshd.core</artifactId>
+		</dependency>
+
+		<!-- Console -->
+		<dependency>
+			<groupId>org.argeo.tp.apache.felix</groupId>
+			<artifactId>org.apache.felix.scr</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.apache.felix</groupId>
@@ -156,6 +180,12 @@
 			<groupId>org.argeo.tp.apache.felix</groupId>
 			<artifactId>org.apache.felix.gogo.shell</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.equinox</groupId>
+			<artifactId>org.eclipse.equinox.console</artifactId>
+		</dependency>
+
+		<!-- Jackrabbit client -->
 		<dependency>
 			<groupId>org.argeo.tp.apache.jackrabbit</groupId>
 			<artifactId>org.apache.jackrabbit.api</artifactId>
@@ -189,11 +219,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.39-SNAPSHOT</version>
+			<version>2.1.74-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
@@ -220,21 +256,7 @@
 									<excludeTransitive>true</excludeTransitive>
 									<includeTypes>jar</includeTypes>
 									<includeScope>runtime</includeScope>
-								</configuration>
-							</execution>
-							<execution>
-								<id>copy-tp</id>
-								<phase>package</phase>
-								<goals>
-									<goal>copy-dependencies</goal>
-								</goals>
-								<configuration>
-									<includeTypes>jar</includeTypes>
-									<outputDirectory>${project.build.directory}/lib-tp</outputDirectory>
-									<excludeGroupIds>org.argeo.commons</excludeGroupIds>
-									<excludeTransitive>true</excludeTransitive>
-									<includeTypes>jar</includeTypes>
-									<includeScope>runtime</includeScope>
+									<useRepositoryLayout>true</useRepositoryLayout>
 								</configuration>
 							</execution>
 						</executions>
@@ -262,11 +284,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>
@@ -283,6 +312,28 @@
 			<id>rpmbuild-tp</id>
 			<build>
 				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-dependency-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>copy-tp</id>
+								<phase>package</phase>
+								<goals>
+									<goal>copy-dependencies</goal>
+								</goals>
+								<configuration>
+									<includeTypes>jar</includeTypes>
+									<outputDirectory>${project.build.directory}/lib-tp</outputDirectory>
+									<excludeGroupIds>org.argeo.commons</excludeGroupIds>
+									<excludeTransitive>true</excludeTransitive>
+									<includeTypes>jar</includeTypes>
+									<includeScope>runtime</includeScope>
+									<useRepositoryLayout>true</useRepositoryLayout>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>rpm-maven-plugin</artifactId>
@@ -295,7 +346,7 @@
 								</goals>
 								<configuration>
 									<name>argeo-cms-client-tp</name>
-									<projversion>${version.argeo-distribution}</projversion>
+									<projversion>${version.argeo-tp}</projversion>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi</directory>
@@ -307,7 +358,7 @@
 												<source>
 													<location>${project.build.directory}/lib-tp</location>
 													<includes>
-														<include>*.jar</include>
+														<include>**/*.jar</include>
 													</includes>
 												</source>
 											</sources>