X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=blobdiff_plain;f=dep%2Forg.argeo.dep.cms.client%2Fpom.xml;h=d1375110c95fdfa3b46053ac913c419c10de8f02;hp=c2a7b7b0c9d64ca0e1300f0bb58182a89a9de3fc;hb=dfcc0a6154d21674e8b1d8a1ccb4eefbc8f8caa5;hpb=94fc38845d358e5aafdcfb97110e6e381dc04259

diff --git a/dep/org.argeo.dep.cms.client/pom.xml b/dep/org.argeo.dep.cms.client/pom.xml
index c2a7b7b0c..d1375110c 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.79</version>
+		<version>2.1.91</version>
 		<artifactId>dep</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
@@ -12,25 +12,20 @@
 	<dependencies>
 
 		<!-- Argeo Commons -->
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.util</artifactId>
-			<version>2.1.79</version>
-		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.enterprise</artifactId>
-			<version>2.1.79</version>
+			<version>2.1.91</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.jcr</artifactId>
-			<version>2.1.79</version>
+			<version>2.1.91</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.core</artifactId>
-			<version>2.1.79</version>
+			<version>2.1.91</version>
 		</dependency>
 
 		<!-- Third Parties -->
@@ -40,38 +35,53 @@
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.javax</groupId>
-			<artifactId>javax.transaction</artifactId>
+			<artifactId>javax.el-api</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.apache</groupId>
-			<artifactId>org.apache.log4j</artifactId>
+			<groupId>org.argeo.tp.javax</groupId>
+			<artifactId>javax.interceptor-api</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>com.jcraft.jsch</artifactId>
+			<groupId>org.argeo.tp.javax</groupId>
+			<artifactId>javax.enterprise.cdi-api</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>org.slf4j.log4j12</artifactId>
+			<groupId>org.argeo.tp.javax</groupId>
+			<artifactId>javax.transaction-api</artifactId>
 		</dependency>
+		
 		<dependency>
-			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>org.slf4j.api</artifactId>
+			<groupId>org.argeo.tp.apache</groupId>
+			<artifactId>org.apache.log4j</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>org.slf4j.commons.logging</artifactId>
+			<artifactId>org.slf4j.log4j12</artifactId>
 		</dependency>
-		
 		<dependency>
 			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>org.freemarker</artifactId>
+			<artifactId>org.slf4j.api</artifactId>
 		</dependency>
-		
 		<dependency>
-			<groupId>org.argeo.tp.bouncycastle</groupId>
-			<artifactId>bcprov</artifactId>
+			<groupId>org.argeo.tp.misc</groupId>
+			<artifactId>org.slf4j.commons.logging</artifactId>
 		</dependency>
+
+		<!-- OSGi annotations -->
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.tp.sdk</groupId> -->
+<!-- 			<artifactId>osgi.annotation</artifactId> -->
+<!-- 		</dependency> -->
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.tp.sdk</groupId> -->
+<!-- 			<artifactId>org.osgi.service.metatype.annotations</artifactId> -->
+<!-- 		</dependency> -->
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.tp.sdk</groupId> -->
+<!-- 			<artifactId>org.osgi.service.component.annotations</artifactId> -->
+<!-- 		</dependency> -->
+
+
 		<dependency>
 			<groupId>org.argeo.tp.bouncycastle</groupId>
 			<artifactId>bcpkix</artifactId>
@@ -80,7 +90,7 @@
 			<groupId>org.argeo.tp.bouncycastle</groupId>
 			<artifactId>bcpg</artifactId>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.argeo.tp.apache</groupId>
 			<artifactId>org.apache.httpcomponents.httpcore</artifactId>
@@ -109,10 +119,6 @@
 			<groupId>org.argeo.tp.apache.commons</groupId>
 			<artifactId>org.apache.commons.httpclient</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.apache.commons</groupId>
-			<artifactId>org.apache.commons.vfs</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.apache.commons</groupId>
 			<artifactId>org.apache.commons.net</artifactId>
@@ -121,32 +127,10 @@
 			<groupId>org.argeo.tp.apache.commons</groupId>
 			<artifactId>org.apache.commons.collections</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.apache.commons</groupId>
-			<artifactId>org.apache.commons.dbcp</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.apache.commons</groupId>
-			<artifactId>org.apache.commons.pool</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.apache.commons</groupId>
 			<artifactId>org.apache.commons.compress</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.apache.commons</groupId>
-			<artifactId>org.apache.commons.math3</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.javax</groupId>
-			<artifactId>javax.servlet</artifactId>
-		</dependency>
-
-		<!-- Database drivers -->
-		<dependency>
-			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>org.h2</artifactId>
-		</dependency>
 
 		<!-- Equinox -->
 		<dependency>
@@ -194,44 +178,6 @@
 			<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.tomcat.jni</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.apache</groupId>
-			<artifactId>org.apache.sshd.core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.apache</groupId>
-			<artifactId>org.apache.sshd.common</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.apache</groupId>
-			<artifactId>org.apache.sshd.sftp</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.apache</groupId>
-			<artifactId>org.apache.sshd.scp</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.apache</groupId>
-			<artifactId>org.apache.sshd.cli</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.apache</groupId>
-			<artifactId>org.apache.sshd.putty</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>net.i2p.crypto.eddsa</artifactId>
-		</dependency>
-
 		<!-- Console -->
 		<dependency>
 			<groupId>org.argeo.tp.apache.felix</groupId>
@@ -284,61 +230,11 @@
 			<artifactId>org.apache.jackrabbit.jcr2spi</artifactId>
 		</dependency>
 
-		<!-- Jackrabbit Repository -->
-		<dependency>
-			<groupId>org.argeo.tp.apache.jackrabbit</groupId>
-			<artifactId>org.apache.jackrabbit.data</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.apache.jackrabbit</groupId>
-			<artifactId>org.apache.jackrabbit.core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.apache.jackrabbit</groupId>
-			<artifactId>org.apache.jackrabbit.server</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>EDU.oswego.cs.dl.util.concurrent</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.apache.commons</groupId>
-			<artifactId>org.apache.commons.fileupload</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.apache</groupId>
-			<artifactId>org.apache.tika.core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.apache</groupId>
-			<artifactId>org.apache.tika.parsers</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.apache</groupId>
-			<artifactId>org.apache.lucene</artifactId>
-		</dependency>
-
-		<!-- Required by Jackrabbit 2.12 -->
-		<dependency>
-			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>com.google.guava</artifactId>
-		</dependency>
-
-		<!-- Git -->
-		<dependency>
-			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>org.eclipse.jgit</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>com.googlecode.javaewah.JavaEWAH</artifactId>
-		</dependency>
-
 		<!-- Test only -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.osgi.boot</artifactId>
-			<version>2.1.79</version>
+			<version>2.1.91</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
@@ -365,28 +261,6 @@
 							</execution>
 						</executions>
 					</plugin>
-					<!-- <plugin> -->
-					<!-- <groupId>org.apache.maven.plugins</groupId> -->
-					<!-- <artifactId>maven-dependency-plugin</artifactId> -->
-					<!-- <executions> -->
-					<!-- <execution> -->
-					<!-- <id>copy-argeo</id> -->
-					<!-- <phase>package</phase> -->
-					<!-- <goals> -->
-					<!-- <goal>copy-dependencies</goal> -->
-					<!-- </goals> -->
-					<!-- <configuration> -->
-					<!-- <includeTypes>jar</includeTypes> -->
-					<!-- <outputDirectory>${project.build.directory}/lib-argeo</outputDirectory> -->
-					<!-- <includeGroupIds>org.argeo.commons</includeGroupIds> -->
-					<!-- <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>
@@ -415,17 +289,10 @@
 												</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>
-										<require>osgi-boot</require>
+										<require>argeo-osgi-boot</require>
 									</requires>
 								</configuration>
 							</execution>
@@ -455,28 +322,6 @@
 							</execution>
 						</executions>
 					</plugin>
-					<!-- <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>
@@ -490,6 +335,7 @@
 								<configuration>
 									<name>argeo-cms-client-tp</name>
 									<projversion>${version.argeo-tp}</projversion>
+									<release>${maven.build.timestamp}</release>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi</directory>