X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=dep%2Forg.argeo.suite.dep.e4.rcp%2Fpom.xml;h=17b9ae3c78e9bd10c173abd3ce975ee197fd9a83;hb=c285180bece610b2c2921d44fe14b6dde2123efa;hp=02d06abf2c89248d0a9b85ba6cf61df19a122a59;hpb=de9ee5ddb7726dea59ca8a5ad4e8db19dec39787;p=gpl%2Fargeo-suite.git

diff --git a/dep/org.argeo.suite.dep.e4.rcp/pom.xml b/dep/org.argeo.suite.dep.e4.rcp/pom.xml
index 02d06ab..17b9ae3 100644
--- a/dep/org.argeo.suite.dep.e4.rcp/pom.xml
+++ b/dep/org.argeo.suite.dep.e4.rcp/pom.xml
@@ -1,47 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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.suite</groupId>
 		<artifactId>dep</artifactId>
-		<version>0.1.13-SNAPSHOT</version>
+		<version>2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.suite.dep.e4.rcp</artifactId>
 	<name>Suite E4 Platform RCP</name>
 	<packaging>jar</packaging>
 	<dependencies>
-		<!-- Default Assembly for supported minimal set of Argeo Suite Features -->
+		<!-- Base Argeo platform distribution -->
 		<dependency>
-			<groupId>org.argeo.suite</groupId>
-			<artifactId>org.argeo.suite.cms</artifactId>
-			<version>0.1.13-SNAPSHOT</version>
+			<groupId>org.argeo.commons.rcp</groupId>
+			<artifactId>org.argeo.dep.cms.e4.rcp</artifactId>
+			<version>${version.argeo-rcp}</version>
+			<type>pom</type>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.suite</groupId>
-			<artifactId>org.argeo.suite.e4</artifactId>
-			<version>0.1.13-SNAPSHOT</version>
-		</dependency>
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.suite</groupId> -->
-<!-- 			<artifactId>org.argeo.suite.e4.rap</artifactId> -->
-<!-- 			<version>0.1.13-SNAPSHOT</version> -->
-<!-- 		</dependency> -->
 
-		<!-- Base CMS distribution -->
-		<dependency>
-			<groupId>org.argeo.connect</groupId>
-			<artifactId>org.argeo.connect.dep.e4.rcp</artifactId>
-			<version>${version.argeo-connect}</version>
-		</dependency>
-		
-		<!-- Argeo TP Extras -->
 		<dependency>
-			<groupId>org.argeo.tp.payment</groupId>
-			<artifactId>com.stripe</artifactId>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.dep.cms.ext</artifactId>
+			<version>${version.argeo-commons}</version>
+			<type>pom</type>
 		</dependency>
-		
 	</dependencies>
 	<profiles>
 		<profile>
@@ -49,26 +34,43 @@
 			<build>
 				<plugins>
 					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-dependency-plugin</artifactId>
+						<artifactId>maven-assembly-plugin</artifactId>
 						<executions>
 							<execution>
-								<id>copy-argeo</id>
+								<id>prepare-source</id>
 								<phase>package</phase>
 								<goals>
-									<goal>copy-dependencies</goal>
+									<goal>single</goal>
 								</goals>
 								<configuration>
-									<includeTypes>jar</includeTypes>
-									<outputDirectory>${project.build.directory}/lib-argeo</outputDirectory>
-									<includeGroupIds>org.argeo.suite</includeGroupIds>
-									<includeTypes>jar</includeTypes>
-									<includeScope>runtime</includeScope>
-									<useRepositoryLayout>true</useRepositoryLayout>
+									<descriptorRefs>
+										<descriptorRef>a2-source</descriptorRef>
+									</descriptorRefs>
 								</configuration>
 							</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.suite</includeGroupIds> -->
+					<!-- <includeTypes>jar</includeTypes> -->
+					<!-- <includeScope>runtime</includeScope> -->
+					<!-- <useRepositoryLayout>true</useRepositoryLayout> -->
+					<!-- </configuration> -->
+					<!-- </execution> -->
+					<!-- </executions> -->
+					<!-- </plugin> -->
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>rpm-maven-plugin</artifactId>
@@ -80,7 +82,7 @@
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>argeo-suite-e4</name>
+									<name>argeo-suite-e4-rcp${argeo.rpm.suffix}</name>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi</directory>
@@ -90,7 +92,7 @@
 											<directoryIncluded>true</directoryIncluded>
 											<sources>
 												<source>
-													<location>${project.build.directory}/lib-argeo</location>
+													<location>${project.build.directory}/${project.artifactId}-${project.version}-a2-source</location>
 													<includes>
 														<include>**/*.jar</include>
 													</includes>
@@ -99,7 +101,8 @@
 										</mapping>
 									</mappings>
 									<requires>
-										<require>argeo-connect-e4-tp</require>
+										<require>argeo-cms-e4-rcp</require>
+										<require>argeo-connect-tp</require>
 									</requires>
 								</configuration>
 							</execution>