X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fplugins%2Forg.argeo.security.ui.admin%2Fpom.xml;h=bbeec0a38e9e3ef5fd6337cfcfcdd50ce1bf7882;hb=368bd27f3da5356a1e45ae3645f64e674eb89904;hp=83b0192c370bb9afc39d12d66f065ca9057dd003;hpb=c14e4c1b8d58840705d0290d446c78bb8656e38d;p=lgpl%2Fargeo-commons.git

diff --git a/security/plugins/org.argeo.security.ui.admin/pom.xml b/security/plugins/org.argeo.security.ui.admin/pom.xml
index 83b0192c3..bbeec0a38 100644
--- a/security/plugins/org.argeo.security.ui.admin/pom.xml
+++ b/security/plugins/org.argeo.security.ui.admin/pom.xml
@@ -1,9 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <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>
-		<version>0.2.3-SNAPSHOT</version>
+		<version>2.1.3-SNAPSHOT</version>
 		<artifactId>plugins</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
@@ -27,39 +28,22 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>${version.maven-bundle-plugin}</version>
 				<configuration>
-					<!-- <instructions> -->
-					<!-- <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy> -->
-					<!-- <Bundle-Activator>org.argeo.security.ui.SecurityUiPlugin</Bundle-Activator> -->
-					<!-- <Require-Bundle>org.eclipse.ui;resolution:=optional,org.eclipse.rap.ui;resolution:=optional,org.eclipse.core.runtime</Require-Bundle> -->
-					<!-- <Import-Package> -->
-					<!-- org.argeo.eclipse.spring, -->
-					<!-- org.osgi.framework;version="0.0.0", -->
-					<!-- !org.eclipse.core.runtime, -->
-					<!-- !org.eclipse.core.commands, -->
-					<!-- !org.eclipse.ui.plugin, -->
-					<!-- !org.eclipse.ui, -->
-					<!-- !org.eclipse.ui.commands, -->
-					<!-- !org.eclipse.ui.handlers, -->
-					<!-- !org.eclipse.ui.part, -->
-					<!-- * -->
-					<!-- </Import-Package> -->
-					<!-- <Private-Package>icons</Private-Package> -->
-					<!-- <Export-Package>org.argeo.security.ui.*</Export-Package> -->
-					<!-- </instructions> -->
 					<instructions>
 						<Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
-						<Bundle-Activator>org.argeo.security.ui.SecurityUiPlugin</Bundle-Activator>
-						<Require-Bundle>org.eclipse.ui;resolution:=optional,org.eclipse.rap.ui;resolution:=optional,org.eclipse.core.runtime</Require-Bundle>
+						<Bundle-Activator>org.argeo.security.ui.admin.SecurityAdminPlugin
+						</Bundle-Activator>
+						<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.internal.*,
-							org.argeo.security.ui.*
-						</Export-Package>
+						<Export-Package>org.argeo.security.ui.admin.*</Export-Package>
 					</instructions>
 				</configuration>
 			</plugin>
@@ -67,51 +51,63 @@
 	</build>
 	<dependencies>
 		<!-- Argeo Security -->
+		<dependency>
+			<groupId>org.argeo.commons.security</groupId>
+			<artifactId>org.argeo.security.ui</artifactId>
+			<version>2.1.3-SNAPSHOT</version>
+		</dependency>
+
 		<dependency>
 			<groupId>org.argeo.commons.security</groupId>
 			<artifactId>org.argeo.security.core</artifactId>
-			<version>0.2.3-SNAPSHOT</version>
+			<version>2.1.3-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Argeo Eclipse -->
 		<dependency>
-			<groupId>org.argeo.commons.eclipse</groupId>
-			<artifactId>org.argeo.eclipse.ui</artifactId>
-			<version>0.2.3-SNAPSHOT</version>
+			<groupId>org.argeo.commons.base</groupId>
+			<artifactId>org.argeo.eclipse.ui.jcr</artifactId>
+			<version>2.1.3-SNAPSHOT</version>
 		</dependency>
 
-		<!-- Argeo Eclipse distribution (common dependencies for both RAP and RCP) -->
 		<dependency>
-			<groupId>org.argeo.commons.eclipse</groupId>
-			<artifactId>org.argeo.eclipse.dep.common</artifactId>
-			<version>0.2.3-SNAPSHOT</version>
+			<groupId>org.argeo.commons.base</groupId>
+			<artifactId>org.argeo.eclipse.ui</artifactId>
+			<version>2.1.3-SNAPSHOT</version>
 		</dependency>
 
 		<!-- RCP only dependency, needed at compile time -->
 		<dependency>
-			<groupId>org.argeo.commons.eclipse</groupId>
+			<groupId>org.argeo.commons.base</groupId>
 			<artifactId>org.argeo.eclipse.dep.rcp</artifactId>
-			<version>0.2.3-SNAPSHOT</version>
+			<version>2.1.3-SNAPSHOT</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.base</groupId>
+			<artifactId>org.argeo.eclipse.ui.rcp</artifactId>
+			<version>2.1.3-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 
 		<!-- Commons -->
 		<dependency>
-			<groupId>org.argeo.commons.basic</groupId>
-			<artifactId>org.argeo.basic.nodeps</artifactId>
-			<version>0.2.3-SNAPSHOT</version>
+			<groupId>org.argeo.commons.base</groupId>
+			<artifactId>org.argeo.util</artifactId>
+			<version>2.1.3-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Spring -->
 		<dependency>
-			<groupId>org.springframework.security</groupId>
+			<groupId>org.argeo.tp</groupId>
 			<artifactId>org.springframework.security.core</artifactId>
 		</dependency>
 
 		<!-- Others -->
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>slf4j.org.apache.commons.logging
+			</artifactId>
 		</dependency>
 	</dependencies>
-</project>
+</project>
\ No newline at end of file