Author: olamy
Date: Tue Oct 18 16:38:30 2011
New Revision: 1185747
URL: http://svn.apache.org/viewvc?rev=1185747&view=rev
Log:
use temporary 8-SNAPSHOT as parent
Modified:
archiva/trunk/archiva-tomcat/pom.xml
archiva/trunk/archiva-tomcat/src/main/tomcatconf/archiva.xml
archiva/trunk/pom.xml
Modified: archiva/trunk/archiva-tomcat/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-tomcat/pom.xml?rev=1185747&r1=1185746&r2=1185747&view=diff
==============================================================================
--- archiva/trunk/archiva-tomcat/pom.xml (original)
+++ archiva/trunk/archiva-tomcat/pom.xml Tue Oct 18 16:38:30 2011
@@ -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>
Modified: archiva/trunk/archiva-tomcat/src/main/tomcatconf/archiva.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-tomcat/src/main/tomcatconf/archiva.xml?rev=1185747&r1=1185746&r2=1185747&view=diff
==============================================================================
--- archiva/trunk/archiva-tomcat/src/main/tomcatconf/archiva.xml (original)
+++ archiva/trunk/archiva-tomcat/src/main/tomcatconf/archiva.xml Tue Oct 18
16:38:30 2011
@@ -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"
Modified: archiva/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1185747&r1=1185746&r2=1185747&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Tue Oct 18 16:38:30 2011
@@ -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>
