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 14:25:49 UTC
[maven] branch revert-MNG-5639 updated (bd385cc -> 8c9c303)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch revert-MNG-5639
in repository https://gitbox.apache.org/repos/asf/maven.git.
omit bd385cc [MNG-7046] Revert MNG-5639 and make repo config static only
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 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
new 8c9c303 [MNG-7046] Revert MNG-5639 and make repo config static only
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 (bd385cc)
\
N -- N -- N refs/heads/revert-MNG-5639 (8c9c303)
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 +-
.../repository/ArtifactRepositoryPolicy.java | 4 +-
.../AbstractArtifactComponentTestCase.java | 25 +
.../repository/legacy/DefaultWagonManagerTest.java | 5 +
.../main/java/org/apache/maven/ReactorReader.java | 23 +-
.../apache/maven/bridge/MavenRepositorySystem.java | 22 +-
.../aether/ConsumerModelSourceTransformer.java | 4 +-
.../maven/lifecycle/DefaultLifecycleExecutor.java | 22 -
.../DefaultLifecycleExecutionPlanCalculator.java | 84 ++-
.../internal/LifecycleExecutionPlanCalculator.java | 5 +-
.../apache/maven/lifecycle/mapping/Lifecycle.java | 8 -
.../maven/project/DefaultProjectBuilder.java | 122 ++---
.../apache/maven/project/ProjectModelResolver.java | 2 +-
.../apache/maven/project/ReactorModelCache.java | 9 +-
.../DefaultConsumerPomXMLFilterFactory.java | 29 +-
.../main/resources/META-INF/maven/extension.xml | 4 +-
.../maven/lifecycle/LifecycleExecutorTest.java | 4 +-
.../stub/LifecycleExecutionPlanCalculatorStub.java | 2 +-
.../apache/maven/project/PomConstructionTest.java | 2 +-
.../test/resources/META-INF/plexus/components.xml | 8 +-
.../building/BuildModelSourceTransformer.java | 2 +-
.../building/DefaultBuildPomXMLFilterFactory.java | 45 +-
.../maven/model/building/DefaultModelBuilder.java | 572 ++++++++++++++-------
.../building/DefaultModelBuildingRequest.java | 21 +-
.../model/building/DefaultModelBuildingResult.java | 30 ++
.../model/building/DefaultTransformerContext.java | 95 ++++
.../model/building/FilterModelBuildingRequest.java | 12 +-
.../apache/maven/model/building/ModelBuilder.java | 2 +
.../maven/model/building/ModelBuildingRequest.java | 32 +-
.../maven/model/building/ModelBuildingResult.java | 7 +
.../apache/maven/model/building/ModelCacheTag.java | 10 +-
.../org/apache/maven/model/building/ModelData.java | 113 +---
.../model/building/ModelSourceTransformer.java | 14 +-
.../maven/model/building/TransformerContext.java | 6 +-
...sformer.java => TransformerContextBuilder.java} | 33 +-
.../apache/maven/model/io/DefaultModelReader.java | 14 +-
.../org/apache/maven/model/io/ModelReader.java | 6 +
.../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 ++++++
.../validation/DefaultModelValidatorTest.java | 4 -
maven-model/src/main/mdo/maven.mdo | 7 +-
.../internal/ArtifactDescriptorUtils.java | 18 +-
.../xml/sax/filter/BuildPomXMLFilterFactory.java | 45 +-
.../maven/xml/sax/filter/CiFriendlyXMLFilter.java | 31 +-
.../sax/filter/ConsumerPomXMLFilterFactory.java | 33 +-
.../maven/xml/sax/filter/ParentXMLFilter.java | 71 +--
.../xml/sax/filter/CiFriendlyXMLFilterTest.java | 2 +-
.../xml/sax/filter/ConsumerPomXMLFilterTest.java | 17 +-
.../maven/xml/sax/filter/ParentXMLFilterTest.java | 37 +-
pom.xml | 6 +
51 files changed, 1190 insertions(+), 689 deletions(-)
create mode 100644 maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultTransformerContext.java
copy maven-model-builder/src/main/java/org/apache/maven/model/building/{DefaultModelSourceTransformer.java => TransformerContextBuilder.java} (55%)
create mode 100644 maven-model-builder/src/test/java/org/apache/maven/model/building/DefaultModelBuilderTest.java
[maven] 01/01: [MNG-7046] Revert MNG-5639 and make repo config
static only
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-5639
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 8c9c303f9c20396b2d2810a872b16245f9eabfcb
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Wed Dec 2 23:24:06 2020 +0100
[MNG-7046] Revert MNG-5639 and make repo config static only
This closes #409
---
.../apache/maven/project/ProjectModelResolver.java | 5 ++--
.../project/DefaultMavenProjectBuilderTest.java | 10 -------
...pom-resolves-from-property-based-repository.xml | 31 ----------------------
.../maven/model/building/DefaultModelBuilder.java | 11 +-------
.../repository/internal/DefaultModelResolver.java | 4 ---
5 files changed, 3 insertions(+), 58 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 8a1c1f8..470bb25 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
@@ -93,9 +93,8 @@ public class ProjectModelResolver
this.resolver = resolver;
this.remoteRepositoryManager = remoteRepositoryManager;
this.pomRepositories = new ArrayList<>();
- this.externalRepositories = Collections.unmodifiableList( new ArrayList<>( repositories ) );
- this.repositories = new ArrayList<>();
- this.repositories.addAll( externalRepositories );
+ this.externalRepositories = repositories;
+ this.repositories = repositories;
this.repositoryMerging = repositoryMerging;
this.repositoryIds = new HashSet<>();
this.modelPool = modelPool;
diff --git a/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java b/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
index b2e314f..1bb66ab 100644
--- a/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
@@ -238,16 +238,6 @@ public class DefaultMavenProjectBuilderTest
}
}
- public void testImportScopePomResolvesFromPropertyBasedRepository()
- throws Exception
- {
- File pomFile = getTestFile( "src/test/resources/projects/import-scope-pom-resolves-from-property-based-repository.xml" );
- ProjectBuildingRequest request = newBuildingRequest();
- request.setProcessPlugins( false );
- request.setResolveDependencies( true );
- projectBuilder.build( pomFile, request );
- }
-
/**
* Tests whether local version range parent references are build correctly.
*
diff --git a/maven-core/src/test/resources/projects/import-scope-pom-resolves-from-property-based-repository.xml b/maven-core/src/test/resources/projects/import-scope-pom-resolves-from-property-based-repository.xml
deleted file mode 100644
index 4c29a3b..0000000
--- a/maven-core/src/test/resources/projects/import-scope-pom-resolves-from-property-based-repository.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<project>
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>test</groupId>
- <artifactId>imported-pom-found</artifactId>
- <version>0.0.1-SNAPSHOT</version>
-
- <properties>
- <repo.url>file:src/test/remote-repo</repo.url>
- </properties>
-
- <repositories>
- <repository>
- <id>central</id>
- <url>${repo.url}</url>
- </repository>
- </repositories>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.its</groupId>
- <artifactId>a</artifactId>
- <version>0.1</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
-</project>
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index e12e566..7233cf5 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -484,9 +484,6 @@ public class DefaultModelBuilder
result.setEffectiveModel( resultModel );
- // Now the fully interpolated model is available: reconfigure the resolver
- configureResolver( request.getModelResolver(), resultModel, problems, true );
-
return resultModel;
}
@@ -843,12 +840,6 @@ public class DefaultModelBuilder
private void configureResolver( ModelResolver modelResolver, Model model, DefaultModelProblemCollector problems )
{
- configureResolver( modelResolver, model, problems, false );
- }
-
- private void configureResolver( ModelResolver modelResolver, Model model, DefaultModelProblemCollector problems,
- boolean replaceRepositories )
- {
if ( modelResolver == null )
{
return;
@@ -862,7 +853,7 @@ public class DefaultModelBuilder
{
try
{
- modelResolver.addRepository( repository, replaceRepositories );
+ modelResolver.addRepository( repository, false );
}
catch ( InvalidRepositoryException e )
{
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 993d38e..0819477 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
@@ -67,8 +67,6 @@ class DefaultModelResolver
private List<RemoteRepository> repositories;
- private final List<RemoteRepository> externalRepositories;
-
private final ArtifactResolver resolver;
private final VersionRangeResolver versionRangeResolver;
@@ -88,7 +86,6 @@ class DefaultModelResolver
this.versionRangeResolver = versionRangeResolver;
this.remoteRepositoryManager = remoteRepositoryManager;
this.repositories = repositories;
- this.externalRepositories = Collections.unmodifiableList( new ArrayList<>( repositories ) );
this.repositoryIds = new HashSet<>();
}
@@ -102,7 +99,6 @@ class DefaultModelResolver
this.versionRangeResolver = original.versionRangeResolver;
this.remoteRepositoryManager = original.remoteRepositoryManager;
this.repositories = new ArrayList<>( original.repositories );
- this.externalRepositories = original.externalRepositories;
this.repositoryIds = new HashSet<>();
}