SAK-20767

git-svn-id: https://source.sakaiproject.org/svn/courier/trunk@99799 66ffb92e-73f9-0310-93c1-f5514f145a0a
autocare · Oct 15, 2011 · ccaac26 · ccaac26
1 parent 9e8db40
commit ccaac26
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 11 deletions.
diff --git a/courier/courier-api/api/pom.xml b/courier/courier-api/api/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.sakaiproject.purepoms</groupId>
         <artifactId>sakai-standard-tool</artifactId>
-        <version>2.9-SNAPSHOT</version>
+        <version>2.9.0-a01</version>
     </parent>
 
     <!--
     <parent>
         <groupId>org.sakaiproject.courier</groupId>
-        <artifactId>courier-base</artifactId>
+        <artifactId>courier</artifactId>
         <version>2.9-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>

diff --git a/courier/courier-assembly/pom.xml b/courier/courier-assembly/pom.xml
@@ -4,7 +4,7 @@
 
     <parent>
         <groupId>org.sakaiproject.courier</groupId>
-        <artifactId>courier-base</artifactId>
+        <artifactId>courier</artifactId>
         <version>2.9-SNAPSHOT</version>
     </parent>
 

diff --git a/courier/courier-impl/impl/pom.xml b/courier/courier-impl/impl/pom.xml
@@ -5,7 +5,7 @@
 
     <parent>
         <groupId>org.sakaiproject.courier</groupId>
-        <artifactId>courier-base</artifactId>
+        <artifactId>courier</artifactId>
         <version>2.9-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>

diff --git a/courier/courier-impl/pack/pom.xml b/courier/courier-impl/pack/pom.xml
@@ -5,7 +5,7 @@
 
     <parent>
         <groupId>org.sakaiproject.courier</groupId>
-        <artifactId>courier-base</artifactId>
+        <artifactId>courier</artifactId>
         <version>2.9-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>

diff --git a/courier/courier-tool/tool/pom.xml b/courier/courier-tool/tool/pom.xml
@@ -5,7 +5,7 @@
 
     <parent>
         <groupId>org.sakaiproject.courier</groupId>
-        <artifactId>courier-base</artifactId>
+        <artifactId>courier</artifactId>
         <version>2.9-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>

diff --git a/courier/courier-util/util/pom.xml b/courier/courier-util/util/pom.xml
@@ -5,7 +5,7 @@
 
     <parent>
         <groupId>org.sakaiproject.courier</groupId>
-        <artifactId>courier-base</artifactId>
+        <artifactId>courier</artifactId>
         <version>2.9-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>

diff --git a/courier/pom.xml b/courier/pom.xml
@@ -6,12 +6,12 @@
     <parent>
         <groupId>org.sakaiproject.purepoms</groupId>
         <artifactId>sakai-standard-tool</artifactId>
-        <version>2.9-SNAPSHOT</version>
+        <version>2.9.0-a01</version>
     </parent>
 
     <name>sakai-courier base pom</name>
     <groupId>org.sakaiproject.courier</groupId>
-    <artifactId>courier-base</artifactId>
+    <artifactId>courier</artifactId>
     <version>2.9-SNAPSHOT</version>
     <packaging>pom</packaging>
 
@@ -25,8 +25,9 @@
     </modules>
 
     <properties>
+    	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    	<sakai.presence.version>2.9.0-a01</sakai.presence.version>
         <url.localsite>scp://source.sakaiproject.org/var/www/html/release/courier/${project.version}</url.localsite>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
     <scm>
@@ -137,7 +138,7 @@
             <dependency>
                 <groupId>org.sakaiproject.presence</groupId>
                 <artifactId>sakai-presence-api</artifactId>
-                <version>2.9-SNAPSHOT</version>
+                <version>${sakai.presence.version}</version>
                 <scope>provided</scope>
             </dependency>
         </dependencies>