You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/07/21 20:43:02 UTC
[maven-integration-testing] branch MNG-7020 updated (b2ba5ddc3 -> 2381f284e)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MNG-7020
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
omit b2ba5ddc3 [MNG-7020] Remove Maven 2 WagonExcluder backward compat code
add 1931de367 [MNG-7045] Drop CDI API from Maven
add dcd63dc29 [MNG-6972] Allow access to org.apache.maven.graph
add 20560b6ac [MNG-828] add regression test for listing plugin configuration values in debug
add 6afb7e0d4 [MNG-828] fix date format in assertions
add 77d816748 [MNG-828] fix assertions for maps, properties
add 46836a21e Fix MNG-828
add 80fee6048 Fix tests on JDK 1.7 - setup TLS protocol for verifier
add 357135018 Skip mng7045 DropUselessAndOutdatedCdiApiTest on JDK 1.7
add 2d09cea54 Use old version of m-enforcer-p for JDK 1.7
add e12d12171 [MNG-5222] Maven 3 no longer logs warnings about deprecated plugin parameters
add 279d0afdc [MNG-5222] Enable tests for 3.9.x
add a0fba738a Replace o.codehaus.doxia.sink.Sink with o.a.m.doxia.sink.Sink
add 9948cf787 [MNG-5222] Improvement in deprecated params detection
add 8f948214d [MNG-5222] Improvement in deprecated params detection enable for 3.9.x
add 46f258254 [MNG-7457] Warn about deprecated plugin Mojo
add 30b13db32 [MNG-7404] Drop support for prefixless expressions
add ae224ff5a [MNG-7464] Warn about using read-only parameters for Mojo in configuration
add bf8441319 [MNG-7464] Warn about using read-only parameters for Mojo in configuration - 3.9
add a51623051 Fix test Maven version range assumptions MavenITmng7464ReadOnlyMojoParametersWarningTest
add cd63b2b38 Remove a seemingly unused file
add 8c9cb886a [MNG-7470] mvn 3.9+ IT that uses wagon (default) and native transport (#158)
add ff841ac81 Extend MavenITmng7470ResolverTransportTest (#160)
add 84da51eb3 Fix the MavenITmng7470ResolverTransportTest (#161)
add 99ede4e4d Mute Jetty (#159)
add 43ecb7343 Fix - mute Jetty
add c12a5c148 Upgrade maven-verifier to 1.8.0
add 63ca915f5 upgrade sonatype -> eclipse for sisu-maven-plugin
add 88bb1d5bd [MNG-7487] Fix deadlock during forked lifecycle executions
add a54213b79 [MNG-7468] Check unsupported plugins parameters in configuration
add 879b76462 [MNG-7468] Check unsupported plugins parameters in configuration - 3.9
add ab5d3e063 [MNG-7160] Integration test for extension classloading strategy
add 01dabc2db [MNG-7160] Fix integration tests with element renaming
add 444a062f4 Fix WS
add a4b6ad797 [MNG-7160] Integration test for extension classloading strategy
add 99a4c6f16 [MNG-7160] Backport to 3.9.x
add a2b5d9019 create a simple Jenkinsfile/gh actions to validate PR and branches without changes in core (#172)
add 4f8055333 Demonstrating that importing a BOM works even when it declares those same components in dependency management. (#25)
add 0f88fa928 [MNG-6965] Extensions suddenly have org.codehaus.plexus:plexus-utils:jar:1.1 on their classpath
add be4e35e60 [MNG-7360] Add an IT for build consumer with tags in plugin configs (#167)
add 0b8a1d613 [MNG-7504] Don't print warning unsupported reportPlugins for m-site-p
add 31dff13ce Upgrade to JDK8, use a plugin to download all dependencies to bypass conflict resolution (#178)
add 58cd5d87f Fix minor typos
new 2381f284e [MNG-7020] Remove Maven 2 WagonExcluder backward compat code
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (b2ba5ddc3)
\
N -- N -- N refs/heads/MNG-7020 (2381f284e)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/maven-verify.yml | 48 ++++
Jenkinsfile | 64 +++++
core-it-suite/pom.xml | 6 +-
core-it-suite/src/site/apt/index.apt.vm | 8 +-
.../test/java/org/apache/maven/it/HttpServer.java | 22 ++
.../org/apache/maven/it/IntegrationTestSuite.java | 26 +-
.../maven/it/MavenIT0008SimplePluginTest.java | 4 +-
.../maven/it/MavenIT0009GoalConfigurationTest.java | 6 +-
...MavenIT0010DependencyClosureResolutionTest.java | 6 +-
.../maven/it/MavenIT0012PomInterpolationTest.java | 4 +-
.../it/MavenIT0018DependencyManagementTest.java | 2 +-
...avenIT0019PluginVersionMgmtBySuperPomTest.java} | 6 +-
.../apache/maven/it/MavenIT0021PomProfileTest.java | 4 +-
.../maven/it/MavenIT0023SettingsProfileTest.java | 2 +-
.../it/MavenIT0024MultipleGoalExecutionsTest.java | 2 +-
...venIT0025MultipleExecutionLevelConfigsTest.java | 4 +-
...> MavenIT0030DepPomDepMgmtInheritanceTest.java} | 6 +-
.../apache/maven/it/MavenIT0036ReleasePomTest.java | 4 +-
.../it/MavenIT0037AlternatePomFileSameDirTest.java | 4 +-
...avenIT0038AlternatePomFileDifferentDirTest.java | 4 +-
.../it/MavenIT0039ReleasePomInReactorTest.java | 8 +-
...avenIT0040PackagingFromPluginExtensionTest.java | 2 +-
...nIT0041ArtifactTypeFromPluginExtensionTest.java | 4 +-
.../maven/it/MavenIT0051ReleaseProfileTest.java | 4 +-
.../maven/it/MavenIT0052ReleaseProfileTest.java | 6 +-
.../it/MavenIT0056MultipleGoalExecutionsTest.java | 4 +-
.../it/MavenIT0064MojoConfigViaSettersTest.java | 4 +-
...enIT0071PluginConfigWithDottedPropertyTest.java | 2 +-
.../maven/it/MavenIT0108SnapshotUpdateTest.java | 6 +-
.../maven/it/MavenIT0130CleanLifecycleTest.java | 2 +-
.../maven/it/MavenIT0131SiteLifecycleTest.java | 4 +-
.../maven/it/MavenIT0132PomLifecycleTest.java | 6 +-
.../maven/it/MavenIT0133JarLifecycleTest.java | 16 +-
.../maven/it/MavenIT0134WarLifecycleTest.java | 16 +-
.../maven/it/MavenIT0135EjbLifecycleTest.java | 16 +-
.../maven/it/MavenIT0136RarLifecycleTest.java | 16 +-
.../maven/it/MavenIT0137EarLifecycleTest.java | 10 +-
.../maven/it/MavenIT0138PluginLifecycleTest.java | 22 +-
...MavenIT0145ReactorWithIncludesExcludesTest.java | 18 +-
.../it/MavenIT0146InstallerSnapshotNaming.java | 4 +-
.../maven/it/MavenIT0199CyclicImportScopeTest.java | 56 ++++
.../org/apache/maven/it/MavenITBootstrapTest.java | 1 +
.../MavenITmng0095ReactorFailureBehaviorTest.java | 24 +-
...82NonReactorExecWhenProjectIndependentTest.java | 4 +-
...venITmng0294MergeGlobalAndUserSettingsTest.java | 2 +-
.../MavenITmng0377PluginLookupFromPrefixTest.java | 4 +-
.../MavenITmng0449PluginVersionResolutionTest.java | 18 +-
.../maven/it/MavenITmng0469ReportConfigTest.java | 6 +-
.../it/MavenITmng0471CustomLifecycleTest.java | 4 +-
.../it/MavenITmng0479OverrideCentralRepoTest.java | 26 +-
...ITmng0496IgnoreUnknownPluginParametersTest.java | 2 +-
.../it/MavenITmng0507ArtifactRelocationTest.java | 8 +-
...avenITmng0522InheritedPluginMgmtConfigTest.java | 4 +-
.../MavenITmng0553SettingsAuthzEncryptionTest.java | 8 +-
.../MavenITmng0557UserSettingsCliOptionTest.java | 2 +-
.../it/MavenITmng0666IgnoreLegacyPomTest.java | 2 +-
.../it/MavenITmng0731LegacyRepoLayoutTest.java | 4 +-
.../MavenITmng0761MissingSnapshotDistRepoTest.java | 2 +-
.../maven/it/MavenITmng0768OfflineModeTest.java | 4 +-
...MavenITmng0781PluginConfigVsExecConfigTest.java | 4 +-
.../it/MavenITmng0786ProfileAwareReactorTest.java | 4 +-
.../it/MavenITmng0823MojoContextPassingTest.java | 2 +-
...avenITmng0828PluginConfigValuesInDebugTest.java | 117 ++++++++
...enITmng0870ReactorAwarePluginDiscoveryTest.java | 2 +-
...enITmng0985NonExecutedPluginMgmtGoalsTest.java} | 6 +-
...venITmng1021EqualAttachmentBuildNumberTest.java | 34 +--
...ava => MavenITmng1052PluginMgmtConfigTest.java} | 8 +-
.../MavenITmng1073AggregatorForksReactorTest.java | 12 +-
.../MavenITmng1088ReactorPluginResolutionTest.java | 2 +-
.../it/MavenITmng1144MultipleDefaultGoalsTest.java | 4 +-
.../it/MavenITmng1349ChecksumFormatsTest.java | 24 +-
...03PomValidationErrorIncludesLineNumberTest.java | 2 +-
.../it/MavenITmng1908LegacySnapshotUpdateTest.java | 2 +-
.../MavenITmng2068ReactorRelativeParentsTest.java | 2 +-
...2098VersionRangeSatisfiedFromWrongRepoTest.java | 2 +-
...venITmng2103PluginExecutionInheritanceTest.java | 2 +-
...ng2124PomInterpolationWithParentValuesTest.java | 2 +-
...nITmng2130ParentLookupFromReactorCacheTest.java | 2 +-
.../it/MavenITmng2135PluginBuildInReactorTest.java | 2 +-
.../MavenITmng2136ActiveByDefaultProfileTest.java | 2 +-
.../it/MavenITmng2196ParentResolutionTest.java | 2 +-
.../it/MavenITmng2199ParentVersionRangeTest.java | 8 +-
...venITmng2234ActiveProfilesFromSettingsTest.java | 2 +-
.../MavenITmng2339BadProjectInterpolationTest.java | 3 +-
...avenITmng2363BasedirAwareFileActivatorTest.java | 24 +-
.../maven/it/MavenITmng2387InactiveProxyTest.java | 2 +-
.../it/MavenITmng2432PluginPrefixOrderTest.java | 4 +-
...9PluginDependenciesComeFromPluginReposTest.java | 2 +-
.../it/MavenITmng2576MakeLikeReactorTest.java | 92 +++----
...mng2668UsePluginDependenciesForSortingTest.java | 4 +-
.../it/MavenITmng2690MojoLoadingErrorsTest.java | 2 +-
.../MavenITmng2695OfflinePluginSnapshotsTest.java | 8 +-
...avenITmng2720SiblingClasspathArtifactsTest.java | 2 +-
...Tmng2738ProfileIdCollidesWithCliOptionTest.java | 2 +-
.../it/MavenITmng2744checksumVerificationTest.java | 8 +-
...ustomArtifactHandlerAndCustomLifecycleTest.java | 2 +-
.../maven/it/MavenITmng2865MirrorWildcardTest.java | 2 +-
...004ReactorFailureBehaviorMultithreadedTest.java | 40 +--
...enITmng3023ReactorDependencyResolutionTest.java | 4 +-
.../it/MavenITmng3052DepRepoAggregationTest.java | 4 +-
...avenITmng3099SettingsProfilesWithNoPomTest.java | 6 +-
...avenITmng3106ProfileMultipleActivatorsTest.java | 4 +-
...3139UseCachedMetadataOfBlacklistedRepoTest.java | 2 +-
...venITmng3208ProfileAwareReactorSortingTest.java | 2 +-
.../MavenITmng3217InterPluginDependencyTest.java | 4 +-
...venITmng3268MultipleHyphenPCommandLineTest.java | 8 +-
.../it/MavenITmng3284UsingCachedPluginsTest.java | 8 +-
.../it/MavenITmng3314OfflineSnapshotsTest.java | 4 +-
...avenITmng3394POMPluginVersionDominanceTest.java | 4 +-
.../maven/it/MavenITmng3461MirrorMatchingTest.java | 10 +-
...ctChecksumVerificationOfDependencyPomTest.java} | 4 +-
.../MavenITmng3485OverrideWagonExtensionTest.java | 2 +-
.../it/MavenITmng3545ProfileDeactivationTest.java | 48 ++--
...MavenITmng3599useHttpProxyForWebDAVMk2Test.java | 4 +-
.../MavenITmng3599useHttpProxyForWebDAVTest.java | 4 +-
.../MavenITmng3600DeploymentModeDefaultsTest.java | 6 +-
.../it/MavenITmng3652UserAgentHeaderTest.java | 2 +-
...avenITmng3679PluginExecIdInterpolationTest.java | 2 +-
.../it/MavenITmng3714ToolchainsCliOptionTest.java | 4 +-
.../it/MavenITmng3729MultiForkAggregatorsTest.java | 2 +-
.../MavenITmng3766ToolchainsFromExtensionTest.java | 2 +-
...Tmng3775ConflictResolutionBacktrackingTest.java | 2 +-
...venITmng3808ReportInheritanceOrderingTest.java} | 6 +-
.../it/MavenITmng3819PluginDepPlexusUtilsTest.java | 2 +-
.../it/MavenITmng3831PomInterpolationTest.java | 2 +-
.../MavenITmng3836PluginConfigInheritanceTest.java | 2 +-
.../MavenITmng3845LimitedPomInheritanceTest.java | 2 +-
...Tmng3885UniqueVersionFromParentProfileTest.java | 12 +-
.../it/MavenITmng3892ReleaseDeploymentTest.java | 28 +-
...nITmng3927PluginDefaultExecutionConfigTest.java | 4 +-
.../MavenITmng3938MergePluginExecutionsTest.java | 2 +-
.../it/MavenITmng3940EnvVarInterpolationTest.java | 2 +-
.../it/MavenITmng3944BasedirInterpolationTest.java | 2 +-
...nITmng3947PluginDefaultExecutionConfigTest.java | 4 +-
...ng3948ParentResolutionFromProfileReposTest.java | 4 +-
.../maven/it/MavenITmng3951AbsolutePathsTest.java | 2 +-
...ITmng3970DepResolutionFromProfileReposTest.java | 6 +-
.../maven/it/MavenITmng3974MirrorOrderingTest.java | 4 +-
.../maven/it/MavenITmng3979ElementJoinTest.java | 2 +-
...ng3983PluginResolutionFromProfileReposTest.java | 6 +-
...ITmng4016PrefixedPropertyInterpolationTest.java | 2 +-
...ng4036ParentResolutionFromSettingsRepoTest.java | 4 +-
.../it/MavenITmng4068AuthenticatedMirrorTest.java | 4 +-
...avenITmng4086ExplicitPluginMetaversionTest.java | 8 +-
.../MavenITmng4087PercentEncodedFileUrlTest.java | 4 +-
.../MavenITmng4180PerDependencyExclusionsTest.java | 2 +-
...ITmng4203TransitiveDependencyExclusionTest.java | 4 +-
.../it/MavenITmng4207PluginWithLog4JTest.java | 2 +-
...avenITmng4214MirroredParentSearchReposTest.java | 2 +-
...enITmng4235HttpAuthDeploymentChecksumsTest.java | 2 +-
...nITmng4262MakeLikeReactorDottedPath370Test.java | 10 +-
...avenITmng4262MakeLikeReactorDottedPathTest.java | 10 +-
...Tmng4269BadReactorResolutionFromOutDirTest.java | 2 +-
.../MavenITmng4279WagonProviderFailoverTest.java | 2 +-
.../it/MavenITmng4281PreferLocalSnapshotTest.java | 4 +-
.../MavenITmng4291MojoRequiresOnlineModeTest.java | 2 +-
...nITmng4314DirectInvocationOfAggregatorTest.java | 6 +-
...7PluginVersionResolutionFromMultiReposTest.java | 2 +-
...ng4319PluginExecutionGoalInterpolationTest.java | 2 +-
.../MavenITmng4321CliUsesPluginMgmtConfigTest.java | 2 +-
...venITmng4343MissingReleaseUpdatePolicyTest.java | 14 +-
...enITmng4345DefaultPluginExecutionOrderTest.java | 2 +-
...ITmng4348NoUnnecessaryRepositoryAccessTest.java | 2 +-
...4357LifecycleMappingDiscoveryInReactorTest.java | 8 +-
...venITmng4367LayoutAwareMirrorSelectionTest.java | 6 +-
.../MavenITmng4396AntBased20xMojoSupportTest.java | 2 +-
...enITmng4401RepositoryOrderForParentPomTest.java | 4 +-
.../it/MavenITmng4412OfflineModeInPluginTest.java | 2 +-
...avenITmng4413MirroringOfDependencyRepoTest.java | 2 +-
...g4422PluginExecutionPhaseInterpolationTest.java | 2 +-
...avenITmng4433ForceParentSnapshotUpdateTest.java | 8 +-
...g4453PluginVersionFromLifecycleMappingTest.java | 2 +-
...ng4464PlatformIndependentFileSeparatorTest.java | 2 +-
...65PluginPrefixFromLocalCacheOfDownRepoTest.java | 4 +-
...Tmng4470AuthenticatedDeploymentToProxyTest.java | 2 +-
...MavenITmng4489MirroringOfExtensionRepoTest.java | 4 +-
...528ExcludeWagonsFromMavenCoreArtifactsTest.java | 2 +-
...avenITmng4554PluginPrefixMappingUpdateTest.java | 6 +-
.../MavenITmng4561MirroringOfPluginRepoTest.java | 6 +-
...mng4565MultiConditionProfileActivationTest.java | 4 +-
...LevelPluginDepUsedForCliInvocInReactorTest.java | 2 +-
...ixResolutionFromVersionlessPluginMgmtTest.java} | 6 +-
...ng4600DependencyOptionalFlagManagementTest.java | 2 +-
...Tmng4654ArtifactHandlerForMainArtifactTest.java | 4 +-
.../it/MavenITmng4660OutdatedPackagedArtifact.java | 6 +-
...nITmng4684DistMgmtOverriddenByProfileTest.java} | 4 +-
...76ForkedReactorPluginVersionResolutionTest.java | 4 +-
.../MavenITmng4786AntBased21xMojoSupportTest.java | 2 +-
...ITmng4788InstallationToCustomLocalRepoTest.java | 4 +-
...venITmng4800NearestWinsVsScopeWideningTest.java | 2 +-
.../it/MavenITmng4840MavenPrerequisiteTest.java | 4 +-
...mng4842ParentResolutionOfDependencyPomTest.java | 4 +-
...ng4890MakeLikeReactorConsidersVersionsTest.java | 12 +-
...g4895PluginDepWithNonRelocatedMavenApiTest.java | 2 +-
...4925ContainerLookupRealmDuringMojoExecTest.java | 2 +-
.../MavenITmng4960MakeLikeReactorResumeTest.java | 12 +-
...ingBasedCompLookupFromChildPluginRealmTest.java | 4 +-
.../maven/it/MavenITmng5222MojoDeprecatedTest.java | 264 ++++++++++++++++++
.../MavenITmng5230MakeReactorWithExcludesTest.java | 96 +++----
...mng5389LifecycleParticipantAfterSessionEnd.java | 2 +-
...Tmng5418FileProjectPropertiesActivatorTest.java | 8 +-
.../it/MavenITmng5530MojoExecutionScopeTest.java | 12 +-
.../maven/it/MavenITmng5591WorkspaceReader.java | 4 +-
...MavenITmng5639ImportScopePomResolutionTest.java | 2 +-
...mng5640LifecycleParticipantAfterSessionEnd.java | 24 +-
...Tmng5663NestedImportScopePomResolutionTest.java | 2 +-
.../maven/it/MavenITmng5669ReadPomsOnce.java | 12 +-
.../maven/it/MavenITmng5716ToolchainsTypeTest.java | 2 +-
...avenITmng5742BuildExtensionClassloaderTest.java | 2 +-
...mng5753CustomMojoExecutionConfiguratorTest.java | 2 +-
.../maven/it/MavenITmng5760ResumeFeatureTest.java | 2 +-
.../MavenITmng5774ConfigurationProcessorsTest.java | 2 +-
.../MavenITmng5783PluginDependencyFiltering.java | 4 +-
.../it/MavenITmng6057CheckReactorOrderTest.java | 2 +-
...uginExecutionConfigurationInterferenceTest.java | 6 +-
.../MavenITmng6173GetAllProjectsInReactorTest.java | 2 +-
.../maven/it/MavenITmng6352PrintVersionTest.java | 4 +-
.../maven/it/MavenITmng6391PrintVersionTest.java | 4 +-
...MavenITmng6511OptionalProjectSelectionTest.java | 10 +-
...avenITmng6972AllowAccessToGraphPackageTest.java | 2 +-
...nITmng7045DropUselessAndOutdatedCdiApiTest.java | 5 +-
...avenITmng7051OptionalProfileActivationTest.java | 4 +-
...MavenITmng7112ProjectsWithNonRecursiveTest.java | 20 +-
.../it/MavenITmng7160ExtensionClassloader.java | 71 +++++
...iTest.java => MavenITmng7360BuildConsumer.java} | 28 +-
.../MavenITmng7390SelectModuleOutsideCwdTest.java | 34 +--
...enITmng7404IgnorePrefixlessExpressionsTest.java | 57 ++++
...ITmng7464ReadOnlyMojoParametersWarningTest.java | 138 ++++++++++
...nITmng7468UnsupportedPluginsParametersTest.java | 183 +++++++++++++
.../it/MavenITmng7470ResolverTransportTest.java | 112 ++++++++
.../maven/it/MavenITmng7487DeadlockTest.java | 52 ++++
...mng7504NotWarnUnsupportedReportPluginsTest.java | 61 +++++
.../src/test/resources-filtered/bootstrap.txt | 163 ++++++++++++
.../src/test/resources/bootstrap/group-1/pom.xml | 141 ----------
.../src/test/resources/bootstrap/group-10/pom.xml | 93 -------
.../src/test/resources/bootstrap/group-11/pom.xml | 75 ------
.../src/test/resources/bootstrap/group-12/pom.xml | 83 ------
.../src/test/resources/bootstrap/group-13/pom.xml | 63 -----
.../src/test/resources/bootstrap/group-2/pom.xml | 68 -----
.../src/test/resources/bootstrap/group-3/pom.xml | 296 ---------------------
.../src/test/resources/bootstrap/group-4/pom.xml | 57 ----
.../src/test/resources/bootstrap/group-5/pom.xml | 86 ------
.../src/test/resources/bootstrap/group-6/pom.xml | 164 ------------
.../src/test/resources/bootstrap/group-7/pom.xml | 89 -------
.../src/test/resources/bootstrap/group-8/pom.xml | 103 -------
.../src/test/resources/bootstrap/group-9/pom.xml | 58 ----
core-it-suite/src/test/resources/bootstrap/pom.xml | 166 +++---------
.../src/test/resources/bootstrap/settings.xml | 66 ++---
.../cyclic-import-scope/v1/componentA/pom.xml | 12 +
.../v1/componentA/src/main/java/Av1.java | 1 +
.../cyclic-import-scope/v1/componentB/pom.xml | 19 ++
.../v1/componentB/src/main/java/Bv1.java | 1 +
.../cyclic-import-scope/v1/main/bundle/pom.xml | 21 ++
.../v1/main/bundle/src/main/java/Bundle.java | 3 +
.../resources/cyclic-import-scope/v1/main/pom.xml | 25 ++
.../cyclic-import-scope/v1/parent/pom.xml | 8 +
.../cyclic-import-scope/v2/componentA/pom.xml | 12 +
.../v2/componentA/src/main/java/Av2.java | 1 +
.../cyclic-import-scope/v2/componentB/pom.xml | 18 ++
.../v2/componentB/src/main/java/Bv2.java | 1 +
.../cyclic-import-scope/v2/main/bundle/pom.xml | 21 ++
.../v2/main/bundle/src/main/java/Bundle.java | 3 +
.../resources/cyclic-import-scope/v2/main/pom.xml | 25 ++
.../cyclic-import-scope/v2/parent/pom.xml | 19 ++
.../cyclic-import-scope/v3/componentA/pom.xml | 12 +
.../v3/componentA/src/main/java/Av3.java | 1 +
.../cyclic-import-scope/v3/componentB/pom.xml | 19 ++
.../v3/componentB/src/main/java/Bv3.java | 1 +
.../cyclic-import-scope/v3/main/bundle/pom.xml | 21 ++
.../v3/main/bundle/src/main/java/Bundle.java | 3 +
.../resources/cyclic-import-scope/v3/main/pom.xml | 25 ++
.../cyclic-import-scope/v3/parent/pom.xml | 19 ++
core-it-suite/src/test/resources/mng-0377/pom.xml | 2 +-
.../0.1/maven-it-plugin-b-0.1.pom | 2 +-
.../src/test/resources/mng-0479/setup/pom.xml | 2 +-
.../mng-0479/test-1/settings-template.xml | 2 +-
.../mng-0479/test-2/settings-template.xml | 2 +-
.../mng-0479/test-3/settings-template.xml | 2 +-
.../mng-0479/test-4/settings-template.xml | 2 +-
.../src/test/resources/mng-0479/test/pom.xml | 2 +-
.../resources/mng-0479/test/settings-template.xml | 2 +-
core-it-suite/src/test/resources/mng-0828/pom.xml | 117 ++++++++
.../src/test/resources/mng-0870/plugin/pom.xml | 2 +-
core-it-suite/src/test/resources/mng-2098/pom.xml | 2 +-
.../src/test/resources/mng-2103/child-1/pom.xml | 2 +-
.../src/test/resources/mng-2103/child-2/pom.xml | 2 +-
core-it-suite/src/test/resources/mng-2103/pom.xml | 2 +-
.../test/resources/mng-2124/parent/child/pom.xml | 2 +-
core-it-suite/src/test/resources/mng-2130/pom.xml | 2 +-
core-it-suite/src/test/resources/mng-2196/pom.xml | 2 +-
core-it-suite/src/test/resources/mng-2289/test.sh | 2 +-
.../src/test/resources/mng-2486/test/pom.xml | 2 +-
.../test/resources/mng-3099/settings-template.xml | 2 +-
.../src/test/resources/mng-3208/mod-a/pom.xml | 2 +-
.../src/test/resources/mng-3208/mod-b/pom.xml | 2 +-
core-it-suite/src/test/resources/mng-3208/pom.xml | 2 +-
.../test/resources/mng-3396/dependencies/pom.xml | 2 +-
.../src/test/resources/mng-3396/plugin/pom.xml | 2 +-
.../src/test/resources/mng-3498/readme.txt | 2 +-
.../src/test/resources/mng-3599-mk2/pom.xml | 11 +-
core-it-suite/src/test/resources/mng-3599/pom.xml | 2 +-
core-it-suite/src/test/resources/mng-3719/pom.xml | 2 +-
.../src/test/resources/mng-3729/readme.txt | 4 +-
.../src/test/resources/mng-3775/test-abc/pom.xml | 2 +-
.../src/test/resources/mng-3775/test-acb/pom.xml | 2 +-
.../src/test/resources/mng-3775/test-bac/pom.xml | 2 +-
.../src/test/resources/mng-3775/test-bca/pom.xml | 2 +-
.../src/test/resources/mng-3775/test-cab/pom.xml | 2 +-
.../src/test/resources/mng-3775/test-cba/pom.xml | 2 +-
core-it-suite/src/test/resources/mng-3808/pom.xml | 2 +-
core-it-suite/src/test/resources/mng-3839/pom.xml | 2 +-
core-it-suite/src/test/resources/mng-3845/pom.xml | 2 +-
core-it-suite/src/test/resources/mng-3927/pom.xml | 2 +-
core-it-suite/src/test/resources/mng-3979/pom.xml | 2 +-
.../src/test/resources/mng-3979/sub/pom.xml | 2 +-
.../test/resources/mng-4068/settings-template.xml | 2 +-
.../test/resources/mng-4072/profiles-template.xml | 2 +-
core-it-suite/src/test/resources/mng-4180/pom.xml | 2 +-
core-it-suite/src/test/resources/mng-4207/pom.xml | 2 +-
.../src/test/resources/mng-4326/dependency/pom.xml | 2 +-
.../src/test/resources/mng-4326/test/pom.xml | 2 +-
.../src/test/resources/mng-4331/sub-2/pom.xml | 2 +-
core-it-suite/src/test/resources/mng-4345/pom.xml | 2 +-
.../test/resources/mng-4361/settings-template.xml | 2 +-
.../test/resources/mng-4433/settings-template.xml | 2 +-
.../test/resources/mng-4482/settings-template.xml | 2 +-
core-it-suite/src/test/resources/mng-4580/pom.xml | 2 +-
.../src/test/resources/mng-4580/sub/pom.xml | 2 +-
.../test/resources/mng-4679/settings-template.xml | 2 +-
.../src/test/resources/mng-4800/test-ab/pom.xml | 2 +-
.../src/test/resources/mng-4800/test-ba/pom.xml | 2 +-
core-it-suite/src/test/resources/mng-5019/pom.xml | 2 +-
core-it-suite/src/test/resources/mng-5135/pom.xml | 4 +-
.../mng-5222-mojo-deprecated-params/pom.xml | 105 ++++++++
core-it-suite/src/test/resources/mng-5382/pom.xml | 4 +-
.../extension/pom.xml | 4 +-
.../extension-plugin/pom.xml | 4 +-
.../extension/pom.xml | 4 +-
.../mng-5530-mojo-execution-scope/plugin/pom.xml | 4 +-
.../extension-plugin/pom.xml | 4 +-
.../mng-5578-session-scope/extension/pom.xml | 4 +-
.../mng-5578-session-scope/plugin/pom.xml | 4 +-
.../extension/pom.xml | 6 +-
.../mng-5591-workspace-reader/extension/pom.xml | 6 +-
.../extension/pom.xml | 4 +-
.../test/resources/mng-5669-read-poms-once/pom.xml | 2 +-
.../plugin/pom.xml | 4 +-
.../child/pom.xml | 19 +-
.../child/pom.xml | 19 +-
.../child/pom.xml | 18 +-
.../test/resources/mng-6084-jsr250-support/pom.xml | 4 +-
.../extension}/pom.xml | 29 +-
.../org/apache/maven/its/mng7160/Extension.java | 48 ++++
.../project-build}/pom.xml | 29 +-
.../project-core-parent-first/.mvn/extensions.xml | 8 +
.../project-core-parent-first/pom.xml} | 13 +-
.../project-core-plugin/.mvn/extensions.xml | 8 +
.../project-core-plugin}/pom.xml | 16 +-
.../project-core-self-first/.mvn/extensions.xml | 8 +
.../project-core-self-first}/pom.xml | 16 +-
.../test/resources/mng-7360-build-consumer/pom.xml | 42 +++
.../mng-7390-pl-outside-cwd-no-dotmvn/pom.xml | 2 +-
.../test/resources/mng-7390-pl-outside-cwd/pom.xml | 2 +-
.../mng-7404-ignore-prefixless-expressions/pom.xml | 12 +
.../pom.xml | 53 ++--
.../config-build-execution}/pom.xml | 28 +-
.../config-build-mixed}/pom.xml | 30 ++-
.../config-build-plugin}/pom.xml | 28 +-
.../module}/pom.xml | 32 ++-
.../config-plugin-management-parent}/pom.xml | 30 ++-
.../config-plugin-management}/pom.xml | 42 +--
.../config-with-fork-goal}/pom.xml | 26 +-
.../no-config}/pom.xml | 22 +-
.../valid-parameter-alias}/pom.xml | 25 +-
.../valid-parameter-other-goal}/pom.xml | 25 +-
.../valid-parameter}/pom.xml | 25 +-
.../project}/pom.xml | 27 +-
.../project}/settings-template.xml | 22 +-
.../repo/.gitattributes | 0
.../dependency/1.0/dependency-1.0.jar} | Bin
.../dependency/1.0/dependency-1.0.jar.sha1} | 0
.../dependency/1.0/dependency-1.0.pom} | 16 +-
.../dependency/1.0/dependency-1.0.pom.sha1 | 1 +
.../1.7.3/resolver-demo-maven-plugin-1.7.3.jar | Bin 0 -> 11819 bytes
.../resolver-demo-maven-plugin-1.7.3.jar.sha1 | 1 +
.../1.7.3/resolver-demo-maven-plugin-1.7.3.pom | 102 +++++++
.../resolver-demo-maven-plugin-1.7.3.pom.sha1 | 1 +
.../consumer}/pom.xml | 53 ++--
.../java/com/example/demo/DemoApplication.java | 9 +
.../plugin/pom.xml | 48 ++--
.../src/main/java/testmojo/AggregatorMojo.java | 45 +---
.../java/testmojo/RequiresCompilePhaseMojo.java | 46 +---
.../pom.xml | 28 ++
.../maven/coreits/javaagent/mng5669/Premain.java | 6 +-
.../maven-it-plugin-ant-based/pom.xml | 2 +-
.../src/main/resources/META-INF/maven/plugin.xml | 2 +-
.../maven-it-plugin-configuration/pom.xml | 5 +
.../org/apache/maven/plugin/coreit/ConfigMojo.java | 2 +-
.../maven/plugin/coreit/DeprecatedConfigMojo.java | 200 ++++++++++++++
.../maven/plugin/coreit/ReadOnlyConfigMojo.java | 58 ++++
.../org/apache/maven/plugin/coreit/TouchMojo.java} | 59 ++--
.../org/apache/maven/plugin/coreit/ThrowMojo.java | 2 +-
.../org/apache/maven/plugin/coreit/CleanMojo.java | 2 +-
.../apache/maven/plugin/coreit/CompileMojo.java | 2 +-
.../maven/plugin/coreit/TestCompileMojo.java | 2 +-
.../org/apache/maven/plugin/coreit/DeployMojo.java | 2 +-
.../org/apache/maven/plugin/coreit/EarMojo.java | 2 +-
.../plugin/coreit/GenerateApplicationXmlMojo.java | 2 +-
.../org/apache/maven/plugin/coreit/EjbMojo.java | 2 +-
.../apache/maven/plugin/coreit/InstallMojo.java | 2 +-
.../org/apache/maven/plugin/coreit/JarMojo.java | 2 +-
.../org/apache/maven/plugin/coreit/JarMojo.java | 2 +-
.../coreit/AddPluginArtifactMetadataMojo.java | 2 +-
.../apache/maven/plugin/coreit/DescriptorMojo.java | 2 +-
.../maven/plugin/coreit/UpdateRegistryMojo.java | 2 +-
.../org/apache/maven/plugin/coreit/RarMojo.java | 2 +-
.../apache/maven/plugin/coreit/ResourcesMojo.java | 2 +-
.../maven/plugin/coreit/TestResourcesMojo.java | 2 +-
.../maven/plugin/coreit/AttachDescriptorMojo.java | 2 +-
.../org/apache/maven/plugin/coreit/DeployMojo.java | 2 +-
.../org/apache/maven/plugin/coreit/SiteMojo.java | 2 +-
.../org/apache/maven/plugin/coreit/JarMojo.java | 2 +-
.../org/apache/maven/plugin/coreit/TestMojo.java | 2 +-
.../org/apache/maven/plugin/coreit/WarMojo.java | 2 +-
.../org/apache/maven/plugin/coreit/EvalMojo.java | 2 +-
.../maven-it-plugin-optional-mojos/pom.xml | 2 +-
.../maven-it-plugin-packaging/pom.xml | 2 +-
.../org/apache/maven/plugin/coreit/AppendMojo.java | 2 +-
.../apache/maven/plugin/coreit/DerivedItMojo.java | 2 +-
.../core-it-plugins/maven-it-plugin-site/pom.xml | 4 +-
.../apache/maven/plugin/coreit/GenerateMojo.java | 2 +-
.../org/apache/maven/plugin/coreit/InfoReport.java | 3 +-
.../maven/plugin/coreit/DumpVersionMojo.java | 2 +-
.../maven/plugin/coreit/LookupWagonMojo.java | 2 +-
.../maven/it/AbstractMavenIntegrationTestCase.java | 61 +----
.../pom.xml | 36 +--
.../apache/maven/its/bootstrap/DownloadMojo.java | 154 +++++++++++
.../src/main/resources/stc_checks.xml | 2 +-
core-it-support/pom.xml | 1 +
pom.xml | 8 +-
run-its.sh | 3 +
441 files changed, 4046 insertions(+), 2885 deletions(-)
create mode 100644 .github/workflows/maven-verify.yml
create mode 100644 Jenkinsfile
rename core-it-suite/src/test/java/org/apache/maven/it/{MavenIT0019PluginVersionMngtBySuperPomTest.java => MavenIT0019PluginVersionMgmtBySuperPomTest.java} (90%)
rename core-it-suite/src/test/java/org/apache/maven/it/{MavenIT0030DepPomDepMngtInheritanceTest.java => MavenIT0030DepPomDepMgmtInheritanceTest.java} (92%)
create mode 100644 core-it-suite/src/test/java/org/apache/maven/it/MavenIT0199CyclicImportScopeTest.java
create mode 100644 core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0828PluginConfigValuesInDebugTest.java
rename core-it-suite/src/test/java/org/apache/maven/it/{MavenITmng0985NonExecutedPluginMngtGoalsTest.java => MavenITmng0985NonExecutedPluginMgmtGoalsTest.java} (91%)
rename core-it-suite/src/test/java/org/apache/maven/it/{MavenITmng1052PluginMngtConfigTest.java => MavenITmng1052PluginMgmtConfigTest.java} (89%)
rename core-it-suite/src/test/java/org/apache/maven/it/{MavenITmng3470StrictCheckumVerificationOfDependencyPomTest.java => MavenITmng3470StrictChecksumVerificationOfDependencyPomTest.java} (95%)
rename core-it-suite/src/test/java/org/apache/maven/it/{MavenITmng3808ReportInheritenceOrderingTest.java => MavenITmng3808ReportInheritanceOrderingTest.java} (92%)
rename core-it-suite/src/test/java/org/apache/maven/it/{MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMngtTest.java => MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMgmtTest.java} (96%)
rename core-it-suite/src/test/java/org/apache/maven/it/{MavenITmng4684DistMngtOverridenByProfileTest.java => MavenITmng4684DistMgmtOverriddenByProfileTest.java} (96%)
create mode 100644 core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5222MojoDeprecatedTest.java
create mode 100644 core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7160ExtensionClassloader.java
copy core-it-suite/src/test/java/org/apache/maven/it/{MavenITmng7045DropUselessAndOutdatedCdiApiTest.java => MavenITmng7360BuildConsumer.java} (57%)
create mode 100644 core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7404IgnorePrefixlessExpressionsTest.java
create mode 100644 core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7464ReadOnlyMojoParametersWarningTest.java
create mode 100644 core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7468UnsupportedPluginsParametersTest.java
create mode 100644 core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java
create mode 100644 core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7487DeadlockTest.java
create mode 100644 core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7504NotWarnUnsupportedReportPluginsTest.java
create mode 100644 core-it-suite/src/test/resources-filtered/bootstrap.txt
delete mode 100644 core-it-suite/src/test/resources/bootstrap/group-1/pom.xml
delete mode 100644 core-it-suite/src/test/resources/bootstrap/group-10/pom.xml
delete mode 100644 core-it-suite/src/test/resources/bootstrap/group-11/pom.xml
delete mode 100644 core-it-suite/src/test/resources/bootstrap/group-12/pom.xml
delete mode 100644 core-it-suite/src/test/resources/bootstrap/group-13/pom.xml
delete mode 100644 core-it-suite/src/test/resources/bootstrap/group-2/pom.xml
delete mode 100644 core-it-suite/src/test/resources/bootstrap/group-3/pom.xml
delete mode 100644 core-it-suite/src/test/resources/bootstrap/group-4/pom.xml
delete mode 100644 core-it-suite/src/test/resources/bootstrap/group-5/pom.xml
delete mode 100644 core-it-suite/src/test/resources/bootstrap/group-6/pom.xml
delete mode 100644 core-it-suite/src/test/resources/bootstrap/group-7/pom.xml
delete mode 100644 core-it-suite/src/test/resources/bootstrap/group-8/pom.xml
delete mode 100644 core-it-suite/src/test/resources/bootstrap/group-9/pom.xml
create mode 100644 core-it-suite/src/test/resources/cyclic-import-scope/v1/componentA/pom.xml
create mode 100644 core-it-suite/src/test/resources/cyclic-import-scope/v1/componentA/src/main/java/Av1.java
create mode 100644 core-it-suite/src/test/resources/cyclic-import-scope/v1/componentB/pom.xml
create mode 100644 core-it-suite/src/test/resources/cyclic-import-scope/v1/componentB/src/main/java/Bv1.java
create mode 100644 core-it-suite/src/test/resources/cyclic-import-scope/v1/main/bundle/pom.xml
create mode 100644 core-it-suite/src/test/resources/cyclic-import-scope/v1/main/bundle/src/main/java/Bundle.java
create mode 100644 core-it-suite/src/test/resources/cyclic-import-scope/v1/main/pom.xml
create mode 100644 core-it-suite/src/test/resources/cyclic-import-scope/v1/parent/pom.xml
create mode 100644 core-it-suite/src/test/resources/cyclic-import-scope/v2/componentA/pom.xml
create mode 100644 core-it-suite/src/test/resources/cyclic-import-scope/v2/componentA/src/main/java/Av2.java
create mode 100644 core-it-suite/src/test/resources/cyclic-import-scope/v2/componentB/pom.xml
create mode 100644 core-it-suite/src/test/resources/cyclic-import-scope/v2/componentB/src/main/java/Bv2.java
create mode 100644 core-it-suite/src/test/resources/cyclic-import-scope/v2/main/bundle/pom.xml
create mode 100644 core-it-suite/src/test/resources/cyclic-import-scope/v2/main/bundle/src/main/java/Bundle.java
create mode 100644 core-it-suite/src/test/resources/cyclic-import-scope/v2/main/pom.xml
create mode 100644 core-it-suite/src/test/resources/cyclic-import-scope/v2/parent/pom.xml
create mode 100644 core-it-suite/src/test/resources/cyclic-import-scope/v3/componentA/pom.xml
create mode 100644 core-it-suite/src/test/resources/cyclic-import-scope/v3/componentA/src/main/java/Av3.java
create mode 100644 core-it-suite/src/test/resources/cyclic-import-scope/v3/componentB/pom.xml
create mode 100644 core-it-suite/src/test/resources/cyclic-import-scope/v3/componentB/src/main/java/Bv3.java
create mode 100644 core-it-suite/src/test/resources/cyclic-import-scope/v3/main/bundle/pom.xml
create mode 100644 core-it-suite/src/test/resources/cyclic-import-scope/v3/main/bundle/src/main/java/Bundle.java
create mode 100644 core-it-suite/src/test/resources/cyclic-import-scope/v3/main/pom.xml
create mode 100644 core-it-suite/src/test/resources/cyclic-import-scope/v3/parent/pom.xml
create mode 100644 core-it-suite/src/test/resources/mng-0828/pom.xml
create mode 100644 core-it-suite/src/test/resources/mng-5222-mojo-deprecated-params/pom.xml
rename core-it-suite/src/test/resources/{bootstrap/group-14 => mng-7160-extensionclassloader/extension}/pom.xml (67%)
create mode 100644 core-it-suite/src/test/resources/mng-7160-extensionclassloader/extension/src/main/java/org/apache/maven/its/mng7160/Extension.java
copy core-it-suite/src/test/resources/{mng-3208 => mng-7160-extensionclassloader/project-build}/pom.xml (61%)
create mode 100644 core-it-suite/src/test/resources/mng-7160-extensionclassloader/project-core-parent-first/.mvn/extensions.xml
copy core-it-suite/src/test/resources/{mng-6991-local-repo-from-settings/settings.xml => mng-7160-extensionclassloader/project-core-parent-first/pom.xml} (68%)
create mode 100644 core-it-suite/src/test/resources/mng-7160-extensionclassloader/project-core-plugin/.mvn/extensions.xml
copy core-it-suite/src/test/resources/{mng-0377 => mng-7160-extensionclassloader/project-core-plugin}/pom.xml (68%)
create mode 100644 core-it-suite/src/test/resources/mng-7160-extensionclassloader/project-core-self-first/.mvn/extensions.xml
copy core-it-suite/src/test/resources/{mng-0377 => mng-7160-extensionclassloader/project-core-self-first}/pom.xml (68%)
create mode 100644 core-it-suite/src/test/resources/mng-7360-build-consumer/pom.xml
create mode 100644 core-it-suite/src/test/resources/mng-7404-ignore-prefixless-expressions/pom.xml
copy core-it-suite/src/test/resources/{mng-3208/mod-a => mng-7464-mojo-read-only-params}/pom.xml (52%)
copy core-it-suite/src/test/resources/{mng-3208/mod-b => mng-7468-unsupported-params/config-build-execution}/pom.xml (68%)
copy core-it-suite/src/test/resources/{mng-3208/mod-b => mng-7468-unsupported-params/config-build-mixed}/pom.xml (69%)
copy core-it-suite/src/test/resources/{mng-3208/mod-b => mng-7468-unsupported-params/config-build-plugin}/pom.xml (70%)
copy core-it-suite/src/test/resources/{mng-3208/mod-b => mng-7468-unsupported-params/config-plugin-management-parent/module}/pom.xml (68%)
copy core-it-suite/src/test/resources/{mng-3208 => mng-7468-unsupported-params/config-plugin-management-parent}/pom.xml (58%)
copy core-it-suite/src/test/resources/{mng-3208/mod-b => mng-7468-unsupported-params/config-plugin-management}/pom.xml (60%)
copy core-it-suite/src/test/resources/{mng-3208/mod-b => mng-7468-unsupported-params/config-with-fork-goal}/pom.xml (73%)
copy core-it-suite/src/test/resources/{mng-3208/mod-b => mng-7468-unsupported-params/no-config}/pom.xml (68%)
copy core-it-suite/src/test/resources/{mng-3208/mod-b => mng-7468-unsupported-params/valid-parameter-alias}/pom.xml (70%)
copy core-it-suite/src/test/resources/{mng-3208/mod-b => mng-7468-unsupported-params/valid-parameter-other-goal}/pom.xml (70%)
copy core-it-suite/src/test/resources/{mng-3208/mod-b => mng-7468-unsupported-params/valid-parameter}/pom.xml (70%)
copy core-it-suite/src/test/resources/{mng-3927 => mng-7470-resolver-transport/project}/pom.xml (63%)
copy core-it-suite/src/test/resources/{mng-4679 => mng-7470-resolver-transport/project}/settings-template.xml (73%)
copy core-it-suite/src/test/resources/{it0010 => mng-7470-resolver-transport}/repo/.gitattributes (100%)
copy core-it-suite/src/test/resources/{mng-2861/repo/org/apache/maven/its/mng2861/old/project/1.1/project-1.1.jar => mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/dependency/1.0/dependency-1.0.jar} (100%)
copy core-it-suite/src/test/resources/{mng-2861/repo/org/apache/maven/its/mng2861/old/project/1.1/project-1.1.jar.sha1 => mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/dependency/1.0/dependency-1.0.jar.sha1} (100%)
rename core-it-suite/src/test/resources/{mng-6991-local-repo-from-settings/settings.xml => mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/dependency/1.0/dependency-1.0.pom} (68%)
create mode 100644 core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/dependency/1.0/dependency-1.0.pom.sha1
create mode 100644 core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.jar
create mode 100644 core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.jar.sha1
create mode 100644 core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.pom
create mode 100644 core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.pom.sha1
copy core-it-suite/src/test/resources/{mng-7390-pl-outside-cwd => mng-7487-deadlock/consumer}/pom.xml (60%)
create mode 100644 core-it-suite/src/test/resources/mng-7487-deadlock/consumer/src/main/java/com/example/demo/DemoApplication.java
copy core-it-suite/src/test/resources/{mng-5578-session-scope => mng-7487-deadlock}/plugin/pom.xml (63%)
copy core-it-support/core-it-plugins/maven-it-plugin-context-passing/src/main/java/org/apache/maven/plugin/coreit/ThrowMojo.java => core-it-suite/src/test/resources/mng-7487-deadlock/plugin/src/main/java/testmojo/AggregatorMojo.java (55%)
copy core-it-support/core-it-plugins/maven-it-plugin-context-passing/src/main/java/org/apache/maven/plugin/coreit/ThrowMojo.java => core-it-suite/src/test/resources/mng-7487-deadlock/plugin/src/main/java/testmojo/RequiresCompilePhaseMojo.java (55%)
create mode 100644 core-it-suite/src/test/resources/mng-7504-warn-unsupported-report-plugins/pom.xml
create mode 100644 core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/DeprecatedConfigMojo.java
create mode 100644 core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/ReadOnlyConfigMojo.java
copy core-it-support/core-it-plugins/{maven-it-plugin-packaging/src/main/java/org/apache/maven/plugin/coreit/AppendMojo.java => maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/TouchMojo.java} (53%)
copy core-it-support/{core-it-plugins/maven-it-plugin-configuration => maven-it-plugin-bootstrap}/pom.xml (64%)
create mode 100644 core-it-support/maven-it-plugin-bootstrap/src/main/java/org/apache/maven/its/bootstrap/DownloadMojo.java
[maven-integration-testing] 01/01: [MNG-7020] Remove Maven 2 WagonExcluder backward compat code
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MNG-7020
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
commit 2381f284e85254e9d4849ab3852a509d56ec1bc4
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Fri Nov 13 23:29:19 2020 +0100
[MNG-7020] Remove Maven 2 WagonExcluder backward compat code
* Disable unused tests
* Update Maven 2 plugins to Maven 3 to avoid conflicts with old Maven
and Wagon 1
This closes #78
---
core-it-suite/pom.xml | 2 +-
.../it/MavenITmng3652UserAgentHeaderTest.java | 63 ++++------------------
...528ExcludeWagonsFromMavenCoreArtifactsTest.java | 2 +-
.../maven/it/MavenITmng5669ReadPomsOnce.java | 12 ++---
.../src/test/resources-filtered/bootstrap.txt | 1 +
.../src/test/resources/mng-3599-mk2/pom.xml | 11 +++-
core-it-suite/src/test/resources/mng-3599/pom.xml | 2 +-
.../test/resources/mng-3652/test-plugin/pom.xml | 8 +--
.../test/resources/mng-3652/test-project/pom.xml | 2 +-
.../test/resources/mng-5669-read-poms-once/pom.xml | 10 ++--
.../mng-7470-resolver-transport/project/pom.xml | 5 ++
11 files changed, 45 insertions(+), 73 deletions(-)
diff --git a/core-it-suite/pom.xml b/core-it-suite/pom.xml
index cdb95f9c7..3e225ee7b 100644
--- a/core-it-suite/pom.xml
+++ b/core-it-suite/pom.xml
@@ -234,7 +234,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav-jackrabbit</artifactId>
- <version>2.0</version>
+ <version>3.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java
index d6cb804e2..3642c927e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java
@@ -48,7 +48,7 @@ public class MavenITmng3652UserAgentHeaderTest
public MavenITmng3652UserAgentHeaderTest()
{
- super( "[2.1.0-M1,3.0-alpha-1),[3.0-beta-3,)" ); // 2.1.0-M1+
+ super( "[3.0-beta-3,)" );
}
@Override
@@ -139,21 +139,13 @@ public class MavenITmng3652UserAgentHeaderTest
// NOTE: system property for maven.version may not exist if you use -Dtest
// surefire parameter to run this single test. Therefore, the plugin writes
// the maven version into the check file.
- String mavenVersion = getMavenUAVersion( lines.get( 0 ) );
+ String mavenVersion = lines.get( 0 );
String javaVersion = lines.get( 1 );
String os = lines.get( 2 ) + " " + lines.get( 3 );
String artifactVersion = lines.get( 4 );
- if ( matchesVersionRange( "(,3.0-beta-3)" ) )
- {
- assertEquals( "Comparing User-Agent '" + userAgent + "'", "Apache-Maven/" + mavenVersion + " (Java "
- + javaVersion + "; " + os + ")" + " maven-artifact/" + artifactVersion, userAgent );
- }
- else
- {
- assertEquals( "Comparing User-Agent '" + userAgent + "'", "Apache-Maven/" + mavenVersion + " (Java "
- + javaVersion + "; " + os + ")", userAgent );
- }
+ assertEquals( "Comparing User-Agent '" + userAgent + "'", "Apache-Maven/" + mavenVersion + " (Java "
+ + javaVersion + "; " + os + ")", userAgent );
}
public void testmng3652_UnConfiguredDAV()
@@ -188,7 +180,7 @@ public class MavenITmng3652UserAgentHeaderTest
// NOTE: system property for maven.version may not exist if you use -Dtest
// surefire parameter to run this single test. Therefore, the plugin writes
// the maven version into the check file.
- String mavenVersion = getMavenUAVersion( lines.get( 0 ) );
+ String mavenVersion = lines.get( 0 );
String javaVersion = lines.get( 1 );
String os = lines.get( 2 ) + " " + lines.get( 3 );
String artifactVersion = lines.get( 4 );
@@ -196,16 +188,8 @@ public class MavenITmng3652UserAgentHeaderTest
String userAgent = this.userAgent;
assertNotNull( userAgent );
- if ( matchesVersionRange( "(,3.0-beta-3)" ) )
- {
- assertEquals( "Comparing User-Agent '" + userAgent + "'", "Apache-Maven/" + mavenVersion + " (Java "
- + javaVersion + "; " + os + ")" + " maven-artifact/" + artifactVersion, userAgent );
- }
- else
- {
- assertEquals( "Comparing User-Agent '" + userAgent + "'", "Apache-Maven/" + mavenVersion + " (Java "
- + javaVersion + "; " + os + ")", userAgent );
- }
+ assertEquals( "Comparing User-Agent '" + userAgent + "'", "Apache-Maven/" + mavenVersion + " (Java "
+ + javaVersion + "; " + os + ")", userAgent );
}
public void testmng3652_ConfigurationInSettingsWithoutUserAgent()
@@ -242,7 +226,7 @@ public class MavenITmng3652UserAgentHeaderTest
// NOTE: system property for maven.version may not exist if you use -Dtest
// surefire parameter to run this single test. Therefore, the plugin writes
// the maven version into the check file.
- String mavenVersion = getMavenUAVersion( lines.get( 0 ) );
+ String mavenVersion = lines.get( 0 );
String javaVersion = lines.get( 1 );
String os = lines.get( 2 ) + " " + lines.get( 3 );
String artifactVersion = lines.get( 4 );
@@ -250,25 +234,13 @@ public class MavenITmng3652UserAgentHeaderTest
String userAgent = this.userAgent;
assertNotNull( userAgent );
- if ( matchesVersionRange( "(,3.0-beta-3)" ) )
- {
- assertEquals( "Comparing User-Agent '" + userAgent + "'", "Apache-Maven/" + mavenVersion + " (Java "
- + javaVersion + "; " + os + ")" + " maven-artifact/" + artifactVersion, userAgent );
- }
- else
- {
- assertEquals( "Comparing User-Agent '" + userAgent + "'", "Apache-Maven/" + mavenVersion + " (Java "
- + javaVersion + "; " + os + ")", userAgent );
- }
+ assertEquals( "Comparing User-Agent '" + userAgent + "'", "Apache-Maven/" + mavenVersion + " (Java "
+ + javaVersion + "; " + os + ")", userAgent );
}
public void testmng3652_UserAgentConfiguredInSettings()
throws Exception
{
- // customizing version not supported in Maven 3
- //requiresMavenVersion( "(,3.0-beta-3)" );
- requiresMavenVersion("[2.1.0-M1,3.0-alpha-1),[3.0-beta-3,)");
-
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3652" );
File pluginDir = new File( testDir, "test-plugin" );
File projectDir = new File( testDir, "test-project" );
@@ -302,9 +274,6 @@ public class MavenITmng3652UserAgentHeaderTest
public void testmng3652_AdditionalHttpHeaderConfiguredInSettings()
throws Exception
{
- // customizing version not supported in Maven 3
- requiresMavenVersion("[2.1.0-M1,3.0-alpha-1),[3.0-beta-3,)");
-
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3652" );
File pluginDir = new File( testDir, "test-plugin" );
File projectDir = new File( testDir, "test-project" );
@@ -335,16 +304,4 @@ public class MavenITmng3652UserAgentHeaderTest
assertEquals( "My wonderful header", customHeader );
}
- private String getMavenUAVersion( String mavenVersion )
- {
- if ( matchesVersionRange( "(,3.0-beta-3)" ) )
- {
- return mavenVersion.substring( 0, 3 );
- }
- else
- {
- // Maven 3 returns the whole version
- return mavenVersion;
- }
- }
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java
index b8038ab27..94fc57544 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java
@@ -37,7 +37,7 @@ public class MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest
public MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest()
{
- super( "[2.0.5,3.0-alpha-1),[3.0-alpha-7,)" );
+ super( "[2.0.5,3.0-alpha-1),[3.0-alpha-7,3.9.0)" );
}
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java
index de432d599..cbcd46c03 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java
@@ -74,10 +74,10 @@ public class MavenITmng5669ReadPomsOnce
break;
}
}
- assertEquals( logTxt.toString(), 168, logTxt.size() );
+ assertEquals( logTxt.toString(), 202, logTxt.size() );
// analyze lines. It is a Hashmap, so we can't rely on the order
- Set<String> uniqueBuildingSources = new HashSet<>( 168 );
+ Set<String> uniqueBuildingSources = new HashSet<>( 202 );
final String buildSourceKey = "org.apache.maven.model.building.source=";
final int keyLength = buildSourceKey.length();
for ( String line : logTxt )
@@ -95,7 +95,7 @@ public class MavenITmng5669ReadPomsOnce
}
uniqueBuildingSources.add( line.substring( start + keyLength, end ) );
}
- assertEquals( uniqueBuildingSources.size(), 167 /* is 168 minus superpom */ );
+ assertEquals( uniqueBuildingSources.size(), 201 /* is 202 minus superpom */ );
}
public void testWithBuildConsumer()
@@ -128,11 +128,11 @@ public class MavenITmng5669ReadPomsOnce
break;
}
}
- assertEquals( logTxt.toString(), 168 + 4 /* reactor poms are read twice: file + raw (=XMLFilters) */,
+ assertEquals( logTxt.toString(), 202 + 4 /* reactor poms are read twice: file + raw (=XMLFilters) */,
logTxt.size() );
// analyze lines. It is a Hashmap, so we can't rely on the order
- Set<String> uniqueBuildingSources = new HashSet<>( 168 );
+ Set<String> uniqueBuildingSources = new HashSet<>( 202 );
final String buildSourceKey = "org.apache.maven.model.building.source=";
final int keyLength = buildSourceKey.length();
for ( String line : logTxt )
@@ -150,7 +150,7 @@ public class MavenITmng5669ReadPomsOnce
}
uniqueBuildingSources.add( line.substring( start + keyLength, end ) );
}
- assertEquals( uniqueBuildingSources.size(), 167 /* is 168 minus superpom */ );
+ assertEquals( uniqueBuildingSources.size(), 201 /* is 202 minus superpom */ );
}
}
diff --git a/core-it-suite/src/test/resources-filtered/bootstrap.txt b/core-it-suite/src/test/resources-filtered/bootstrap.txt
index 851152a86..adc695fe4 100644
--- a/core-it-suite/src/test/resources-filtered/bootstrap.txt
+++ b/core-it-suite/src/test/resources-filtered/bootstrap.txt
@@ -70,6 +70,7 @@ org.apache.maven.plugins:maven-compiler-plugin:${stubPluginVersion}
org.apache.maven.plugins:maven-compiler-plugin:2.0.2
org.apache.maven.plugins:maven-compiler-plugin:3.1
org.apache.maven.plugins:maven-compiler-plugin:3.8.1
+org.apache.maven.plugins:maven-compiler-plugin:3.10.1
org.apache.maven.plugins:maven-dependency-plugin:2.7
org.apache.maven.plugins:maven-dependency-plugin:2.8
org.apache.maven.plugins:maven-deploy-plugin:${stubPluginVersion}
diff --git a/core-it-suite/src/test/resources/mng-3599-mk2/pom.xml b/core-it-suite/src/test/resources/mng-3599-mk2/pom.xml
index 693733940..441702638 100644
--- a/core-it-suite/src/test/resources/mng-3599-mk2/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3599-mk2/pom.xml
@@ -15,9 +15,18 @@
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav-jackrabbit</artifactId>
- <version>2.10</version>
+ <version>3.0.0</version>
</extension>
</extensions>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.10.1</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</project>
diff --git a/core-it-suite/src/test/resources/mng-3599/pom.xml b/core-it-suite/src/test/resources/mng-3599/pom.xml
index 779cbc865..98f6103ef 100644
--- a/core-it-suite/src/test/resources/mng-3599/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3599/pom.xml
@@ -15,7 +15,7 @@
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav-jackrabbit</artifactId>
- <version>2.0</version>
+ <version>3.0.0</version>
</extension>
</extensions>
</build>
diff --git a/core-it-suite/src/test/resources/mng-3652/test-plugin/pom.xml b/core-it-suite/src/test/resources/mng-3652/test-plugin/pom.xml
index 3fa623c0c..3206281c7 100644
--- a/core-it-suite/src/test/resources/mng-3652/test-plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3652/test-plugin/pom.xml
@@ -10,13 +10,13 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact-manager</artifactId>
- <version>2.0.9</version>
+ <artifactId>maven-compat</artifactId>
+ <version>3.0-beta-3</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>2.0</version>
+ <version>3.0-beta-3</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -27,7 +27,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <version>2.0.9</version>
+ <version>3.0-beta-3</version>
</dependency>
</dependencies>
</project>
diff --git a/core-it-suite/src/test/resources/mng-3652/test-project/pom.xml b/core-it-suite/src/test/resources/mng-3652/test-project/pom.xml
index f07a5dd7f..6e5ded482 100644
--- a/core-it-suite/src/test/resources/mng-3652/test-project/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3652/test-project/pom.xml
@@ -25,7 +25,7 @@
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav-jackrabbit</artifactId>
- <version>2.0</version>
+ <version>3.0.0</version>
</extension>
</extensions>
</build>
diff --git a/core-it-suite/src/test/resources/mng-5669-read-poms-once/pom.xml b/core-it-suite/src/test/resources/mng-5669-read-poms-once/pom.xml
index 77013251a..8b41e0b6a 100644
--- a/core-it-suite/src/test/resources/mng-5669-read-poms-once/pom.xml
+++ b/core-it-suite/src/test/resources/mng-5669-read-poms-once/pom.xml
@@ -39,25 +39,25 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.6</version>
+ <version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
+ <version>3.10.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.12.4</version>
+ <version>3.0.0-M5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
+ <version>3.2.0</version>
</plugin>
</plugins>
</pluginManagement>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/project/pom.xml b/core-it-suite/src/test/resources/mng-7470-resolver-transport/project/pom.xml
index 9759c899b..c9dbca26b 100644
--- a/core-it-suite/src/test/resources/mng-7470-resolver-transport/project/pom.xml
+++ b/core-it-suite/src/test/resources/mng-7470-resolver-transport/project/pom.xml
@@ -34,6 +34,11 @@ under the License.
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.10.1</version>
+ </plugin>
<plugin>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>resolver-demo-maven-plugin</artifactId>