Skip to content

[MNG-5075] MavenProject.getParent throws undocumented ISE #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jglick wants to merge 1 commit into from
Closed

[MNG-5075] MavenProject.getParent throws undocumented ISE #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions maven-core/src/main/java/org/apache/maven/project/MavenProject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@ public class MavenProject

public static final String EMPTY_PROJECT_VERSION = "0";

private static final MavenProject ERROR_BUILDING_PARENT = new MavenProject();

private Model model;

private MavenProject parent;
Expand Down Expand Up @@ -344,6 +346,10 @@ public Model getModel()
return model;
}

/**
* Returns the project corresponding to a declared parent.
* @return the parent, or null if no parent is declared or there was an error building it
*/
public MavenProject getParent()
{
if ( parent == null )
Expand All @@ -364,7 +370,11 @@ public MavenProject getParent()
}
catch ( ProjectBuildingException e )
{
throw new IllegalStateException( "Failed to build parent project for " + getId(), e );
if ( logger != null )
{
logger.error( "Failed to build parent project for " + getId(), e );
}
parent = ERROR_BUILDING_PARENT;
}
}
else if ( model.getParent() != null )
Expand All @@ -379,11 +389,15 @@ else if ( model.getParent() != null )
}
catch ( ProjectBuildingException e )
{
throw new IllegalStateException( "Failed to build parent project for " + getId(), e );
if ( logger != null )
{
logger.error( "Failed to build parent project for " + getId(), e );
}
parent = ERROR_BUILDING_PARENT;
}
}
}
return parent;
return parent == ERROR_BUILDING_PARENT ? null : parent;
}

public void setParent( MavenProject parent )
Expand Down
28 changes: 28 additions & 0 deletions maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@
import java.io.IOException;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;

import org.apache.maven.lifecycle.internal.stub.LoggerStub;
import org.apache.maven.model.DependencyManagement;
import org.apache.maven.model.Model;
import org.apache.maven.model.Parent;
Expand Down Expand Up @@ -177,6 +179,32 @@ public void testCloneWithActiveProfile()
activeProfilesClone );
}

public void testInvalidParent() throws Exception
{
Parent parent = new Parent();
parent.setGroupId( "test-group" );
parent.setArtifactId( "parent-artifact" );
parent.setVersion( "1.0" );
Model model = new Model();
model.setParent( parent );
model.setArtifactId( "child-artifact" );
final AtomicInteger logged = new AtomicInteger();
class L extends LoggerStub
{
@Override
public void error( String s, Throwable throwable )
{
logged.incrementAndGet();
}
}
MavenProject project = new MavenProject( repositorySystem, projectBuilder, newBuildingRequest(), new L() );
project.setModel( model );
assertNull( project.getParent() );
assertEquals( 1, logged.get() );
assertNull( project.getParent() );
assertEquals( 1, logged.get() );
}

public void testUndefinedOutputDirectory()
throws Exception
{
Expand Down