mirror of https://github.com/apache/archiva.git
use tomcat embeded for unit tests
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1350799 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
f2809251dc
commit
904b86e395
|
@ -31,8 +31,6 @@
|
||||||
<properties>
|
<properties>
|
||||||
<archiva.baseRestUrl />
|
<archiva.baseRestUrl />
|
||||||
<rest.admin.pwd />
|
<rest.admin.pwd />
|
||||||
<test.useTomcat>false</test.useTomcat>
|
|
||||||
<jettyVersion>7.5.3.v20111011</jettyVersion>
|
|
||||||
<!--
|
<!--
|
||||||
<redbackTestJdbcUrl>jdbc:derby:memory:users-test;create=true</redbackTestJdbcUrl>
|
<redbackTestJdbcUrl>jdbc:derby:memory:users-test;create=true</redbackTestJdbcUrl>
|
||||||
<redbackTestJdbcDriver>org.apache.derby.jdbc.EmbeddedDriver</redbackTestJdbcDriver>
|
<redbackTestJdbcDriver>org.apache.derby.jdbc.EmbeddedDriver</redbackTestJdbcDriver>
|
||||||
|
@ -187,6 +185,10 @@
|
||||||
<groupId>org.codehaus.jettison</groupId>
|
<groupId>org.codehaus.jettison</groupId>
|
||||||
<artifactId>jettison</artifactId>
|
<artifactId>jettison</artifactId>
|
||||||
</exclusion>
|
</exclusion>
|
||||||
|
<exclusion>
|
||||||
|
<groupId>org.apache.geronimo.specs</groupId>
|
||||||
|
<artifactId>geronimo-servlet_2.5_spec</artifactId>
|
||||||
|
</exclusion>
|
||||||
</exclusions>
|
</exclusions>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
@ -230,19 +232,6 @@
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
|
||||||
<artifactId>jetty-server</artifactId>
|
|
||||||
<version>${jettyVersion}</version>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
|
||||||
<artifactId>jetty-plus</artifactId>
|
|
||||||
<version>${jettyVersion}</version>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.slf4j</groupId>
|
<groupId>org.slf4j</groupId>
|
||||||
|
@ -317,6 +306,31 @@
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.tomcat.embed</groupId>
|
||||||
|
<artifactId>tomcat-embed-core</artifactId>
|
||||||
|
<version>${tomcat7Version}</version>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.tomcat</groupId>
|
||||||
|
<artifactId>tomcat-juli</artifactId>
|
||||||
|
<version>${tomcat7Version}</version>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.tomcat.embed</groupId>
|
||||||
|
<artifactId>tomcat-embed-logging-juli</artifactId>
|
||||||
|
<version>${tomcat7Version}</version>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.tomcat</groupId>
|
||||||
|
<artifactId>tomcat-servlet-api</artifactId>
|
||||||
|
<version>${tomcat7Version}</version>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
@ -355,7 +369,6 @@
|
||||||
<derby.system.home>${project.build.directory}/appserver-base</derby.system.home>
|
<derby.system.home>${project.build.directory}/appserver-base</derby.system.home>
|
||||||
<archiva.baseRestUrl>${archiva.baseRestUrl}</archiva.baseRestUrl>
|
<archiva.baseRestUrl>${archiva.baseRestUrl}</archiva.baseRestUrl>
|
||||||
<rest.admin.pwd>${rest.admin.pwd}</rest.admin.pwd>
|
<rest.admin.pwd>${rest.admin.pwd}</rest.admin.pwd>
|
||||||
<test.useTomcat>${test.useTomcat}</test.useTomcat>
|
|
||||||
<redback.jdbc.url>${redbackTestJdbcUrl}</redback.jdbc.url>
|
<redback.jdbc.url>${redbackTestJdbcUrl}</redback.jdbc.url>
|
||||||
<redback.jdbc.driver.name>${redbackTestJdbcDriver}</redback.jdbc.driver.name>
|
<redback.jdbc.driver.name>${redbackTestJdbcDriver}</redback.jdbc.driver.name>
|
||||||
<basedir>${basedir}</basedir>
|
<basedir>${basedir}</basedir>
|
||||||
|
|
Loading…
Reference in New Issue