X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=inline;f=org.argeo.slc.client.ui.dist%2Fpom.xml;h=cbed736bfee2a389e33577b54b1459620aeab953;hb=6519e63c4eb9761288b300aea3f468d7bc9ea9c9;hp=2225b17be260b86ab1e43490eef791e3819e28e7;hpb=7e2f6c6ae08e97925955184aaa29035ac05de149;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.client.ui.dist/pom.xml b/org.argeo.slc.client.ui.dist/pom.xml
index 2225b17be..cbed736bf 100644
--- a/org.argeo.slc.client.ui.dist/pom.xml
+++ b/org.argeo.slc.client.ui.dist/pom.xml
@@ -1,98 +1,68 @@
 <?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</groupId>
-		<artifactId>plugins</artifactId>
-		<version>2.1.1-SNAPSHOT</version>
+		<artifactId>argeo-slc</artifactId>
+		<version>2.1.17-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.slc.client.ui.dist</artifactId>
 	<name>SLC Client UI Distribution</name>
 	<packaging>jar</packaging>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<configuration>
-					<instructions>
-						<Bundle-Activator>org.argeo.slc.client.ui.dist.DistPlugin</Bundle-Activator>
-						<Require-Bundle>
-							org.eclipse.ui;resolution:=optional,
-							org.eclipse.rap.ui;resolution:=optional,
-							org.eclipse.core.runtime;resolution:=optional,
-							org.eclipse.rap.ui.workbench;resolution:=optional
- 						</Require-Bundle>
-						<Import-Package>
-							org.argeo.eclipse.spring,
-							javax.jcr.nodetype,
-							javax.jcr.security,
-							aQute.lib.*;resolution:=optional,
-							org.argeo.slc.client.ui.specific,
-							*
-						</Import-Package>
-					</instructions>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
 	<dependencies>
-	
-		<!-- Single sourcing - we build against RCP  -->
-		<dependency>
-			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.client.rcp</artifactId>
-			<version>2.1.1-SNAPSHOT</version>
-			<scope>provided</scope>
-		</dependency>
-		
 		<!-- Commons UI -->
 		<dependency>
-			<groupId>org.argeo.commons.base</groupId>
+			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.eclipse.ui</artifactId>
 			<version>${version.argeo-commons}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.commons.base</groupId>
-			<artifactId>org.argeo.eclipse.ui.jcr</artifactId>
-			<version>${version.argeo-commons}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.base</groupId>
-			<artifactId>org.argeo.eclipse.ui.rcp</artifactId>
-			<version>${version.argeo-commons}</version>
-			<scope>provided</scope>
+			<groupId>org.argeo.slc.legacy.commons</groupId>
+			<artifactId>org.argeo.cms.ui.workbench</artifactId>
+			<version>${version.argeo-commons-legacy}</version>
 		</dependency>
 
+
 		<!-- SLC repo -->
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.specs</artifactId>
-			<version>2.1.1-SNAPSHOT</version>
+			<artifactId>org.argeo.slc.api</artifactId>
+			<version>2.1.17-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.repo</artifactId>
-			<version>2.1.1-SNAPSHOT</version>
+			<version>2.1.17-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.server.repo</artifactId>
-			<version>2.1.1-SNAPSHOT</version>
+			<artifactId>org.argeo.slc.spring</artifactId>
+			<version>2.1.17-SNAPSHOT</version>
 		</dependency>
-
 		<dependency>
-			<groupId>org.argeo.tp</groupId>
-			<artifactId>biz.aQute.bndlib</artifactId>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.server.repo</artifactId>
+			<version>2.1.17-SNAPSHOT</version>
 		</dependency>
-		
-		<!--  Argeo Base dependencies -->
+
+		<!-- Argeo Base dependencies -->
 		<dependency>
-			<groupId>org.argeo.commons.base</groupId>
+			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.util</artifactId>
 			<version>${version.argeo-commons}</version>
 		</dependency>
-		
+
+		<!-- RAP workbench -->
+		<dependency>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>argeo-tp-rap-e3</artifactId>
+			<version>${version.argeo-tp}</version>
+			<type>pom</type>
+			<scope>provided</scope>
+		</dependency>
+
 	</dependencies>
 </project>
\ No newline at end of file