Commit 2aacfb2a91925ba9e431ba0d956cbd76f1a10b16

Authored by Steven Glover
1 parent 8cbeba57d5
Exists in master

Fix tests again (make sure both db and alf_data are cleaned)

Showing 1 changed file with 22 additions and 1 deletions   Show diff stats
... ... @@ -21,6 +21,10 @@
21 21 <!-- Defines the alfresco version to compile against -->
22 22 <alfresco.version>5.2.b-EA</alfresco.version>
23 23  
  24 + <alfresco.data.location>alf_data</alfresco.data.location>
  25 +
  26 + <maven.clean.version>3.0.0</maven.clean.version>
  27 +
24 28 <db.drop.command>drop database if exists ${db.name}</db.drop.command>
25 29 <db.create.command>create database ${db.name}</db.create.command>
26 30 <db.driver>org.postgresql.Driver</db.driver>
... ... @@ -62,7 +66,6 @@
62 66 <dependency>
63 67 <groupId>javax.servlet</groupId>
64 68 <artifactId>servlet-api</artifactId>
65   - <version>2.5</version>
66 69 <scope>provided</scope>
67 70 </dependency>
68 71 <!-- Test dependencies -->
... ... @@ -146,6 +149,24 @@
146 149 <build>
147 150 <plugins>
148 151 <plugin>
  152 + <groupId>org.apache.maven.plugins</groupId>
  153 + <artifactId>maven-clean-plugin</artifactId>
  154 + <version>${maven.clean.version}</version>
  155 + <configuration>
  156 + <filesets>
  157 + <fileset>
  158 + <directory>${alfresco.data.location}</directory>
  159 + </fileset>
  160 + <fileset>
  161 + <directory>${project.basedir}</directory>
  162 + <includes>
  163 + <include>**/*.log*</include>
  164 + </includes>
  165 + </fileset>
  166 + </filesets>
  167 + </configuration>
  168 + </plugin>
  169 + <plugin>
149 170 <groupId>org.codehaus.mojo</groupId>
150 171 <artifactId>sql-maven-plugin</artifactId>
151 172 <dependencies>
... ...