Fix manifests generation

[lgpl/argeo-commons.git] / eclipse / plugins / org.argeo.eclipse.ui / pom.xml

diff --git a/eclipse/plugins/org.argeo.eclipse.ui/pom.xml b/eclipse/plugins/org.argeo.eclipse.ui/pom.xml
index 460702ee10a404dcb1a28497448a755595a76649..acbba4ea4e07891298551ee9bcec661d53dc0542 100644 (file)
--- a/eclipse/plugins/org.argeo.eclipse.ui/pom.xml
+++ b/eclipse/plugins/org.argeo.eclipse.ui/pom.xml
@@ -1,9 +1,8 @@
-<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.eclipse</groupId>
-               <version>0.2.2-SNAPSHOT</version>
+               <version>0.2.3-SNAPSHOT</version>
                <artifactId>plugins</artifactId>
                <relativePath>..</relativePath>
        </parent>
@@ -32,7 +31,7 @@
                                        <instructions>
                                                <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
                                                <Bundle-Activator>org.argeo.eclipse.ui.ArgeoUiPlugin</Bundle-Activator>
-                                               <Require-Bundle>org.eclipse.ui;resolution:=optional,org.eclipse.rap.ui;resolution:=optional,org.eclipse.core.runtime</Require-Bundle>
+                                               <Require-Bundle>org.eclipse.ui;resolution:=optional,org.eclipse.rap.ui;resolution:=optional,org.eclipse.core.runtime,org.springframework.osgi.extender</Require-Bundle>
                                                <Import-Package>
                                                        org.springframework.beans.factory,
                                                        org.springframework.core.io.support,
@@ -47,70 +46,33 @@
                </plugins>
        </build>
        <dependencies>
-               <!-- Commons -->
-               <dependency>
-                       <groupId>org.argeo.commons.basic</groupId>
-                       <artifactId>org.argeo.basic.nodeps</artifactId>
-                       <version>0.2.2-SNAPSHOT</version>
-               </dependency>
 
-               <!-- Eclipse -->
-               <dependency>
-                       <groupId>org.eclipse.ui</groupId>
-                       <artifactId>org.eclipse.ui</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.core</groupId>
-                       <artifactId>org.eclipse.core.runtime</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.core</groupId>
-                       <artifactId>org.eclipse.core.commands</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.equinox</groupId>
-                       <artifactId>org.eclipse.equinox.launcher</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.equinox</groupId>
-                       <artifactId>org.eclipse.equinox.preferences</artifactId>
-                       <version>3.3.0</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.ibm.icu</groupId>
-                       <artifactId>com.ibm.icu</artifactId>
-               </dependency>
+               <!-- Argeo Eclipse distribution (common dependencies for both RAP and RCP) -->
                <dependency>
-                       <groupId>org.eclipse.swt</groupId>
-                       <artifactId>org.eclipse.swt</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.swt</groupId>
-                       <artifactId>org.eclipse.swt.gtk.linux.x86_64</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.swt</groupId>
-                       <artifactId>org.eclipse.swt.gtk.linux.x86</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.swt</groupId>
-                       <artifactId>org.eclipse.swt.win32.win32.x86</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.equinox</groupId>
-                       <artifactId>org.eclipse.equinox.launcher</artifactId>
+                       <groupId>org.argeo.commons.eclipse</groupId>
+                       <artifactId>org.argeo.eclipse.dep.common</artifactId>
+                       <version>0.2.3-SNAPSHOT</version>
                </dependency>
+
+               <!-- JCR -->
                <dependency>
-                       <groupId>org.eclipse.equinox</groupId>
-                       <artifactId>org.eclipse.equinox.launcher.gtk.linux.x86_64</artifactId>
+                       <groupId>org.argeo.dep.osgi</groupId>
+                       <artifactId>org.argeo.dep.osgi.jcr</artifactId>
                </dependency>
+
+               <!-- RCP only dependency, needed at compile time -->
                <dependency>
-                       <groupId>org.eclipse.equinox</groupId>
-                       <artifactId>org.eclipse.equinox.launcher.gtk.linux.x86</artifactId>
+                       <groupId>org.argeo.commons.eclipse</groupId>
+                       <artifactId>org.argeo.eclipse.dep.rcp</artifactId>
+                       <version>0.2.3-SNAPSHOT</version>
+                       <scope>provided</scope>
                </dependency>
+
+               <!-- Commons -->
                <dependency>
-                       <groupId>org.eclipse.equinox</groupId>
-                       <artifactId>org.eclipse.equinox.launcher.win32.win32.x86</artifactId>
+                       <groupId>org.argeo.commons.basic</groupId>
+                       <artifactId>org.argeo.basic.nodeps</artifactId>
+                       <version>0.2.3-SNAPSHOT</version>
                </dependency>
 
                <!-- Spring -->
@@ -118,7 +80,11 @@
                        <groupId>org.springframework</groupId>
                        <artifactId>org.springframework.context</artifactId>
                </dependency>
-               
+               <dependency>
+                       <groupId>org.springframework.osgi</groupId>
+                       <artifactId>org.springframework.osgi.extender</artifactId>
+               </dependency>
+
                <!-- Others -->
                <dependency>
                        <groupId>org.slf4j</groupId>