SAK-20775 drop -base from base pom name, creates funky tag name.

git-svn-id: https://source.sakaiproject.org/svn/site/trunk@99774 66ffb92e-73f9-0310-93c1-f5514f145a0a
zerojuls · Oct 15, 2011 · e9cc1b0 · e9cc1b0
1 parent d98c95a
commit e9cc1b0
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 13 deletions.
diff --git a/site/mergedlist-util/util/pom.xml b/site/mergedlist-util/util/pom.xml
@@ -4,7 +4,7 @@
 
     <parent>
         <groupId>org.sakaiproject.site</groupId>
-        <artifactId>site-base</artifactId>
+        <artifactId>site</artifactId>
         <version>2.9-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>

diff --git a/site/pom.xml b/site/pom.xml
@@ -5,12 +5,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-site base pom</name>
     <groupId>org.sakaiproject.site</groupId>
-    <artifactId>site-base</artifactId>
+    <artifactId>site</artifactId>
     <version>2.9-SNAPSHOT</version>
     <packaging>pom</packaging>
 
@@ -37,6 +37,8 @@
     </profiles>
 
     <properties>
+        <sakai.courier.version>2.9.0-a01</sakai.courier.version>
+        <sakai.velocity.version>2.9.0-a01</sakai.velocity.version>
         <url.localsite>scp://source.sakaiproject.org/var/www/html/release/site/${project.version}</url.localsite>
     </properties>
 
@@ -137,20 +139,20 @@
         <dependency>
             <groupId>org.sakaiproject.courier</groupId>
             <artifactId>sakai-courier-api</artifactId>
-            <version>2.9-SNAPSHOT</version>
+            <version>${sakai.courier.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.sakaiproject.velocity</groupId>
             <artifactId>sakai-velocity-tool-api</artifactId>
-            <version>2.9-SNAPSHOT</version>
+            <version>${sakai.velocity.version}</version>
             <scope>provided</scope>
         </dependency>
-            <dependency>
-                <groupId>org.sakaiproject.velocity</groupId>
-                <artifactId>sakai-velocity-tool</artifactId>
-                <version>2.9-SNAPSHOT</version>
-            </dependency>
+        <dependency>
+            <groupId>org.sakaiproject.velocity</groupId>
+            <artifactId>sakai-velocity-tool</artifactId>
+            <version>${sakai.velocity.version}</version>
+        </dependency>
         </dependencies>
     </dependencyManagement>
 

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

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

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