You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2013/03/26 21:38:20 UTC
git commit: o Added an IT parent to reduce duplication
Updated Branches:
refs/heads/master c1e06f8ed -> becadaf1f
o Added an IT parent to reduce duplication
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/becadaf1
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/becadaf1
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/becadaf1
Branch: refs/heads/master
Commit: becadaf1fec1f0aadbece3406d0ba03638671ec2
Parents: c1e06f8
Author: Kristian Rosenvold <kr...@apache.org>
Authored: Tue Mar 26 10:23:06 2013 +0100
Committer: Kristian Rosenvold <kr...@apache.org>
Committed: Tue Mar 26 21:37:41 2013 +0100
----------------------------------------------------------------------
.../maven/surefire/its/fixture/MavenLauncher.java | 9 +++-
.../test/resources/additional-classpath/pom.xml | 15 ++++-
.../src/test/resources/aggregate-report/pom.xml | 9 +++-
.../src/test/resources/ant-ignore/pom.xml | 27 +++-------
.../src/test/java/antignore/BasicTest.java | 4 +-
.../src/test/resources/argLine-parameter/pom.xml | 10 +++-
.../src/test/resources/classpath-filtering/pom.xml | 8 +++-
.../src/test/resources/classpath-order/pom.xml | 9 +++-
.../resources/classpath-scope-filtering/pom.xml | 8 +++-
.../src/test/resources/concurrentjunit47/pom.xml | 17 +++---
.../src/test/resources/consoleOutput/pom.xml | 17 +++---
.../src/test/resources/consoleoutput-noisy/pom.xml | 18 +++---
.../src/test/java/consoleoutput_noisy/Test1.java | 2 -
.../src/test/java/consoleoutput_noisy/Test2.java | 2 -
.../src/test/resources/crash-detection/pom.xml | 17 +++---
.../default-configuration-abstract/pom.xml | 18 +++----
.../default-configuration-classWithNoTests/pom.xml | 18 +++----
.../default-configuration-noTests/pom.xml | 18 +++---
.../test/resources/default-configuration/pom.xml | 18 +++----
.../src/test/resources/pom.xml | 40 +++++++++++++++
.../test/resources/working-directory/child/pom.xml | 6 ++
21 files changed, 181 insertions(+), 109 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/becadaf1/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
index 4acc8fc..e0befcc 100755
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
@@ -21,6 +21,7 @@ package org.apache.maven.surefire.its.fixture;
import java.io.File;
import java.io.IOException;
+import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -396,6 +397,12 @@ public class MavenLauncher
File testDir = new File( tempDir, resourcePath );
try
{
+ File parentPom = new File( tempDir.getParentFile(), "pom.xml" );
+ if (!parentPom.exists()){
+ URL resource = cl.getResource( "/pom.xml" );
+ FileUtils.copyURLToFile( resource, parentPom );
+ }
+
FileUtils.deleteDirectory( testDir );
File file = ResourceExtractor.extractResourceToDestination( cl, resourcePath, tempDir, true );
return file.getCanonicalFile();
@@ -411,7 +418,7 @@ public class MavenLauncher
{
String tempDirPath = System.getProperty( "maven.test.tmpdir", System.getProperty( "java.io.tmpdir" ) );
return new File( tempDirPath,
- testCaseBeingRun.getSimpleName() + File.separator + getTestMethodName() + suffix );
+ testCaseBeingRun.getSimpleName() + "_" + getTestMethodName() + suffix );
}
public File getArtifactPath( String gid, String aid, String version, String ext )
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/becadaf1/surefire-integration-tests/src/test/resources/additional-classpath/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/additional-classpath/pom.xml b/surefire-integration-tests/src/test/resources/additional-classpath/pom.xml
index 6356b9b..f383597 100644
--- a/surefire-integration-tests/src/test/resources/additional-classpath/pom.xml
+++ b/surefire-integration-tests/src/test/resources/additional-classpath/pom.xml
@@ -23,6 +23,14 @@
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.maven.surefire</groupId>
+ <artifactId>it-parent</artifactId>
+ <version>1.0</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<groupId>org.apache.maven.plugins.surefire</groupId>
<artifactId>additional-classpath</artifactId>
<version>1.0-SNAPSHOT</version>
@@ -32,12 +40,13 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
<configuration>
<additionalClasspathElements>
<additionalClasspathElement>${basedir}/extraResource</additionalClasspathElement>
- <additionalClasspathElement>${abc}</additionalClasspathElement><!-- SUREFIRE-694 -->
- <additionalClasspathElement></additionalClasspathElement><!-- SUREFIRE-694 -->
+ <additionalClasspathElement>${abc}</additionalClasspathElement>
+ <!-- SUREFIRE-694 -->
+ <additionalClasspathElement></additionalClasspathElement>
+ <!-- SUREFIRE-694 -->
</additionalClasspathElements>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/becadaf1/surefire-integration-tests/src/test/resources/aggregate-report/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/aggregate-report/pom.xml b/surefire-integration-tests/src/test/resources/aggregate-report/pom.xml
index 7b65912..39febf6 100644
--- a/surefire-integration-tests/src/test/resources/aggregate-report/pom.xml
+++ b/surefire-integration-tests/src/test/resources/aggregate-report/pom.xml
@@ -23,6 +23,13 @@
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.maven.surefire</groupId>
+ <artifactId>it-parent</artifactId>
+ <version>1.0</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<groupId>org.apache.maven.plugins.surefire</groupId>
<artifactId>aggregate-report</artifactId>
<version>1.0-SNAPSHOT</version>
@@ -37,7 +44,6 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
<configuration>
<testFailureIgnore>true</testFailureIgnore>
</configuration>
@@ -49,7 +55,6 @@
<plugins>
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>${surefire.version}</version>
<configuration>
<aggregate>true</aggregate>
</configuration>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/becadaf1/surefire-integration-tests/src/test/resources/ant-ignore/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/ant-ignore/pom.xml b/surefire-integration-tests/src/test/resources/ant-ignore/pom.xml
index cc9643f..3cc74a1 100644
--- a/surefire-integration-tests/src/test/resources/ant-ignore/pom.xml
+++ b/surefire-integration-tests/src/test/resources/ant-ignore/pom.xml
@@ -23,6 +23,14 @@
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.maven.surefire</groupId>
+ <artifactId>it-parent</artifactId>
+ <version>1.0</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<groupId>org.apache.maven.plugins.surefire</groupId>
<artifactId>ant-ignore</artifactId>
<version>1.0-SNAPSHOT</version>
@@ -36,23 +44,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
-
- </plugins>
- </build>
-
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/becadaf1/surefire-integration-tests/src/test/resources/ant-ignore/src/test/java/antignore/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/ant-ignore/src/test/java/antignore/BasicTest.java b/surefire-integration-tests/src/test/resources/ant-ignore/src/test/java/antignore/BasicTest.java
index 8a70308..487427a 100644
--- a/surefire-integration-tests/src/test/resources/ant-ignore/src/test/java/antignore/BasicTest.java
+++ b/surefire-integration-tests/src/test/resources/ant-ignore/src/test/java/antignore/BasicTest.java
@@ -1,13 +1,13 @@
package antignore;
-import junit.framework.TestCase;
import org.junit.Assert;
-import org.junit.Test;
import org.junit.Ignore;
+import org.junit.Test;
public class BasicTest
{
+ @Test
@Ignore
public void testIgnorable()
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/becadaf1/surefire-integration-tests/src/test/resources/argLine-parameter/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/argLine-parameter/pom.xml b/surefire-integration-tests/src/test/resources/argLine-parameter/pom.xml
index 82734b1..2eed551 100644
--- a/surefire-integration-tests/src/test/resources/argLine-parameter/pom.xml
+++ b/surefire-integration-tests/src/test/resources/argLine-parameter/pom.xml
@@ -23,6 +23,14 @@
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.maven.surefire</groupId>
+ <artifactId>it-parent</artifactId>
+ <version>1.0</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<groupId>org.apache.maven.plugins.surefire</groupId>
<artifactId>testArgLine</artifactId>
<version>1.0-SNAPSHOT</version>
@@ -42,8 +50,8 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
<configuration>
+ <forkMode>once</forkMode>
<argLine>-Dfoo.property="foo foo/foo/bar/1.0" -Dbar.property="bar bar/foo/bar/2.0"</argLine>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/becadaf1/surefire-integration-tests/src/test/resources/classpath-filtering/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/classpath-filtering/pom.xml b/surefire-integration-tests/src/test/resources/classpath-filtering/pom.xml
index 50bd686..6b16431 100644
--- a/surefire-integration-tests/src/test/resources/classpath-filtering/pom.xml
+++ b/surefire-integration-tests/src/test/resources/classpath-filtering/pom.xml
@@ -23,6 +23,13 @@
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.maven.surefire</groupId>
+ <artifactId>it-parent</artifactId>
+ <version>1.0</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<groupId>org.apache.maven.plugins.surefire</groupId>
<artifactId>classpath-dependency-filter</artifactId>
<version>1.0-SNAPSHOT</version>
@@ -32,7 +39,6 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
<configuration>
<classpathDependencyExcludes>
<exclude>org.apache.commons:*</exclude>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/becadaf1/surefire-integration-tests/src/test/resources/classpath-order/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/classpath-order/pom.xml b/surefire-integration-tests/src/test/resources/classpath-order/pom.xml
index 8209e6e..a72c2f5 100644
--- a/surefire-integration-tests/src/test/resources/classpath-order/pom.xml
+++ b/surefire-integration-tests/src/test/resources/classpath-order/pom.xml
@@ -23,6 +23,14 @@
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.maven.surefire</groupId>
+ <artifactId>it-parent</artifactId>
+ <version>1.0</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<groupId>org.apache.maven.plugins.surefire</groupId>
<artifactId>classpath-order</artifactId>
<version>1.0-SNAPSHOT</version>
@@ -32,7 +40,6 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/becadaf1/surefire-integration-tests/src/test/resources/classpath-scope-filtering/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/classpath-scope-filtering/pom.xml b/surefire-integration-tests/src/test/resources/classpath-scope-filtering/pom.xml
index 97f9961..84789c5 100644
--- a/surefire-integration-tests/src/test/resources/classpath-scope-filtering/pom.xml
+++ b/surefire-integration-tests/src/test/resources/classpath-scope-filtering/pom.xml
@@ -23,6 +23,13 @@
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.maven.surefire</groupId>
+ <artifactId>it-parent</artifactId>
+ <version>1.0</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<groupId>org.apache.maven.plugins.surefire</groupId>
<artifactId>classpath-scope-filter</artifactId>
<version>1.0-SNAPSHOT</version>
@@ -32,7 +39,6 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
<configuration>
<classpathDependencyScopeExclude>compile</classpathDependencyScopeExclude>
</configuration>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/becadaf1/surefire-integration-tests/src/test/resources/concurrentjunit47/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/concurrentjunit47/pom.xml b/surefire-integration-tests/src/test/resources/concurrentjunit47/pom.xml
index bbc65d0..ab4a7fb 100644
--- a/surefire-integration-tests/src/test/resources/concurrentjunit47/pom.xml
+++ b/surefire-integration-tests/src/test/resources/concurrentjunit47/pom.xml
@@ -23,6 +23,14 @@
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.maven.surefire</groupId>
+ <artifactId>it-parent</artifactId>
+ <version>1.0</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<groupId>org.apache.maven.plugins.surefire</groupId>
<artifactId>junit47</artifactId>
<version>1.0-SNAPSHOT</version>
@@ -46,16 +54,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
<configuration>
<parallel>methods</parallel>
<threadCount>2</threadCount>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/becadaf1/surefire-integration-tests/src/test/resources/consoleOutput/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/consoleOutput/pom.xml b/surefire-integration-tests/src/test/resources/consoleOutput/pom.xml
index 69e4e28..b19dbd2 100644
--- a/surefire-integration-tests/src/test/resources/consoleOutput/pom.xml
+++ b/surefire-integration-tests/src/test/resources/consoleOutput/pom.xml
@@ -1,5 +1,13 @@
<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">
+
+ <parent>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>it-parent</artifactId>
+ <version>1.0</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.plugins.surefire</groupId>
<artifactId>consoleOutputTest</artifactId>
@@ -19,16 +27,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
<configuration>
<forkMode>${forkMode}</forkMode>
<printSummary>${printSummary}</printSummary>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/becadaf1/surefire-integration-tests/src/test/resources/consoleoutput-noisy/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/consoleoutput-noisy/pom.xml b/surefire-integration-tests/src/test/resources/consoleoutput-noisy/pom.xml
index 46382e8..192134a 100644
--- a/surefire-integration-tests/src/test/resources/consoleoutput-noisy/pom.xml
+++ b/surefire-integration-tests/src/test/resources/consoleoutput-noisy/pom.xml
@@ -1,5 +1,14 @@
<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">
+
+
+ <parent>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>it-parent</artifactId>
+ <version>1.0</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.plugins.surefire</groupId>
<artifactId>fork-consoleOutput-noisy</artifactId>
@@ -19,16 +28,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
<configuration>
<forkMode>${forkMode}</forkMode>
<printSummary>${printSummary}</printSummary>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/becadaf1/surefire-integration-tests/src/test/resources/consoleoutput-noisy/src/test/java/consoleoutput_noisy/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/consoleoutput-noisy/src/test/java/consoleoutput_noisy/Test1.java b/surefire-integration-tests/src/test/resources/consoleoutput-noisy/src/test/java/consoleoutput_noisy/Test1.java
index 8f43d53..d4a677b 100644
--- a/surefire-integration-tests/src/test/resources/consoleoutput-noisy/src/test/java/consoleoutput_noisy/Test1.java
+++ b/surefire-integration-tests/src/test/resources/consoleoutput-noisy/src/test/java/consoleoutput_noisy/Test1.java
@@ -20,8 +20,6 @@ package consoleoutput_noisy;
*/
import junit.framework.TestCase;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
public class Test1
extends TestCase
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/becadaf1/surefire-integration-tests/src/test/resources/consoleoutput-noisy/src/test/java/consoleoutput_noisy/Test2.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/consoleoutput-noisy/src/test/java/consoleoutput_noisy/Test2.java b/surefire-integration-tests/src/test/resources/consoleoutput-noisy/src/test/java/consoleoutput_noisy/Test2.java
index 06b7418..de4e0fc 100644
--- a/surefire-integration-tests/src/test/resources/consoleoutput-noisy/src/test/java/consoleoutput_noisy/Test2.java
+++ b/surefire-integration-tests/src/test/resources/consoleoutput-noisy/src/test/java/consoleoutput_noisy/Test2.java
@@ -20,8 +20,6 @@ package consoleoutput_noisy;
*/
import junit.framework.TestCase;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
public class Test2
extends TestCase
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/becadaf1/surefire-integration-tests/src/test/resources/crash-detection/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/crash-detection/pom.xml b/surefire-integration-tests/src/test/resources/crash-detection/pom.xml
index e6c22f0..92a1e5f 100644
--- a/surefire-integration-tests/src/test/resources/crash-detection/pom.xml
+++ b/surefire-integration-tests/src/test/resources/crash-detection/pom.xml
@@ -21,8 +21,14 @@
<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.maven.surefire</groupId>
+ <artifactId>it-parent</artifactId>
+ <version>1.0</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.plugins.surefire</groupId>
<artifactId>crash-detection</artifactId>
<version>1.0-SNAPSHOT</version>
@@ -36,19 +42,14 @@
<scope>test</scope>
</dependency>
</dependencies>
-
+
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <forkMode>once</forkMode>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/becadaf1/surefire-integration-tests/src/test/resources/default-configuration-abstract/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/default-configuration-abstract/pom.xml b/surefire-integration-tests/src/test/resources/default-configuration-abstract/pom.xml
index d4a2de7..2d24d31 100644
--- a/surefire-integration-tests/src/test/resources/default-configuration-abstract/pom.xml
+++ b/surefire-integration-tests/src/test/resources/default-configuration-abstract/pom.xml
@@ -23,6 +23,14 @@
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.maven.surefire</groupId>
+ <artifactId>it-parent</artifactId>
+ <version>1.0</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<groupId>org.apache.maven.plugins.surefire</groupId>
<artifactId>default-configuration-abstract</artifactId>
<version>1.0-SNAPSHOT</version>
@@ -36,14 +44,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </build>
-
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/becadaf1/surefire-integration-tests/src/test/resources/default-configuration-classWithNoTests/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/default-configuration-classWithNoTests/pom.xml b/surefire-integration-tests/src/test/resources/default-configuration-classWithNoTests/pom.xml
index 54d1bb2..9d2f682 100644
--- a/surefire-integration-tests/src/test/resources/default-configuration-classWithNoTests/pom.xml
+++ b/surefire-integration-tests/src/test/resources/default-configuration-classWithNoTests/pom.xml
@@ -23,6 +23,14 @@
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.maven.surefire</groupId>
+ <artifactId>it-parent</artifactId>
+ <version>1.0</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<groupId>org.apache.maven.plugins.surefire</groupId>
<artifactId>default-configuration-classWithNoTests</artifactId>
<version>1.0-SNAPSHOT</version>
@@ -36,14 +44,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </build>
-
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/becadaf1/surefire-integration-tests/src/test/resources/default-configuration-noTests/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/default-configuration-noTests/pom.xml b/surefire-integration-tests/src/test/resources/default-configuration-noTests/pom.xml
index f51da5a..453130f 100644
--- a/surefire-integration-tests/src/test/resources/default-configuration-noTests/pom.xml
+++ b/surefire-integration-tests/src/test/resources/default-configuration-noTests/pom.xml
@@ -23,6 +23,14 @@
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.maven.surefire</groupId>
+ <artifactId>it-parent</artifactId>
+ <version>1.0</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<groupId>org.apache.maven.plugins.surefire</groupId>
<artifactId>default-configuration-noTests</artifactId>
<version>1.0-SNAPSHOT</version>
@@ -40,14 +48,6 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </build>
<profiles>
<profile>
<id>junit47</id>
@@ -55,7 +55,6 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
@@ -63,6 +62,7 @@
<version>${surefire.version}</version>
</dependency>
</dependencies>
+
</plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/becadaf1/surefire-integration-tests/src/test/resources/default-configuration/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/default-configuration/pom.xml b/surefire-integration-tests/src/test/resources/default-configuration/pom.xml
index 38f4956..b5b1686 100644
--- a/surefire-integration-tests/src/test/resources/default-configuration/pom.xml
+++ b/surefire-integration-tests/src/test/resources/default-configuration/pom.xml
@@ -23,6 +23,14 @@
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.maven.surefire</groupId>
+ <artifactId>it-parent</artifactId>
+ <version>1.0</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<groupId>org.apache.maven.plugins.surefire</groupId>
<artifactId>default-configuration</artifactId>
<version>1.0-SNAPSHOT</version>
@@ -36,14 +44,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </build>
-
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/becadaf1/surefire-integration-tests/src/test/resources/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/pom.xml b/surefire-integration-tests/src/test/resources/pom.xml
new file mode 100644
index 0000000..a5a9341
--- /dev/null
+++ b/surefire-integration-tests/src/test/resources/pom.xml
@@ -0,0 +1,40 @@
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>it-parent</artifactId>
+ <packaging>pom</packaging>
+
+ <version>1.0</version>
+ <name>It parent</name>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.5.1</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <forkMode>never</forkMode>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <forkMode>never</forkMode>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>${surefire.version}</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/becadaf1/surefire-integration-tests/src/test/resources/working-directory/child/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/working-directory/child/pom.xml b/surefire-integration-tests/src/test/resources/working-directory/child/pom.xml
index 6f22880..d12b79a 100644
--- a/surefire-integration-tests/src/test/resources/working-directory/child/pom.xml
+++ b/surefire-integration-tests/src/test/resources/working-directory/child/pom.xml
@@ -23,6 +23,12 @@
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.maven.surefire</groupId>
+ <artifactId>it-parent</artifactId>
+ <version>1.0</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
<groupId>org.apache.maven.plugins.surefire</groupId>
<artifactId>working-directory-child</artifactId>
<version>1.0-SNAPSHOT</version>