From d7a8e0309cdbebaaf96954aea2860205169b0628 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 24 Mar 2011 19:39:40 +0000
Subject: [PATCH] Use version properties for modules dependencies

git-svn-id: https://svn.argeo.org/commons/trunk@4373 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../dep/org.argeo.security.dep.ads/pom.xml    |  2 +-
 .../dep/org.argeo.security.dep.node/pom.xml   | 15 ++----
 .../org.argeo.security.dep.node.rap/pom.xml   | 46 +++++++++++--------
 .../plugins/org.argeo.security.ui.rap/pom.xml |  5 --
 .../pom.xml                                   |  4 +-
 .../dep/org.argeo.server.dep.tomcat/pom.xml   |  2 +-
 6 files changed, 36 insertions(+), 38 deletions(-)

diff --git a/security/dep/org.argeo.security.dep.ads/pom.xml b/security/dep/org.argeo.security.dep.ads/pom.xml
index 3ee670716..38d37c018 100644
--- a/security/dep/org.argeo.security.dep.ads/pom.xml
+++ b/security/dep/org.argeo.security.dep.ads/pom.xml
@@ -21,7 +21,7 @@
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.server.ads.server</artifactId>
-			<version>0.3.1-SNAPSHOT</version>
+			<version>${version.argeo-commons}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
diff --git a/security/dep/org.argeo.security.dep.node/pom.xml b/security/dep/org.argeo.security.dep.node/pom.xml
index c8c739832..be7de50ca 100644
--- a/security/dep/org.argeo.security.dep.node/pom.xml
+++ b/security/dep/org.argeo.security.dep.node/pom.xml
@@ -62,17 +62,12 @@
 		<dependency>
 			<groupId>org.argeo.commons.security</groupId>
 			<artifactId>org.argeo.security.services</artifactId>
-			<version>0.3.1-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.services.admin</artifactId>
-			<version>0.3.1-SNAPSHOT</version>
+			<version>${version.argeo-commons}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.security</groupId>
 			<artifactId>org.argeo.security.dao.ldap</artifactId>
-			<version>0.3.1-SNAPSHOT</version>
+			<version>${version.argeo-commons}</version>
 		</dependency>
 
 		<!-- LDAP server -->
@@ -139,17 +134,17 @@
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.jackrabbit.webapp</artifactId>
-			<version>0.3.1-SNAPSHOT</version>
+			<version>${version.argeo-commons}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.node.repo.jackrabbit</artifactId>
-			<version>0.3.1-SNAPSHOT</version>
+			<version>${version.argeo-commons}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.node.repofactory.jackrabbit</artifactId>
-			<version>0.3.1-SNAPSHOT</version>
+			<version>${version.argeo-commons}</version>
 		</dependency>
 		<!-- Hibernate -->
 		<dependency>
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 5c1793877..2250c50d3 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>
@@ -15,24 +16,24 @@
 				<groupId>org.argeo.maven.plugins</groupId>
 				<artifactId>maven-argeo-osgi-plugin</artifactId>
 			</plugin>
-<!--			<plugin>-->
-<!--				<groupId>org.apache.maven.plugins</groupId>-->
-<!--				<artifactId>maven-assembly-plugin</artifactId>-->
-<!--				<configuration>-->
-<!--					<descriptors>-->
-<!--						<descriptor>src/assembly/dist.xml</descriptor>-->
-<!--					</descriptors>-->
-<!--				</configuration>-->
-<!--				<executions>-->
-<!--					<execution>-->
-<!--						<id>attach-assembly</id>-->
-<!--						<phase>package</phase>-->
-<!--						<goals>-->
-<!--							<goal>single</goal>-->
-<!--						</goals>-->
-<!--					</execution>-->
-<!--				</executions>-->
-<!--			</plugin>-->
+			<!-- <plugin> -->
+			<!-- <groupId>org.apache.maven.plugins</groupId> -->
+			<!-- <artifactId>maven-assembly-plugin</artifactId> -->
+			<!-- <configuration> -->
+			<!-- <descriptors> -->
+			<!-- <descriptor>src/assembly/dist.xml</descriptor> -->
+			<!-- </descriptors> -->
+			<!-- </configuration> -->
+			<!-- <executions> -->
+			<!-- <execution> -->
+			<!-- <id>attach-assembly</id> -->
+			<!-- <phase>package</phase> -->
+			<!-- <goals> -->
+			<!-- <goal>single</goal> -->
+			<!-- </goals> -->
+			<!-- </execution> -->
+			<!-- </executions> -->
+			<!-- </plugin> -->
 		</plugins>
 	</build>
 	<dependencies>
@@ -60,5 +61,12 @@
 			<artifactId>org.argeo.security.ui.rap</artifactId>
 			<version>0.3.1-SNAPSHOT</version>
 		</dependency>
+
+		<!-- For Tomcat deployment -->
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.osgi.webapp</artifactId>
+			<version>${version.argeo-commons}</version>
+		</dependency>
 	</dependencies>
 </project>
diff --git a/security/plugins/org.argeo.security.ui.rap/pom.xml b/security/plugins/org.argeo.security.ui.rap/pom.xml
index 5ea1ba420..76b7bd4e3 100644
--- a/security/plugins/org.argeo.security.ui.rap/pom.xml
+++ b/security/plugins/org.argeo.security.ui.rap/pom.xml
@@ -75,10 +75,5 @@
 			<artifactId>org.argeo.eclipse.ui.rap</artifactId>
 			<version>0.3.1-SNAPSHOT</version>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.osgi.webapp</artifactId>
-			<version>0.3.1-SNAPSHOT</version>
-		</dependency>
 	</dependencies>
 </project>
diff --git a/server/dep/org.argeo.server.dep.jackrabbit.server/pom.xml b/server/dep/org.argeo.server.dep.jackrabbit.server/pom.xml
index 525a7d48c..3ff37d495 100644
--- a/server/dep/org.argeo.server.dep.jackrabbit.server/pom.xml
+++ b/server/dep/org.argeo.server.dep.jackrabbit.server/pom.xml
@@ -17,12 +17,12 @@
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.server.tika.jackrabbit</artifactId>
-			<version>0.3.1-SNAPSHOT</version>
+			<version>${version.argeo-commons}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.server.ext.jackrabbit</artifactId>
-			<version>0.3.1-SNAPSHOT</version>
+			<version>${version.argeo-commons}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.xalan</groupId>
diff --git a/server/dep/org.argeo.server.dep.tomcat/pom.xml b/server/dep/org.argeo.server.dep.tomcat/pom.xml
index ec989d77c..62fa128f7 100644
--- a/server/dep/org.argeo.server.dep.tomcat/pom.xml
+++ b/server/dep/org.argeo.server.dep.tomcat/pom.xml
@@ -22,7 +22,7 @@
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.server.catalina</artifactId>
-			<version>0.3.1-SNAPSHOT</version>
+			<version>${version.argeo-commons}</version>
 		</dependency>
 <!-- 		<dependency> -->
 <!-- 			<groupId>org.argeo.commons.server</groupId> -->
-- 
2.30.2