You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2020/12/27 17:50:45 UTC
[maven] branch MNG-5222 updated (cb48e85 -> 547ed74)
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a change to branch MNG-5222
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard cb48e85 [MNG-5222] - Maven 3 no longer logs warnings about deprecated plugin parameters
add 65ec04c [MNG-6948] Repository files should not pass build-filters
add 2e66809 [MNG-6952] Fail early if pom cannot be transformed
add c9d1788 [MNG-6949] Add a GitHub Actions Workflow for building and integration testing changes
add 3b442ba [MNG-6949] Run integration tests on large matrix, build on small one.
add 117cfde [MNG-5760] Several fixes for the --resume feature.
add 51c0399 [MNG-6967] Improve the command line output from maven-artifact.
add 4f193b3 [MNG-6964] Maven version sorting is internally inconsistent.
add 5739b12 Resume from generates misleading hint when multiple projects fail.
add 6087444 [MNG-6972] Allow access to org.apache.maven.graph
add 4927b1d Use Maven 3.6.3 for builds
add f211600 Merge branch 'master' of https://gitbox.apache.org/repos/asf/maven
add 4de92e4 add 15-ea build
add 9864cdb only 8 and 11
add 9120d86 [MNG-6977] Use hyphen when creating builder threads (names)
add 001310a disable publishers
add fe26a18 Update README
add dd54c1e update ASF CI url
add e26f2f0 update ASF CI url
add 2a23d7b [MNG-6772] Prevent Super POM central entry from overriding
add 8b7f6f0 [MNG-6987] Reorder groupId before artifactId when writing an exclusion using maven-model
add 5fbe40a Bump ant from 1.10.4 to 1.10.8 in /maven-wrapper
add ac80f5c Refactor MavenCli.populateRequest
add 2c3949c Run Github CI builds with Java 8, 11, 15 and 16-ea
add 0e3c7a4 [MNG-6949] Get the correct PR origin user and branch name from the GitHub Actions context, in order to run the matching integration tests repo and branch.
add df67c00 [MNG-6991] Restore how the local repository is determined
add 39641ac [MNG-6983] Plugin key can get out of sync with artifactId and groupId
add d5a5bc5 [MNG-6992] Allow access to org.eclipse.aether.transform
add ecfff26 [MNG-6993] Upgrade SLF4J to 1.7.30
add c61e630 [MNG-6965] Extensions suddenly have org.codehaus.plexus:plexus-utils:jar:1.1 on their classpath
add 7c7de41 [MNG-6996] Upgrade Maven Resolver to 1.6.1
add 789d75f Merge branch 'master' of https://gitbox.apache.org/repos/asf/maven
add 8393b9e [MNG-7000] metadata.mdo contains invalid link to schema
add a5b292d [MNG-6118] Make Maven aware of all projects in a multi module project when using -f or when changing directory to a submodule.
add 87670dd [MNG-6931] Deprecate custom logging approach
add 42af8ba [MNG-6981] Include the child projects (modules) of the selected projects with --pl in the reactor.
add 8913502 Merge branch 'master' of https://gitbox.apache.org/repos/asf/maven
add afd17a3 [MNG-7002] Added a test scenario for including child modules when using the --pl switch.
add 6034102 Merge pull request #387 from infosupport/MNG-7002-include-unit-test-for-pl-including-children
add d98844c [MNG-7004] Replacing set-env in the GitHub Actions workflow with the new way to set environment variables, since set-env is deprecated.
add 3a51a3a [MNG-6873] update junit dependency to 4.13.1
add 449e6dc [MNG-6873] update junit dependency to 4.13.1 - also in unit tests
add 2469718 Merge branch 'master' of https://gitbox.apache.org/repos/asf/maven
add e7eef9d [MNG-6999] Chained (consumer) XMLFilters can result in "floating" comments
add ba7a037 Refactor ProjectsCollector.collectProjects
add a89a3d3 [MNG-6999] prevent potential race condition
add 7a4b77b [MNG-6548] Lifecycle plugin version upgrades
add 230773a [MNG-6554] Packaging 'ear' binding plugin upgrades
add 6d75136 [MNG-6552] Packaging 'ejb' binding plugin upgrades
add 658b7a9 [MNG-6552] Packaging 'rar' binding plugin upgrades
add 033a7a2 [MNG-6553] Packaging 'war' binding plugin upgrades
add 7b04f82 [MNG-6556] Packaging 'maven-plugin' binding plugin upgrades
add 7251b8d [MNG-6551] Packaging 'jar' binding plugin upgrades
add 2072372 [MNG-6550] Packaging 'pom' binding plugin upgrades
add 7268880 [MNG-6754] Set the same timestamp in multi module builds
add 827224c [MNG-7019] Notify also at start when profile is missing
add 3736be9 Updating version in preparation for Maven 4
add b24c34b [MNG-7041] Update @since, version ranges and other version related strings
add d8ad76b [MNG-5728] Switch the default checksum policy from "warn" to "fail"
add 06c3217 Merge branch 'MNG-5728' of https://gitbox.apache.org/repos/asf/maven
add b6cf710 [MNG-7042] Upgrade Maven Wagon to 3.4.2
add 26f1e81 Merge branch 'master' of https://gitbox.apache.org/repos/asf/maven
add 2bdc0c5 remove unused imports
add 251ba22 Revert "[MNG-5728] Switch the default checksum policy from "warn" to "fail""
add 95ee890 [MNG-5728] Switch the default checksum policy from "warn" to "fail"
add be8ced6 [MNG-7034] StackOverflowError thrown if a cycle exists in BOM imports
add d8c2cc7 [MNG-6566] Plugins that require a certain phase should not fork goals that are already in the execution plan.
add 2ef0e5b Upgrade github actions cache and use m2 cache for integration testing as well
add 2609cdc [MNG-7045] Drop CDI API from Maven
add 9f88494 [MNG-6957] Versionless reactor dependencies/parent should work even if modules are aggregated in reverse order
add 7e21a52 [MNG-4660] Increase usefulness of logging
add d2adab7 [MNG-6054] Remove super POM plugin management section
add 72a125e [MNG-7022] Remove o.a.m.lifecycle.mapping.Lifecycle optional mojos backward compat code
add 7f63dac [MNG-7021] Remove old MHELP backward compat code
add 8c9c303 [MNG-7046] Revert MNG-5639 and make repo config static only
add 673a7d1 Trim trailing whitespace
add 8eda091 Replace tabs with proper count of spaces
add 5c59834 Ignore .checkstyle
add c79682b [MNG-7057] Param style of Javadoc in ReactorModelPool is wrong
new 547ed74 [MNG-5222] - Maven 3 no longer logs warnings about deprecated plugin parameters
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 (cb48e85)
\
N -- N -- N refs/heads/MNG-5222 (547ed74)
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.yml | 140 +++++
.gitignore | 1 +
Jenkinsfile | 22 +-
README.md | 20 +-
apache-maven/README.txt | 2 +-
apache-maven/maven-wrapper.pom | 10 +-
apache-maven/pom.xml | 2 +-
apache-maven/src/assembly/maven/component.xml | 2 +-
.../src/assembly/maven/conf/toolchains.xml | 40 +-
apache-maven/src/assembly/wrapper/bin.xml | 2 +-
.../src/assembly/wrapper/script/download.cmd | 12 +-
.../shared/.mvn/wrapper/maven-wrapper.properties | 4 +-
.../.mvn/wrapper/MavenWrapperDownloader.java | 10 +-
.../src/main/appended-resources/META-INF/NOTICE.vm | 18 +-
.../main/appended-resources/licenses/CDDL-1.0.txt | 56 +-
...f4j-api-1.7.29.txt => MIT-slf4j-api-1.7.30.txt} | 2 +-
maven-artifact/pom.xml | 2 +-
.../maven/artifact/handler/ArtifactHandler.java | 4 +-
.../repository/ArtifactRepositoryPolicy.java | 4 +-
.../artifact/versioning/ComparableVersion.java | 43 +-
.../versioning/DefaultArtifactVersion.java | 2 +-
.../maven/artifact/versioning/VersionRange.java | 2 +-
.../artifact/versioning/ComparableVersionIT.java | 6 +-
.../artifact/versioning/ComparableVersionTest.java | 15 +
maven-builder-support/pom.xml | 2 +-
.../java/org/apache/maven/building/FileSource.java | 2 +-
.../apache/maven/building/ProblemCollector.java | 8 +-
.../maven/building/ProblemCollectorFactory.java | 6 +-
.../org/apache/maven/building/StringSource.java | 2 +-
.../building/DefaultProblemCollectorTest.java | 8 +-
.../apache/maven/building/DefaultProblemTest.java | 20 +-
.../building/ProblemCollectorFactoryTest.java | 4 +-
maven-compat/pom.xml | 2 +-
.../installer/DefaultArtifactInstaller.java | 1 +
.../repository/legacy/DefaultWagonManager.java | 2 +-
.../resolver/DefaultLegacyArtifactCollector.java | 2 +-
.../transform/ReleaseArtifactTransformation.java | 1 +
.../resolver/transform/SnapshotTransformation.java | 1 +
.../AbstractArtifactComponentTestCase.java | 25 +
.../inheritance/t09/ProjectInheritanceTest.java | 2 +-
.../inheritance/t10/ProjectInheritanceTest.java | 4 +-
.../repository/legacy/DefaultWagonManagerTest.java | 5 +
.../DefaultClasspathTransformationTest.java | 124 ++--
.../DefaultGraphConflictResolutionPolicyTest.java | 38 +-
.../metadata/DefaultGraphConflictResolverTest.java | 170 +++---
.../org/apache/maven/its/a/0.1/a-0.1.pom | 2 +-
.../org/apache/maven/its/b/0.1/b-0.1.pom | 2 +-
.../test/resources/inheritance-repo/t04/p0/pom.xml | 12 +-
.../test/resources/inheritance-repo/t10/p0/pom.xml | 14 +-
.../t12scm/maven/p0/1.0/p0-1.0.pom | 4 +-
.../t12scm/maven/p1/1.0/p1-1.0.pom | 2 +-
maven-core/pom.xml | 2 +-
.../org/apache/maven/ArtifactFilterManager.java | 4 +-
.../main/java/org/apache/maven/DefaultMaven.java | 2 +
.../maven/DefaultProjectDependenciesResolver.java | 2 +-
.../org/apache/maven/ProjectCycleException.java | 2 +-
.../main/java/org/apache/maven/ReactorReader.java | 23 +-
.../java/org/apache/maven/RepositoryUtils.java | 6 +-
.../metadata/AbstractRepositoryMetadata.java | 1 -
.../apache/maven/bridge/MavenRepositorySystem.java | 22 +-
.../maven/execution/BuildResumptionData.java | 21 +-
.../execution/DefaultBuildResumptionAnalyzer.java | 36 +-
.../DefaultBuildResumptionDataRepository.java | 23 +-
.../execution/DefaultMavenExecutionRequest.java | 10 +-
.../DefaultMavenExecutionRequestPopulator.java | 20 +-
.../maven/execution/MavenExecutionRequest.java | 3 +-
.../execution/MavenExecutionRequestPopulator.java | 2 +-
.../org/apache/maven/execution/MavenSession.java | 28 +-
.../maven/extension/internal/CoreExports.java | 2 +-
.../apache/maven/graph/DefaultGraphBuilder.java | 162 ++---
.../aether/ConsumerModelSourceTransformer.java | 25 +-
.../DefaultRepositorySystemSessionFactory.java | 11 +-
.../maven/lifecycle/DefaultLifecycleExecutor.java | 22 -
.../apache/maven/lifecycle/DefaultLifecycles.java | 16 +-
.../java/org/apache/maven/lifecycle/Lifecycle.java | 2 +-
.../maven/lifecycle/MojoExecutionConfigurator.java | 2 +-
.../lifecycle/internal/BuildListCalculator.java | 2 +-
.../lifecycle/internal/BuildThreadFactory.java | 4 +-
.../DefaultLifecycleExecutionPlanCalculator.java | 86 ++-
.../internal/DefaultLifecyclePluginAnalyzer.java | 12 +-
.../lifecycle/internal/DependencyContext.java | 2 +-
.../internal/LifecycleDependencyResolver.java | 14 +-
.../internal/LifecycleExecutionPlanCalculator.java | 5 +-
.../lifecycle/internal/LifecycleModuleBuilder.java | 2 +-
.../maven/lifecycle/internal/LifecycleStarter.java | 2 +-
.../lifecycle/internal/ProjectArtifactFactory.java | 2 +-
.../maven/lifecycle/internal/TaskSegment.java | 2 +-
.../lifecycle/internal/builder/BuilderCommon.java | 8 +-
.../builder/multithreaded/ThreadOutputMuxer.java | 2 +-
.../lifecycle/mapping/DefaultLifecycleMapping.java | 2 +-
.../apache/maven/lifecycle/mapping/Lifecycle.java | 8 -
.../maven/lifecycle/mapping/LifecycleMojo.java | 14 +-
.../maven/lifecycle/mapping/LifecyclePhase.java | 26 +-
.../maven/plugin/DefaultPluginArtifactsCache.java | 4 +-
.../maven/plugin/DefaultPluginDescriptorCache.java | 4 +-
.../maven/plugin/DefaultPluginRealmCache.java | 6 +-
.../apache/maven/plugin/MavenPluginManager.java | 2 +-
.../plugin/PluginParameterExpressionEvaluator.java | 6 +-
.../plugin/internal/DefaultMavenPluginManager.java | 2 +-
.../DefaultPluginDependenciesResolver.java | 12 +-
.../maven/plugin/internal/PlexusUtilsInjector.java | 87 ---
.../project/DefaultModelBuildingListener.java | 2 +-
.../maven/project/DefaultProjectBuilder.java | 122 ++--
.../project/DefaultProjectBuildingHelper.java | 5 +-
.../org/apache/maven/project/MavenProject.java | 2 +-
.../apache/maven/project/ProjectModelResolver.java | 9 +-
.../apache/maven/project/ReactorModelCache.java | 21 +-
.../org/apache/maven/project/ReactorModelPool.java | 24 +-
.../maven/project/RepositorySessionDecorator.java | 4 +-
.../artifact/DefaultProjectArtifactsCache.java | 30 +-
.../project/artifact/ProjectArtifactsCache.java | 2 +-
.../project/collector/DefaultProjectsSelector.java | 103 ++++
.../collector/MultiModuleCollectionStrategy.java | 194 ++++++
.../collector/PomlessCollectionStrategy.java | 65 ++
.../collector/ProjectCollectionStrategy.java} | 27 +-
.../collector/ProjectsSelector.java} | 31 +-
.../collector/RequestPomCollectionStrategy.java | 54 ++
.../apache/maven/toolchain/DefaultToolchain.java | 10 +-
.../maven/toolchain/DefaultToolchainManager.java | 6 +-
.../toolchain/DefaultToolchainManagerPrivate.java | 2 +-
.../maven/toolchain/RequirementMatcherFactory.java | 4 +-
.../maven/toolchain/ToolchainManagerPrivate.java | 2 +-
.../apache/maven/toolchain/ToolchainPrivate.java | 2 +-
.../building/DefaultToolchainsBuilder.java | 8 +-
.../building/DefaultToolchainsBuildingRequest.java | 2 +-
.../building/DefaultToolchainsBuildingResult.java | 10 +-
.../building/ToolchainsBuildingResult.java | 2 +-
.../maven/toolchain/java/DefaultJavaToolChain.java | 2 +-
.../toolchain/merge/MavenToolchainMerger.java | 6 +-
.../DefaultConsumerPomXMLFilterFactory.java | 33 +-
maven-core/src/main/mdo/toolchains.mdo | 8 +-
.../main/resources/META-INF/maven/extension.xml | 12 +-
.../main/resources/META-INF/plexus/components.xml | 6 +-
.../resources/META-INF/plexus/default-bindings.xml | 100 ++--
maven-core/src/site/apt/offline-mode.apt | 2 +-
.../maven/AbstractCoreMavenComponentTestCase.java | 9 +-
.../filter/ExclusionArtifactFilterTest.java | 16 +-
.../DefaultBuildResumptionAnalyzerTest.java | 4 +-
.../DefaultBuildResumptionDataRepositoryTest.java | 30 +
.../DefaultMavenExecutionRequestPopulatorTest.java | 2 +-
.../maven/graph/DefaultGraphBuilderTest.java | 239 +++++---
.../aether/ConsumerModelSourceTransformerTest.java | 70 +++
.../maven/lifecycle/DefaultLifecyclesTest.java | 12 +-
.../maven/lifecycle/LifecycleExecutorTest.java | 4 +-
.../lifecycle/MojoExecutionXPathContainer.java | 2 +-
.../lifecycle/internal/BuilderCommonTest.java | 8 +-
.../lifecycle/internal/ProjectBuildListTest.java | 2 +-
.../stub/LifecycleExecutionPlanCalculatorStub.java | 4 +-
.../lifecycle/mapping/LifecyclePhaseTest.java | 16 +-
.../org/apache/maven/plugin/PluginManagerTest.java | 2 +-
.../maven/plugin/PluginParameterExceptionTest.java | 18 +-
.../project/DefaultMavenProjectBuilderTest.java | 10 -
.../apache/maven/project/PomConstructionTest.java | 4 +-
.../apache/maven/project/ProjectBuilderTest.java | 106 ++--
.../apache/maven/project/ProjectSorterTest.java | 2 +-
.../artifact/DefaultProjectArtifactsCacheTest.java | 18 +-
.../maven/project/harness/PomTestWrapper.java | 4 +-
.../DefaultToolchainManagerPrivateTest.java | 4 +-
.../projects/lifecycle-dependency-resolver/pom.xml | 4 +-
.../lifecycle-dependency-resolver/war/pom.xml | 4 +-
.../project-with-inheritance/pom.xml | 2 +-
.../project-with-inheritance/pom.xml | 2 +-
.../project-builder/MNG-6983/parent-pom.xml | 38 ++
.../test/projects/project-builder/MNG-6983/pom.xml | 22 +
.../org/apache/maven/its/a/0.1/a-0.1.pom | 2 +-
.../org/apache/maven/its/b/0.1/b-0.1.pom | 2 +-
.../maven-plugin-api/2.0/maven-plugin-api-2.0.pom | 2 +-
.../org/apache/maven/maven/2.0/maven-2.0.pom | 2 +-
.../config-with-plugin-mng/pom.xml | 75 ++-
.../dependency-inheritance/pom.xml | 2 +-
.../dependency-inheritance/sub/pom.xml | 2 +-
.../dependency-scope-inheritance/pom.xml | 28 +-
.../duplicate-exclusions-dependency/pom.xml | 56 +-
.../w-plugin-mgmt/pom.xml | 2 +-
.../resources-project-builder/micromailer/pom.xml | 218 +++----
.../micromailer/spice-parent-9.pom | 186 +++---
.../parent-interpolation/pom.xml | 30 +-
.../parent-interpolation/sub/pom.xml | 16 +-
.../plugin-inheritance-simple/pom.xml | 31 +-
.../plugin-inheritance-simple/sub/pom.xml | 38 +-
.../plugin-management-dependencies/pom.xml | 44 +-
.../plugin-management-duplicate/pom.xml | 66 +-
.../plugin-management-duplicate/sub/pom.xml | 12 +-
.../pluginmanagement-inherited/pom.xml | 34 +-
.../pluginmanagement-inherited/sub/pom.xml | 32 +-
.../profile-properties-interpolation/pom.xml | 86 +--
.../properties-no-duplication/sub/pom.xml | 6 +-
.../reporting-interpolation/pom.xml | 10 +-
.../resources-settings/settings-no-pom/pom.xml | 22 +-
.../settings-no-pom/settings.xml | 34 +-
.../test/resources/META-INF/plexus/components.xml | 8 +-
.../org/apache/maven/execution/resume.properties | 2 +
.../junit/junit/3.8.1/junit-3.8.1.jar | Bin 121070 -> 0 bytes
.../junit/junit/3.8.1/junit-3.8.1.jar.md5 | 1 -
.../junit/junit/3.8.1/junit-3.8.1.jar.sha1 | 1 -
.../junit/junit/3.8.1/junit-3.8.1.pom | 29 -
.../junit/junit/3.8.1/junit-3.8.1.pom.md5 | 1 -
.../junit/junit/3.8.1/junit-3.8.1.pom.sha1 | 1 -
.../3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.pom | 52 +-
.../test/test-extension/1/test-extension-1.pom | 6 +-
.../1/test-lifecycle-and-artifactHandler-1.pom | 4 +-
.../apache/maven/maven-parent/5/maven-parent-5.pom | 10 +-
.../wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom | 2 +-
.../plexus-active-collections-1.0-beta-1.pom | 2 +-
.../plexus-classworlds-1.2-alpha-10.pom | 4 +-
.../1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom | 2 +-
.../1.1.6/plexus-components-1.1.6.pom | 18 +-
.../plexus-container-default-1.0-alpha-32.pom | 4 +-
.../plexus-containers-1.0-alpha-16.pom | 2 +-
.../plexus-containers-1.0-alpha-32.pom | 2 +-
.../plexus/plexus/1.0.10/plexus-1.0.10.pom | 4 +-
.../plexus/plexus/1.0.11/plexus-1.0.11.pom | 10 +-
.../codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom | 4 +-
.../codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom | 6 +-
.../codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom | 4 +-
.../resources/org/apache/maven/lifecycle/pom.xml | 2 +-
.../tests/project-caching/1/project-caching-1.pom | 4 +-
.../toolchain/model/toolchains-jdks-extend.xml | 2 +-
.../project-dynamism/plugin-level-dep.pom.xml | 2 +-
.../grandchild-check/child/grandchild/pom.xml | 15 +-
.../projects/grandchild-check/child/pom.xml | 16 +-
.../resources/projects/grandchild-check/pom.xml | 10 +-
...pom-resolves-from-property-based-repository.xml | 31 -
.../pom.xml | 10 +-
.../pom.xml | 10 +-
.../parent-version-range-local-valid/pom.xml | 10 +-
.../test/resources/projects/transform/after.pom | 2 +
.../test/resources/projects/transform/before.pom | 5 +
maven-embedder/pom.xml | 2 +-
maven-embedder/src/examples/simple-project/pom.xml | 2 +-
.../main/java/org/apache/maven/cli/CliRequest.java | 4 +-
.../main/java/org/apache/maven/cli/MavenCli.java | 533 ++++++++++-------
maven-embedder/src/site/apt/index.apt.vm | 3 +-
.../java/org/apache/maven/cli/MavenCliTest.java | 91 ++-
.../maven/cli/event/ExecutionEventLoggerTest.java | 2 +-
maven-model-builder/pom.xml | 2 +-
.../java/org/apache/maven/feature/Features.java | 24 +-
.../building/AbstractModelSourceTransformer.java | 93 ++-
.../maven/model/building/ArtifactModelSource.java | 46 +-
.../building/BuildModelSourceTransformer.java | 21 +-
.../building/DefaultBuildPomXMLFilterFactory.java | 49 +-
.../maven/model/building/DefaultModelBuilder.java | 661 ++++++++++++++-------
.../building/DefaultModelBuildingRequest.java | 27 +-
.../model/building/DefaultModelBuildingResult.java | 30 +
.../building/DefaultModelSourceTransformer.java | 6 +-
.../model/building/DefaultTransformerContext.java | 95 +++
.../maven/model/building/FileModelSource.java | 18 +-
.../model/building/FilterModelBuildingRequest.java | 16 +-
.../apache/maven/model/building/ModelBuilder.java | 2 +
.../maven/model/building/ModelBuildingRequest.java | 36 +-
.../maven/model/building/ModelBuildingResult.java | 7 +
.../apache/maven/model/building/ModelCache.java | 12 +-
.../apache/maven/model/building/ModelCacheTag.java | 10 +-
.../org/apache/maven/model/building/ModelData.java | 113 +---
.../model/building/ModelSourceTransformer.java | 16 +-
.../maven/model/building/StringModelSource.java | 2 +-
.../maven/model/building/TransformerContext.java | 22 +-
.../model/building/TransformerContextBuilder.java | 32 +-
.../maven/model/building/TransformerException.java | 4 +-
.../maven/model/building/UrlModelSource.java | 2 +-
.../StringVisitorModelInterpolator.java | 2 +-
.../apache/maven/model/io/DefaultModelReader.java | 14 +-
.../org/apache/maven/model/io/ModelReader.java | 6 +
.../model/validation/DefaultModelValidator.java | 4 +-
.../resources/org/apache/maven/model/pom-4.0.0.xml | 22 -
maven-model-builder/src/site/apt/index.apt | 27 +-
.../model/building/DefaultModelBuilderTest.java | 147 +++++
.../maven/model/building/FileModelSourceTest.java | 10 +-
.../model/building/FileToRawModelMergerTest.java | 4 +-
.../DefaultInheritanceAssemblerTest.java | 13 +-
.../maven/model/merge/MavenModelMergerTest.java | 4 +-
.../validation/DefaultModelValidatorTest.java | 10 +-
.../module-path-not-artifactId-child.xml | 2 +-
.../module-path-not-artifactId-expected.xml | 2 +-
.../raw-model/bad-ci-friendly-sha1plus.xml | 18 +-
.../raw-model/bad-ci-friendly-sha1plus2.xml | 18 +-
.../poms/validation/raw-model/bad-ci-friendly.xml | 18 +-
.../raw-model/bad-parent-version-latest.xml | 30 +-
.../raw-model/bad-parent-version-release.xml | 30 +-
.../raw-model/ok-ci-friendly-all-expressions.xml | 18 +-
.../raw-model/ok-ci-friendly-changelist.xml | 18 +-
.../raw-model/ok-ci-friendly-revision.xml | 18 +-
.../validation/raw-model/ok-ci-friendly-sha1.xml | 18 +-
.../poms/validation/raw-model/self-referencing.xml | 32 +-
maven-model/pom.xml | 2 +-
.../org/apache/maven/model/merge/ModelMerger.java | 12 +-
maven-model/src/main/mdo/maven.mdo | 23 +-
.../apache/maven/model/merge/ModelMergerTest.java | 62 +-
maven-plugin-api/pom.xml | 2 +-
.../apache/maven/monitor/logging/DefaultLog.java | 5 +-
.../java/org/apache/maven/plugin/AbstractMojo.java | 10 +-
.../main/java/org/apache/maven/plugin/Mojo.java | 9 +-
.../java/org/apache/maven/plugin/logging/Log.java | 5 +-
.../maven/plugin/logging/SystemStreamLog.java | 5 +-
maven-repository-metadata/pom.xml | 2 +-
.../src/main/mdo/metadata.mdo | 2 +-
maven-resolver-provider/pom.xml | 2 +-
.../internal/ArtifactDescriptorReaderDelegate.java | 2 +-
.../internal/ArtifactDescriptorUtils.java | 18 +-
.../repository/internal/DefaultModelResolver.java | 6 +-
.../repository/internal/LocalSnapshotMetadata.java | 15 +-
.../internal/LocalSnapshotMetadataGenerator.java | 7 +-
.../maven/repository/internal/MavenMetadata.java | 8 +-
.../repository/internal/MavenSnapshotMetadata.java | 5 +-
.../internal/RemoteSnapshotMetadata.java | 14 +-
.../internal/RemoteSnapshotMetadataGenerator.java | 9 +-
.../repository/internal/VersionsMetadata.java | 13 +-
.../internal/VersionsMetadataGenerator.java | 7 +-
.../internal/RemoteSnapshotMetadataTest.java | 2 +-
maven-settings-builder/pom.xml | 2 +-
.../settings/building/FileSettingsSource.java | 2 +-
.../maven/settings/building/SettingsSource.java | 2 +-
.../settings/building/StringSettingsSource.java | 2 +-
.../maven/settings/building/UrlSettingsSource.java | 4 +-
.../validation/DefaultSettingsValidator.java | 2 +-
maven-settings/pom.xml | 2 +-
maven-slf4j-provider/pom.xml | 2 +-
maven-slf4j-wrapper/pom.xml | 2 +-
maven-wrapper/pom.xml | 10 +-
.../apache/maven/wrapper/BootstrapMainStarter.java | 2 +-
.../java/org/apache/maven/wrapper/Installer.java | 6 +-
.../org/apache/maven/wrapper/MavenWrapperMain.java | 2 +-
.../apache/maven/wrapper/WrapperExecutorTest.java | 2 +-
maven-xml/pom.xml | 2 +-
.../main/java/org/apache/maven/xml/Factories.java | 16 +-
.../java/org/apache/maven/xml/sax/SAXEvent.java | 4 +-
.../org/apache/maven/xml/sax/SAXEventFactory.java | 10 +-
.../org/apache/maven/xml/sax/SAXEventUtils.java | 12 +-
.../maven/xml/sax/ext/CommentRenormalizer.java | 10 +-
.../xml/sax/filter/AbstractEventXMLFilter.java | 54 +-
.../maven/xml/sax/filter/AbstractSAXFilter.java | 41 +-
.../maven/xml/sax/filter/BuildPomXMLFilter.java | 13 +-
.../xml/sax/filter/BuildPomXMLFilterFactory.java | 83 ++-
.../xml/sax/filter/BuildPomXMLFilterListener.java | 6 +-
.../maven/xml/sax/filter/CiFriendlyXMLFilter.java | 37 +-
.../maven/xml/sax/filter/ConsumerPomXMLFilter.java | 16 +-
.../sax/filter/ConsumerPomXMLFilterFactory.java | 46 +-
.../apache/maven/xml/sax/filter/DependencyKey.java | 26 +-
.../maven/xml/sax/filter/FastForwardFilter.java | 26 +-
.../maven/xml/sax/filter/ModulesXMLFilter.java | 24 +-
.../maven/xml/sax/filter/ParentXMLFilter.java | 73 ++-
.../xml/sax/filter/ReactorDependencyXMLFilter.java | 22 +-
.../xml/sax/filter/RelativePathXMLFilter.java | 22 +-
.../maven/xml/sax/filter/RelativeProject.java | 14 +-
.../apache/maven/xml/sax/ChainedFilterTest.java | 150 +++++
.../maven/xml/sax/ext/CommentRenormalizerTest.java | 14 +-
.../xml/sax/filter/AbstractXMLFilterTests.java | 138 +++--
.../xml/sax/filter/CiFriendlyXMLFilterTest.java | 6 +-
.../xml/sax/filter/ConsumerPomXMLFilterTest.java | 248 ++++----
.../maven/xml/sax/filter/ModulesXMLFilterTest.java | 80 +--
.../maven/xml/sax/filter/ParentXMLFilterTest.java | 44 +-
.../sax/filter/ReactorDependencyXMLFilterTest.java | 93 +--
.../xml/sax/filter/RelativePathXMLFilterTest.java | 22 +-
pom.xml | 18 +-
354 files changed, 5197 insertions(+), 3487 deletions(-)
create mode 100644 .github/workflows/maven.yml
rename apache-maven/src/main/appended-resources/licenses/{MIT-slf4j-api-1.7.29.txt => MIT-slf4j-api-1.7.30.txt} (94%)
delete mode 100644 maven-core/src/main/java/org/apache/maven/plugin/internal/PlexusUtilsInjector.java
create mode 100644 maven-core/src/main/java/org/apache/maven/project/collector/DefaultProjectsSelector.java
create mode 100644 maven-core/src/main/java/org/apache/maven/project/collector/MultiModuleCollectionStrategy.java
create mode 100644 maven-core/src/main/java/org/apache/maven/project/collector/PomlessCollectionStrategy.java
copy maven-core/src/main/java/org/apache/maven/{execution/BuildSuccess.java => project/collector/ProjectCollectionStrategy.java} (64%)
copy maven-core/src/main/java/org/apache/maven/{execution/BuildSuccess.java => project/collector/ProjectsSelector.java} (54%)
create mode 100644 maven-core/src/main/java/org/apache/maven/project/collector/RequestPomCollectionStrategy.java
create mode 100644 maven-core/src/test/java/org/apache/maven/internal/aether/ConsumerModelSourceTransformerTest.java
create mode 100644 maven-core/src/test/projects/project-builder/MNG-6983/parent-pom.xml
create mode 100644 maven-core/src/test/projects/project-builder/MNG-6983/pom.xml
create mode 100644 maven-core/src/test/resources/org/apache/maven/execution/resume.properties
delete mode 100644 maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/junit/junit/3.8.1/junit-3.8.1.jar
delete mode 100644 maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/junit/junit/3.8.1/junit-3.8.1.jar.md5
delete mode 100644 maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/junit/junit/3.8.1/junit-3.8.1.jar.sha1
delete mode 100644 maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/junit/junit/3.8.1/junit-3.8.1.pom
delete mode 100644 maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/junit/junit/3.8.1/junit-3.8.1.pom.md5
delete mode 100644 maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/junit/junit/3.8.1/junit-3.8.1.pom.sha1
delete mode 100644 maven-core/src/test/resources/projects/import-scope-pom-resolves-from-property-based-repository.xml
copy maven-model-builder/src/test/resources/poms/factory/simple.xml => maven-core/src/test/resources/projects/transform/after.pom (99%)
copy maven-model-builder/src/test/resources/poms/factory/simple.xml => maven-core/src/test/resources/projects/transform/before.pom (95%)
create mode 100644 maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultTransformerContext.java
copy maven-core/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingResult.java => maven-model-builder/src/main/java/org/apache/maven/model/building/TransformerContextBuilder.java (54%)
create mode 100644 maven-model-builder/src/test/java/org/apache/maven/model/building/DefaultModelBuilderTest.java
create mode 100644 maven-xml/src/test/java/org/apache/maven/xml/sax/ChainedFilterTest.java
[maven] 01/01: [MNG-5222] - Maven 3 no longer logs warnings about
deprecated plugin parameters
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch MNG-5222
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 547ed747b962c213366d8bf6d254468c3d6bf0c6
Author: Gabriel Belingueres <be...@gmail.com>
AuthorDate: Mon Sep 9 00:36:13 2019 -0300
[MNG-5222] - Maven 3 no longer logs warnings about deprecated plugin
parameters
- Added warning when setting deprecated parameter with value different
than the default.
- Stop using deprecated DebugConfigurationListener class.
---
.../plugin/internal/DefaultMavenPluginManager.java | 6 +-
.../internal/ValidatingConfigurationListener.java | 77 ++++++++++++++++++++--
2 files changed, 73 insertions(+), 10 deletions(-)
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
index 7c77ee8..773dcde 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
@@ -27,7 +27,6 @@ import org.apache.maven.execution.scope.internal.MojoExecutionScopeModule;
import org.apache.maven.model.Plugin;
import org.apache.maven.monitor.logging.DefaultLog;
import org.apache.maven.plugin.ContextEnabled;
-import org.apache.maven.plugin.DebugConfigurationListener;
import org.apache.maven.plugin.ExtensionRealmCache;
import org.apache.maven.plugin.InvalidPluginDescriptorException;
import org.apache.maven.plugin.MavenPluginManager;
@@ -65,7 +64,6 @@ import org.codehaus.plexus.classworlds.realm.ClassRealm;
import org.codehaus.plexus.component.composition.CycleDetectedInComponentGraphException;
import org.codehaus.plexus.component.configurator.ComponentConfigurationException;
import org.codehaus.plexus.component.configurator.ComponentConfigurator;
-import org.codehaus.plexus.component.configurator.ConfigurationListener;
import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
import org.codehaus.plexus.component.repository.ComponentDescriptor;
@@ -619,10 +617,8 @@ public class DefaultMavenPluginManager
// so that this method could entirely be handled by a plexus lookup?
configurator = container.lookup( ComponentConfigurator.class, configuratorId );
- ConfigurationListener listener = new DebugConfigurationListener( logger );
-
ValidatingConfigurationListener validator =
- new ValidatingConfigurationListener( mojo, mojoDescriptor, listener );
+ new ValidatingConfigurationListener( mojo, mojoDescriptor, logger );
logger.debug(
"Configuring mojo '" + mojoDescriptor.getId() + "' with " + configuratorId + " configurator -->" );
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/ValidatingConfigurationListener.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/ValidatingConfigurationListener.java
index 99b18af..7745e25 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/ValidatingConfigurationListener.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/ValidatingConfigurationListener.java
@@ -19,13 +19,18 @@ package org.apache.maven.plugin.internal;
* under the License.
*/
+import java.lang.reflect.Array;
+import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
+import java.util.StringJoiner;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.Parameter;
+import org.apache.maven.shared.utils.logging.MessageUtils;
import org.codehaus.plexus.component.configurator.ConfigurationListener;
+import org.codehaus.plexus.logging.Logger;
/**
* A configuration listener to help validate the plugin configuration. For instance, check for required but missing
@@ -39,14 +44,17 @@ class ValidatingConfigurationListener
private final Object mojo;
- private final ConfigurationListener delegate;
+ private final MojoDescriptor mojoDescriptor;
+
+ private final Logger logger;
private final Map<String, Parameter> missingParameters;
- ValidatingConfigurationListener( Object mojo, MojoDescriptor mojoDescriptor, ConfigurationListener delegate )
+ ValidatingConfigurationListener( Object mojo, MojoDescriptor mojoDescriptor, Logger logger )
{
this.mojo = mojo;
- this.delegate = delegate;
+ this.mojoDescriptor = mojoDescriptor;
+ this.logger = logger;
this.missingParameters = new HashMap<>();
if ( mojoDescriptor.getParameters() != null )
@@ -68,21 +76,31 @@ class ValidatingConfigurationListener
public void notifyFieldChangeUsingSetter( String fieldName, Object value, Object target )
{
- delegate.notifyFieldChangeUsingSetter( fieldName, value, target );
+ if ( logger.isDebugEnabled() )
+ {
+ logger.debug( " (s) " + fieldName + " = " + toString( value ) );
+ }
if ( mojo == target )
{
notify( fieldName, value );
+
+ warnDeprecated( fieldName, value );
}
}
public void notifyFieldChangeUsingReflection( String fieldName, Object value, Object target )
{
- delegate.notifyFieldChangeUsingReflection( fieldName, value, target );
+ if ( logger.isDebugEnabled() )
+ {
+ logger.debug( " (f) " + fieldName + " = " + toString( value ) );
+ }
if ( mojo == target )
{
notify( fieldName, value );
+
+ warnDeprecated( fieldName, value );
}
}
@@ -94,4 +112,53 @@ class ValidatingConfigurationListener
}
}
+ private void warnDeprecated( String fieldName, Object value )
+ {
+ Parameter parameter = mojoDescriptor.getParameterMap().get( fieldName );
+ String deprecated = parameter.getDeprecated();
+ if ( deprecated != null && !deprecated.isEmpty() )
+ {
+ if ( !toString( value ).equals( toString( parameter.getDefaultValue() ) ) )
+ {
+ StringBuilder sb = new StringBuilder( " Parameter '" );
+ sb.append( fieldName ).append( '\'' );
+ if ( parameter.getExpression() != null )
+ {
+ String userProperty = parameter.getExpression().replace( "${", "'" ).replace( '}', '\'' );
+ sb.append( " (User Property " ).append( userProperty ).append( ")" );
+ }
+ sb.append( " is deprecated. " ).append( deprecated );
+
+ logger.warn( MessageUtils.buffer().warning( sb.toString() ).toString() );
+ }
+ }
+ }
+
+ /**
+ * Creates a human-friendly string representation of the specified object.
+ *
+ * @param obj The object to create a string representation for, may be <code>null</code>.
+ * @return The string representation, never <code>null</code>.
+ */
+ private String toString( Object obj )
+ {
+ String str;
+ if ( obj != null && obj.getClass().isArray() )
+ {
+ int n = Array.getLength( obj );
+ StringBuilder buf = new StringBuilder( 256 );
+ StringJoiner sj = new StringJoiner( ", ", "[", "]" );
+ for ( int i = 0; i < n; i++ )
+ {
+ sj.add( String.valueOf( Array.get( obj, i ) ) );
+ }
+ buf.append( sj.toString() );
+ str = buf.toString();
+ }
+ else
+ {
+ str = String.valueOf( obj );
+ }
+ return str;
+ }
}