From 16ebcfa933f4d0b02b4a6bcbe6308232ed952dce Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 30 Mar 2011 17:57:47 +0000
Subject: [PATCH] Improve dependencies

git-svn-id: https://svn.argeo.org/commons/trunk@4411 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 security/dep/org.argeo.security.dep.node/pom.xml  |  9 ---------
 .../org.argeo.security.dep.node.rap/pom.xml       | 15 +++++++++++----
 .../plugins/org.argeo.security.ui.admin/pom.xml   | 11 +++++++----
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/security/dep/org.argeo.security.dep.node/pom.xml b/security/dep/org.argeo.security.dep.node/pom.xml
index a02086a7f..c0cfbcc99 100644
--- 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 624995809..caf3b4763 100644
--- 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 54c9d921d..e4d9413df 100644
--- 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>
-- 
2.30.2