This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository surefire.
commit c461fe0c73f20a0cd5227a959769955158df6c4d Merge: 253f417 7238a39 Author: Emmanuel Bourg <[email protected]> Date: Thu Jul 20 10:04:31 2017 +0200 Updated version 2.18 from 'upstream/2.18' with Debian dir 65d9868bcb7c302acf16c84a5ed76122800fa043 .../src/site/fml/faq.fml => CONTRIBUTING.md | 25 +- README.TXT | 28 +- deploySite.sh | 3 +- maven-failsafe-plugin/pom.xml | 25 +- .../src/it/jetty-war-test-failing/pom.xml | 18 +- .../src/it/jetty-war-test-passing/pom.xml | 18 +- .../maven/plugin/failsafe/IntegrationTestMojo.java | 38 ++- .../apache/maven/plugin/failsafe/VerifyMojo.java | 4 +- maven-surefire-common/pom.xml | 10 +- .../plugin/surefire/AbstractSurefireMojo.java | 329 +++++++++++-------- .../maven/plugin/surefire/ClasspathCache.java | 7 +- .../maven/plugin/surefire/CommonReflector.java | 5 +- .../apache/maven/plugin/surefire/ProviderList.java | 2 + .../surefire/StartupReportConfiguration.java | 22 +- .../maven/plugin/surefire/SurefireProperties.java | 26 +- .../surefire/booterclient/BooterSerializer.java | 7 +- .../surefire/booterclient/ChecksumCalculator.java | 3 +- .../surefire/booterclient/ForkConfiguration.java | 32 +- .../surefire/booterclient/ForkNumberBucket.java | 29 +- .../plugin/surefire/booterclient/ForkStarter.java | 44 ++- .../OutputStreamFlushableCommandline.java | 3 - .../lazytestprovider/TestProvidingInputStream.java | 6 +- .../surefire/booterclient/output/ForkClient.java | 5 + .../output/ThreadedStreamConsumer.java | 11 +- .../surefire/report/ConsoleOutputFileReporter.java | 4 +- .../plugin/surefire/report/ConsoleReporter.java | 3 - .../surefire/report/DefaultReporterFactory.java | 295 +++++++++++++++-- .../maven/plugin/surefire/report/FileReporter.java | 5 +- .../plugin/surefire/report/FileReporterUtils.java | 4 +- .../surefire/report/PrettyPrintXMLWriter.java | 4 + .../plugin/surefire/report/ReportEntryType.java | 40 ++- .../surefire/report/StatelessXmlReporter.java | 283 +++++++++++++++-- ...FileReporterUtils.java => TestMethodStats.java} | 48 +-- .../plugin/surefire/report/TestSetRunListener.java | 50 +-- .../maven/plugin/surefire/report/TestSetStats.java | 35 +- .../Utf8RecodingDeferredFileOutputStream.java | 23 +- .../plugin/surefire/report/WrappedReportEntry.java | 14 +- .../plugin/surefire/util/DependencyScanner.java | 15 +- .../plugin/surefire/util/DirectoryScanner.java | 5 +- .../maven/plugin/surefire/util/Relocator.java | 7 +- .../maven/plugin/surefire/util/ScannerUtil.java | 16 +- .../plugin/surefire/util/SpecificFileFilter.java | 4 + .../surefire/report/SurefireReportParser.java | 3 +- .../surefire/report/TestSuiteXmlParser.java | 4 +- .../maven/surefire/report/RunStatistics.java | 95 ++---- ...ooterDeserializerProviderConfigurationTest.java | 5 +- .../report/DefaultReporterFactoryTest.java | 232 ++++++++++++++ .../surefire/report/StatelessXMLReporterTest.java | 172 ---------- .../surefire/report/StatelessXmlReporterTest.java | 290 +++++++++++++++++ .../maven/surefire/report/FileReporterTest.java | 4 +- .../maven/surefire/report/RunStatisticsTest.java | 87 +---- maven-surefire-plugin/pom.xml | 25 +- .../maven/plugin/surefire/SurefirePlugin.java | 42 ++- maven-surefire-plugin/src/site/apt/api.apt.vm | 32 +- .../src/site/apt/developing.apt.vm | 111 ++++--- .../src/site/apt/examples/class-loading.apt.vm | 86 ++--- .../site/apt/examples/configuring-classpath.apt.vm | 8 +- .../src/site/apt/examples/debugging.apt.vm | 6 +- .../fork-options-and-parallel-execution.apt.vm | 54 +++- .../site/apt/examples/inclusion-exclusion.apt.vm | 22 +- .../src/site/apt/examples/junit.apt.vm | 61 ++-- .../src/site/apt/examples/pojo-test.apt.vm | 15 +- .../src/site/apt/examples/providers.apt.vm | 12 +- .../site/apt/examples/rerun-failing-tests.apt.vm | 136 ++++++++ .../src/site/apt/examples/single-test.apt.vm | 12 +- .../src/site/apt/examples/skipping-test.apt.vm | 12 +- .../src/site/apt/examples/system-properties.apt.vm | 20 +- .../src/site/apt/examples/testng.apt.vm | 14 +- .../src/site/apt/featurematrix.apt.vm | 14 +- maven-surefire-plugin/src/site/apt/index.apt.vm | 26 +- maven-surefire-plugin/src/site/apt/usage.apt.vm | 47 ++- maven-surefire-plugin/src/site/fml/faq.fml | 24 +- .../src/site/markdown/newerrorsummary.md | 30 +- maven-surefire-plugin/src/site/site.xml | 19 +- maven-surefire-report-plugin/pom.xml | 22 +- .../report/AbstractSurefireReportMojo.java | 63 +--- .../surefire/report/FailsafeReportMojo.java | 9 +- .../surefire/report/SurefireReportGenerator.java | 294 +++++++++-------- .../surefire/report/SurefireReportMojo.java | 12 +- .../surefire/report/SurefireReportOnlyMojo.java | 4 +- .../site/apt/examples/changing-report-name.apt.vm | 14 +- .../src/site/apt/examples/cross-referencing.apt.vm | 20 +- .../apt/examples/report-custom-location.apt.vm | 12 +- .../src/site/apt/examples/show-failures.apt.vm | 10 +- .../src/site/apt/index.apt | 20 +- .../src/site/apt/usage.apt.vm | 10 +- maven-surefire-report-plugin/src/site/fml/faq.fml | 7 +- maven-surefire-report-plugin/src/site/site.xml | 8 +- .../surefire/report/SurefireReportMojoTest.java | 14 +- pom.xml | 123 ++++--- deploySite.sh => src/site/resources/download.cgi | 8 +- src/site/site.xml | 7 + src/site/xdoc/download.xml.vm | 126 ++++++++ surefire-api/pom.xml | 2 +- .../surefire/runorder/RunEntryStatistics.java | 1 + .../runorder/ThreadedExecutionScheduler.java | 1 + .../maven/surefire/SpecificTestClassFilter.java | 5 + .../maven/surefire/booter/BaseProviderFactory.java | 4 +- .../maven/surefire/booter/ForkingRunListener.java | 14 +- .../surefire/booter/ProviderParameterNames.java | 1 + .../maven/surefire/booter/SurefireReflector.java | 7 +- .../surefire/providerapi/SurefireProvider.java | 2 +- .../maven/surefire/report/ConsoleLogger.java | 2 +- .../surefire/report/ConsoleOutputCapture.java | 4 +- .../ConsoleOutputReceiverForCurrentThread.java | 9 +- .../report/DefaultDirectConsoleReporter.java | 1 + .../report/LegacyPojoStackTraceWriter.java | 6 +- .../apache/maven/surefire/report/ReportEntry.java | 18 +- .../maven/surefire/report/SafeThrowable.java | 1 + .../org/apache/maven/surefire/suite/RunResult.java | 22 +- .../maven/surefire/testset/RunOrderParameters.java | 2 +- .../apache/maven/surefire/testset/TestRequest.java | 19 ++ .../surefire/util/DefaultRunOrderCalculator.java | 4 +- .../maven/surefire/util/DefaultScanResult.java | 10 +- .../maven/surefire/util/ReflectionUtils.java | 1 + .../maven/surefire/util/RunOrderCalculator.java | 34 +- .../surefire/util/SurefireReflectionException.java | 2 +- .../org/apache/maven/surefire/util/TestsToRun.java | 18 ++ .../maven/surefire/util/internal/ByteBuffer.java | 8 +- .../maven/surefire/util/internal/StringUtils.java | 5 +- surefire-api/src/site/apt/index.apt | 10 +- .../report/LegacyPojoStackTraceWriterTest.java | 19 ++ .../apache/maven/surefire/suite/RunResultTest.java | 5 +- .../surefire/util/RunOrderCalculatorTest.java | 2 +- .../apache/maven/surefire/util/TestsToRunTest.java | 8 + surefire-booter/pom.xml | 2 +- .../maven/surefire/booter/BooterConstants.java | 47 +-- .../maven/surefire/booter/BooterDeserializer.java | 9 +- .../apache/maven/surefire/booter/Classpath.java | 18 +- .../surefire/booter/ClasspathConfiguration.java | 5 +- .../apache/maven/surefire/booter/ForkedBooter.java | 9 +- .../maven/surefire/booter/IsolatedClassLoader.java | 4 +- .../maven/surefire/booter/KeyValueSource.java | 1 + .../maven/surefire/booter/LazyTestsToRun.java | 3 +- .../maven/surefire/booter/PropertiesWrapper.java | 18 +- .../surefire/booter/ProviderConfiguration.java | 1 + .../maven/surefire/booter/ProviderFactory.java | 9 +- .../surefire/booter/StartupConfiguration.java | 2 +- .../maven/surefire/booter/TypeEncodedValue.java | 34 +- .../surefire/booter/PropertiesWrapperTest.java | 4 +- .../surefire/booter/SurefireReflectorTest.java | 3 +- surefire-grouper/pom.xml | 4 +- .../surefire/group/match/AndGroupMatcher.java | 5 + .../maven/surefire/group/match/GroupMatcher.java | 5 + .../surefire/group/match/InverseGroupMatcher.java | 5 + .../surefire/group/match/JoinGroupMatcher.java | 5 + .../maven/surefire/group/match/OrGroupMatcher.java | 5 + .../surefire/group/match/SingleGroupMatcher.java | 5 + surefire-integration-tests/pom.xml | 2 +- ...ForkModeIT.java => EnvironmentVariablesIT.java} | 10 +- .../surefire/its/CheckTestNgListenersIT.java} | 22 +- .../maven/surefire/its/CheckTestNgSuiteXmlIT.java | 12 +- .../maven/surefire/its/ForkModeMultiModuleIT.java | 2 +- .../maven/surefire/its/JUnit47ParallelIT.java | 13 +- .../surefire/its/JUnit4RerunFailingTestsIT.java | 278 ++++++++++++++++ .../its/Junit47StaticInnerClassTestsIT.java | 19 ++ ...teXmlIT.java => TestNgSuccessPercentageIT.java} | 31 +- .../surefire/its/fixture/HelperAssertions.java | 35 +- .../its/fixture/IntegrationTestSuiteResults.java | 18 +- .../surefire/its/fixture/OutputValidator.java | 26 +- .../surefire/its/fixture/SurefireLauncher.java | 6 + .../surefire/its/fixture/SurefireLauncherTest.java | 19 ++ ...java => Surefire1028UnableToRunSingleTest.java} | 35 +- .../its/jiras/Surefire1053SystemPropertiesIT.java | 72 +++++ ...a => Surefire1080ParallelForkDoubleTestIT.java} | 32 +- .../Surefire1082ParallelJUnitParameterizedIT.java | 135 ++++++++ .../its/jiras/Surefire1095NpeInRunListener.java | 93 ++++++ .../its/jiras/Surefire1098BalancedRunOrderIT.java | 119 +++++++ .../jiras/Surefire260TestWithIdenticalNamesIT.java | 4 +- .../Surefire569RunTestFromDependencyJarsIT.java | 19 ++ .../Surefire649EmptyStringSystemPropertiesIT.java | 84 +++++ .../Surefire747MethodParallelWithSuiteCountIT.java | 67 +++- ...teCountIT.java => Surefire817SystemExitIT.java} | 25 +- .../its/jiras/Surefire943ReportContentIT.java | 46 ++- .../src/test/resources/SurefireToolchains/pom.xml | 2 +- .../src/test/java/consoleoutput_noisy/Test1.java | 55 +++- .../test/resources/environment-variables/pom.xml | 2 + .../src/test/java/environment/BasicTest.java | 5 + .../pom.xml | 33 +- .../src/test/java/junit4/FlakyFirstTimeTest.java} | 45 +-- .../src/test/java/junit4/PassingTest.java} | 25 +- .../src/test/java/surefire747/SuiteTest1.java | 23 +- .../src/test/java/surefire747/SuiteTest2.java | 23 +- .../src/test/java/surefire747/TestSuite.java | 16 + .../src/test/resources/junit47-parallel/pom.xml | 45 ++- .../src/test/java/surefireparallel/TestClass.java | 2 +- .../pom.xml | 53 ++-- .../src/test/java/jiras/surefire1028/SomeTest.java | 20 +- .../pom.xml | 56 ++-- .../src/test/java/jiras/surefire1053/ATest.java} | 24 +- .../pom.xml | 60 ++-- .../test/java/com/cal/HelloWorldFlakyCotTest.java | 21 +- .../java/com/cal/HelloWorldFlakyErrorTest.java | 21 +- .../src/test/java/com/cal/HelloWorldTest.java | 24 +- .../src/test/java/com/cal/SimpleTest.java} | 32 +- .../pom.xml | 52 ++- .../java/jiras/surefire1082/Jira1082Test.java} | 40 ++- .../pom.xml | 61 ++-- .../test/java/jiras/surefire1095/Listener.java} | 39 +-- .../src/test/java/jiras/surefire1095/SomeTest.java | 16 +- .../pom.xml | 53 ++-- .../src/test/java/jiras/surefire1098/ATest.java} | 26 +- .../src/test/java/jiras/surefire1098/BTest.java} | 26 +- .../src/test/java/jiras/surefire1098/CTest.java} | 26 +- .../src/test/java/jiras/surefire1098/DTest.java} | 26 +- .../pom.xml | 58 ++-- .../jiras/surefire649/SystemPropertiesTest.java} | 24 +- .../pom.xml | 55 ++-- .../surefire649/SystemPropertyVariablesTest.java} | 24 +- .../pom.xml | 60 ++-- .../src/test/java/jiras/surefire817/Test.java | 16 +- .../src/test/java/org/sample/module/My1Test.java | 3 - .../src/test/java/org/sample/module/My2Test.java | 3 - .../src/test/java/org/sample/module/My3Test.java | 3 - .../src/test/java/org/sample/module/My4Test.java | 5 - .../sample/module/{My4Test.java => My5Test.java} | 23 +- .../src/test/resources/system-properties/pom.xml | 2 +- .../src/test/java/systemProperties/BasicTest.java | 4 +- .../resources/test-helper-dump-pid-plugin/pom.xml | 2 +- .../src/test/resources/testng-listeners}/pom.xml | 46 +-- .../test/java/listeners/MarkAsFailureListener.java | 83 +++++ .../src/test/java/listeners/SimpleTest.java} | 23 +- .../pom.xml | 47 +-- .../testng/TestNGSuccessPercentFailingTest.java | 33 +- .../testng/TestNGSuccessPercentPassingTest.java | 34 +- .../src/test/resources/testng-suite-xml/pom.xml | 3 +- .../src/test-data/{testng.xml => testng1.xml} | 0 .../src/test-data/{testng.xml => testng2.xml} | 2 +- surefire-providers/common-java5/pom.xml | 2 +- .../surefire/report/PojoStackTraceWriter.java | 15 + .../surefire/report/SmartStackTraceParser.java | 9 +- surefire-providers/common-junit3/pom.xml | 2 +- .../surefire/common/junit3/JUnit3Reflector.java | 4 + surefire-providers/common-junit4/pom.xml | 2 +- .../surefire/common/junit4/JUnit4ProviderUtil.java | 118 +++++++ .../surefire/common/junit4/JUnit4Reflector.java | 36 ++- .../surefire/common/junit4/JUnit4RunListener.java | 11 +- .../common/junit4/JUnitTestFailureListener.java | 35 +- .../common/junit4/JUnit4ProviderUtilTest.java | 85 +++++ surefire-providers/common-junit48/pom.xml | 2 +- .../surefire/common/junit48/FilterFactory.java | 58 +++- .../surefire/common/junit48/JUnit48Reflector.java | 5 +- .../common/junit48/JUnit48TestChecker.java | 8 +- surefire-providers/pom.xml | 2 +- surefire-providers/surefire-junit3/pom.xml | 2 +- .../maven/surefire/junit/JUnit3Provider.java | 5 +- .../apache/maven/surefire/junit/JUnitTestSet.java | 4 + .../apache/maven/surefire/junit/PojoTestSet.java | 4 + .../maven/surefire/junit/SurefireTestSet.java | 4 + .../junit/TestListenerInvocationHandler.java | 4 + surefire-providers/surefire-junit4/pom.xml | 2 +- .../maven/surefire/junit4/JUnit4Provider.java | 156 +++++---- .../maven/surefire/junit4/JUnit4Provider.java.orig | 297 ----------------- .../maven/surefire/junit4/JUnit4ProviderTest.java | 18 +- surefire-providers/surefire-junit47/pom.xml | 8 +- .../surefire/junitcore/AsynchronousRunner.java | 4 + .../junitcore/ConfigurableParallelComputer.java | 11 +- .../surefire/junitcore/JUnitCoreProvider.java | 51 ++- .../maven/surefire/junitcore/JUnitCoreWrapper.java | 33 +- .../junitcore/NonConcurrentRunListener.java | 16 +- .../surefire/junitcore/SynchronousRunner.java | 5 + .../apache/maven/surefire/junitcore/TestSet.java | 6 +- .../junitcore/pc/AbstractThreadPoolStrategy.java | 34 +- .../maven/surefire/junitcore/pc/Balancer.java | 6 +- .../maven/surefire/junitcore/pc/Destroyable.java | 40 +-- .../surefire/junitcore/pc/ExecutionStatus.java | 23 +- .../surefire/junitcore/pc/InvokerStrategy.java | 38 ++- .../junitcore/pc/NonSharedThreadPoolStrategy.java | 13 +- .../surefire/junitcore/pc/ParallelComputer.java | 228 ++++++++----- .../junitcore/pc/ParallelComputerBuilder.java | 169 +++++++--- .../junitcore/pc/ParallelComputerUtil.java | 53 +++- .../maven/surefire/junitcore/pc/Scheduler.java | 143 ++++++--- .../surefire/junitcore/pc/SchedulingStrategy.java | 29 +- .../junitcore/pc/SharedThreadPoolStrategy.java | 21 +- .../surefire/junitcore/pc/ShutdownResult.java | 57 ++++ .../surefire/junitcore/pc/ShutdownStatus.java | 64 ++++ .../junitcore/pc/SingleThreadScheduler.java | 88 +++++ .../junitcore/pc/ThreadResourcesBalancer.java | 6 + .../surefire/junitcore/pc/WrappedRunners.java | 7 +- .../junitcore/ConcurrentRunListenerTest.java | 5 +- .../junitcore/pc/ParallelComputerBuilderTest.java | 353 ++++++++++++++++++++- .../junitcore/pc/ParallelComputerUtilTest.java | 82 ++++- surefire-providers/surefire-testng-utils/pom.xml | 2 +- .../testng/utils/GroupMatcherMethodSelector.java | 5 + .../surefire/testng/utils/MethodSelector.java | 8 +- surefire-providers/surefire-testng/pom.xml | 7 +- .../surefire/testng/TestNGDirectoryTestSuite.java | 17 +- .../maven/surefire/testng/TestNGExecutor.java | 2 + .../maven/surefire/testng/TestNGProvider.java | 7 +- .../maven/surefire/testng/TestNGReporter.java | 3 +- .../maven/surefire/testng/TestNGXmlTestSuite.java | 10 +- .../maven/surefire/testng/TestNgTestSuite.java | 3 +- .../testng/conf/AbstractDirectConfigurator.java | 8 + .../maven/surefire/testng/conf/Configurator.java | 4 + .../testng/conf/TestNGMapConfigurator.java | 3 +- surefire-report-parser/pom.xml | 6 +- .../plugins/surefire/report/ReportTestSuite.java | 12 + .../surefire/report/SurefireReportParser.java | 3 +- .../surefire/report/TestSuiteXmlParser.java | 10 +- surefire-setup-integration-tests/pom.xml | 6 +- surefire-shadefire/pom.xml | 4 +- 301 files changed, 6765 insertions(+), 3075 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
