X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.eclipse.ui.workbench%2Fpom.xml;h=b0663cacd5ccc1de2ec4da252cb71ba1908765a4;hb=a581132b59880b93926ac7f2936409cef712f5ee;hp=67451c833482631d15bae0c9a2625532450398c9;hpb=21a4ea1fb5380ce1dd763c1ea09067cdd2dfd0f3;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.eclipse.ui.workbench/pom.xml b/org.argeo.eclipse.ui.workbench/pom.xml
index 67451c833..b0663cacd 100644
--- a/org.argeo.eclipse.ui.workbench/pom.xml
+++ b/org.argeo.eclipse.ui.workbench/pom.xml
@@ -1,47 +1,34 @@
-<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.12-SNAPSHOT</version>
+		<version>2.1.13-SNAPSHOT</version>
 		<artifactId>argeo-commons</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.eclipse.ui.workbench</artifactId>
 	<name>Commons Eclipse UI Workbench</name>
-<!-- 	<build> -->
-<!-- 		<plugins> -->
-<!-- 			<plugin> -->
-<!-- 				<groupId>org.apache.felix</groupId> -->
-<!-- 				<artifactId>maven-bundle-plugin</artifactId> -->
-<!-- 				<configuration> -->
-<!-- 					<instructions> -->
-<!-- 						<Bundle-SymbolicName>${project.artifactId};singleton:=true</Bundle-SymbolicName> -->
-<!-- 						<Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy> -->
-<!-- 						<Bundle-Activator>org.argeo.osgi.ui.explorer.OsgiExplorerPlugin</Bundle-Activator> -->
-<!-- 						<Require-Bundle>org.eclipse.ui;resolution:=optional, -->
-<!-- 							org.eclipse.rap.ui;resolution:=optional, -->
-<!-- 							org.eclipse.core.runtime</Require-Bundle> -->
-<!-- 						<Export-Package>org.argeo.osgi.ui.explorer.*</Export-Package> -->
-<!-- 					</instructions> -->
-<!-- 				</configuration> -->
-<!-- 			</plugin> -->
-<!-- 		</plugins> -->
-<!-- 	</build> -->
 	<dependencies>
-
 		<!-- Generic Eclipse UI Dependencies -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.eclipse.ui</artifactId>
-			<version>2.1.12-SNAPSHOT</version>
+			<version>2.1.13-SNAPSHOT</version>
+			<exclusions>
+				<!-- version of the org.osgi.framework package provided in this bundle 
+					is too old -->
+				<exclusion>
+					<groupId>org.argeo.tp</groupId>
+					<artifactId>org.osgi.core</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
-		<!-- RCP only dependency, needed at compile time -->
+		<!-- We build against RAP -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.eclipse.ui.rcp</artifactId>
-			<version>2.1.12-SNAPSHOT</version>
+			<artifactId>org.argeo.eclipse.ui.rap</artifactId>
+			<version>2.1.13-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 
@@ -49,27 +36,15 @@
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.eclipse.dep.rap</artifactId>
 			<type>pom</type>
-			<version>2.1.12-SNAPSHOT</version>
+			<version>2.1.13-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 
-
 		<!-- Business dependencies -->
-		<dependency>
-			<groupId>org.argeo.tp</groupId>
-			<artifactId>org.eclipse.osgi</artifactId>
-			<scope>provided</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.util</artifactId>
-			<version>2.1.12-SNAPSHOT</version>
+			<version>2.1.13-SNAPSHOT</version>
 		</dependency>
-
-		<!-- <dependency> <groupId>org.argeo.commons</groupId> <artifactId>org.argeo.eclipse.dep.rap</artifactId> 
-			<type>pom</type> <version>2.1.12-SNAPSHOT</version> <scope>provided</scope> 
-			</dependency> <dependency> <groupId>org.argeo.commons</groupId> <artifactId>org.argeo.eclipse.ui.rcp</artifactId> 
-			<version>2.1.12-SNAPSHOT</version> <scope>provided</scope> </dependency> -->
 	</dependencies>
 </project>