X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=dep%2Forg.argeo.dep.cms.platform%2Fpom.xml;h=f533edc3e5eae6bf68e45e77eb4a4245b609023c;hb=b20d9443fc46845df95ae47ead3ecf431689d311;hp=e7bbe3a2cf54a78623b02bd1352af5e328ded009;hpb=430f6d810b15adce43b1eebbee5cf512ad3d82fd;p=lgpl%2Fargeo-commons.git

diff --git a/dep/org.argeo.dep.cms.platform/pom.xml b/dep/org.argeo.dep.cms.platform/pom.xml
index e7bbe3a2c..f533edc3e 100644
--- a/dep/org.argeo.dep.cms.platform/pom.xml
+++ b/dep/org.argeo.dep.cms.platform/pom.xml
@@ -1,9 +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.commons</groupId>
-		<version>2.1.41-SNAPSHOT</version>
+		<version>2.1.71-SNAPSHOT</version>
 		<artifactId>dep</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
@@ -15,37 +16,23 @@
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.dep.cms.node</artifactId>
-			<version>2.1.41-SNAPSHOT</version>
+			<version>2.1.71-SNAPSHOT</version>
+			<type>pom</type>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.security.core</artifactId>
-			<version>2.1.41-SNAPSHOT</version>
+			<artifactId>org.argeo.cms.ui.workbench</artifactId>
+			<version>2.1.71-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.security.ui</artifactId>
-			<version>2.1.41-SNAPSHOT</version>
+			<artifactId>org.argeo.cms.ui.workbench.rap</artifactId>
+			<version>2.1.71-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.eclipse.ui.workbench</artifactId>
-			<version>2.1.41-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.security.ui.admin</artifactId>
-			<version>2.1.41-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.eclipse.ui.workbench.rap</artifactId>
-			<version>2.1.41-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.security.ui.rap</artifactId>
-			<version>2.1.41-SNAPSHOT</version>
+			<artifactId>org.argeo.ext.rap.ui.workbench</artifactId>
+			<version>2.1.71-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Misc Third Parties -->
@@ -69,36 +56,46 @@
 			<groupId>org.argeo.tp.apache.ant</groupId>
 			<artifactId>org.apache.ant.launch</artifactId>
 		</dependency>
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.misc</groupId> -->
+		<!-- <artifactId>org.quartz-scheduler.quartz</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.misc</groupId> -->
+		<!-- <artifactId>org.quartz-scheduler.quartz.jobs</artifactId> -->
+		<!-- </dependency> -->
 		<dependency>
-			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>org.quartz-scheduler.quartz</artifactId>
+			<groupId>org.argeo.tp.javax</groupId>
+			<artifactId>javax.mail</artifactId>
 		</dependency>
+
+		<!-- Spring -->
 		<dependency>
-			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>org.quartz-scheduler.quartz.jobs</artifactId>
+			<groupId>org.argeo.tp.spring</groupId>
+			<artifactId>org.springframework.aspects</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.javax</groupId>
-			<artifactId>javax.mail</artifactId>
+			<groupId>org.argeo.tp.spring</groupId>
+			<artifactId>org.springframework.context.support</artifactId>
 		</dependency>
-
-		<!-- RAP Workbench -->
 		<dependency>
-			<groupId>org.argeo.tp.rap.platform</groupId>
-			<artifactId>org.eclipse.rap.ui</artifactId>
+			<groupId>org.argeo.tp.spring</groupId>
+			<artifactId>org.springframework.jdbc</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.rap.platform</groupId>
-			<artifactId>org.eclipse.rap.ui.forms</artifactId>
+			<groupId>org.argeo.tp.spring</groupId>
+			<artifactId>org.springframework.tx</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.rap.platform</groupId>
-			<artifactId>org.eclipse.rap.ui.views</artifactId>
+			<groupId>org.argeo.tp.spring</groupId>
+			<artifactId>org.springframework.web</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.rap.platform</groupId>
-			<artifactId>org.eclipse.rap.ui.workbench</artifactId>
+			<groupId>org.argeo.tp.spring</groupId>
+			<artifactId>org.springframework.web.servlet</artifactId>
 		</dependency>
+
+		<!-- Eclipse Core -->
 		<dependency>
 			<groupId>org.argeo.tp.rap.platform</groupId>
 			<artifactId>org.eclipse.core.databinding</artifactId>
@@ -148,32 +145,122 @@
 			<artifactId>org.eclipse.help</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>
+		<!-- RAP Workbench -->
 		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.jdbc</artifactId>
+			<groupId>org.argeo.tp.rap.platform</groupId>
+			<artifactId>org.eclipse.rap.ui</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.tx</artifactId>
+			<groupId>org.argeo.tp.rap.platform</groupId>
+			<artifactId>org.eclipse.rap.ui.forms</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.web</artifactId>
+			<groupId>org.argeo.tp.rap.platform</groupId>
+			<artifactId>org.eclipse.rap.ui.views</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.web.servlet</artifactId>
+			<groupId>org.argeo.tp.rap.platform</groupId>
+			<artifactId>org.eclipse.rap.ui.workbench</artifactId>
 		</dependency>
+
+		<!-- Eclipse 4 -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+		<!-- <artifactId>org.eclipse.rap.e4</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+		<!-- <artifactId>org.eclipse.emf.common</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+		<!-- <artifactId>org.eclipse.emf.ecore.change</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+		<!-- <artifactId>org.eclipse.emf.ecore.xmi</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+		<!-- <artifactId>org.eclipse.e4.ui.workbench.renderers.swt</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+		<!-- <artifactId>org.eclipse.e4.ui.di</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+		<!-- <artifactId>org.eclipse.e4.core.di</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+		<!-- <artifactId>org.eclipse.e4.ui.workbench.addons.swt</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+		<!-- <artifactId>org.eclipse.e4.core.commands</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+		<!-- <artifactId>org.eclipse.e4.ui.bindings</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+		<!-- <artifactId>org.eclipse.e4.ui.workbench.swt</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+		<!-- <artifactId>org.eclipse.e4.core.di.extensions.supplier</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+		<!-- <artifactId>org.eclipse.e4.ui.model.workbench</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+		<!-- <artifactId>org.eclipse.e4.emf.xpath</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+		<!-- <artifactId>org.eclipse.e4.core.contexts</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+		<!-- <artifactId>org.eclipse.e4.core.services</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+		<!-- <artifactId>org.eclipse.e4.core.di.annotations</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+		<!-- <artifactId>org.eclipse.e4.ui.services</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+		<!-- <artifactId>org.eclipse.rap.fileupload</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+		<!-- <artifactId>org.eclipse.e4.core.di.extensions</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+		<!-- <artifactId>org.eclipse.e4.ui.workbench</artifactId> -->
+		<!-- </dependency> -->
+
 	</dependencies>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.argeo.tp</groupId>
+				<artifactId>argeo-tp-rap-e3</artifactId>
+				<version>${version.argeo-tp}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 
 	<profiles>
 		<profile>
@@ -197,21 +284,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>
@@ -239,11 +312,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-node</require>
@@ -260,6 +340,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>
@@ -272,7 +374,7 @@
 								</goals>
 								<configuration>
 									<name>argeo-cms-platform-tp</name>
-									<projversion>${version.argeo-distribution}</projversion>
+									<projversion>${version.argeo-tp}</projversion>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi</directory>
@@ -284,7 +386,7 @@
 												<source>
 													<location>${project.build.directory}/lib-tp</location>
 													<includes>
-														<include>*.jar</include>
+														<include>**/*.jar</include>
 													</includes>
 												</source>
 											</sources>