You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2021/10/01 15:51:54 UTC
[maven-integration-testing] branch MNG-7020 updated (cf5ed47 ->
685bdf0)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch MNG-7020
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git.
from cf5ed47 [MNG-7020] Remove Maven 2 WagonExcluder backward compat code
add 1ef778b [MNG-7095] Support for parallel builds when resuming
add b7e4915 [MNG-6114] Elements from the global settings should be ordered before elements from the user settings
add 2fb5528 Make tests verifiable with at least Maven 3.6.3
add 379faa9 [MNG-7051] When an optional profile could not be found, an info message should be thrown instead of a warning.
add 70a45ce [MNG-7110] Different behavior of extensions
add c18cf64 Merge branch 'MNG-7110'
add 1735a9e Revert "[MNG-7046] Revert MNG-5639 and make repo config static only"
add 0b9e6e6 Fix syntax error
add c9f83d9 [MNG-6075] Increase the model validation level to the next minor level version
add 9be9c24 [MNG-6511] Testing whether projects can be marked optional during (de)selection using --projects.
add 39b9af7 [MNG-7128] test blocked HTTP repository in pom.xml
add 8f2aacb [MNG-7045] Upgrade to IT to use Groovy 4.0.0-alpha-2
add 39a2071 [MNG-7045] Make sure Groovy 4.0.0-alpha-2 is available
add 56f4d9e [MNG-7112] Test that --non-recursive can be used together with --projects to just build the aggregator project.
add 04203bf [MNG-7045] Make sure Ant 1.10.8 is available
add 20c870e [MNG-7045] Upgrade to IT to use Groovy 4.0.0-alpha-3
add 197b3b2 Disable IT for MNG-6772
add d0182a7 Use the loopback address for connecting to an in-process web server
add 91a7aa7 Simplify and fix script on Windows
add c7b2d1d [MNG-5868] Enable IT for Maven 3.8.2
add de92fee [MNG-6071] Enable IT for Maven 3.8.2
add 4586a84 Add new ignores
add bd99d87 [MNG-7115] MavenITmng5771CoreExtensionsTest fails on maven-3.8.x branch
add 2ca196f Make ITs compile on Java 7
add be44f4a [MNG-7056] Replace tabs in IT files
add 882c500 [MNG-6754] Enable IT for Maven 3.8.2
add a3933b5 Remove unintentionally added files
add 80e4752 Properly quote arguements in run-its.sh
add 68ad366 [MNG-7047] Adjust repositoryUrl for MNG-6759
add 1adb6bc [MNG-7189] Remove undocumented environment variable MAVEN_BASEDIR in startup scripts
add b1bd585 Normalize line endings
add 5569806 [MNG-7230] Replace assert by simpler but equivalent calls
add 04959fb [MNG-7231] Fix Javadoc errors
add 3bcfdda [MNG-4463] Dependency management import should support version ranges
add db04150 Up enforcer version (#115)
add 685bdf0 Merge branch 'master' into MNG-7020
No new revisions were added by this update.
Summary of changes:
.gitignore | 1 +
.../org/apache/maven/it/IntegrationTestSuite.java | 8 +-
.../it/MavenIT0146InstallerSnapshotNaming.java | 4 +-
.../maven/it/MavenITmng0469ReportConfigTest.java | 5 +-
...venITmng1021EqualAttachmentBuildNumberTest.java | 30 +-
.../it/MavenITmng1701DuplicatePluginTest.java | 27 +-
...51ForcedMetadataUpdateDuringDeploymentTest.java | 4 +-
.../maven/it/MavenITmng2387InactiveProxyTest.java | 2 +-
...avenITmng3422ActiveComponentCollectionTest.java | 6 +-
.../it/MavenITmng3642DynamicResourcesTest.java | 10 +-
.../it/MavenITmng3719PomExecutionOrderingTest.java | 2 +-
...ng3807PluginConfigExpressionEvaluationTest.java | 2 +-
.../it/MavenITmng3810BadProfileActivationTest.java | 1 -
.../maven/it/MavenITmng3843PomInheritanceTest.java | 4 +-
.../MavenITmng3933ProfilesXmlActivationTest.java | 6 +-
.../it/MavenITmng4005UniqueDependencyKeyTest.java | 27 +-
...ITmng4023ParentProfileOneTimeInjectionTest.java | 2 +-
.../MavenITmng4053PluginConfigAttributesTest.java | 4 +-
...ITmng4361ForceDependencySnapshotUpdateTest.java | 2 +-
...mng4368TimestampAwareArtifactInstallerTest.java | 10 +-
...463DependencyManagementImportVersionRanges.java | 111 ++
...enITmng4474PerLookupWagonInstantiationTest.java | 4 +-
...528ExcludeWagonsFromMavenCoreArtifactsTest.java | 4 +-
.../maven/it/MavenITmng4991NonProxyHostsTest.java | 2 +-
.../MavenITmng5572ReactorPluginExtensionsTest.java | 9 +-
...MavenITmng5639ImportScopePomResolutionTest.java | 2 +-
.../maven/it/MavenITmng5760ResumeFeatureTest.java | 106 +
.../maven/it/MavenITmng5771CoreExtensionsTest.java | 12 +-
...MavenITmng5868NoDuplicateAttachedArtifacts.java | 2 +-
.../maven/it/MavenITmng5937MavenWrapper.java | 42 +-
.../it/MavenITmng6071GetResourceWithCustomPom.java | 3 +-
.../it/MavenITmng6118SubmoduleInvocation.java | 3 -
...avenITmng6240PluginExtensionAetherProvider.java | 2 +-
...MavenITmng6511OptionalProjectSelectionTest.java | 104 +
...avenITmng6754TimestampInMultimoduleProject.java | 2 +-
...ng6759TransitiveDependencyRepositoriesTest.java | 15 +-
...nITmng7045DropUselessAndOutdatedCdiApiTest.java | 5 +-
...avenITmng7051OptionalProfileActivationTest.java | 8 +-
.../it/MavenITmng7110ExtensionClassloader.java | 66 +
...MavenITmng7112ProjectsWithNonRecursiveTest.java | 78 +
...MavenITmng7128BlockExternalHttpReactorTest.java | 62 +
.../src/test/resources/bootstrap/group-11/pom.xml | 18 +-
.../src/test/resources/bootstrap/group-12/pom.xml | 6 +-
.../bootstrap/{group-11 => group-13}/pom.xml | 21 +-
.../src/test/resources/bootstrap/group-8/pom.xml | 5 -
core-it-suite/src/test/resources/bootstrap/pom.xml | 1 +
core-it-suite/src/test/resources/it0038/pom.xml | 2 +-
.../src/test/resources/mng-0612/project/pom.xml | 26 +-
.../src/test/resources/mng-0773/settings.xml | 30 +-
core-it-suite/src/test/resources/mng-1021/pom.xml | 2 +-
core-it-suite/src/test/resources/mng-2196/pom.xml | 2 +-
.../issue/src/main/java/mng/Issue2289.java | 10 +-
.../src/test/resources/mng-2771/project/pom.xml | 26 +-
.../main/java/org/apache/maven/it/mng3203/App.java | 2 +-
.../java/org/apache/maven/it/mng3203/Diamond.java | 2 +-
.../src/test/resources/mng-3259/module1/pom.xml | 16 +-
.../module1/src/main/java/mng/XStreamTestCase.java | 23 +-
.../src/test/resources/mng-3259/module2/pom.xml | 18 +-
.../module2/src/main/java/mng/Module2.java | 2 +-
.../src/test/resources/mng-3259/module3/pom.xml | 64 +-
.../module3/src/main/java/mng/Module3.java | 2 +-
.../module3/src/test/java/mng/Module3TestUtil.java | 10 +-
.../src/test/resources/mng-3259/module4/pom.xml | 84 +-
.../module4/src/main/java/mng/Module4.java | 2 +-
.../module4/src/main/java/mng/Module4Bean.java | 38 +-
.../src/test/resources/mng-3259/module5/pom.xml | 100 +-
.../module5/src/main/java/mng/Module5.java | 2 +-
.../module5/src/test/java/mng/Module5Test.java | 23 +-
.../src/test/resources/mng-3259/parent/pom.xml | 108 +-
core-it-suite/src/test/resources/mng-3259/pom.xml | 2 +-
.../resources/mng-3372/dependency-tree/pom.xml | 2022 ++++++++++----------
.../java/org/apache/maven/its/mng3506/App.java | 28 +-
.../java/org/apache/maven/its/mng3506/AppTest.java | 28 +-
.../java/org/apache/maven/its/mng3506/App.java | 28 +-
.../java/org/apache/maven/its/mng3506/AppTest.java | 28 +-
.../mng-3684/maven-mng3684-plugin/pom.xml | 18 +-
.../mng-3693/maven-mng3693-plugin/pom.xml | 6 +-
.../test/resources/mng-3693/projects/app/pom.xml | 8 +-
.../mng-3694/maven-mng3694-plugin/pom.xml | 6 +-
.../src/main/java/plugin/MyMojo.java | 24 +-
.../mng-3703/maven-mng3703-plugin/pom.xml | 14 +-
.../mng-3704/maven-mng3704-plugin/pom.xml | 8 +-
.../maven-mng3710-originalModel-plugin/pom.xml | 8 +-
.../pom-inheritance/projects/middle/pom.xml | 2 +-
.../src/test/resources/mng-3716/projects/pom.xml | 4 +-
.../mng-3723/maven-mng3723-plugin/pom.xml | 8 +-
.../src/test/resources/mng-3723/projects/pom.xml | 2 +-
.../mng-3724/maven-mng3724-plugin/pom.xml | 8 +-
.../plugins/maven-mng3743-report-plugin/pom.xml | 8 +-
.../src/test/resources/mng-3743/plugins/pom.xml | 6 +-
.../src/test/resources/mng-3814/plugin-a/pom.xml | 4 +-
.../its/mng4148/module/1.0.0/module-1.0.0.pom | 14 +-
.../java/org/apache/maven/its/mng3506/App.java | 28 +-
.../java/org/apache/maven/its/mng3506/AppTest.java | 28 +-
.../main/java/org/apache/maven/it/mng4347/App.java | 2 +-
.../exclusive-upper-bound}/pom.xml | 49 +-
.../inclusive-upper-bound}/pom.xml | 49 +-
.../module-2 => mng-4463/no-upper-bound}/pom.xml | 36 +-
.../module-a/pom.xml | 2 +-
.../module-b/pom.xml | 2 +-
.../mng-4660-resume-from/module-a/pom.xml | 2 +-
.../mng-4660-resume-from/module-b/pom.xml | 2 +-
.../test/resources/mng-5207/application/pom.xml | 40 +-
.../src/test/resources/mng-5207/delegate/pom.xml | 10 +-
.../src/test/resources/mng-5207/ejb/pom.xml | 72 +-
.../test/resources/mng-5207/prepare/delegate-1.pom | 44 +-
.../src/test/resources/mng-5207/prepare/ejb-1.pom | 72 +-
.../test/resources/mng-5207/prepare/master-1.pom | 482 ++---
.../test/resources/mng-5207/prepare/master-x.pom | 482 ++---
.../src/test/resources/mng-5214/consumer/pom.xml | 10 +-
.../src/test/resources/mng-5214/dependency/pom.xml | 64 +-
.../basic/test/BasicTest.java | 13 +-
.../module-a/pom.xml | 2 +-
.../test/java/org/apache/maven/it/TestCase.java} | 24 +-
.../module-b/pom.xml | 2 +-
.../test/java/org/apache/maven/it/TestCase.java} | 24 +-
.../module-c/pom.xml | 2 +-
.../test/java/org/apache/maven/it/TestCase.java} | 24 +-
.../module-c => four-modules/module-d}/pom.xml | 6 +-
.../test/java/org/apache/maven/it/TestCase.java} | 24 +-
.../module-b => four-modules}/pom.xml | 35 +-
.../parent-dependent/module-a/pom.xml | 2 +-
.../parent-dependent/module-b/pom.xml | 2 +-
.../parent-dependent/module-c/pom.xml | 2 +-
.../parent-independent/module-a/pom.xml | 2 +-
.../parent-independent/module-b/pom.xml | 2 +-
.../settings-template-mirror-auth.xml | 2 +-
.../child/pom.xml | 2 +-
.../parent-1/pom.xml | 2 +-
.../child/pom.xml | 2 +-
.../parent-1/pom.xml | 2 +-
.../child/pom.xml | 2 +-
.../parent-1/pom.xml | 2 +-
.../module-1/pom.xml | 10 +-
.../module-2/pom.xml | 48 +-
.../module-3/pom.xml | 88 +-
.../pom.xml | 2 +-
.../mng-6057-check-reactor-order/module-1/pom.xml | 10 +-
.../mng-6057-check-reactor-order/module-2/pom.xml | 10 +-
core-it-suite/src/test/resources/mng-6071/pom.xml | 2 +-
.../mng-6090-ci-friendly/module-1/pom.xml | 8 +-
.../mng-6090-ci-friendly/module-2/pom.xml | 48 +-
.../mng-6090-ci-friendly/module-3/pom.xml | 94 +-
.../test/resources/mng-6090-ci-friendly/pom.xml | 2 +-
.../project/pom.xml | 2 +-
.../.mvn/.gitkeep | 0
.../existing-module}/pom.xml | 25 +-
.../src/main/java/org/apache/its/mng6511}/App.java | 3 +-
.../pom.xml | 43 +-
.../expected/simple-parent.pom | 6 +-
.../mng-6656-buildconsumer/simple-parent/pom.xml | 4 +-
.../resources/mng-6720-fail-fast/module-1/pom.xml | 2 +-
.../resources/mng-6720-fail-fast/module-2/pom.xml | 2 +-
.../resources/mng-6720-fail-fast/module-3/pom.xml | 2 +-
.../child-a/pom.xml | 2 +-
.../child-b/pom.xml | 2 +-
.../pom.xml | 4 +-
.../module2/pom.xml | 2 +-
.../expected/simple-parent.pom | 6 +-
.../expected/utils-parent.pom | 6 +-
.../mng-6957-buildconsumer/simple-parent/pom.xml | 4 +-
.../simple-parent/utils-parent/pom.xml | 4 +-
.../bom}/pom.xml | 34 +-
.../extension}/pom.xml | 15 +-
.../extension/src/main/resources/extension.txt} | 19 +-
.../lib}/pom.xml | 15 +-
.../lib/src/main/resources/lib.txt} | 19 +-
.../mng-7110-extensionclassloader/module/pom.xml | 74 +
.../parent}/pom.xml | 47 +-
.../aggregator-a}/module-a/pom.xml | 22 +-
.../aggregator-a}/pom.xml | 32 +-
.../aggregator-b}/module-b/pom.xml | 22 +-
.../aggregator-b}/pom.xml | 32 +-
.../mng-7112-projects-with-non-recursive/pom.xml | 73 +
.../mng-7128-block-external-http-reactor/pom.xml | 44 +
.../settings.xml} | 27 +-
core-it-suite/src/test/resources/mng7045/pom.xml | 12 +-
.../maven/plugin/coreit/CheckThreadSafetyMojo.java | 1 +
.../apache/maven/plugin/coreit/ResolveMojo.java | 1 +
.../org/apache/maven/plugin/coreit/ItMojo.java | 1 +
.../maven/plugin/coreit/BuildLocalPomMojo.java | 1 +
.../maven/plugin/coreit/BuildRemotePomMojo.java | 1 +
.../its/mng5958/AbstractLifecycleMapping.java | 142 +-
.../maven/its/mng5958/BadLifecycleMapping.java | 90 +-
.../maven/its/mng5958/GoodLifecycleMapping.java | 80 +-
.../maven/it/AbstractMavenIntegrationTestCase.java | 10 +
run-its.bat | 14 +-
run-its.sh | 6 +-
188 files changed, 3742 insertions(+), 2917 deletions(-)
create mode 100644 core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4463DependencyManagementImportVersionRanges.java
create mode 100644 core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6511OptionalProjectSelectionTest.java
create mode 100644 core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7110ExtensionClassloader.java
create mode 100644 core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7112ProjectsWithNonRecursiveTest.java
create mode 100644 core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7128BlockExternalHttpReactorTest.java
copy core-it-suite/src/test/resources/bootstrap/{group-11 => group-13}/pom.xml (68%)
copy core-it-suite/src/test/resources/{mng-5214/consumer => mng-4463/exclusive-upper-bound}/pom.xml (60%)
copy core-it-suite/src/test/resources/{mng-5214/consumer => mng-4463/inclusive-upper-bound}/pom.xml (60%)
copy core-it-suite/src/test/resources/{mng-6057-check-reactor-order/module-2 => mng-4463/no-upper-bound}/pom.xml (56%)
copy core-it-suite/src/test/resources/mng-5760-resume-feature/{parent-dependent => four-modules}/module-a/pom.xml (98%)
copy core-it-suite/src/test/resources/{mng-5581-lifecycle-mapping-delegate/basic/test/java/org/apache/maven/its/mng5581/lifecyclemappingdelegate/basic/test/BasicTest.java => mng-5760-resume-feature/four-modules/module-a/src/test/java/org/apache/maven/it/TestCase.java} (70%)
copy core-it-suite/src/test/resources/mng-5760-resume-feature/{parent-dependent => four-modules}/module-b/pom.xml (98%)
copy core-it-suite/src/test/resources/{mng-5581-lifecycle-mapping-delegate/basic/test/java/org/apache/maven/its/mng5581/lifecyclemappingdelegate/basic/test/BasicTest.java => mng-5760-resume-feature/four-modules/module-b/src/test/java/org/apache/maven/it/TestCase.java} (70%)
copy core-it-suite/src/test/resources/mng-5760-resume-feature/{parent-dependent => four-modules}/module-c/pom.xml (99%)
copy core-it-suite/src/test/resources/{mng-5581-lifecycle-mapping-delegate/basic/test/java/org/apache/maven/its/mng5581/lifecyclemappingdelegate/basic/test/BasicTest.java => mng-5760-resume-feature/four-modules/module-c/src/test/java/org/apache/maven/it/TestCase.java} (70%)
copy core-it-suite/src/test/resources/mng-5760-resume-feature/{parent-dependent/module-c => four-modules/module-d}/pom.xml (94%)
copy core-it-suite/src/test/resources/{mng-5581-lifecycle-mapping-delegate/basic/test/java/org/apache/maven/its/mng5581/lifecyclemappingdelegate/basic/test/BasicTest.java => mng-5760-resume-feature/four-modules/module-d/src/test/java/org/apache/maven/it/TestCase.java} (70%)
copy core-it-suite/src/test/resources/mng-5760-resume-feature/{parent-independent/module-b => four-modules}/pom.xml (67%)
copy core-it-suite/src/test/resources/{mng-6118-submodule-invocation-full-reactor => mng-6511-optional-project-selection}/.mvn/.gitkeep (100%)
copy core-it-suite/src/test/resources/{it0038 => mng-6511-optional-project-selection/existing-module}/pom.xml (71%)
copy core-it-suite/src/test/resources/{mng-4347/src/main/java/org/apache/maven/it/mng4347 => mng-6511-optional-project-selection/existing-module/src/main/java/org/apache/its/mng6511}/App.java (93%)
copy core-it-suite/src/test/resources/{mng-5895-ci-friendly-usage-with-property => mng-6511-optional-project-selection}/pom.xml (61%)
copy core-it-suite/src/test/resources/{mng-6720-fail-fast/module-1 => mng-7110-extensionclassloader/bom}/pom.xml (69%)
copy core-it-suite/src/test/resources/{mng-6957-buildconsumer/simple-parent/utils-parent => mng-7110-extensionclassloader/extension}/pom.xml (71%)
copy core-it-suite/src/test/resources/{mng-6090-ci-friendly/module-1/pom.xml => mng-7110-extensionclassloader/extension/src/main/resources/extension.txt} (59%)
copy core-it-suite/src/test/resources/{mng-6957-buildconsumer/simple-parent/utils-parent => mng-7110-extensionclassloader/lib}/pom.xml (71%)
copy core-it-suite/src/test/resources/{mng-6090-ci-friendly/module-1/pom.xml => mng-7110-extensionclassloader/lib/src/main/resources/lib.txt} (59%)
create mode 100644 core-it-suite/src/test/resources/mng-7110-extensionclassloader/module/pom.xml
copy core-it-suite/src/test/resources/{mng-6754-version-timestamp-in-multimodule-build/child-b => mng-7110-extensionclassloader/parent}/pom.xml (61%)
copy core-it-suite/src/test/resources/{mng-5760-resume-feature/parent-dependent => mng-7112-projects-with-non-recursive/aggregator-a}/module-a/pom.xml (77%)
copy core-it-suite/src/test/resources/{mng-5760-resume-feature/parent-dependent/module-a => mng-7112-projects-with-non-recursive/aggregator-a}/pom.xml (69%)
copy core-it-suite/src/test/resources/{mng-5760-resume-feature/parent-dependent => mng-7112-projects-with-non-recursive/aggregator-b}/module-b/pom.xml (77%)
copy core-it-suite/src/test/resources/{mng-5760-resume-feature/parent-dependent/module-a => mng-7112-projects-with-non-recursive/aggregator-b}/pom.xml (69%)
create mode 100644 core-it-suite/src/test/resources/mng-7112-projects-with-non-recursive/pom.xml
create mode 100644 core-it-suite/src/test/resources/mng-7128-block-external-http-reactor/pom.xml
copy core-it-suite/src/test/resources/{mng-5895-ci-friendly-usage-with-property/module-1/pom.xml => mng-7128-block-external-http-reactor/settings.xml} (54%)