From 80b7556bebeb4a919c86105f288eeb40892c2568 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Tue, 23 Aug 2011 16:35:49 +0000
Subject: [PATCH] get rid of created ${plexus.home} with derby database created
 in and never cleaned : could cause some issues -> account locked

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1160783 13f79535-47bb-0310-9956-ffa450edef68
---
 .gitignore                                           |  1 -
 .../archiva-rest/archiva-rest-services/pom.xml       |  9 +++++++++
 archiva-modules/archiva-web/archiva-webapp/pom.xml   | 12 +++---------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0799422bf..df9cf6888 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,6 @@ target
 build
 *.iml
 derby.log
-${plexus.home}
 archiva-modules/archiva-web/archiva-webapp/appserver-base/
 archiva-modules/archiva-web/archiva-webapp/overlays/
 archiva-modules/archiva-web/archiva-webapp/src/main/webapp/archiva-applet.jar
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
index 912e80983..62d9074b4 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
@@ -207,6 +207,15 @@
           </filesets>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <systemPropertyVariables>
+            <plexus.home>${project.build.outputDirectory}</plexus.home>
+          </systemPropertyVariables>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index 21118e417..c68acd2c3 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -447,21 +447,15 @@
       </resource>
     </resources>
     <plugins>
-      <!--
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <argLine>-agentlib:yjpagent</argLine>
-          <excludes>
-            <exclude>**/Abstract*</exclude>
-            <exclude>**/*TestCase.java</exclude>
-            <exclude>**/*Tests.java</exclude>
-            <exclude>**/*TestSuite.java</exclude>
-          </excludes>
+          <systemPropertyVariables>
+            <plexus.home>${project.build.outputDirectory}</plexus.home>
+          </systemPropertyVariables>
         </configuration>
       </plugin>
-       -->
       <!-- hack for jetty:run, archiva web config files are checked in /WEB-INF/ dir -->
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
-- 
2.39.5