From 3c9a6cbe59cfc0d633cfc919c6efefb4ba97973a Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Tue, 18 Oct 2011 16:38:30 +0000
Subject: [PATCH] use temporary 8-SNAPSHOT as parent

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1185747 13f79535-47bb-0310-9956-ffa450edef68
---
 archiva-tomcat/pom.xml                         | 2 +-
 archiva-tomcat/src/main/tomcatconf/archiva.xml | 2 +-
 pom.xml                                        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/archiva-tomcat/pom.xml b/archiva-tomcat/pom.xml
index bb9c76797..a40126391 100644
--- a/archiva-tomcat/pom.xml
+++ b/archiva-tomcat/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva</artifactId>
-    <version>1.4-M1-SNAPSHOT</version>
+    <version>1.4-M2-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-tomcat</artifactId>
   <packaging>pom</packaging>
diff --git a/archiva-tomcat/src/main/tomcatconf/archiva.xml b/archiva-tomcat/src/main/tomcatconf/archiva.xml
index 4f7ce1d69..32b71b094 100644
--- a/archiva-tomcat/src/main/tomcatconf/archiva.xml
+++ b/archiva-tomcat/src/main/tomcatconf/archiva.xml
@@ -22,7 +22,7 @@
             username="sa"
             password=""
             driverClassName="org.apache.derby.jdbc.EmbeddedDriver"
-            url="jdbc:derby:${appserver.base}/database/users;create=true"
+            url="jdbc:derby:${catalina.base}/database/users;create=true"
   />
   <Resource name="mail/Session" auth="Container"
           type="javax.mail.Session"
diff --git a/pom.xml b/pom.xml
index ec44477f3..223605695 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-parent</artifactId>
-    <version>7-SNAPSHOT</version>
+    <version>8-SNAPSHOT</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
-- 
2.39.5