X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=legacy%2Fargeo-commons%2Fdep%2Forg.argeo.dep.cms.platform%2Fpom.xml;h=ac978aac7d0908e14a7cc0b454472d240d65451c;hb=08c973d498504bf59f993eb8f62b626a23465157;hp=249782a8bc2dbe2d647186ff5b1527e97acc9300;hpb=e89dfe9dc78f57a9e6af8def551393d88f4747c6;p=gpl%2Fargeo-slc.git

diff --git a/legacy/argeo-commons/dep/org.argeo.dep.cms.platform/pom.xml b/legacy/argeo-commons/dep/org.argeo.dep.cms.platform/pom.xml
index 249782a8b..ac978aac7 100644
--- a/legacy/argeo-commons/dep/org.argeo.dep.cms.platform/pom.xml
+++ b/legacy/argeo-commons/dep/org.argeo.dep.cms.platform/pom.xml
@@ -1,12 +1,10 @@
 <?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.slc.legacy.commons</groupId>
 		<artifactId>legacy-dep</artifactId>
-		<version>2.1.85-SNAPSHOT</version>
+		<version>2.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.dep.cms.platform</artifactId>
@@ -69,17 +67,17 @@
 		<dependency>
 			<groupId>org.argeo.slc.legacy.commons</groupId>
 			<artifactId>org.argeo.cms.ui.workbench</artifactId>
-			<version>2.1.85-SNAPSHOT</version>
+			<version>2.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.legacy.commons</groupId>
 			<artifactId>org.argeo.cms.ui.workbench.rap</artifactId>
-			<version>2.1.85-SNAPSHOT</version>
+			<version>2.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.legacy.commons</groupId>
 			<artifactId>org.argeo.ext.rap.ui.workbench</artifactId>
-			<version>2.1.85-SNAPSHOT</version>
+			<version>2.3-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Misc Third Parties -->
@@ -87,22 +85,14 @@
 		<!-- <groupId>org.argeo.tp.apache</groupId> -->
 		<!-- <artifactId>org.apache.tika.parser</artifactId> -->
 		<!-- </dependency> -->
-		<dependency>
-			<groupId>org.argeo.tp.bouncycastle</groupId>
-			<artifactId>bcmail</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.bouncycastle</groupId>
-			<artifactId>bcpg</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.apache.ant</groupId>
-			<artifactId>org.apache.ant</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.apache.ant</groupId>
-			<artifactId>org.apache.ant.launch</artifactId>
-		</dependency>
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.bouncycastle</groupId> -->
+		<!-- <artifactId>bcmail</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.bouncycastle</groupId> -->
+		<!-- <artifactId>bcpg</artifactId> -->
+		<!-- </dependency> -->
 		<!-- <dependency> -->
 		<!-- <groupId>org.argeo.tp.misc</groupId> -->
 		<!-- <artifactId>org.quartz-scheduler.quartz</artifactId> -->
@@ -111,86 +101,83 @@
 		<!-- <groupId>org.argeo.tp.misc</groupId> -->
 		<!-- <artifactId>org.quartz-scheduler.quartz.jobs</artifactId> -->
 		<!-- </dependency> -->
-		<dependency>
-			<groupId>org.argeo.tp.javax</groupId>
-			<artifactId>javax.mail</artifactId>
-		</dependency>
 
 		<!-- Base Spring dependency -->
-		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.beans</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.javax</groupId>
-			<artifactId>javax.el</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.gemini</groupId>
-			<artifactId>org.eclipse.gemini.blueprint.core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.gemini</groupId>
-			<artifactId>org.eclipse.gemini.blueprint.extender</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.gemini</groupId>
-			<artifactId>org.eclipse.gemini.blueprint.io</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>org.aspectj.weaver</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>org.aopalliance</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.aop</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.context</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.expression</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.instrument</artifactId>
-		</dependency>
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.spring</groupId> -->
+		<!-- <artifactId>org.springframework.beans</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.spring</groupId> -->
+		<!-- <artifactId>org.springframework.core</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.javax</groupId> -->
+		<!-- <artifactId>javax.el</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.gemini</groupId> -->
+		<!-- <artifactId>org.eclipse.gemini.blueprint.core</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.gemini</groupId> -->
+		<!-- <artifactId>org.eclipse.gemini.blueprint.extender</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.gemini</groupId> -->
+		<!-- <artifactId>org.eclipse.gemini.blueprint.io</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.misc</groupId> -->
+		<!-- <artifactId>org.aspectj.weaver</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.misc</groupId> -->
+		<!-- <artifactId>org.aopalliance</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.spring</groupId> -->
+		<!-- <artifactId>org.springframework.aop</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.spring</groupId> -->
+		<!-- <artifactId>org.springframework.context</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.spring</groupId> -->
+		<!-- <artifactId>org.springframework.expression</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.spring</groupId> -->
+		<!-- <artifactId>org.springframework.instrument</artifactId> -->
+		<!-- </dependency> -->
 
 		<!-- Spring -->
-		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.aspects</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.context.support</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.jdbc</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.tx</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.web</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.web.servlet</artifactId>
-		</dependency>
+
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.spring</groupId> -->
+		<!-- <artifactId>org.springframework.aspects</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.spring</groupId> -->
+		<!-- <artifactId>org.springframework.context.support</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.spring</groupId> -->
+		<!-- <artifactId>org.springframework.jdbc</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.spring</groupId> -->
+		<!-- <artifactId>org.springframework.tx</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.spring</groupId> -->
+		<!-- <artifactId>org.springframework.web</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.spring</groupId> -->
+		<!-- <artifactId>org.springframework.web.servlet</artifactId> -->
+		<!-- </dependency> -->
 
 		<!-- Equinox HTTP registry is required by Eclipse 3 but causes problem 
 			with Eclipse 4 -->
@@ -301,29 +288,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> -->
-					<!-- <excludeArtifactIds>org.argeo.dep.cms.node</excludeArtifactIds> -->
-					<!-- <includeTypes>jar</includeTypes> -->
-					<!-- <includeScope>runtime</includeScope> -->
-					<!-- <useRepositoryLayout>true</useRepositoryLayout> -->
-					<!-- </configuration> -->
-					<!-- </execution> -->
-					<!-- </executions> -->
-					<!-- </plugin> -->
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>rpm-maven-plugin</artifactId>
@@ -335,7 +299,8 @@
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>argeo-cms-platform</name>
+									<name>argeo-cms-platform${argeo.rpm.suffix}</name>
+									<version>${project.version}</version>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi</directory>
@@ -352,17 +317,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-node</require>
-										<require>argeo-cms-platform-tp</require>
+										<require>argeo-cms-node${argeo.rpm.suffix}</require>
+										<require>argeo-cms-platform-tp${argeo.rpm.suffix}</require>
 									</requires>
 								</configuration>
 							</execution>
@@ -392,28 +350,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>
@@ -425,8 +361,9 @@
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>argeo-cms-platform-tp</name>
+									<name>argeo-cms-platform-tp${argeo.rpm.suffix}</name>
 									<projversion>${version.argeo-tp}</projversion>
+									<release>${argeo.rpm.release.tp}</release>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi</directory>
@@ -445,7 +382,7 @@
 										</mapping>
 									</mappings>
 									<requires>
-										<require>argeo-cms-node-tp</require>
+										<require>argeo-cms-node-tp${argeo.rpm.suffix}</require>
 									</requires>
 								</configuration>
 							</execution>