Author: olamy
Date: Tue Aug 23 16:35:49 2011
New Revision: 1160783
URL: http://svn.apache.org/viewvc?rev=1160783&view=rev
Log:
get rid of created ${plexus.home} with derby database created in and never
cleaned : could cause some issues -> account locked
Modified:
archiva/trunk/.gitignore
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
Modified: archiva/trunk/.gitignore
URL:
http://svn.apache.org/viewvc/archiva/trunk/.gitignore?rev=1160783&r1=1160782&r2=1160783&view=diff
==============================================================================
--- archiva/trunk/.gitignore (original)
+++ archiva/trunk/.gitignore Tue Aug 23 16:35:49 2011
@@ -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
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml?rev=1160783&r1=1160782&r2=1160783&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
Tue Aug 23 16:35:49 2011
@@ -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>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=1160783&r1=1160782&r2=1160783&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Tue Aug 23
16:35:49 2011
@@ -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>
