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 2018/11/02 04:11:51 UTC
[maven-surefire] branch master updated (4d43de1 -> fecadb8)
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git.
from 4d43de1 build fix
add 1d706bc [SUREFIRE-1493] Maven Plugin API 3.0
add d23e970 [SUREFIRE-1474] Java 1.7 as minimum
add fecadb8 [SUREFIRE-1212] @Component is deprecated. @Parameter should be used instead.
No new revisions were added by this update.
Summary of changes:
Jenkinsfile | 10 +-
README.md | 2 +-
maven-failsafe-plugin/pom.xml | 621 ++++++++++-----------
.../src/it/multiple-summaries-failing/pom.xml | 4 +-
.../src/it/multiple-summaries/pom.xml | 4 +-
.../src/it/working-directory/pom.xml | 4 +-
.../maven/plugin/failsafe/IntegrationTestMojo.java | 9 -
.../apache/maven/plugin/failsafe/VerifyMojo.java | 2 +-
.../failsafe/util/FailsafeSummaryXmlUtils.java | 23 +-
maven-surefire-common/pom.xml | 368 ++++++------
.../plugin/surefire/AbstractSurefireMojo.java | 331 +++--------
.../maven/plugin/surefire/JdkAttributes.java | 2 +-
.../apache/maven/plugin/surefire/ProviderInfo.java | 4 +-
.../surefire/SurefireDependencyResolver.java | 154 +++--
.../maven/plugin/surefire/SurefireHelper.java | 44 +-
.../maven/plugin/surefire/SurefireProperties.java | 24 +-
.../surefire/booterclient/ChecksumCalculator.java | 4 +-
.../plugin/surefire/booterclient/ForkStarter.java | 20 +-
.../booterclient/JarManifestForkConfiguration.java | 7 +-
.../ModularClasspathForkConfiguration.java | 20 +-
.../lazytestprovider/AbstractForkInputStream.java | 2 +-
.../plugin/surefire/log/PluginConsoleLogger.java | 43 +-
.../surefire/report/ConsoleOutputFileReporter.java | 2 +-
.../surefire/report/DefaultReporterFactory.java | 15 +-
.../surefire/report/DirectConsoleOutput.java | 2 +-
.../maven/plugin/surefire/report/FileReporter.java | 12 +-
.../surefire/report/StatelessXmlReporter.java | 38 +-
.../plugin/surefire/report/TestSetRunListener.java | 2 +-
.../Utf8RecodingDeferredFileOutputStream.java | 2 +-
.../plugin/surefire/util/DependencyScanner.java | 17 +-
.../maven/surefire/providerapi/ServiceLoader.java | 30 +-
.../AbstractSurefireMojoJava7PlusTest.java | 52 +-
.../plugin/surefire/AbstractSurefireMojoTest.java | 11 +-
.../maven/plugin/surefire/MojoMocklessTest.java | 43 +-
.../surefire/SurefireDependencyResolverTest.java | 412 ++++++++++++++
.../TestProvidingInputStreamTest.java | 10 +-
.../surefire/report/StatelessXmlReporterTest.java | 3 +-
.../surefire/util/DependenciesScannerTest.java | 17 +-
.../report/ConsoleOutputFileReporterTest.java | 4 +-
maven-surefire-plugin/pom.xml | 273 ++++-----
.../maven/plugin/surefire/SurefirePlugin.java | 9 -
maven-surefire-plugin/src/site/apt/index.apt.vm | 2 +-
maven-surefire-report-plugin/pom.xml | 414 +++++++-------
.../surefire/report/PluginConsoleLogger.java | 43 +-
.../surefire/report/SurefireReportGenerator.java | 2 +-
.../surefire/report/SurefireReportMojoTest.java | 5 +-
pom.xml | 254 +++------
surefire-api/pom.xml | 4 +-
.../surefire/runorder/RunEntryStatisticsMap.java | 28 +-
.../org/apache/maven/surefire/booter/Command.java | 2 +-
.../maven/surefire/booter/CommandReader.java | 11 +-
.../surefire/booter/MasterProcessCommand.java | 6 +-
.../report/LegacyPojoStackTraceWriter.java | 8 +-
.../org/apache/maven/surefire/suite/RunResult.java | 8 +-
.../maven/surefire/util/ReflectionUtils.java | 39 +-
.../surefire/util/internal/DumpFileUtils.java | 32 +-
.../maven/surefire/util/internal/ObjectUtils.java | 42 +-
.../maven/surefire/util/internal/StringUtils.java | 13 +-
.../maven/surefire/util/internal/UrlUtils.java | 79 ---
.../java/org/apache/maven/JUnit4SuiteTest.java | 2 -
.../apache/maven/surefire/util/UrlUtilsTest.java | 102 ----
surefire-booter/pom.xml | 16 +-
.../apache/maven/surefire/booter/Classpath.java | 28 +-
.../apache/maven/surefire/booter/PpidChecker.java | 2 +-
.../maven/surefire/booter/ProviderFactory.java | 4 +-
.../surefire/booter/SystemPropertyManager.java | 37 +-
.../apache/maven/surefire/booter/SystemUtils.java | 34 +-
.../maven/surefire/booter/TypeEncodedValue.java | 2 +-
.../maven/surefire/booter/ClasspathTest.java | 16 -
.../maven/surefire/booter/CommandReaderTest.java | 17 +-
.../surefire/booter/SurefireReflectorTest.java | 12 +-
surefire-grouper/pom.xml | 2 +-
surefire-its/pom.xml | 434 +++++++-------
.../maven/surefire/its/AbstractJigsawIT.java | 7 +-
.../its/JUnit47RerunFailingTestWithCucumberIT.java | 9 -
.../maven/surefire/its/JUnit47WithCucumberIT.java | 9 -
.../maven/surefire/its/JUnitPlatformEnginesIT.java | 7 +-
.../maven/surefire/its/WorkingDirectoryIT.java | 7 +-
.../maven/surefire/its/fixture/TestFile.java | 8 +-
.../jiras/Surefire1177TestngParallelSuitesIT.java | 5 -
.../its/jiras/Surefire1211JUnitTestNgIT.java | 6 -
.../jiras/Surefire260TestWithIdenticalNamesIT.java | 7 +-
.../src/test/resources/SurefireToolchains/pom.xml | 2 +-
.../test/resources/environment-variables/pom.xml | 4 +-
.../src/test/resources/failingBuilds/pom.xml | 4 +-
.../src/test/resources/failsafe-notests/pom.xml | 4 +-
.../test/resources/failure-result-counting/pom.xml | 4 +-
.../src/test/resources/failureOutput/pom.xml | 4 +-
.../src/test/resources/fork-consoleOutput/pom.xml | 4 +-
.../resources/fork-consoleOutputWithErrors/pom.xml | 4 +-
surefire-its/src/test/resources/fork-fail/pom.xml | 4 +-
.../fork-fail/src/test/java/forkMode/Test1.java | 15 +-
.../module-a/src/test/java/forkMode/Test1.java | 22 +-
.../module-b/src/test/java/forkMode/Test1.java | 22 +-
.../test/resources/fork-mode-multimodule/pom.xml | 4 +-
.../resources/fork-mode-resource-loading/pom.xml | 4 +-
.../src/test/resources/fork-mode-testng/pom.xml | 4 +-
.../src/test/java/forkMode/Test1.java | 19 +-
surefire-its/src/test/resources/fork-mode/pom.xml | 4 +-
.../fork-mode/src/test/java/forkMode/Test1.java | 23 +-
.../src/test/resources/fork-timeout/pom.xml | 4 +-
.../resources/includes-excludes-from-file/pom.xml | 4 +-
.../src/test/java/org/test/DefaultTest.java | 8 +-
.../test/java/org/test/NotIncludedByDefault.java | 8 +-
.../src/test/resources/includes-excludes/pom.xml | 4 +-
.../src/test/java/org/test/DefaultTest.java | 8 +-
.../test/java/org/test/NotIncludedByDefault.java | 8 +-
.../test/resources/isolated-classloader/pom.xml | 4 +-
.../test/resources/junit-fork-mode-always/pom.xml | 4 +-
.../src/test/java/junit4/forkMode/Test1.java | 18 +-
.../src/test/resources/junit-ignore/pom.xml | 4 +-
.../src/test/resources/junit-innerClass/pom.xml | 4 +-
.../resources/junit-notExtendingTestCase/pom.xml | 4 +-
.../test/resources/junit-pathWithUmlaut/pom.xml | 4 +-
.../test/resources/junit-twoTestCaseSuite/pom.xml | 4 +-
.../src/test/resources/junit-twoTestCases/pom.xml | 4 +-
.../resources/junit4-forkAlways-staticInit/pom.xml | 4 +-
.../resources/junit4-rerun-failing-tests/pom.xml | 4 +-
.../src/test/resources/junit4-runlistener/pom.xml | 4 +-
.../src/test/java/runListener/FileHelper.java | 8 +-
.../test/resources/junit4-twoTestCaseSuite/pom.xml | 4 +-
.../src/test/resources/junit44-dep/pom.xml | 4 +-
.../src/test/resources/junit44-environment/pom.xml | 4 +-
.../src/test/resources/junit44-hamcrest/pom.xml | 4 +-
.../test/resources/junit44-method-pattern/pom.xml | 4 +-
.../test/resources/junit44-single-method/pom.xml | 4 +-
.../resources/junit47-parallel-with-suite/pom.xml | 4 +-
.../test/resources/junit47-redirect-output/pom.xml | 4 +-
.../junit47-static-inner-class-tests/pom.xml | 4 +-
.../src/test/resources/junit48-categories/pom.xml | 4 +-
.../test/resources/junit48-smartStackTrace/pom.xml | 4 +-
.../src/test/resources/norunnableTests/pom.xml | 4 +-
.../src/test/resources/parallel-runtime/pom.xml | 4 +-
.../resources/plain-old-java-classpath/pom.xml | 4 +-
.../src/test/resources/plexus-conflict/pom.xml | 4 +-
.../src/test/resources/pojo-simple/pom.xml | 4 +-
surefire-its/src/test/resources/pom.xml | 4 +-
surefire-its/src/test/resources/reporters/pom.xml | 4 +-
.../src/test/resources/result-counting/pom.xml | 4 +-
surefire-its/src/test/resources/runOrder/pom.xml | 4 +-
.../src/test/resources/runorder-parallel/pom.xml | 4 +-
.../sibling-aggregator/aggregator/pom.xml | 4 +-
.../resources/sibling-aggregator/child1/pom.xml | 4 +-
.../resources/sibling-aggregator/child2/pom.xml | 4 +-
.../test/resources/small-result-counting/pom.xml | 4 +-
.../jiras-surefire-1024-testjar/pom.xml | 4 +-
.../pom.xml | 4 +-
.../pom.xml | 4 +-
.../surefire-1122-parallel-and-flakyTests/pom.xml | 4 +-
.../pom.xml | 4 +-
.../surefire-1202-rerun-and-failfast/pom.xml | 4 +-
.../surefire-1209-rerun-and-forkcount/pom.xml | 4 +-
.../surefire-1278-group-name-ending/pom.xml | 4 +-
.../pom.xml | 4 +-
.../pom.xml | 4 +-
.../pom.xml | 4 +-
.../surefire-141-pluggableproviders/pom.xml | 4 +-
.../surefire-146-forkPerTestNoSetup/pom.xml | 4 +-
.../surefire-1535-parallel-testng/pom.xml | 4 +-
.../resources/surefire-162-charsetProvider/pom.xml | 4 +-
.../surefire-224-wellFormedXmlFailures/pom.xml | 4 +-
.../resources/surefire-257-rerunningTests/pom.xml | 4 +-
.../surefire-260-testWithIdenticalNames/pom.xml | 4 +-
.../surefire-34-securityManager-success/pom.xml | 4 +-
.../resources/surefire-34-securityManager/pom.xml | 4 +-
.../surefire-408-manual-provider-selection/pom.xml | 4 +-
.../resources/surefire-500-puzzling-error/pom.xml | 4 +-
.../resources/surefire-510-testClassPath/pom.xml | 4 +-
.../surefire-570-multipleReportDirectories/pom.xml | 4 +-
.../surefire-613-testCount-in-parallel/pom.xml | 4 +-
.../pom.xml | 4 +-
.../pom.xml | 4 +-
.../surefire-634-systemPropertiesWarning/pom.xml | 4 +-
.../test/resources/surefire-673-mockito/pom.xml | 4 +-
.../surefire-674-buildFailingWhenErrors/pom.xml | 4 +-
.../surefire-685-commaseparatedIncludes/pom.xml | 4 +-
.../resources/surefire-697-niceSummary/pom.xml | 4 +-
.../surefire-733-allOverridesCaptured/pom.xml | 4 +-
.../pom.xml | 4 +-
.../apache/maven/surefire/test/FailingTest.java | 18 +-
.../apache/maven/surefire/test/SucceedingTest.java | 19 +-
.../pom.xml | 4 +-
.../surefire-806-specifiedTests-multi/pom.xml | 4 +-
.../surefire-806-specifiedTests-single/pom.xml | 4 +-
.../surefire-809-groupExpr-junit48/pom.xml | 4 +-
.../surefire-809-groupExpr-testng/pom.xml | 4 +-
.../surefire-812-log4j-classloader/pom.xml | 4 +-
.../surefire-818-ignored-tests-on-npe/pom.xml | 4 +-
.../surefire-828-emptyGroupExpr-junit48/pom.xml | 4 +-
.../surefire-828-emptyGroupExpr-testng/pom.xml | 4 +-
.../surefire-832-provider-selection/pom.xml | 4 +-
.../test/resources/surefire-847-testngfail/pom.xml | 4 +-
.../test/java/jiras/surefre855/bundle/FooIT.java | 18 +-
.../src/test/java/jiras/surefire855/jar/FooIT.java | 18 +-
.../src/test/java/jiras/surefire855/war/FooIT.java | 18 +-
.../surefire-930-failsafe-runtests/pom.xml | 4 +-
.../surefire-931-provider-failure/pom.xml | 4 +-
.../resources/surefire-943-report-content/pom.xml | 4 +-
.../pom.xml | 4 +-
.../surefire-946-self-destruct-plugin/pom.xml | 4 +-
.../surefire-972-bizarre-noclassdef/pom.xml | 4 +-
.../resources/surefire-975-wrong-encoding/pom.xml | 4 +-
.../module1/pom.xml | 4 +-
.../module2/pom.xml | 4 +-
.../pom.xml | 4 +-
.../src/test/resources/system-properties/pom.xml | 4 +-
.../resources/test-helper-dump-pid-plugin/pom.xml | 6 +-
.../plugins/surefire/dumppid/DumpPidMojo.java | 17 +-
.../resources/testng-afterSuiteFailure/pom.xml | 4 +-
.../src/test/resources/testng-beforeMethod/pom.xml | 4 +-
.../resources/testng-beforeMethodFailure/pom.xml | 4 +-
.../test/resources/testng-execute-error/pom.xml | 4 +-
.../src/test/resources/testng-groups/pom.xml | 4 +-
.../src/test/resources/testng-jdk14/pom.xml | 4 +-
.../test/resources/testng-junit-together/pom.xml | 4 +-
.../resources/testng-listener-reporter/pom.xml | 4 +-
.../src/test/java/listenReport/FileHelper.java | 10 +-
.../test/java/listeners/MarkAsFailureListener.java | 18 +-
.../resources/testng-method-pattern-after/pom.xml | 4 +-
.../resources/testng-method-pattern-before/pom.xml | 4 +-
.../test/resources/testng-method-pattern/pom.xml | 4 +-
.../test/java/testng/objectfactory/FileHelper.java | 14 +-
.../testng-parallel-with-annotations/pom.xml | 4 +-
.../test/resources/testng-path with spaces/pom.xml | 4 +-
.../src/test/resources/testng-simple/pom.xml | 4 +-
.../resources/testng-single-method-5-14-9/pom.xml | 4 +-
.../test/resources/testng-single-method/pom.xml | 4 +-
.../src/test/resources/testng-suite-xml/pom.xml | 4 +-
.../java/testng/testrunnerfactory/FileHelper.java | 14 +-
.../test/resources/testng-twoTestCaseSuite/pom.xml | 4 +-
.../src/test/resources/timeout-forked/pom.xml | 4 +-
.../src/test/resources/unicode-testnames/pom.xml | 4 +-
.../working-directory-is-invalid-property/pom.xml | 4 +-
.../resources/working-directory-missing/pom.xml | 4 +-
.../child/src/test/java/workingDir/BasicTest.java | 15 +-
.../src/test/resources/working-directory/pom.xml | 4 +-
.../surefire/log/api/ConsoleLoggerUtils.java | 8 +-
surefire-providers/common-java5/pom.xml | 10 +-
.../surefire/report/PojoStackTraceWriter.java | 8 +-
.../surefire/common/junit3/JUnit3Reflector.java | 14 +-
surefire-providers/common-junit4/pom.xml | 1 -
.../surefire/common/junit4/JUnit4Reflector.java | 50 +-
.../common/junit4/JUnit4RunListenerFactory.java | 7 +-
surefire-providers/common-junit48/pom.xml | 38 +-
surefire-providers/pom.xml | 1 +
surefire-providers/surefire-junit-platform/pom.xml | 37 +-
surefire-providers/surefire-junit3/pom.xml | 31 -
.../apache/maven/surefire/junit/JUnitTestSet.java | 19 +-
.../apache/maven/surefire/junit/PojoTestSet.java | 9 +-
.../junit/TestListenerInvocationHandler.java | 37 +-
.../maven/surefire/junit/JUnitTestSetTest.java | 5 +-
surefire-providers/surefire-junit4/pom.xml | 42 --
surefire-providers/surefire-junit47/pom.xml | 292 +++++-----
.../surefire-junit47/src/assembly/assembly.xml | 26 +-
.../junitcore/ClassesParallelRunListener.java | 1 +
.../junitcore/MethodsParallelRunListener.java | 1 +
.../maven/surefire/junitcore/ThreadSafe.java | 37 --
.../maven/surefire/junitcore/pc/Scheduler.java | 13 +-
.../surefire/junitcore/pc/SchedulingStrategy.java | 8 +-
surefire-providers/surefire-testng-utils/pom.xml | 31 +-
surefire-providers/surefire-testng/pom.xml | 6 -
.../maven/surefire/testng/TestNGExecutor.java | 16 +-
.../testng/conf/TestNGMapConfigurator.java | 82 +--
surefire-report-parser/pom.xml | 7 +-
.../surefire/report/TestSuiteXmlParser.java | 213 ++++---
surefire-shadefire/pom.xml | 3 -
266 files changed, 2729 insertions(+), 3611 deletions(-)
create mode 100644 maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefireDependencyResolverTest.java
delete mode 100644 surefire-api/src/main/java/org/apache/maven/surefire/util/internal/UrlUtils.java
delete mode 100644 surefire-api/src/test/java/org/apache/maven/surefire/util/UrlUtilsTest.java
copy maven-failsafe-plugin/src/it/jetty-war-test-failing/src/main/webapp/index.html => surefire-providers/surefire-junit47/src/assembly/assembly.xml (54%)
delete mode 100644 surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ThreadSafe.java