You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2013/06/30 13:32:13 UTC

svn commit: r1498096 - in /maven/plugins/trunk/maven-war-plugin: pom.xml src/test/java/org/apache/maven/plugin/war/stub/MavenProjectBasicStub.java

Author: olamy
Date: Sun Jun 30 11:32:12 2013
New Revision: 1498096

URL: http://svn.apache.org/r1498096
Log:
prevent to create maven-archiver directory in base directory when testinge

Modified:
    maven/plugins/trunk/maven-war-plugin/pom.xml
    maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProjectBasicStub.java

Modified: maven/plugins/trunk/maven-war-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=1498096&r1=1498095&r2=1498096&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-war-plugin/pom.xml Sun Jun 30 11:32:12 2013
@@ -201,6 +201,15 @@ under the License.
           <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <systemPropertyVariables>
+            <project.build.directory>${project.build.directory}</project.build.directory>
+          </systemPropertyVariables>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 

Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProjectBasicStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProjectBasicStub.java?rev=1498096&r1=1498095&r2=1498096&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProjectBasicStub.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProjectBasicStub.java Sun Jun 30 11:32:12 2013
@@ -19,6 +19,7 @@ package org.apache.maven.plugin.war.stub
  * under the License.
  */
 
+import org.apache.maven.model.Build;
 import org.apache.maven.model.Organization;
 import org.apache.maven.project.MavenProject;
 
@@ -108,4 +109,13 @@ public class MavenProjectBasicStub
         };
     }
 
+    @Override
+    public Build getBuild()
+    {
+        Build build = super.getBuild();
+
+        build.setDirectory( System.getProperty( "project.build.directory" ) );
+
+        return build;
+    }
 }