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 2020/12/24 21:46:59 UTC
[maven] branch MNG-6114 updated (64a9b5e -> 6eed791)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MNG-6114
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard 64a9b5e [MNG-6114] Profiles from the global settings should be ordered before profiles from the user settings.
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
new 6eed791 [MNG-6114] Elements from the global settings should be ordered before elements from the user settings
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 (64a9b5e)
\
N -- N -- N refs/heads/MNG-6114 (6eed791)
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 | 14 +-
Jenkinsfile | 4 +-
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 +-
maven-artifact/pom.xml | 2 +-
.../maven/artifact/handler/ArtifactHandler.java | 4 +-
.../repository/ArtifactRepositoryPolicy.java | 4 +-
.../versioning/DefaultArtifactVersion.java | 2 +-
.../maven/artifact/versioning/VersionRange.java | 2 +-
.../artifact/versioning/ComparableVersionIT.java | 6 +-
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 +-
.../repository/legacy/DefaultWagonManager.java | 2 +-
.../resolver/DefaultLegacyArtifactCollector.java | 2 +-
.../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 +-
.../apache/maven/bridge/MavenRepositorySystem.java | 22 +-
.../DefaultMavenExecutionRequestPopulator.java | 20 +-
.../execution/MavenExecutionRequestPopulator.java | 2 +-
.../org/apache/maven/execution/MavenSession.java | 28 +-
.../maven/extension/internal/CoreExports.java | 2 +-
.../aether/ConsumerModelSourceTransformer.java | 16 +-
.../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 +-
.../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 +-
.../maven/project/DefaultProjectBuilder.java | 122 ++--
.../org/apache/maven/project/MavenProject.java | 2 +-
.../apache/maven/project/ProjectModelResolver.java | 7 +-
.../apache/maven/project/ReactorModelCache.java | 21 +-
.../org/apache/maven/project/ReactorModelPool.java | 18 +-
.../maven/project/RepositorySessionDecorator.java | 4 +-
.../artifact/DefaultProjectArtifactsCache.java | 30 +-
.../project/artifact/ProjectArtifactsCache.java | 2 +-
.../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 | 10 +-
maven-core/src/site/apt/offline-mode.apt | 2 +-
.../maven/AbstractCoreMavenComponentTestCase.java | 4 +-
.../filter/ExclusionArtifactFilterTest.java | 16 +-
.../DefaultMavenExecutionRequestPopulatorTest.java | 2 +-
.../aether/ConsumerModelSourceTransformerTest.java | 6 +-
.../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 | 2 +-
.../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 +-
.../org/apache/maven/its/a/0.1/a-0.1.pom | 2 +-
.../org/apache/maven/its/b/0.1/b-0.1.pom | 2 +-
.../config-with-plugin-mng/pom.xml | 75 ++-
.../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 +-
.../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 +-
.../plexus-classworlds-1.2-alpha-10.pom | 2 +-
.../1.1.6/plexus-components-1.1.6.pom | 18 +-
.../plexus-container-default-1.0-alpha-32.pom | 4 +-
.../plexus/plexus/1.0.10/plexus-1.0.10.pom | 2 +-
.../plexus/plexus/1.0.11/plexus-1.0.11.pom | 8 +-
.../codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom | 2 +-
.../codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom | 4 +-
.../codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom | 2 +-
.../tests/project-caching/1/project-caching-1.pom | 4 +-
.../toolchain/model/toolchains-jdks-extend.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 +-
maven-embedder/pom.xml | 2 +-
.../main/java/org/apache/maven/cli/CliRequest.java | 4 +-
maven-embedder/src/site/apt/index.apt.vm | 3 +-
.../maven/cli/event/ExecutionEventLoggerTest.java | 2 +-
maven-model-builder/pom.xml | 2 +-
.../java/org/apache/maven/feature/Features.java | 24 +-
.../building/AbstractModelSourceTransformer.java | 26 +-
.../maven/model/building/ArtifactModelSource.java | 14 +-
.../building/BuildModelSourceTransformer.java | 12 +-
.../building/DefaultBuildPomXMLFilterFactory.java | 47 +-
.../maven/model/building/DefaultModelBuilder.java | 659 ++++++++++++++-------
.../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 | 6 +-
.../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 | 7 +-
.../apache/maven/model/merge/ModelMergerTest.java | 62 +-
maven-plugin-api/pom.xml | 2 +-
maven-repository-metadata/pom.xml | 2 +-
maven-resolver-provider/pom.xml | 2 +-
.../internal/ArtifactDescriptorReaderDelegate.java | 2 +-
.../internal/ArtifactDescriptorUtils.java | 18 +-
.../repository/internal/DefaultModelResolver.java | 4 -
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 | 6 +-
.../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 | 48 +-
.../maven/xml/sax/filter/AbstractSAXFilter.java | 32 +-
.../maven/xml/sax/filter/BuildPomXMLFilter.java | 10 +-
.../xml/sax/filter/BuildPomXMLFilterFactory.java | 57 +-
.../xml/sax/filter/BuildPomXMLFilterListener.java | 6 +-
.../maven/xml/sax/filter/CiFriendlyXMLFilter.java | 33 +-
.../maven/xml/sax/filter/ConsumerPomXMLFilter.java | 10 +-
.../sax/filter/ConsumerPomXMLFilterFactory.java | 45 +-
.../apache/maven/xml/sax/filter/DependencyKey.java | 26 +-
.../maven/xml/sax/filter/FastForwardFilter.java | 22 +-
.../maven/xml/sax/filter/ModulesXMLFilter.java | 20 +-
.../maven/xml/sax/filter/ParentXMLFilter.java | 73 ++-
.../xml/sax/filter/ReactorDependencyXMLFilter.java | 22 +-
.../xml/sax/filter/RelativePathXMLFilter.java | 18 +-
.../maven/xml/sax/filter/RelativeProject.java | 14 +-
.../apache/maven/xml/sax/ChainedFilterTest.java | 8 +-
.../maven/xml/sax/ext/CommentRenormalizerTest.java | 14 +-
.../xml/sax/filter/AbstractXMLFilterTests.java | 50 +-
.../xml/sax/filter/CiFriendlyXMLFilterTest.java | 6 +-
.../xml/sax/filter/ConsumerPomXMLFilterTest.java | 231 ++++----
.../maven/xml/sax/filter/ModulesXMLFilterTest.java | 78 +--
.../maven/xml/sax/filter/ParentXMLFilterTest.java | 37 +-
.../sax/filter/ReactorDependencyXMLFilterTest.java | 84 +--
.../xml/sax/filter/RelativePathXMLFilterTest.java | 22 +-
pom.xml | 10 +-
278 files changed, 3051 insertions(+), 2614 deletions(-)
delete mode 100644 maven-core/src/test/resources/projects/import-scope-pom-resolves-from-property-based-repository.xml
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
[maven] 01/01: [MNG-6114] Elements from the global settings should
be ordered before elements from the user settings
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MNG-6114
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 6eed791ca2ec62985bad79fc2067e47ad2da8bc5
Author: Christian Schulte <sc...@apache.org>
AuthorDate: Sat Nov 12 21:06:19 2016 +0100
[MNG-6114] Elements from the global settings should be ordered before elements from the user settings
This closes #142
---
.../java/org/apache/maven/settings/merge/MavenSettingsMerger.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/merge/MavenSettingsMerger.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/merge/MavenSettingsMerger.java
index 8d9f67b..cb5f6c1 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/merge/MavenSettingsMerger.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/merge/MavenSettingsMerger.java
@@ -111,6 +111,7 @@ public class MavenSettingsMerger
String recessiveSourceLevel )
{
Map<String, T> dominantById = mapById( dominant );
+ final List<T> identifiables = new ArrayList<>( recessive.size() );
for ( T identifiable : recessive )
{
@@ -118,9 +119,11 @@ public class MavenSettingsMerger
{
identifiable.setSourceLevel( recessiveSourceLevel );
- dominant.add( identifiable );
+ identifiables.add( identifiable );
}
}
+
+ dominant.addAll( 0, identifiables );
}
/**