Merge adaptations related to the new third parties.

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

diff --git a/org.argeo.eclipse.ui/pom.xml b/org.argeo.eclipse.ui/pom.xml
index 29e94fc0b6af0587c82ee5b55bd8cfa618e9c193..7aa21aa975176fdc56bc0439f04a15a7dabca369 100644 (file)
--- a/org.argeo.eclipse.ui/pom.xml
+++ b/org.argeo.eclipse.ui/pom.xml
@@ -11,52 +11,11 @@
        <artifactId>org.argeo.eclipse.ui</artifactId>
        <name>Commons Eclipse UI</name>
        <packaging>jar</packaging>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-source-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                       </plugin>
-                       <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.eclipse.ui.ArgeoUiPlugin</Bundle-Activator>
-                                               <Require-Bundle>org.eclipse.ui;resolution:=optional,org.eclipse.rap.ui;resolution:=optional,org.eclipse.core.runtime</Require-Bundle>
-                                               <Import-Package>
-                                                       org.springframework.beans.factory,
-                                                       org.springframework.core.io.support,
-                                                       !org.eclipse.core.runtime,
-                                                       !org.eclipse.core.commands,
-                                                       !org.eclipse.ui.plugin,
-                                                       *
-                                               </Import-Package>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
+       <!-- <build> <plugins> <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> 
+               <configuration> <instructions> <Bundle-SymbolicName>${project.artifactId};singleton:=true</Bundle-SymbolicName> 
+               </instructions> </configuration> </plugin> </plugins> </build> -->
        <dependencies>
-               <!-- JCR -->
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.server.jcr</artifactId>
-                       <version>2.1.12-SNAPSHOT</version>
-               </dependency>
-
-               <!-- RCP only dependency, needed at compile time -->
+               <!-- We build against RAP -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.eclipse.dep.rap</artifactId>
@@ -71,22 +30,34 @@
                        <artifactId>org.argeo.util</artifactId>
                        <version>2.1.12-SNAPSHOT</version>
                </dependency>
-
-               <!-- Spring -->
                <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>org.springframework.context</artifactId>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.server.jcr</artifactId>
+                       <version>2.1.12-SNAPSHOT</version>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>org.springframework.osgi.extender</artifactId>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.security.core</artifactId>
+                       <version>2.1.12-SNAPSHOT</version>
                </dependency>
 
-               <!-- Others -->
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>slf4j.org.apache.commons.logging</artifactId>
-               </dependency>
+               <!-- Bridge Spring and OSGi -->
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.tp</groupId> -->
+<!--                   <artifactId>org.springframework.osgi.extender</artifactId> -->
+<!--           </dependency> -->
+
+               <!-- Spring -->
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.tp</groupId> -->
+<!--                   <artifactId>org.springframework.context</artifactId> -->
+<!--           </dependency> -->
 
+
+               <!-- Others -->
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.tp</groupId> -->
+<!--                   <artifactId>slf4j.org.apache.commons.logging</artifactId> -->
+<!--           </dependency> -->
        </dependencies>
 </project>
\ No newline at end of file