X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.eclipse.ui%2Fpom.xml;h=551fdc4ace6653d72ebd371203f9618219c7a514;hb=2918c3f49a72ed17a9352a65e90b7e72b77f84ee;hp=29e94fc0b6af0587c82ee5b55bd8cfa618e9c193;hpb=59fd3768e7925334805dca3825f6f87f082d9810;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.eclipse.ui/pom.xml b/org.argeo.eclipse.ui/pom.xml
index 29e94fc0b..551fdc4ac 100644
--- a/org.argeo.eclipse.ui/pom.xml
+++ b/org.argeo.eclipse.ui/pom.xml
@@ -1,67 +1,25 @@
 <?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">
+<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</groupId>
-		<version>2.1.12-SNAPSHOT</version>
+		<version>2.1.12</version>
 		<artifactId>argeo-commons</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
 	<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>
 			<type>pom</type>
-			<version>2.1.12-SNAPSHOT</version>
+			<version>2.1.12</version>
 			<scope>provided</scope>
 		</dependency>
 
@@ -69,7 +27,20 @@
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.util</artifactId>
-			<version>2.1.12-SNAPSHOT</version>
+			<version>2.1.12</version>
+		</dependency>
+
+		<!-- JCR -->
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.server.jcr</artifactId>
+			<version>2.1.12</version>
+		</dependency>
+
+		<!-- Bridge Spring and OSGi -->
+		<dependency>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>org.springframework.osgi.extender</artifactId>
 		</dependency>
 
 		<!-- Spring -->
@@ -77,16 +48,19 @@
 			<groupId>org.argeo.tp</groupId>
 			<artifactId>org.springframework.context</artifactId>
 		</dependency>
+
+		<!-- Base security -->
 		<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</version>
 		</dependency>
 
+
 		<!-- Others -->
 		<dependency>
 			<groupId>org.argeo.tp</groupId>
 			<artifactId>slf4j.org.apache.commons.logging</artifactId>
 		</dependency>
-
 	</dependencies>
 </project>
\ No newline at end of file