SAK-2138: modify maven build process to make sakai version dependenci…

…es configurable git-svn-id: https://source.sakaiproject.org/svn/trunk/sakai/sam@2124 66ffb92e-73f9-0310-93c1-f5514f145a0a
s50600822 · Sep 28, 2005 · 14644ec · 14644ec
1 parent f2ac30e
commit 14644ec
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 18 deletions.
diff --git a/samigo/api/project.xml b/samigo/api/project.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
   <pomVersion>3</pomVersion>
+  <extend>../../master/project.xml</extend>
   <name>Sakai Samigo API</name>
   <shortDescription>Samigo (Test and Quizzes) exportable interfaces.</shortDescription>
   <groupId>sakaiproject</groupId>
   <id>sakai-samigo-api</id>
-  <currentVersion>2.1.0</currentVersion>
+  <currentVersion>${sakai.version}</currentVersion>
 
   <organization>
       <name>Sakai Project</name>

diff --git a/samigo/audio/project.xml b/samigo/audio/project.xml
@@ -5,7 +5,7 @@
   <shortDescription>Samigo (Test and Quizzes) recorder applet.</shortDescription>
   <groupId>sakaiproject</groupId>
   <id>sakai-samigo-audio</id>
-  <currentVersion>2.1.0</currentVersion>
+  <currentVersion>${sakai.version}</currentVersion>
 
   <organization>
       <name>Sakai Project</name>

diff --git a/samigo/component/project.xml b/samigo/component/project.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
   <pomVersion>3</pomVersion>
+  <extend>../../master/project.xml</extend>
   <name>Sakai Samigo Components</name>
   <shortDescription>Samigo (Test and Quizzes) implementation.</shortDescription>
   <groupId>sakaiproject</groupId>
   <id>sakai-samigo-component</id>
-  <currentVersion>2.1.0</currentVersion>
+  <currentVersion>${sakai.version}</currentVersion>
 
   <organization>
       <name>Sakai Project</name>
@@ -23,7 +24,11 @@
     <dependency>
       <groupId>sakaiproject</groupId>
       <artifactId>sakai-samigo-api</artifactId>
-      <version>${pom.currentVersion}</version>
+      <!-- it may be that this should be the ${pom.currentVersion}
+	   if it should depend on the version of Samigo not the version
+	   of Sakai.
+	   -->
+      <version>${sakai.version}</version>  
     </dependency>
   </dependencies>
 

diff --git a/samigo/project.xml b/samigo/project.xml
@@ -2,9 +2,10 @@
 
 <project>
 	<pomVersion>3</pomVersion>
+	<extend>../master/project.xml</extend>
 	<name>Samigo</name>
 	<groupId>sakai-samigo</groupId>
-	<currentVersion>2.0.0</currentVersion>
+	<currentVersion>${sakai.version}</currentVersion>
 	<organization>
 		<name>Sakai Project</name>
 		<url>http://sakaiproject.org/</url>
@@ -15,7 +16,7 @@
                 <dependency>
                         <groupId>sakaiproject</groupId>
                         <artifactId>sakai</artifactId>
-                        <version>${pom.currentVersion}</version>
+                        <version>${sakai.plugin.version}</version>
                         <type>plugin</type>
                 </dependency>
         </dependencies>

diff --git a/samigo/tool/project.xml b/samigo/tool/project.xml
@@ -2,11 +2,12 @@
 
 <project xmlns:ant="jelly:ant">
 	<pomVersion>3</pomVersion>
+	<extend>../../master/project.xml</extend>
 	<name>Samigo Tool</name>
 	<groupId>sakaiproject</groupId>
 	<id>sakai-samigo-tool</id>
 	<artifactId>samigo</artifactId>
-	<currentVersion>2.0.0</currentVersion>
+	<currentVersion>${sakai.version}</currentVersion>
 	<organization>
 		<name>Sakai Project</name>
 		<url>http://www.sakaiproject.org/</url>
@@ -20,7 +21,7 @@
     <dependency>
       <groupId>sakaiproject</groupId>
       <artifactId>sakai-samigo-api</artifactId>
-      <version>2.1.0</version>
+      <version>${sakai.version}</version>
     </dependency>
     <!-- Samigo IMPL -->
 <!-- comment out for now -->
@@ -34,7 +35,7 @@
 		<dependency>
 			<groupId>sakaiproject</groupId>
 			<artifactId>sakai</artifactId>
-			<version>${pom.currentVersion}</version>
+			<version>${sakai.plugin.version}</version>
 			<type>plugin</type>
 		</dependency>
 		<dependency>
@@ -66,7 +67,7 @@
     <dependency>
       <groupId>sakaiproject</groupId>
       <artifactId>sakai-samigo-component</artifactId>
-      <version>${pom.currentVersion}</version>
+      <version>${sakai.version}</version>
       <properties>
         <war.bundle>true</war.bundle>
       </properties>
@@ -76,13 +77,13 @@
 		<dependency>
 			<groupId>sakaiproject</groupId>
 			<artifactId>sakai-tool</artifactId>
-			<version>${pom.currentVersion}</version>
+			<version>${sakai.version}</version>
 		</dependency>
 		<!-- this is required for any Sakai JSF tool -->
 		<dependency>
 			<groupId>sakaiproject</groupId>
 			<artifactId>sakai-jsf-tool</artifactId>
-			<version>${pom.currentVersion}</version>
+			<version>${sakai.version}</version>
 			<properties>
 				<war.bundle>integrated</war.bundle>
 			</properties>
@@ -91,15 +92,15 @@
 		<dependency>
 			<groupId>sakaiproject</groupId>
 			<artifactId>sakai-jsf-app</artifactId>
-			<version>${pom.currentVersion}</version>
+			<version>${sakai.version}</version>
 			<properties>
 				<war.bundle>integrated</war.bundle>
 			</properties>
 		</dependency>
 		<dependency>
 			<groupId>sakaiproject</groupId>
 			<artifactId>sakai-util-web</artifactId>
-			<version>${pom.currentVersion}</version>
+			<version>${sakai.version}</version>
 			<properties>
 				<war.bundle>integrated</war.bundle>
 			</properties>
@@ -108,7 +109,7 @@
 		<dependency>
 			<groupId>sakaiproject</groupId>
 			<artifactId>sakai-gradebook-service</artifactId>
-			<version>${pom.currentVersion}</version>
+			<version>${sakai.version}</version>
 			<properties>
 				<war.bundle>false</war.bundle>
 			</properties>
@@ -117,15 +118,15 @@
 		<dependency>
 			<groupId>sakaiproject</groupId>
 			<artifactId>sakai-component</artifactId>
-			<version>${pom.currentVersion}</version>
+			<version>${sakai.version}</version>
 			<properties>
 				<war.bundle>false</war.bundle>
 			</properties>
 		</dependency>
 		<dependency>
 			<groupId>sakaiproject</groupId>
 			<artifactId>sakai-legacy-service</artifactId>
-			<version>${pom.currentVersion}</version>
+			<version>${sakai.version}</version>
 			<properties>
 				<war.bundle>false</war.bundle>
 			</properties>
@@ -594,4 +595,4 @@
 			</unitTest>
 		-->
 	</build>
-</project>
+</project>