This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository surefire.
commit 7d3af1305c4608367c4af5db72f815ea71a9eb60 Merge: da458f0 d661ead Author: Emmanuel Bourg <[email protected]> Date: Thu Sep 14 12:42:19 2017 +0200 Updated version 2.20 from 'upstream/2.20' with Debian dir 0a26f8ab6e4927b20d254ef0c9182617fad4d517 Jenkinsfile | 38 ++ README.TXT | 11 - README.md | 43 +++ maven-failsafe-plugin/pom.xml | 89 +++-- .../maven/plugin/failsafe/IntegrationTestMojo.java | 136 +++++-- .../apache/maven/plugin/failsafe/VerifyMojo.java | 100 +++-- .../plugin/failsafe/xmlsummary/ErrorType.java | 1 + .../failsafe/xmlsummary/FailsafeSummary.java | 1 + .../xmlsummary/FailsafeSummaryXmlUtils.java | 1 + .../maven/plugin/failsafe/xmlsummary/JAXB.java | 1 + .../plugin/failsafe/xmlsummary/ObjectFactory.java | 1 + .../plugin/failsafe/IntegrationTestMojoTest.java | 1 + .../failsafe/MarshallerUnmarshallerTest.java | 1 + .../maven/plugin/failsafe/RunResultTest.java | 1 + .../maven/plugin/failsafe/failsafe-summary.xml | 1 + maven-surefire-common/pom.xml | 54 ++- .../plugin/surefire/AbstractSurefireMojo.java | 310 ++++++++++------ .../maven/plugin/surefire/CommonReflector.java | 40 +- .../plugin/surefire/InPluginVMSurefireStarter.java | 41 ++- .../surefire/StartupReportConfiguration.java | 79 ++-- .../surefire/SurefireDependencyResolver.java | 7 +- .../surefire/SurefireExecutionParameters.java | 4 + .../maven/plugin/surefire/SurefireHelper.java | 163 ++++++--- .../maven/plugin/surefire/SurefireProperties.java | 2 +- .../surefire/booterclient/BooterSerializer.java | 8 +- .../surefire/booterclient/ForkConfiguration.java | 71 ++-- .../plugin/surefire/booterclient/ForkStarter.java | 266 +++++++++----- .../surefire/booterclient/ProviderDetector.java | 101 +----- .../lazytestprovider/AbstractCommandStream.java | 8 +- .../lazytestprovider/AbstractForkInputStream.java | 2 +- .../lazytestprovider/NotifiableTestStream.java | 2 + .../lazytestprovider/TestLessInputStream.java | 63 +++- .../lazytestprovider/TestProvidingInputStream.java | 18 +- .../output/DeserializedStacktraceWriter.java | 8 +- .../surefire/booterclient/output/ForkClient.java | 402 ++++++++++++++------- .../output/InPluginProcessDumpSingleton.java | 91 +++++ .../output/MultipleFailureException.java | 72 ++++ .../output/NativeStdErrStreamConsumer.java} | 33 +- .../output/ThreadedStreamConsumer.java | 129 ++++--- .../plugin/surefire/log/PluginConsoleLogger.java | 126 +++++++ .../surefire/report/ConsoleOutputFileReporter.java | 5 +- .../plugin/surefire/report/ConsoleReporter.java | 79 ++-- .../surefire/report/DefaultReporterFactory.java | 261 +++++++++---- .../surefire/report/DirectConsoleOutput.java | 9 +- .../maven/plugin/surefire/report/FileReporter.java | 37 +- .../report/NullConsoleOutputReceiver.java} | 32 +- .../surefire/report/NullConsoleReporter.java | 36 +- .../plugin/surefire/report/NullFileReporter.java | 24 +- .../surefire/report/NullStatelessXmlReporter.java} | 31 +- .../NullStatisticsReporter.java} | 43 +-- .../surefire/report/StatelessXmlReporter.java | 47 +-- .../plugin/surefire/report/TestSetRunListener.java | 125 ++++--- .../maven/plugin/surefire/report/TestSetStats.java | 127 ++++++- .../plugin/surefire/report/WrappedReportEntry.java | 6 +- .../surefire/runorder/StatisticsReporter.java | 13 +- .../maven/plugin/surefire/util/ImmutableMap.java | 133 +++++++ .../maven/plugin/surefire/util/Relocator.java | 13 +- .../maven/plugin/surefire/util/ScannerUtil.java | 6 +- .../maven/surefire/report/RunStatistics.java | 4 - .../spi/ServiceLoader.java} | 85 +++-- .../maven/plugin/surefire/SurefireHelperTest.java | 65 ++++ .../plugin/surefire/SurefireReflectorTest.java | 1 + ...ooterDeserializerProviderConfigurationTest.java | 2 +- ...BooterDeserializerStartupConfigurationTest.java | 2 +- .../booterclient/ForkingRunListenerTest.java | 73 ++-- .../booterclient/MockNotifiableTestStream.java | 5 + .../plugin/surefire/booterclient/MockReporter.java | 28 +- .../booterclient/TestSetMockReporterFactory.java | 6 +- .../TestProvidingInputStreamTest.java | 1 + .../report/DefaultReporterFactoryTest.java | 94 +++-- .../surefire/report/StatelessXmlReporterTest.java | 30 +- .../surefire/report/WrappedReportEntryTest.java | 2 +- .../plugin/surefire/util/ImmutableMapTest.java | 86 +++++ .../org/apache/maven/surefire/JUnit4SuiteTest.java | 10 +- .../apache/maven/surefire/spi/CustomizedImpl.java | 17 +- .../org/apache/maven/surefire/spi/DefaultImpl.java | 17 +- .../maven/surefire/spi/EmptyServiceInterface.java | 15 +- .../surefire/spi/ExistingServiceInterface.java | 9 +- .../org/apache/maven/surefire/spi/IDefault.java | 12 +- .../maven/surefire/spi/NoServiceInterface.java | 9 +- .../org/apache/maven/surefire/spi/SPITest.java | 89 +++++ .../org/apache/maven/surefire/spi/SPImpl1.java | 34 +- .../org/apache/maven/surefire/spi/SPImpl2.java | 34 +- ...apache.maven.surefire.spi.EmptyServiceInterface | 21 ++ ...che.maven.surefire.spi.ExistingServiceInterface | 24 ++ .../org.apache.maven.surefire.spi.IDefault | 22 ++ maven-surefire-plugin/pom.xml | 30 +- .../maven/plugin/surefire/SurefirePlugin.java | 47 ++- .../src/site/apt/developing.apt.vm | 4 +- .../src/site/apt/examples/class-loading.apt.vm | 2 +- .../site/apt/examples/configuring-classpath.apt.vm | 1 + .../fork-options-and-parallel-execution.apt.vm | 165 ++++++--- .../site/apt/examples/inclusion-exclusion.apt.vm | 20 +- .../src/site/apt/examples/junit.apt.vm | 1 + .../src/site/apt/examples/shutdown.apt.vm | 12 +- ...{skipping-test.apt.vm => skipping-tests.apt.vm} | 73 +++- maven-surefire-plugin/src/site/apt/index.apt.vm | 16 +- maven-surefire-plugin/src/site/apt/usage.apt.vm | 3 +- maven-surefire-plugin/src/site/fml/faq.fml | 44 ++- .../src/site/markdown/multilineexceptions.md | 34 +- .../src/site/markdown/newerrorsummary.md | 4 +- .../src/site/resources/xsd/bindings.xml | 1 + .../src/site/resources/xsd/failsafe-summary.xsd | 1 + .../site/resources/xsd/surefire-test-report.xsd | 200 +++++----- maven-surefire-plugin/src/site/site.xml | 5 +- maven-surefire-report-plugin/pom.xml | 72 +++- .../report/AbstractSurefireReportMojo.java | 96 ++--- .../surefire/report/FailsafeReportMojo.java | 5 +- .../surefire/report/PluginConsoleLogger.java | 140 +++++++ .../surefire/report/SurefireReportGenerator.java | 23 +- .../surefire/report/SurefireReportOnlyMojo.java | 2 +- .../src/site/apt/index.apt | 4 +- maven-surefire-report-plugin/src/site/fml/faq.fml | 2 +- maven-surefire-report-plugin/src/site/site.xml | 2 +- .../plugins/surefire/report/Surefire597Test.java | 5 +- .../maven/plugins/surefire/report/Utils.java | 1 + pom.xml | 95 ++++- src/site/site.xml | 2 +- surefire-api/pom.xml | 8 +- .../src/main/appended-resources/META-INF/NOTICE | 3 - .../surefire/runorder/RunEntryStatisticsMap.java | 34 +- .../maven/surefire/booter/BaseProviderFactory.java | 29 +- .../org/apache/maven/surefire/booter/Command.java | 3 +- .../maven/surefire/booter/CommandReader.java | 62 +++- .../maven/surefire/booter/DumpErrorSingleton.java | 99 +++++ .../surefire/booter/ForkingReporterFactory.java | 7 +- .../maven/surefire/booter/ForkingRunListener.java | 121 ++++++- .../surefire/booter/MasterProcessCommand.java | 36 +- .../org/apache/maven/surefire/booter/Shutdown.java | 15 + .../maven/surefire/booter/SurefireReflector.java | 41 ++- .../surefire/providerapi/ProviderParameters.java | 9 +- .../surefire/report/CategorizedReportEntry.java | 17 +- .../surefire/report/ConsoleOutputCapture.java | 12 +- .../maven/surefire/report/ConsoleStream.java | 1 + .../report/DefaultDirectConsoleReporter.java | 11 +- .../report/LegacyPojoStackTraceWriter.java | 4 +- .../maven/surefire/report/SafeThrowable.java | 5 + .../maven/surefire/report/SimpleReportEntry.java | 12 +- .../org/apache/maven/surefire/suite/RunResult.java | 105 +----- .../testset/DirectoryScannerParameters.java | 11 +- .../maven/surefire/testset/ResolvedTest.java | 245 +++++++++---- .../maven/surefire/testset/RunOrderParameters.java | 4 +- .../maven/surefire/testset/TestListResolver.java | 35 +- .../surefire/util/DefaultDirectoryScanner.java | 1 + .../maven/surefire/util/DirectoryScanner.java | 1 + .../surefire/util/internal/DumpFileUtils.java | 125 +++++++ .../maven/surefire/util/internal/ObjectUtils.java | 1 + .../maven/surefire/util/internal/StringUtils.java | 75 ++-- .../util/internal/TestClassMethodNameUtils.java | 1 + .../surefire/util/{ => internal}/UrlUtils.java | 7 +- .../surefire/booter/MasterProcessCommandTest.java | 7 + .../apache/maven/surefire/report/MockReporter.java | 183 ---------- .../apache/maven/surefire/suite/RunResultTest.java | 83 +---- .../maven/surefire/testset/ResolvedTestTest.java | 20 +- .../surefire/testset/TestListResolverTest.java | 86 +++++ .../apache/maven/surefire/util/UrlUtilsTest.java | 31 +- surefire-booter/pom.xml | 4 +- .../maven/surefire/booter/BooterConstants.java | 1 + .../maven/surefire/booter/BooterDeserializer.java | 10 +- .../apache/maven/surefire/booter/Classpath.java | 22 +- .../surefire/booter/ClasspathConfiguration.java | 5 +- .../apache/maven/surefire/booter/ForkedBooter.java | 302 +++++++++++----- .../maven/surefire/booter/IsolatedClassLoader.java | 29 +- .../maven/surefire/booter/PropertiesWrapper.java | 1 - .../surefire/booter/ProviderConfiguration.java | 26 +- .../maven/surefire/booter/ProviderFactory.java | 5 +- .../booter/SurefireBooterForkException.java | 51 +++ .../surefire/booter/SystemPropertyManager.java | 1 - .../maven/surefire/booter/TypeEncodedValue.java | 38 +- surefire-grouper/pom.xml | 4 +- .../surefire/group/match/SingleGroupMatcher.java | 2 +- surefire-integration-tests/pom.xml | 68 ++-- ...ntageIT.java => AssumptionFailureReportIT.java} | 23 +- .../its/CheckTestNgBeforeMethodFailureIT.java | 8 +- .../surefire/its/CheckTestNgBeforeMethodIT.java | 6 +- .../surefire/its/CheckTestNgExecuteErrorIT.java | 30 +- .../its/CheckTestNgGroupThreadParallelIT.java | 6 +- .../its/CheckTestNgListenerReporterIT.java | 50 ++- .../surefire/its/CheckTestNgPathWithSpacesIT.java | 6 +- .../surefire/its/CheckTestNgReportTestIT.java | 12 +- .../maven/surefire/its/CheckTestNgSuiteXmlIT.java | 4 +- .../surefire/its/CheckTestNgSuiteXmlSingleIT.java | 7 +- .../maven/surefire/its/CheckTestNgVersionsIT.java | 55 ++- .../maven/surefire/its/CrashDetectionIT.java | 17 +- .../maven/surefire/its/ForkConsoleOutputIT.java | 36 +- .../its/ForkConsoleOutputWithErrorsIT.java | 18 +- .../org/apache/maven/surefire/its/ForkModeIT.java | 15 +- .../maven/surefire/its/ForkModeMultiModuleIT.java | 2 - ...oncurrencyIT.java => JUnit47ConcurrencyIT.java} | 10 +- ...IT.java => JUnit47StaticInnerClassTestsIT.java} | 10 +- ...hCucumberIT.java => JUnit47WithCucumberIT.java} | 8 +- .../{Junit4IgnoreIT.java => JUnit4IgnoreIT.java} | 2 +- .../surefire/its/JUnit4RerunFailingTestsIT.java | 50 +-- ...Junit4VersionsIT.java => JUnit4VersionsIT.java} | 93 ++--- .../maven/surefire/its/TestMethodPatternIT.java | 37 +- .../surefire/its/TestNgSuccessPercentageIT.java | 6 +- .../maven/surefire/its/TestSingleMethodIT.java | 35 +- .../apache/maven/surefire/its/TwoTestCasesIT.java | 22 +- .../maven/surefire/its/XmlReporterRunTimeIT.java | 6 +- .../surefire/its/fixture/HelperAssertions.java | 23 +- .../maven/surefire/its/fixture/MavenLauncher.java | 47 ++- .../surefire/its/fixture/MavenLauncherTest.java | 38 +- .../surefire/its/fixture/OutputValidator.java | 9 +- .../surefire/its/fixture/SurefireLauncher.java | 59 +-- ...t.java => Surefire1028UnableToRunSingleIT.java} | 6 +- .../jiras/Surefire1122ParallelAndFlakyTestsIT.java | 2 - ...urefire1135ImproveIgnoreMessageForTestNGIT.java | 153 +++++++- .../Surefire1136CwdPropagationInForkedModeIT.java | 3 - .../Surefire1146RerunFailedAndParameterized.java | 2 +- .../its/jiras/Surefire1158RemoveInfoLinesIT.java | 3 - .../jiras/Surefire1177TestngParallelSuitesIT.java | 7 +- .../surefire/its/{ => jiras}/Surefire1179IT.java | 2 +- .../its/jiras/Surefire1185DoNotSpawnTestsIT.java | 2 +- .../its/jiras/Surefire1211JUnitTestNgIT.java | 2 +- .../its/jiras/Surefire1260NewTestsPattern.java | 1 + .../Surefire1278GroupNameEndingIT.java} | 17 +- .../Surefire1295AttributeJvmCrashesToTestsIT.java | 120 ++++++ .../its/jiras/Surefire141PluggableProvidersIT.java | 113 +++++- .../Surefire376TestNgAfterSuiteFailureIT.java | 9 +- .../jiras/Surefire377TestNgAndJUnitTogetherIT.java | 12 +- ...fire735ForkFailWithRedirectConsoleOutputIT.java | 44 ++- .../Surefire747MethodParallelWithSuiteCountIT.java | 86 +++-- .../jiras/Surefire806SpecifiedTestControlsIT.java | 3 - .../jiras/Surefire839TestWithoutCategoriesIT.java | 9 +- .../Surefire907PerThreadWithoutThreadCountIT.java | 8 +- .../its/jiras/Surefire943ReportContentIT.java | 7 - ...Surefire946KillMainProcessInReusableForkIT.java | 2 +- .../pom.xml | 63 ++-- .../src/test/java/assumpationFailure/Test1.java} | 24 +- .../pom.xml | 34 +- .../test/java/junit44/environment/BasicTest.java | 50 +-- .../java/junit44/environment/SomeOtherTest.java} | 13 +- .../fail-fast-junit/src/test/java/pkg/ATest.java | 2 +- .../fail-fast-junit/src/test/java/pkg/BTest.java | 2 +- .../fail-fast-junit/src/test/java/pkg/CTest.java | 2 +- .../fail-fast-junit/src/test/java/pkg/DTest.java | 2 +- .../fail-fast-testng/src/test/java/pkg/ATest.java | 2 +- .../fail-fast-testng/src/test/java/pkg/BTest.java | 2 +- .../fail-fast-testng/src/test/java/pkg/CTest.java | 2 +- .../fail-fast-testng/src/test/java/pkg/DTest.java | 2 +- .../src/test/java/forkMode/Test1.java | 4 +- .../resources/junit4-rerun-failing-tests/pom.xml | 7 +- .../src/test/resources/junit4/pom.xml | 2 +- .../pom.xml | 22 +- .../src/test/java/junit47/BasicTest.java | 0 .../resources/junit47-parallel-with-suite/pom.xml | 5 +- .../src/test/java/surefire747/SuiteTest1.java | 8 +- .../src/test/java/surefire747/SuiteTest2.java | 8 +- .../src/test/java/runorder/parallel/Test1.java | 18 +- .../src/test/java/runorder/parallel/Test2.java | 18 +- .../src/test/java/runorder/parallel/Test3.java | 18 +- .../pom.xml | 13 +- .../pom.xml | 13 +- .../surefire-1122-parallel-and-flakyTests/pom.xml | 11 +- .../pom.xml | 83 ++++- .../surefire-1260-new-tests-pattern/pom.xml | 1 + .../src/test/java/pkg/JUnit3Tests.java | 16 +- .../src/test/java/pkg/JUnit4Tests.java} | 25 +- .../pom.xml | 30 +- .../src/test/java/pkg/ATest.java | 22 +- .../src/test/java/org/sample/module/My1Test.java | 4 +- .../src/test/java/org/sample/module/My2Test.java | 4 +- .../src/test/java/org/sample/module/My3Test.java | 4 +- .../surefire/selfdestruct/SelfDestructMojo.java | 2 +- .../resources/test-helper-dump-pid-plugin/pom.xml | 2 +- .../resources/testng-afterSuiteFailure/pom.xml | 5 - .../src/test/resources/testng-beforeMethod/pom.xml | 5 - .../resources/testng-beforeMethodFailure/pom.xml | 5 - .../test/resources/testng-execute-error/pom.xml | 5 - .../resources/testng-group-thread-parallel/pom.xml | 5 - .../test/resources/testng-junit-together/pom.xml | 5 - .../resources/testng-listener-reporter/pom.xml | 5 - .../resources/testng-method-pattern-after/pom.xml | 6 - .../resources/testng-method-pattern-before/pom.xml | 6 - .../test/resources/testng-method-pattern/pom.xml | 6 - .../test/resources/testng-path with spaces/pom.xml | 5 - .../src/test/resources/testng-simple/pom.xml | 1 - .../test/resources/testng-single-method/pom.xml | 6 - .../resources/testng-succes-percentage/pom.xml | 5 - .../src/test/resources/testng-suite-xml/pom.xml | 5 - .../test/resources/testng-twoTestCaseSuite/pom.xml | 5 - .../common-junit3 => surefire-logger-api}/pom.xml | 47 ++- .../plugin/surefire/log/api}/ConsoleLogger.java | 33 +- .../surefire/log/api/ConsoleLoggerDecorator.java | 1 + .../surefire/log/api/ConsoleLoggerUtils.java | 44 ++- .../maven/plugin/surefire/log/api/Level.java | 48 ++- .../plugin/surefire/log/api/NullConsoleLogger.java | 30 +- .../plugin/surefire/log/api/PrintStreamLogger.java | 1 + surefire-providers/common-java5/pom.xml | 2 +- .../surefire/report/PojoStackTraceWriter.java | 6 +- surefire-providers/common-junit3/pom.xml | 2 +- surefire-providers/common-junit4/pom.xml | 2 +- .../surefire/common/junit4/JUnit4RunListener.java | 49 +-- .../common/junit4/JUnit4StackTraceWriter.java | 14 +- .../common/junit4/JUnitTestFailureListener.java | 5 +- .../maven/surefire/common/junit4/Notifier.java | 9 +- surefire-providers/common-junit48/pom.xml | 8 +- .../common/junit48/GroupMatcherCategoryFilter.java | 17 +- .../common/junit48/JUnit46StackTraceWriter.java | 9 +- .../surefire/common/junit48/RequestedTest.java | 2 +- .../surefire/common/junit48/FilterFactoryTest.java | 2 +- surefire-providers/pom.xml | 6 +- surefire-providers/surefire-junit3/pom.xml | 2 +- .../maven/surefire/junit/JUnit3Provider.java | 1 - .../apache/maven/surefire/junit/PojoTestSet.java | 11 +- surefire-providers/surefire-junit4/pom.xml | 2 +- .../maven/surefire/junit4/JUnit4Provider.java | 8 +- .../maven/surefire/junit4/JUnit4ProviderTest.java | 4 +- surefire-providers/surefire-junit47/pom.xml | 2 +- .../junitcore/ClassesParallelRunListener.java | 7 +- .../surefire/junitcore/ConcurrentRunListener.java | 54 ++- .../surefire/junitcore/JUnitCoreProvider.java | 28 +- .../surefire/junitcore/JUnitCoreRunListener.java | 18 +- .../maven/surefire/junitcore/JUnitCoreWrapper.java | 10 +- .../junitcore/MethodsParallelRunListener.java | 7 +- .../junitcore/NonConcurrentRunListener.java | 26 +- .../junitcore/pc/AbstractThreadPoolStrategy.java | 6 +- .../surefire/junitcore/pc/InvokerStrategy.java | 4 +- .../junitcore/pc/NonSharedThreadPoolStrategy.java | 4 +- .../junitcore/pc/ParallelComputerBuilder.java | 87 +++-- .../maven/surefire/junitcore/pc/Scheduler.java | 34 +- .../junitcore/pc/SchedulingStrategies.java | 10 +- .../surefire/junitcore/pc/SchedulingStrategy.java | 9 +- .../junitcore/pc/SharedThreadPoolStrategy.java | 4 +- .../junitcore/pc/SingleThreadScheduler.java | 6 +- .../junitcore/ConcurrentRunListenerTest.java | 9 +- .../junitcore}/DefaultConsoleReporter.java | 29 +- .../maven/surefire/junitcore/JUnitCoreTester.java | 14 +- .../junitcore/MavenSurefireJUnit47RunnerTest.java | 2 +- .../junitcore/MavenSurefireJUnit48RunnerTest.java | 2 +- .../maven/surefire/junitcore/Surefire746Test.java | 11 +- .../junitcore/pc/ParallelComputerBuilderTest.java | 200 +++++----- .../junitcore/pc/ParallelComputerUtilTest.java | 18 +- .../junitcore/pc/SchedulingStrategiesTest.java | 20 +- surefire-providers/surefire-testng-utils/pom.xml | 2 +- surefire-providers/surefire-testng/pom.xml | 2 +- .../maven/surefire/testng/TestNGExecutor.java | 6 +- .../maven/surefire/testng/TestNGProvider.java | 11 +- .../maven/surefire/testng/TestNGXmlTestSuite.java | 7 +- .../testng/conf/AbstractDirectConfigurator.java | 2 +- .../testng/conf/TestNG513Configurator.java | 2 +- .../testng/conf/TestNGMapConfigurator.java | 37 +- surefire-report-parser/pom.xml | 6 +- .../surefire/report/SurefireReportParser.java | 15 +- .../surefire/report/TestSuiteXmlParser.java | 17 +- .../surefire/report/SurefireReportParserTest.java | 7 +- .../surefire/report/TestSuiteXmlParserTest.java | 69 +++- surefire-setup-integration-tests/pom.xml | 5 +- .../maven/surefire/its/StagedLocalRepoHelper.java | 2 + surefire-shadefire/pom.xml | 10 +- 350 files changed, 7095 insertions(+), 3655 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/surefire.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
