diff options
| author | Olivier Lamy <olamy@apache.org> | 2011-10-18 16:38:30 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2011-10-18 16:38:30 +0000 |
| commit | 3c9a6cbe59cfc0d633cfc919c6efefb4ba97973a (patch) | |
| tree | 9573c2ee77bee9107518330e948e51c758d736ee | |
| parent | 7b57e63d681f46c26077455599358eee4956945a (diff) | |
| download | archiva-3c9a6cbe59cfc0d633cfc919c6efefb4ba97973a.tar.gz archiva-3c9a6cbe59cfc0d633cfc919c6efefb4ba97973a.zip | |
use temporary 8-SNAPSHOT as parent
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1185747 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | archiva-tomcat/pom.xml | 2 | ||||
| -rw-r--r-- | archiva-tomcat/src/main/tomcatconf/archiva.xml | 2 | ||||
| -rw-r--r-- | 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" @@ -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> |