svn commit: r1804252 - /maven/pom/trunk/maven/site-pom.xml
Author: hboutemy Date: Sun Aug 6 18:36:21 2017 New Revision: 1804252 URL: http://svn.apache.org/viewvc?rev=1804252=rev Log: updated site parent Modified: maven/pom/trunk/maven/site-pom.xml Modified: maven/pom/trunk/maven/site-pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/site-pom.xml?rev=1804252=1804251=1804252=diff == --- maven/pom/trunk/maven/site-pom.xml (original) +++ maven/pom/trunk/maven/site-pom.xml Sun Aug 6 18:36:21 2017 @@ -25,7 +25,7 @@ under the License. org.apache.maven maven-parent -30 +31-SNAPSHOT ./pom.xml
maven-surefire git commit: Investigating ASF Jenkins fails https://builds.apache.org/job/maven-surefire-windows/1310/
Repository: maven-surefire Updated Branches: refs/heads/master 962640171 -> 2b6926abd Investigating ASF Jenkins fails https://builds.apache.org/job/maven-surefire-windows/1310/ Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/2b6926ab Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/2b6926ab Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/2b6926ab Branch: refs/heads/master Commit: 2b6926abdbc7f8ea3ad86a2364e6c26bc51775fb Parents: 9626401 Author: Tibor17Authored: Sun Aug 6 17:33:39 2017 +0200 Committer: Tibor17 Committed: Sun Aug 6 17:33:39 2017 +0200 -- .../test/java/org/apache/maven/surefire/its/ConsoleOutputIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/2b6926ab/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ConsoleOutputIT.java -- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ConsoleOutputIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ConsoleOutputIT.java index 12fbb49..e01d798 100644 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ConsoleOutputIT.java +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ConsoleOutputIT.java @@ -47,7 +47,7 @@ public class ConsoleOutputIT public void properNewlinesAndEncodingWithDifferentEncoding() { final OutputValidator outputValidator = -unpack( "/consoleOutput" ).forkOnce()/*.argLine( "-Dfile.encoding=UTF-16" )*/.executeTest(); +unpack( "/consoleOutput" ).forkOnce().argLine( "-Dfile.encoding=UTF-16" ).executeTest(); validate( outputValidator, true ); }
maven-surefire git commit: Investigating ASF Jenkins fails https://builds.apache.org/job/maven-surefire-windows/1310/
Repository: maven-surefire Updated Branches: refs/heads/master 3abe25f43 -> 962640171 Investigating ASF Jenkins fails https://builds.apache.org/job/maven-surefire-windows/1310/ Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/96264017 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/96264017 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/96264017 Branch: refs/heads/master Commit: 962640171da0bab929d20a7aadf3d152134c6a39 Parents: 3abe25f Author: Tibor17Authored: Sun Aug 6 16:20:04 2017 +0200 Committer: Tibor17 Committed: Sun Aug 6 16:20:04 2017 +0200 -- .../main/java/org/apache/maven/surefire/booter/PpidChecker.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/96264017/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PpidChecker.java -- diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PpidChecker.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PpidChecker.java index 1292f17..7c27584 100644 --- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PpidChecker.java +++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PpidChecker.java @@ -155,7 +155,7 @@ final class PpidChecker ProcessInfo windows() { -ProcessInfoConsumer reader = new ProcessInfoConsumer( Charset.defaultCharset().name() ) // Windows-1252 +ProcessInfoConsumer reader = new ProcessInfoConsumer( "US-ASCII" ) { private boolean hasHeader;
maven-surefire git commit: Investigating ASF Jenkins fails https://builds.apache.org/job/maven-surefire-windows/1310/
Repository: maven-surefire Updated Branches: refs/heads/master 413be0d6b -> 3d42cf9a6 Investigating ASF Jenkins fails https://builds.apache.org/job/maven-surefire-windows/1310/ Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/3d42cf9a Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/3d42cf9a Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/3d42cf9a Branch: refs/heads/master Commit: 3d42cf9a6d3c3fca786e3586eb3d76a80269959a Parents: 413be0d Author: Tibor17Authored: Sun Aug 6 13:16:31 2017 +0200 Committer: Tibor17 Committed: Sun Aug 6 13:16:31 2017 +0200 -- .../test/java/org/apache/maven/surefire/its/ConsoleOutputIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/3d42cf9a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ConsoleOutputIT.java -- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ConsoleOutputIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ConsoleOutputIT.java index e01d798..12fbb49 100644 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ConsoleOutputIT.java +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ConsoleOutputIT.java @@ -47,7 +47,7 @@ public class ConsoleOutputIT public void properNewlinesAndEncodingWithDifferentEncoding() { final OutputValidator outputValidator = -unpack( "/consoleOutput" ).forkOnce().argLine( "-Dfile.encoding=UTF-16" ).executeTest(); +unpack( "/consoleOutput" ).forkOnce()/*.argLine( "-Dfile.encoding=UTF-16" )*/.executeTest(); validate( outputValidator, true ); }
maven-surefire git commit: [SUREFIRE-1400] Windows surefire boot directory should appear in system default temporary-directory
Repository: maven-surefire Updated Branches: refs/heads/master 26527d10c -> 413be0d6b [SUREFIRE-1400] Windows surefire boot directory should appear in system default temporary-directory Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/413be0d6 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/413be0d6 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/413be0d6 Branch: refs/heads/master Commit: 413be0d6b7232fe6ef6255492099fb0fb4f3bf24 Parents: 26527d1 Author: Tibor17Authored: Tue Aug 1 09:37:48 2017 +0200 Committer: Tibor17 Committed: Sun Aug 6 03:12:33 2017 +0200 -- .../plugin/surefire/AbstractSurefireMojo.java | 93 +- .../surefire/AbstractSurefireMojoTest.java | 125 +++ .../apache/maven/surefire/JUnit4SuiteTest.java | 4 +- .../maven/surefire/util/ReflectionUtils.java| 29 - .../surefire/util/ReflectionUtilsTest.java | 6 +- surefire-integration-tests/pom.xml | 2 + .../maven/surefire/its/LongWindowsPathIT.java | 88 + .../surefire/its/fixture/HelperAssertions.java | 13 +- .../test/resources/long-windows-path/pom.xml| 57 + .../test/java/longwindowspath/BasicTest.java| 36 ++ .../java/jiras/surefre855/bundle/FooIT.java | 32 + .../test/java/jiras/surefire855/jar/FooIT.java | 34 + .../test/java/jiras/surefire855/war/FooIT.java | 32 + 13 files changed, 447 insertions(+), 104 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/413be0d6/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java -- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java index b3df567..f2e5bfb 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java @@ -76,12 +76,14 @@ import org.apache.maven.surefire.testset.TestRequest; import org.apache.maven.surefire.testset.TestSetFailedException; import org.apache.maven.surefire.util.DefaultScanResult; import org.apache.maven.surefire.util.RunOrder; +import org.apache.maven.surefire.util.SurefireReflectionException; import org.apache.maven.toolchain.Toolchain; import org.apache.maven.toolchain.ToolchainManager; import javax.annotation.Nonnull; import java.io.File; import java.io.IOException; +import java.lang.reflect.Array; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Arrays; @@ -98,12 +100,18 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import static java.lang.Thread.currentThread; +import static org.apache.commons.lang3.JavaVersion.JAVA_1_7; +import static org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS; +import static org.apache.commons.lang3.SystemUtils.isJavaVersionAtLeast; import static org.apache.maven.shared.utils.StringUtils.capitalizeFirstLetter; import static org.apache.maven.shared.utils.StringUtils.isEmpty; import static org.apache.maven.shared.utils.StringUtils.isNotBlank; import static org.apache.maven.shared.utils.StringUtils.split; import static org.apache.maven.surefire.suite.RunResult.failure; import static org.apache.maven.surefire.suite.RunResult.noTestsRun; +import static org.apache.maven.surefire.util.ReflectionUtils.invokeGetter; +import static org.apache.maven.surefire.util.ReflectionUtils.invokeStaticMethod; +import static org.apache.maven.surefire.util.ReflectionUtils.tryLoadClass; /** * Abstract base class for running tests using Surefire. @@ -117,6 +125,8 @@ public abstract class AbstractSurefireMojo { private static final Platform PLATFORM = new Platform(); +private static final File SYSTEM_TMP_DIR = new File( System.getProperty( "java.io.tmpdir" ) ); + private final ProviderDetector providerDetector = new ProviderDetector(); /** @@ -342,7 +352,12 @@ public abstract class AbstractSurefireMojo private String forkMode; /** - * Relative path to project.build.directory containing internal Surefire temporary files. + * Relative path to temporary-surefire-boot directory containing internal Surefire temporary files. + * + * The temporary-surefire-boot directory is project.build.directory on most platforms or + * system default temporary-directory specified by the system property {@code java.io.tmpdir} + * on Windows (see