From 05959c936897bd27cf06aec01bab037b34b6717a Mon Sep 17 00:00:00 2001
From: David Haines <dlhaines@umich.edu>
Date: Wed, 28 Sep 2005 16:38:24 +0000
Subject: [PATCH] SAK-2138: modify maven build process to make sakai version
 dependencies configurable

git-svn-id: https://source.sakaiproject.org/svn/trunk/sakai/help@2124 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
 help/help-api/project.xml              |  5 +++--
 help/help-component-shared/project.xml |  7 ++++---
 help/help-component/project.xml        | 11 ++++++-----
 help/help-tool/project.xml             | 27 +++++++++++++-------------
 help/help/project.xml                  |  5 +++--
 help/project.xml                       |  5 +++--
 6 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/help/help-api/project.xml b/help/help-api/project.xml
index 67daf13bdf62..dc5961e04621 100644
--- a/help/help-api/project.xml
+++ b/help/help-api/project.xml
@@ -2,10 +2,11 @@
 
 <project>
 	<pomVersion>3</pomVersion>
+	<extend>../../master/project.xml</extend>
 	<name>Sakai Help API</name>
 	<groupId>sakaiproject</groupId>
 	<id>sakai-help-api</id>
-	<currentVersion>2.0.0</currentVersion>
+	<currentVersion>${sakai.version}</currentVersion>
 	<organization>
 		<name>Sakai</name>
 		<url>http://sakaiproject.org/</url>
@@ -22,7 +23,7 @@
 		<dependency>
 			<groupId>sakaiproject</groupId>
 			<artifactId>sakai-legacy-service</artifactId>
-			<version>${pom.currentVersion}</version>
+			<version>${sakai.version}</version>
 		</dependency>
 
 	</dependencies>
diff --git a/help/help-component-shared/project.xml b/help/help-component-shared/project.xml
index 2934a94f210c..d8a701712b5e 100644
--- a/help/help-component-shared/project.xml
+++ b/help/help-component-shared/project.xml
@@ -2,10 +2,11 @@
 
 <project>
 	<pomVersion>3</pomVersion>
+	<extend>../../master/project.xml</extend>
 	<name>Sakai Help Component (Shared)</name>
 	<groupId>sakaiproject</groupId>
 	<id>sakai-comp-shared-help</id>
-	<currentVersion>2.0.0</currentVersion>
+	<currentVersion>${sakai.version}</currentVersion>
 	<organization>
 		<name>University of Michigan</name>
 		<url>http://sakaiproject.org/</url>
@@ -22,13 +23,13 @@
 		<dependency>
 			<groupId>sakaiproject</groupId>
 			<artifactId>sakai-help-api</artifactId>
-			<version>${pom.currentVersion}</version>
+			<version>${sakai.version}</version>
 		</dependency>
 		
 		<dependency>
 			<groupId>sakaiproject</groupId>
 			<artifactId>sakai-legacy-service</artifactId>
-			<version>${pom.currentVersion}</version>
+			<version>${sakai.version}</version>
 		</dependency>
 
 	</dependencies>
diff --git a/help/help-component/project.xml b/help/help-component/project.xml
index 750e287f4020..38bf95383b61 100644
--- a/help/help-component/project.xml
+++ b/help/help-component/project.xml
@@ -2,10 +2,11 @@
 
 <project>
 	<pomVersion>3</pomVersion>
+	<extend>../../master/project.xml</extend>
 	<name>Sakai Help Component</name>
 	<groupId>sakaiproject</groupId>
 	<id>sakai-comp-help</id>
-	<currentVersion>2.0.0</currentVersion>
+	<currentVersion>${sakai.version}</currentVersion>
 	<organization>
 		<name>University of Michigan</name>
 		<url>http://sakaiproject.org/</url>
@@ -21,13 +22,13 @@
 		<dependency>
 			<groupId>sakaiproject</groupId>
 			<artifactId>sakai-help-api</artifactId>
-			<version>${pom.currentVersion}</version>
+			<version>${sakai.version}</version>
 		</dependency>		
 		
 		<dependency>
 			<groupId>sakaiproject</groupId>
 			<artifactId>sakai-comp-shared-help</artifactId>
-			<version>${pom.currentVersion}</version>
+			<version>${sakai.version}</version>
 		</dependency>
 		
 		<dependency>
@@ -48,13 +49,13 @@
 		<dependency>
 			<groupId>sakaiproject</groupId>
 			<artifactId>sakai-tool</artifactId>
-			<version>${pom.currentVersion}</version>
+			<version>${sakai.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>sakaiproject</groupId>
 			<artifactId>sakai-legacy-service</artifactId>
-			<version>${pom.currentVersion}</version>
+			<version>${sakai.version}</version>
 		</dependency>
 
 		<dependency>
diff --git a/help/help-tool/project.xml b/help/help-tool/project.xml
index b59d82cea685..5d83f5e5b6d2 100644
--- a/help/help-tool/project.xml
+++ b/help/help-tool/project.xml
@@ -2,10 +2,11 @@
 
 <project>
 	<pomVersion>3</pomVersion>
+	<extend>../../master/project.xml</extend>
 	<name>Sakai Help Tool</name>
 	<groupId>sakaiproject</groupId>
 	<id>sakai-help-tool</id>
-	<currentVersion>2.0.0</currentVersion>
+	<currentVersion>${sakai.version}</currentVersion>
 	<organization>
 		<name>University of Michigan</name>
 		<url>http://sakaiproject.org/</url>
@@ -20,7 +21,7 @@
 		<dependency>
 			<groupId>sakaiproject</groupId>
 			<artifactId>sakai-help-api</artifactId>
-			<version>${pom.currentVersion}</version>
+			<version>${sakai.version}</version>
 		</dependency>
 
 		<dependency>
@@ -32,13 +33,13 @@
 		<dependency>
 			<groupId>sakaiproject</groupId>
 			<artifactId>sakai-legacy-service</artifactId>
-			<version>${pom.currentVersion}</version>
+			<version>${sakai.version}</version>
 		</dependency>
 		
 		<dependency>
 			<groupId>sakaiproject</groupId>
 			<artifactId>sakai-component</artifactId>
-			<version>${pom.currentVersion}</version>
+			<version>${sakai.version}</version>
 		</dependency>
 	
 		<dependency>
@@ -83,7 +84,7 @@
 		<dependency>
 			<groupId>sakaiproject</groupId>
 			<artifactId>sakai-jsf-tool</artifactId>
-			<version>${pom.currentVersion}</version>
+			<version>${sakai.version}</version>
 			<properties>
 				<war.bundle>true</war.bundle>
 			</properties>        
@@ -92,7 +93,7 @@
 		<dependency>
 			<groupId>sakaiproject</groupId>
 			<artifactId>sakai-jsf-app</artifactId>
-			<version>${pom.currentVersion}</version>
+			<version>${sakai.version}</version>
 			<properties>
 				<war.bundle>true</war.bundle>
 			</properties>        
@@ -101,7 +102,7 @@
 		<dependency>
 			<groupId>sakaiproject</groupId>
 			<artifactId>sakai-util-web</artifactId>
-			<version>${pom.currentVersion}</version>
+			<version>${sakai.version}</version>
 			<properties>
 				<war.bundle>true</war.bundle>
 			</properties>        
@@ -110,7 +111,7 @@
 		<dependency>
 			<groupId>sakaiproject</groupId>
 			<artifactId>sakai-util-text</artifactId>
-			<version>${pom.currentVersion}</version>
+			<version>${sakai.version}</version>
 			<properties>
 				<war.bundle>true</war.bundle>
 			</properties>        
@@ -119,7 +120,7 @@
 		<dependency>
 			<groupId>sakaiproject</groupId>
 			<artifactId>sakai-jsf-widgets</artifactId>
-			<version>${pom.currentVersion}</version>
+			<version>${sakai.version}</version>
 			<properties>
 				<war.bundle>true</war.bundle>
 			</properties>        
@@ -128,7 +129,7 @@
 		<dependency>
 			<groupId>sakaiproject</groupId>
 			<artifactId>sakai-jsf-widgets-sun</artifactId>
-			<version>${pom.currentVersion}</version>
+			<version>${sakai.version}</version>
 			<properties>
 				<war.bundle>true</war.bundle>
 			</properties>        
@@ -137,13 +138,13 @@
 		<dependency>
 			<groupId>sakaiproject</groupId>
 			<artifactId>sakai-tool</artifactId>
-			<version>${pom.currentVersion}</version>
+			<version>${sakai.version}</version>
 		</dependency>  		  
 
 		<dependency>
 			<groupId>sakaiproject</groupId>
 			<artifactId>sakai-tool-registration</artifactId>
-			<version>${pom.currentVersion}</version>
+			<version>${sakai.version}</version>
 		</dependency>  		  
 
 		<dependency>
@@ -182,7 +183,7 @@
 		<dependency>
 			<groupId>sakaiproject</groupId>
 			<artifactId>sakai-session</artifactId>
-			<version>${pom.currentVersion}</version>
+			<version>${sakai.version}</version>
 		</dependency>
 		
 	</dependencies>
diff --git a/help/help/project.xml b/help/help/project.xml
index d543a67146b9..f4c0ed991581 100644
--- a/help/help/project.xml
+++ b/help/help/project.xml
@@ -2,10 +2,11 @@
 
 <project>
     <pomVersion>3</pomVersion>
+    <extend>../../master/project.xml</extend>
     <name>Sakai Help Help</name>
     <groupId>sakaiproject</groupId>
     <id>sakai-help-content</id>
-	<currentVersion>2.0.0</currentVersion>
+	<currentVersion>${sakai.version}</currentVersion>
     <organization>
         <name>Sakai Project</name>
         <url>http://sakaiproject.org/</url>
@@ -35,4 +36,4 @@
       </resources>     
 
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/help/project.xml b/help/project.xml
index 85cc41edcb8f..160f9b1710b8 100644
--- a/help/project.xml
+++ b/help/project.xml
@@ -2,9 +2,10 @@
 
 <project>
 	<pomVersion>3</pomVersion>
+	<extend>../master/project.xml</extend>
 	<name>Sakai</name>
 	<groupId>sakaiproject</groupId>
-	<currentVersion>2.0.0</currentVersion>
+	<currentVersion>${sakai.version}</currentVersion>
 	<organization>
 		<name>Sakai</name>
 		<url>http://sakaiproject.org/</url>
@@ -17,7 +18,7 @@
 		<dependency>
 			<groupId>sakaiproject</groupId>
 			<artifactId>sakai</artifactId>
-			<version>${pom.currentVersion}</version>
+			<version>${sakai.plugin.version}</version>
 			<type>plugin</type>
 		</dependency>