summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrett Porter <brett@apache.org>2011-10-01 07:10:32 +0000
committerBrett Porter <brett@apache.org>2011-10-01 07:10:32 +0000
commitfc6b251359cb565e2ca24fc8af4c33eb6559215e (patch)
tree1fe2bdf14c384314969aed2363af5b3f746b69b0
parent0fa1fa6ac24c0bf897beed3bfe714f9b9ee45d76 (diff)
downloadarchiva-fc6b251359cb565e2ca24fc8af4c33eb6559215e.tar.gz
archiva-fc6b251359cb565e2ca24fc8af4c33eb6559215e.zip
fix properties to avoid putting test data in JAR
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1177935 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml24
-rw-r--r--pom.xml2
2 files changed, 13 insertions, 13 deletions
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
index d305e3e5d..6a3f6465e 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
@@ -18,7 +18,8 @@
~ under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.archiva</groupId>
@@ -97,17 +98,16 @@
</excludes>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <plexus.home>${project.build.outputDirectory}</plexus.home>
- <appserver.base>${basedir}/target/appserver-base</appserver.base>
- <java.io.tmpdir>${project.build.outputDirectory}</java.io.tmpdir>
- </systemPropertyVariables>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <appserver.base>${project.build.directory}/appserver-base</appserver.base>
+ <plexus.home>${project.build.directory}/appserver-base</plexus.home>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
diff --git a/pom.xml b/pom.xml
index b6d77bdb4..03add1586 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1555,7 +1555,7 @@
<redirectTestOutputToFile>${surefire.redirectTestOutputToFile}</redirectTestOutputToFile>
<runOrder>alphabetical</runOrder>
<systemPropertyVariables>
- <java.io.tmpdir>${project.build.outputDirectory}</java.io.tmpdir>
+ <java.io.tmpdir>${project.build.directory}/temp</java.io.tmpdir>
</systemPropertyVariables>
</configuration>
</plugin>