X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dep%2Forg.argeo.dep.cms.client%2Fpom.xml;h=35bfd18469e475381c8951cccf4ea0499ae44d5d;hb=a6ee8de2e85593de5204628c91b84bdee16e3dc7;hp=44ba00c55dfc509f47f241c17dfbe116cca78697;hpb=1091271b89f2d12e9898e01f6639c48831b1bc4b;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 44ba00c55..35bfd1846 100644
--- a/dep/org.argeo.dep.cms.client/pom.xml
+++ b/dep/org.argeo.dep.cms.client/pom.xml
@@ -1,11 +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.74-SNAPSHOT</version>
+		<version>2.3.0</version>
 		<artifactId>dep</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
@@ -16,13 +14,18 @@
 		<!-- Argeo Commons -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.util</artifactId>
-			<version>2.1.74-SNAPSHOT</version>
+			<artifactId>org.argeo.enterprise</artifactId>
+			<version>2.3.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.jcr</artifactId>
-			<version>2.1.74-SNAPSHOT</version>
+			<version>2.3.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.core</artifactId>
+			<version>2.3.0</version>
 		</dependency>
 
 		<!-- Third Parties -->
@@ -32,15 +35,24 @@
 		</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.javax</groupId>
+			<artifactId>javax.transaction-api</artifactId>
+		</dependency>
+		
+		<dependency>
+			<groupId>org.argeo.tp.apache</groupId>
+			<artifactId>org.apache.log4j</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.misc</groupId>
@@ -54,14 +66,31 @@
 			<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>bcprov</artifactId>
+			<artifactId>bcpkix</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.bouncycastle</groupId>
-			<artifactId>bcpkix</artifactId>
+			<artifactId>bcpg</artifactId>
 		</dependency>
+
 		<dependency>
 			<groupId>org.argeo.tp.apache</groupId>
 			<artifactId>org.apache.httpcomponents.httpcore</artifactId>
@@ -84,11 +113,11 @@
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.apache.commons</groupId>
-			<artifactId>org.apache.commons.httpclient</artifactId>
+			<artifactId>org.apache.commons.cli</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.apache.commons</groupId>
-			<artifactId>org.apache.commons.vfs</artifactId>
+			<artifactId>org.apache.commons.httpclient</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.apache.commons</groupId>
@@ -98,22 +127,12 @@
 			<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.javax</groupId>
-			<artifactId>javax.servlet</artifactId>
-		</dependency>
+
+		<!-- Equinox -->
 		<dependency>
 			<groupId>org.argeo.tp.equinox</groupId>
 			<artifactId>org.eclipse.osgi.util</artifactId>
@@ -159,16 +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.sshd.core</artifactId>
-		</dependency>
-
 		<!-- Console -->
 		<dependency>
 			<groupId>org.argeo.tp.apache.felix</groupId>
@@ -221,17 +230,11 @@
 			<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.74-SNAPSHOT</version>
+			<version>2.3.0</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
@@ -258,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>
@@ -308,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>
@@ -348,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>
@@ -383,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>