Improve dependencies

git-svn-id: https://svn.argeo.org/commons/trunk@4411 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/security/dep/org.argeo.security.dep.node/pom.xml b/security/dep/org.argeo.security.dep.node/pom.xml
index a02086a7f9084b169e1a24c1aa99ad55e4675c9a..c0cfbcc99fb9a0af8db9448adb0969cf6573ed09 100644 (file)
--- a/security/dep/org.argeo.security.dep.node/pom.xml
+++ b/security/dep/org.argeo.security.dep.node/pom.xml
@@ -73,10 +73,6 @@
                </dependency>
 
                <!-- Spring -->
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>org.springframework.jdbc</artifactId>
-               </dependency>
                <dependency>
                        <groupId>org.springframework.osgi</groupId>
                        <artifactId>org.springframework.osgi.extender</artifactId>
@@ -126,11 +122,6 @@
                </dependency>
 
                <!-- DB drivers -->
-               <dependency>
-                       <groupId>org.argeo.commons.server</groupId>
-                       <artifactId>org.argeo.server.jdbc</artifactId>
-                       <version>${version.argeo-commons}</version>
-               </dependency>
                <dependency>
                        <groupId>com.h2database</groupId>
                        <artifactId>com.springsource.org.h2</artifactId>

diff --git a/security/features/org.argeo.security.dep.node.rap/pom.xml b/security/features/org.argeo.security.dep.node.rap/pom.xml
index 6249958094f1c6d7956c71416496c854609392f2..caf3b47633e066a3a011124399867f0c33df8ce2 100644 (file)
--- a/security/features/org.argeo.security.dep.node.rap/pom.xml
+++ b/security/features/org.argeo.security.dep.node.rap/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>
@@ -60,7 +61,7 @@
                        <artifactId>org.argeo.security.ui.rap</artifactId>
                        <version>0.3.2-SNAPSHOT</version>
                </dependency>
-               
+
                <!-- Javax -->
                <dependency>
                        <groupId>javax.annotation</groupId>
@@ -74,7 +75,13 @@
                        <groupId>javax.xml.bind</groupId>
                        <artifactId>com.springsource.javax.xml.bind</artifactId>
                </dependency>
-               
+               <dependency>
+                       <groupId>org.argeo.commons.server</groupId>
+                       <artifactId>org.argeo.server.dep.javax</artifactId>
+                       <version>0.3.2-SNAPSHOT</version>
+                       <type>pom</type>
+               </dependency>
+
                <!-- Security -->
                <dependency>
                        <groupId>org.argeo.commons.security</groupId>
@@ -91,7 +98,7 @@
                        <artifactId>org.argeo.security.services</artifactId>
                        <version>${version.argeo-commons}</version>
                </dependency>
-               
+
                <!-- Web -->
                <dependency>
                        <groupId>org.springframework.osgi</groupId>

diff --git a/security/plugins/org.argeo.security.ui.admin/pom.xml b/security/plugins/org.argeo.security.ui.admin/pom.xml
index 54c9d921dbb73d41bb6604e26ce046cb68ab03f7..e4d9413df3a474a0893221a1607decc329590807 100644 (file)
--- a/security/plugins/org.argeo.security.ui.admin/pom.xml
+++ b/security/plugins/org.argeo.security.ui.admin/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>
@@ -32,13 +33,15 @@
                                                <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
                                                <Bundle-Activator>org.argeo.security.ui.admin.SecurityAdminPlugin
                                                </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.core.runtime</Require-Bundle>
                                                <Import-Package>
+                                                       *,
+                                                       org.eclipse.swt,
+                                                       org.eclipse.ui.services,
+                                                       org.eclipse.jface.window,
                                                        org.argeo.eclipse.spring,
                                                        org.springframework.dao,
                                                        org.springframework.core,
-                                                       *
                                                </Import-Package>
                                                <Export-Package>org.argeo.security.ui.admin.*</Export-Package>
                                        </instructions>