Improve build and maven structure

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

diff --git a/security/eclipse/plugins/org.argeo.security.ui.application/pom.xml b/security/eclipse/plugins/org.argeo.security.ui.application/pom.xml
index 1fd2973a4b07ef37cb594dec64bc27d44b643854..e66484841dc736e1eb4bf45ef7ea310807d86a32 100644 (file)
--- a/security/eclipse/plugins/org.argeo.security.ui.application/pom.xml
+++ b/security/eclipse/plugins/org.argeo.security.ui.application/pom.xml
@@ -1,4 +1,5 @@
-<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.security</groupId>
@@ -29,6 +30,7 @@
                                <version>${version.maven-bundle-plugin}</version>
                                <configuration>
                                        <instructions>
+                                               <Bundle-Activator>org.argeo.security.ui.application.SecureApplicationActivator</Bundle-Activator>
                                                <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
                                                <Require-Bundle>org.eclipse.ui;resolution:=optional,org.eclipse.rap.ui;resolution:=optional,org.eclipse.core.runtime</Require-Bundle>
                                                <Import-Package>*</Import-Package>
@@ -72,59 +74,23 @@
        </build>
        <dependencies>
                <!-- Argeo Security -->
-               <dependency>
-                       <groupId>org.argeo.commons.security</groupId>
-                       <artifactId>org.argeo.security.equinox</artifactId>
-                       <version>0.2.3-SNAPSHOT</version>
-               </dependency>
                <dependency>
                        <groupId>org.argeo.commons.security</groupId>
                        <artifactId>org.argeo.security.ui</artifactId>
                        <version>0.2.3-SNAPSHOT</version>
                </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons.server</groupId>
-                       <artifactId>org.argeo.server.dep.ads</artifactId>
-                       <version>0.2.3-SNAPSHOT</version>
-                       <type>pom</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons.server</groupId>
-                       <artifactId>org.argeo.server.ads.server</artifactId>
-                       <version>${version.argeo-commons}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons.security</groupId>
-                       <artifactId>org.argeo.security.services</artifactId>
-                       <version>${version.argeo-commons}</version>
-               </dependency>
                <dependency>
                        <groupId>org.argeo.commons.security</groupId>
-                       <artifactId>org.argeo.security.manager.ldap</artifactId>
-                       <version>${version.argeo-commons}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons.server</groupId>
-                       <artifactId>org.argeo.server.ads</artifactId>
+                       <artifactId>org.argeo.security.equinox</artifactId>
                        <version>0.2.3-SNAPSHOT</version>
                </dependency>
-               <dependency>
-                       <groupId>org.argeo.dep.osgi</groupId>
-                       <artifactId>org.argeo.dep.osgi.springframework.ldap</artifactId>
-               </dependency>
 
                <!-- Argeo Eclipse distribution (common dependencies for both RAP and RCP) -->
                <dependency>
                        <groupId>org.argeo.commons.eclipse</groupId>
                        <artifactId>org.argeo.eclipse.dep.rcp</artifactId>
                        <version>0.2.3-SNAPSHOT</version>
-               </dependency>
-               
-               <!-- TODO: to be removed -->
-               <dependency>
-                       <groupId>org.argeo.commons.server</groupId>
-                       <artifactId>org.argeo.server.json</artifactId>
-                       <version>0.2.3-SNAPSHOT</version>
+                       <scope>provided</scope>
                </dependency>
 
                <!-- Commons -->
@@ -140,12 +106,15 @@
                        <groupId>org.slf4j</groupId>
                        <artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
                </dependency>
-               <!-- Commons Dep -->
+
+               <!-- For testing and target platform generation -->
+               <!--  LDAP server and security services -->
                <dependency>
-                       <groupId>org.argeo.commons.basic</groupId>
-                       <artifactId>org.argeo.basic.dep.log4j</artifactId>
-                       <version>0.2.3-SNAPSHOT</version>
+                       <groupId>org.argeo.commons.security</groupId>
+                       <artifactId>org.argeo.security.dep.ads</artifactId>
+                       <version>${version.argeo-commons}</version>
                        <type>pom</type>
+                       <scope>test</scope>
                </dependency>
        </dependencies>
 </project>