You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ev...@apache.org on 2005/10/11 10:45:20 UTC
svn commit: r312840 -
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Author: evenisse
Date: Tue Oct 11 01:45:12 2005
New Revision: 312840
URL: http://svn.apache.org/viewcvs?rev=312840&view=rev
Log:
Add build method that can disable distributionManagement status for file that come from repository
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=312840&r1=312839&r2=312840&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Tue Oct 11 01:45:12 2005
@@ -167,7 +167,7 @@
ProfileManager profileManager, TransferListener transferListener )
throws ProjectBuildingException, ArtifactResolutionException, ArtifactNotFoundException
{
- MavenProject project = buildFromSourceFile( projectDescriptor, localRepository, profileManager );
+ MavenProject project = build( projectDescriptor, localRepository, profileManager );
// ----------------------------------------------------------------------
// Typically when the project builder is being used from maven proper
@@ -265,11 +265,20 @@
ProfileManager profileManager )
throws ProjectBuildingException
{
- return buildFromSourceFile( projectDescriptor, localRepository, profileManager );
+ return buildFromSourceFile( projectDescriptor, localRepository, profileManager, true );
+ }
+
+ public MavenProject build( File projectDescriptor, ArtifactRepository localRepository,
+ ProfileManager profileManager, boolean checkDistributionManagementStatus )
+ throws ProjectBuildingException
+ {
+ return buildFromSourceFile( projectDescriptor, localRepository, profileManager,
+ checkDistributionManagementStatus );
}
private MavenProject buildFromSourceFile( File projectDescriptor, ArtifactRepository localRepository,
- ProfileManager profileManager )
+ ProfileManager profileManager,
+ boolean checkDistributionManagementStatus )
throws ProjectBuildingException
{
Model model = readModel( "unknown", projectDescriptor );
@@ -283,10 +292,13 @@
buildArtifactRepositories( getSuperModel() ),
projectDescriptor.getAbsoluteFile().getParentFile(), profileManager );
- if ( project.getDistributionManagement() != null && project.getDistributionManagement().getStatus() != null )
+ if ( checkDistributionManagementStatus )
{
- throw new ProjectBuildingException( project.getId(),
- "Invalid project file: distribution status must not be specified for a project outside of the repository" );
+ if ( project.getDistributionManagement() != null && project.getDistributionManagement().getStatus() != null )
+ {
+ throw new ProjectBuildingException( project.getId(),
+ "Invalid project file: distribution status must not be specified for a project outside of the repository" );
+ }
}
// Only translate the base directory for files in the source tree