Author: brett
Date: Sat Oct 1 07:10:32 2011
New Revision: 1177935
URL: http://svn.apache.org/viewvc?rev=1177935&view=rev
Log:
fix properties to avoid putting test data in JAR
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
archiva/trunk/pom.xml
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml?rev=1177935&r1=1177934&r2=1177935&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
Sat Oct 1 07:10:32 2011
@@ -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>
Modified: archiva/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1177935&r1=1177934&r2=1177935&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Sat Oct 1 07:10:32 2011
@@ -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>
