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/08/16 20:05:19 UTC
[maven] branch maven-3.8.x-revert-MNG-7170 updated (f9c50e4 ->
eb546ae)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch maven-3.8.x-revert-MNG-7170
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard f9c50e4 Revert "[MNG-7170] Allow to associate pomFile/${basedir} with DefaultProjectBuilder.build(ModelSource, ...)"
new eb546ae [MNG-7216] [Regression] Revert MNG-7170
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 (f9c50e4)
\
N -- N -- N refs/heads/maven-3.8.x-revert-MNG-7170 (eb546ae)
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:
.../src/test/java/org/apache/maven/project/ProjectBuilderTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[maven] 01/01: [MNG-7216] [Regression] Revert MNG-7170
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch maven-3.8.x-revert-MNG-7170
in repository https://gitbox.apache.org/repos/asf/maven.git
commit eb546ae50d647f99993d4e83c14de2eeb27dd5d2
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Aug 16 18:08:39 2021 +0200
[MNG-7216] [Regression] Revert MNG-7170
This reverts commit 5a8997312680a4b9c69a129801524691bc546c08.
---
.../apache/maven/project/ProjectBuilderTest.java | 26 ----------------------
.../resources/projects/modelsourcebasedir/pom.xml | 19 ----------------
.../maven/model/building/DefaultModelBuilder.java | 9 +-------
3 files changed, 1 insertion(+), 53 deletions(-)
diff --git a/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java b/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
index 37d51cd..6adb10e 100644
--- a/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
@@ -39,8 +39,6 @@ import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.building.FileModelSource;
import org.apache.maven.model.building.ModelBuildingRequest;
-import org.apache.maven.model.building.ModelProblem;
-import org.apache.maven.model.building.ModelProblem.Severity;
import org.apache.maven.model.building.ModelSource;
import org.apache.maven.shared.utils.io.FileUtils;
@@ -85,30 +83,6 @@ public class ProjectBuilderTest
assertNotNull( result.getProject().getParentFile() );
}
- public void testBuildFromModelSourceResolvesBasedir()
- throws Exception
- {
- File pomFile = new File( "src/test/resources/projects/modelsourcebasedir/pom.xml" );
- MavenSession mavenSession = createMavenSession( null );
- ProjectBuildingRequest configuration = new DefaultProjectBuildingRequest();
- configuration.setRepositorySession( mavenSession.getRepositorySession() );
- ModelSource modelSource = new FileModelSource( pomFile );
- ProjectBuildingResult result =
- getContainer().lookup( org.apache.maven.project.ProjectBuilder.class ).build( modelSource, configuration );
-
- assertEquals( pomFile.getAbsoluteFile(), result.getProject().getModel().getPomFile().getAbsoluteFile() );
- int errors = 0;
- for ( ModelProblem p : result.getProblems() )
- {
- if ( p.getSeverity() == Severity.ERROR )
- {
- errors++;
- }
- }
- assertEquals( 0, errors );
- }
-
-
public void testVersionlessManagedDependency()
throws Exception
{
diff --git a/maven-core/src/test/resources/projects/modelsourcebasedir/pom.xml b/maven-core/src/test/resources/projects/modelsourcebasedir/pom.xml
deleted file mode 100644
index ec0f7d3..0000000
--- a/maven-core/src/test/resources/projects/modelsourcebasedir/pom.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>test.readparent</groupId>
- <artifactId>local-parent</artifactId>
- <packaging>pom</packaging>
- <version>1.0</version>
-
- <dependencies>
- <dependency>
- <groupId>blah</groupId>
- <artifactId>blah</artifactId>
- <version>0.0.1-SNASPSHOT</version>
- <scope>system</scope>
- <systemPath>${basedir}/blah.jar</systemPath>
- </dependency>
- </dependencies>
-
-</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 a089f9d..70c9ed5 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
@@ -624,14 +624,7 @@ public class DefaultModelBuilder
throw problems.newModelBuildingException();
}
- if ( pomFile != null )
- {
- model.setPomFile( pomFile );
- }
- else if ( modelSource instanceof FileModelSource )
- {
- model.setPomFile( ( (FileModelSource) modelSource ).getFile() );
- }
+ model.setPomFile( pomFile );
problems.setSource( model );
modelValidator.validateRawModel( model, request, problems );