You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2016/01/15 06:10:42 UTC
[30/30] maven-surefire git commit: Merge branch 'master' into 3.0-rc1
Merge branch 'master' into 3.0-rc1
Conflicts:
surefire-integration-tests/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/1f6ba2e1
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/1f6ba2e1
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/1f6ba2e1
Branch: refs/heads/3.0-rc1
Commit: 1f6ba2e1226a14f3aa777fb2d3d619725f775a4f
Parents: 7f53637 c43ff3e
Author: Tibor17 <ti...@lycos.com>
Authored: Fri Jan 15 06:09:52 2016 +0100
Committer: Tibor17 <ti...@lycos.com>
Committed: Fri Jan 15 06:09:52 2016 +0100
----------------------------------------------------------------------
README.TXT | 11 --
README.md | 43 ++++++
.../plugin/surefire/AbstractSurefireMojo.java | 16 +-
.../lazytestprovider/TestLessInputStream.java | 14 --
.../surefire/report/StatelessXmlReporter.java | 2 +-
.../maven/plugin/surefire/util/Relocator.java | 10 +-
.../maven/plugin/surefire/util/ScannerUtil.java | 6 +-
.../fork-options-and-parallel-execution.apt.vm | 154 ++++++++++++-------
pom.xml | 37 +++++
surefire-integration-tests/pom.xml | 35 ++++-
.../maven/surefire/common/junit4/Notifier.java | 9 +-
.../maven/surefire/testng/TestNGExecutor.java | 1 +
12 files changed, 229 insertions(+), 109 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1f6ba2e1/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1f6ba2e1/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1f6ba2e1/surefire-integration-tests/pom.xml
----------------------------------------------------------------------
diff --cc surefire-integration-tests/pom.xml
index e86220e,61e7434..5e4dd4e
--- a/surefire-integration-tests/pom.xml
+++ b/surefire-integration-tests/pom.xml
@@@ -202,5 -202,80 +202,36 @@@
<verifier.forkMode>auto</verifier.forkMode>
</properties>
</profile>
+ <profile>
- <id>maven-2.2.1</id>
- <properties>
- <mavenHomeUsed>${project.build.directory}/maven-extract/apache-maven-2.2.1</mavenHomeUsed>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.4</version>
- <executions>
- <execution>
- <id>unpack</id>
- <phase>package</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.maven</groupId>
- <artifactId>apache-maven</artifactId>
- <version>2.2.1</version>
- <type>tar.gz</type>
- <classifier>bin</classifier>
- <overWrite>false</overWrite>
- <outputDirectory>${project.build.directory}/maven-extract</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to http://jira.codehaus.org/browse/MRELEASE-799 -->
- <configuration>
- <excludedGroups>org.apache.maven.surefire.its.Not2xCompatible</excludedGroups>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
+ <id>jenkins</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>jacoco-agent</id>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </execution>
+ <execution>
+ <id>jacoco-agent-it</id>
+ <goals>
+ <goal>prepare-agent-integration</goal>
+ </goals>
+ <configuration>
+ <propertyName>argLine</propertyName>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>