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 2021/03/01 21:48:18 UTC
[maven] branch revert-MNG-6772 updated (c63d228 -> 9b2a895)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch revert-MNG-6772
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard c63d228 don't use mavenDistro when using mavenVersion
discard 4c22d6b Fix placeholder mavenVersion
discard 1b097dc adjust label
discard ae8a54f Don't reintroduce existing variables
discard 6898237 Ensure that ITs can still run by all Maven versions to verify behavior
discard e077191 Ensure that ITs can still run by all Maven versions to verify behavior
discard b0d830f Make sure ITs can still be used to verify older Maven versions
discard 6d4f4cf Revert "[MNG-6772] Prevent Super POM central entry from overriding"
add ab20190 Update ant from 1.10.8 to 1.10.9 in /maven-wrapper
add 48fc108 [MNG-7077] Use JUnit 5 extension
add f820b41 [MNG-7095] Fix resume for parallel builds
add 619973b [MNG-7063] Infinite loop using Shade plugin and JUnit 5 dependency
add 84a1ff2 [MNG-7063] Add unittest to ensure rereading a pom won't return the cached Model
add 441cf73 improve documentation
add 9b5b8d4 extract AbstractMavenLifecycleParticipant dispatch methods
add a515fbe [MNG-7035] remove duplicate dependency (causing warning on build)
add 8ceb6c6 [MNG-7063] Infinite loop using Shade plugin and JUnit 5 dependency
add d740200 [MNG-7107] relax profile id validation, different from coordinate id
add b23116d [MNG-6114] Elements from the global settings should be ordered before elements from the user settings
add a242c1a [MNG-6471] Parallel builder should use the module name as thread name
add c3dba0e [MNG-6113] Rename the 'Central Repository' to 'Maven Central Repository' in the 4.0.0 super POM
new 9b2a895 Revert "[MNG-6772] Prevent Super POM central entry from overriding"
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 (c63d228)
\
N -- N -- N refs/heads/revert-MNG-6772 (9b2a895)
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:
Jenkinsfile | 39 --
.../AbstractArtifactComponentTestCase.java | 17 +-
.../artifact/deployer/ArtifactDeployerTest.java | 1 +
.../factory/DefaultArtifactFactoryTest.java | 4 +-
.../artifact/installer/ArtifactInstallerTest.java | 2 +
.../artifact/resolver/ArtifactResolverTest.java | 10 -
.../resolver/DefaultArtifactResolverTest.java | 11 +-
.../transform/TransformationManagerTest.java | 4 +-
.../manager/DefaultProfileManagerTest.java | 22 +-
.../project/AbstractMavenProjectTestCase.java | 38 +-
.../apache/maven/project/ProjectClasspathTest.java | 12 +-
.../AbstractProjectInheritanceTestCase.java | 2 +
.../repository/LegacyRepositorySystemTest.java | 12 +-
.../maven/repository/MirrorProcessorTest.java | 4 +-
.../repository/legacy/DefaultWagonManagerTest.java | 6 +-
.../legacy/LegacyRepositorySystemTest.java | 4 +-
.../resolver/DefaultArtifactCollectorTest.java | 7 +-
.../conflict/AbstractConflictResolverTest.java | 29 +-
.../DefaultClasspathTransformationTest.java | 8 +-
.../metadata/DefaultGraphConflictResolverTest.java | 8 +-
.../main/java/org/apache/maven/DefaultMaven.java | 49 +-
.../maven/execution/BuildResumptionData.java | 35 +-
.../execution/DefaultBuildResumptionAnalyzer.java | 130 +----
.../DefaultBuildResumptionDataRepository.java | 35 +-
.../multithreaded/MultiThreadedBuilder.java | 21 +-
.../maven/project/DefaultProjectBuilder.java | 36 +-
.../apache/maven/project/ReactorModelCache.java | 160 -----
maven-core/src/site/apt/index.apt | 2 +-
.../maven/AbstractCoreMavenComponentTestCase.java | 32 +-
.../java/org/apache/maven/DefaultMavenTest.java | 2 +-
.../maven/MavenLifecycleParticipantTest.java | 6 -
.../maven/ProjectDependenciesResolverTest.java | 1 +
.../artifact/handler/ArtifactHandlerTest.java | 14 +-
.../DefaultBuildResumptionAnalyzerTest.java | 19 +-
.../DefaultBuildResumptionDataRepositoryTest.java | 28 +-
.../DefaultMavenExecutionRequestPopulatorTest.java | 5 +-
.../maven/graph/DefaultGraphBuilderTest.java | 51 +-
.../maven/lifecycle/DefaultLifecyclesTest.java | 5 +-
.../maven/lifecycle/LifecycleExecutorTest.java | 8 +-
.../PluginParameterExpressionEvaluatorTest.java | 1 +
.../project/AbstractMavenProjectTestCase.java | 26 +-
.../project/DefaultMavenProjectBuilderTest.java | 132 ++---
.../apache/maven/project/PomConstructionTest.java | 15 +-
.../apache/maven/project/ProjectBuilderTest.java | 29 +-
.../maven/project/ProjectModelResolverTest.java | 5 +-
.../project/artifact/MavenMetadataSourceTest.java | 44 +-
.../internal/DefaultRuntimeInformationTest.java | 13 +-
.../settings/PomConstructionWithSettingsTest.java | 6 +-
.../org/apache/maven/execution/resume.properties | 3 +-
.../pom.xml => resources/projects/reread/pom1.xml} | 6 +-
.../pom.xml => resources/projects/reread/pom2.xml} | 7 +-
.../main/java/org/apache/maven/cli/MavenCli.java | 6 +
maven-embedder/src/site/apt/index.apt.vm | 4 +
.../maven/model/building/DefaultModelBuilder.java | 649 ++++++---------------
.../building/DefaultModelBuildingRequest.java | 1 +
.../maven/model/building/FileToRawModelMerger.java | 190 ++++++
.../apache/maven/model/building/ModelCache.java | 56 ++
.../model/validation/DefaultModelValidator.java | 116 ++--
.../resources/org/apache/maven/model/pom-4.0.0.xml | 4 +-
.../model/building/FileToRawModelMergerTest.java | 1 -
.../validation/DefaultModelValidatorTest.java | 18 +-
...-ids-pom.xml => invalid-coordinate-ids-pom.xml} | 0
...alid-profile-id.xml => invalid-profile-ids.xml} | 15 +
.../repository/internal/DefaultModelCache.java | 153 ++++-
.../internal/AbstractRepositoryTestCase.java | 18 +-
.../DefaultArtifactDescriptorReaderTest.java | 2 +-
.../internal/DefaultModelResolverTest.java | 4 +-
.../maven/settings/merge/MavenSettingsMerger.java | 5 +-
maven-test-support/pom.xml | 7 -
.../main/java/org/apache/maven/test/Parameter.java | 32 -
.../apache/maven/test/ParameterizedExtension.java | 182 ------
.../java/org/apache/maven/test/Parameters.java | 35 --
.../{PlexusTestCase.java => PlexusExtension.java} | 42 +-
.../test/{Parameterized.java => PlexusTest.java} | 9 +-
.../src/main/java/org/apache/maven/test/Test.java | 34 --
maven-wrapper/pom.xml | 2 +-
.../maven/xml/sax/ext/CommentRenormalizerTest.java | 31 +-
77 files changed, 1120 insertions(+), 1662 deletions(-)
delete mode 100644 maven-core/src/main/java/org/apache/maven/project/ReactorModelCache.java
copy maven-core/src/test/{resources-project-builder/system-property-interpolation/pom.xml => resources/projects/reread/pom1.xml} (91%)
copy maven-core/src/test/{resources-project-builder/system-property-interpolation/pom.xml => resources/projects/reread/pom2.xml} (91%)
create mode 100644 maven-model-builder/src/main/java/org/apache/maven/model/building/FileToRawModelMerger.java
rename maven-model-builder/src/test/resources/poms/validation/{invalid-ids-pom.xml => invalid-coordinate-ids-pom.xml} (100%)
rename maven-model-builder/src/test/resources/poms/validation/{invalid-profile-id.xml => invalid-profile-ids.xml} (75%)
delete mode 100644 maven-test-support/src/main/java/org/apache/maven/test/Parameter.java
delete mode 100644 maven-test-support/src/main/java/org/apache/maven/test/ParameterizedExtension.java
delete mode 100644 maven-test-support/src/main/java/org/apache/maven/test/Parameters.java
rename maven-test-support/src/main/java/org/apache/maven/test/{PlexusTestCase.java => PlexusExtension.java} (87%)
rename maven-test-support/src/main/java/org/apache/maven/test/{Parameterized.java => PlexusTest.java} (87%)
delete mode 100644 maven-test-support/src/main/java/org/apache/maven/test/Test.java
[maven] 01/01: Revert "[MNG-6772] Prevent Super POM central entry
from overriding"
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch revert-MNG-6772
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 9b2a895a16e52a6b096a64d85d0454f6ebb87c8d
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Jan 23 20:00:24 2021 +0100
Revert "[MNG-6772] Prevent Super POM central entry from overriding"
This reverts commit 2a23d7bf16612ff1868941669bde3a7d323a93e2.
---
.../src/main/java/org/apache/maven/project/ProjectModelResolver.java | 2 +-
.../java/org/apache/maven/repository/internal/DefaultModelResolver.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
index ae44924..4309463 100644
--- a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
@@ -110,7 +110,7 @@ public class ProjectModelResolver
this.externalRepositories = original.externalRepositories;
this.repositories = new ArrayList<>( original.repositories );
this.repositoryMerging = original.repositoryMerging;
- this.repositoryIds = new HashSet<>();
+ this.repositoryIds = new HashSet<>( original.repositoryIds );
this.modelPool = original.modelPool;
}
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
index 0819477..93f6676 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
@@ -99,7 +99,7 @@ class DefaultModelResolver
this.versionRangeResolver = original.versionRangeResolver;
this.remoteRepositoryManager = original.remoteRepositoryManager;
this.repositories = new ArrayList<>( original.repositories );
- this.repositoryIds = new HashSet<>();
+ this.repositoryIds = new HashSet<>( original.repositoryIds );
}
@Override