diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java index fb9e383c24..4d9b85c6c7 100644 --- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java +++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java @@ -252,6 +252,7 @@ public class DefaultMaven true ); systemContext.setSystemProperties( request.getProperties() ); + systemContext.store( buildContextManager ); } @@ -276,45 +277,29 @@ public class DefaultMaven // instances just-in-time. try { - buildExtensionScanner.scanForBuildExtensions( - files, - request.getLocalRepository(), - request.getProfileManager() ); + buildExtensionScanner.scanForBuildExtensions( files, request.getLocalRepository(), request.getProfileManager() ); } catch ( ExtensionScanningException e ) { - throw new MavenExecutionException( - "Error scanning for extensions: " + e.getMessage(), - e ); + throw new MavenExecutionException( "Error scanning for extensions: " + e.getMessage(), e ); } try { - projects = collectProjects( - files, - request.getLocalRepository(), - request.isRecursive(), - request.getProfileManager(), - !request.useReactor() ); + projects = collectProjects( files, request.getLocalRepository(), request.isRecursive(), request.getProfileManager(), !request.useReactor() ); } catch ( ArtifactResolutionException e ) { - throw new MavenExecutionException( - e.getMessage(), - e ); + throw new MavenExecutionException( e.getMessage(), e ); } catch ( ProjectBuildingException e ) { - throw new MavenExecutionException( - e.getMessage(), - e ); + throw new MavenExecutionException( e.getMessage(), e ); } catch ( ProfileActivationException e ) { - throw new MavenExecutionException( - e.getMessage(), - e ); + throw new MavenExecutionException( e.getMessage(), e ); } return projects; } @@ -342,10 +327,7 @@ public class DefaultMaven usingReleasePom = true; } - MavenProject project = projectBuilder.build( - file, - localRepository, - globalProfileManager ); + MavenProject project = projectBuilder.build( file, localRepository, globalProfileManager ); if ( isRoot ) { @@ -355,6 +337,7 @@ public class DefaultMaven if ( project.getPrerequisites() != null && project.getPrerequisites().getMaven() != null ) { DefaultArtifactVersion version = new DefaultArtifactVersion( project.getPrerequisites().getMaven() ); + if ( runtimeInformation.getApplicationVersion().compareTo( version ) < 0 ) { throw new BuildFailureException( @@ -372,14 +355,14 @@ public class DefaultMaven // Initial ordering is as declared in the modules section List moduleFiles = new ArrayList( project.getModules().size() ); + for ( Iterator i = project.getModules().iterator(); i.hasNext(); ) { String name = (String) i.next(); if ( StringUtils.isEmpty( StringUtils.trim( name ) ) ) { - getLogger().warn( - "Empty module detected. Please check you don't have any empty module definitions in your POM." ); + getLogger().warn( "Empty module detected. Please check you don't have any empty module definitions in your POM." ); continue; } @@ -388,15 +371,11 @@ public class DefaultMaven if ( usingReleasePom ) { - moduleFile = new File( - basedir, - name + "/" + Maven.RELEASE_POMv4 ); + moduleFile = new File( basedir, name + "/" + Maven.RELEASE_POMv4 ); } else { - moduleFile = new File( - basedir, - name + "/" + Maven.POMv4 ); + moduleFile = new File( basedir, name + "/" + Maven.POMv4 ); } if ( Os.isFamily( Os.FAMILY_WINDOWS ) ) @@ -409,9 +388,7 @@ public class DefaultMaven } catch ( IOException e ) { - throw new MavenExecutionException( - "Unable to canonicalize file name " + moduleFile, - e ); + throw new MavenExecutionException( "Unable to canonicalize file name " + moduleFile, e ); } } @@ -478,17 +455,11 @@ public class DefaultMaven if ( request.useReactor() ) { - String includes = System.getProperty( - "maven.reactor.includes", - "**/" + POMv4 + ",**/" + RELEASE_POMv4 ); - String excludes = System.getProperty( - "maven.reactor.excludes", - POMv4 + "," + RELEASE_POMv4 ); + String includes = System.getProperty( "maven.reactor.includes", "**/" + POMv4 + ",**/" + RELEASE_POMv4 ); - files = FileUtils.getFiles( - userDir, - includes, - excludes ); + String excludes = System.getProperty( "maven.reactor.excludes", POMv4 + "," + RELEASE_POMv4 ); + + files = FileUtils.getFiles( userDir, includes, excludes ); filterOneProjectFilePerDirectory( files ); @@ -506,15 +477,11 @@ public class DefaultMaven } else { - File projectFile = new File( - userDir, - RELEASE_POMv4 ); + File projectFile = new File( userDir, RELEASE_POMv4 ); if ( !projectFile.exists() ) { - projectFile = new File( - userDir, - POMv4 ); + projectFile = new File( userDir, POMv4 ); } if ( projectFile.exists() ) diff --git a/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java b/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java index 13124e422e..bf2bc1bee5 100644 --- a/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java +++ b/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java @@ -92,6 +92,7 @@ public class DefaultExtensionManager Parent originatingParent = originatingModel.getParent(); String groupId = originatingModel.getGroupId(); + if ( ( groupId == null ) && ( originatingParent != null ) ) { groupId = originatingParent.getGroupId(); @@ -100,6 +101,7 @@ public class DefaultExtensionManager String artifactId = originatingModel.getArtifactId(); String version = originatingModel.getVersion(); + if ( ( version == null ) && ( originatingParent != null ) ) { version = originatingParent.getVersion(); diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java index 06c7d158d9..ec191f42ed 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java @@ -291,7 +291,7 @@ public class DefaultPluginManager plugin.getVersion() ); MavenProject project = mavenProjectBuilder.buildFromRepository( artifact, remoteRepositories, - localRepository, false ); + localRepository ); // if we don't have the required Maven version, then ignore an update if ( ( project.getPrerequisites() != null ) && ( project.getPrerequisites().getMaven() != null ) ) diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java b/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java index dbd6c2fdae..a44915423f 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java @@ -215,9 +215,8 @@ public class DefaultPluginVersionManager try { artifact = artifactFactory.createProjectArtifact( groupId, artifactId, artifactVersion ); - pluginProject = mavenProjectBuilder.buildFromRepository( artifact, - project.getPluginArtifactRepositories(), - localRepository, false ); + + pluginProject = mavenProjectBuilder.buildFromRepository( artifact, project.getPluginArtifactRepositories(), localRepository ); } catch ( ProjectBuildingException e ) { diff --git a/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java b/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java index 767ee9648a..59ebbfc200 100644 --- a/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java +++ b/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java @@ -387,7 +387,7 @@ public class MavenEmbedder public MavenProject readProject( File mavenProject ) throws ProjectBuildingException { - return mavenProjectBuilder.build( mavenProject, request.getLocalRepository(), request.getProfileManager(), false ); + return mavenProjectBuilder.build( mavenProject, request.getLocalRepository(), request.getProfileManager() ); } /** @@ -442,8 +442,7 @@ public class MavenEmbedder projectBuildingResult = mavenProjectBuilder.buildWithDependencies( new File( request.getPomFile() ), request.getLocalRepository(), - request.getProfileManager(), - request.getTransferListener() ); + request.getProfileManager() ); } catch ( ProjectBuildingException e ) { diff --git a/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java b/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java index ffb201238c..b9550fffb9 100644 --- a/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java +++ b/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java @@ -60,7 +60,7 @@ import java.util.Iterator; import java.util.List; /** - * Things that we deal with in this populator to ensure that we have a valid {@MavenExecutionRequest} + * Things that we deal with in this populator to ensure that we have a valid {@MavenExecutionRequest} * * - POM * - Settings @@ -134,15 +134,11 @@ public class DefaultMavenExecutionRequestPopulator else if ( request.getBaseDirectory() != null ) { // Look for a release POM - File pom = new File( - request.getBaseDirectory(), - Maven.RELEASE_POMv4 ); + File pom = new File( request.getBaseDirectory(), Maven.RELEASE_POMv4 ); if ( !pom.exists() ) { - pom = new File( - request.getBaseDirectory(), - Maven.POMv4 ); + pom = new File( request.getBaseDirectory(), Maven.POMv4 ); } request.setPomFile( pom.getAbsolutePath() ); @@ -476,7 +472,7 @@ public class DefaultMavenExecutionRequestPopulator container.release( wagonManager ); } } - + // ------------------------------------------------------------------------ // Eventing // ------------------------------------------------------------------------ diff --git a/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java b/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java index e1da442c85..3839ab241c 100644 --- a/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java +++ b/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java @@ -62,12 +62,10 @@ public class DefaultProfileAdvisor private PlexusContainer container; - public List applyActivatedProfiles( Model model, File projectDir, List explicitlyActiveIds, - List explicitlyInactiveIds ) + public List applyActivatedProfiles( Model model, File projectDir, List explicitlyActiveIds, List explicitlyInactiveIds ) throws ProjectBuildingException { - ProfileManager profileManager = buildProfileManager( model, projectDir, explicitlyActiveIds, - explicitlyInactiveIds ); + ProfileManager profileManager = buildProfileManager( model, projectDir, explicitlyActiveIds, explicitlyInactiveIds ); return applyActivatedProfiles( model, projectDir, profileManager ); } @@ -123,13 +121,13 @@ public class DefaultProfileAdvisor return activeProfiles; } - private ProfileManager buildProfileManager( Model model, File projectDir, List explicitlyActiveIds, - List explicitlyInactiveIds ) + private ProfileManager buildProfileManager( Model model, File projectDir, List explicitlyActiveIds, List explicitlyInactiveIds ) throws ProjectBuildingException { ProfileManager profileManager = new DefaultProfileManager( container ); profileManager.explicitlyActivate( explicitlyActiveIds ); + profileManager.explicitlyDeactivate( explicitlyInactiveIds ); profileManager.addProfiles( model.getProfiles() ); @@ -146,8 +144,7 @@ public class DefaultProfileAdvisor List explicitlyActiveIds, List explicitlyInactiveIds ) throws ProjectBuildingException { - ProfileManager profileManager = buildProfileManager( model, projectDir, explicitlyActiveIds, - explicitlyInactiveIds ); + ProfileManager profileManager = buildProfileManager( model, projectDir, explicitlyActiveIds, explicitlyInactiveIds ); List activeExternalProfiles; { @@ -171,7 +168,7 @@ public class DefaultProfileAdvisor { Repository mavenRepo = (Repository) repoIterator.next(); - ArtifactRepository artifactRepo = null; + ArtifactRepository artifactRepo; try { artifactRepo = mavenTools.buildArtifactRepository( mavenRepo ); diff --git a/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java b/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java index da08d95454..b714614f7a 100644 --- a/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java +++ b/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java @@ -25,7 +25,6 @@ import org.apache.maven.artifact.ArtifactStatus; import org.apache.maven.artifact.ArtifactUtils; import org.apache.maven.artifact.InvalidRepositoryException; import org.apache.maven.artifact.factory.ArtifactFactory; -import org.apache.maven.artifact.manager.WagonManager; import org.apache.maven.artifact.metadata.ArtifactMetadataSource; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy; @@ -52,6 +51,7 @@ import org.apache.maven.model.io.xpp3.MavenXpp3Reader; import org.apache.maven.profiles.MavenProfilesBuilder; import org.apache.maven.profiles.ProfileManager; import org.apache.maven.profiles.activation.ProfileActivationException; +import org.apache.maven.profiles.build.ProfileAdvisor; import org.apache.maven.project.artifact.InvalidDependencyVersionException; import org.apache.maven.project.build.ProjectBuildCache; import org.apache.maven.project.build.ProjectBuildContext; @@ -59,7 +59,6 @@ import org.apache.maven.project.build.model.DefaultModelLineage; import org.apache.maven.project.build.model.ModelLineage; import org.apache.maven.project.build.model.ModelLineageBuilder; import org.apache.maven.project.build.model.ModelLineageIterator; -import org.apache.maven.profiles.build.ProfileAdvisor; import org.apache.maven.project.inheritance.ModelInheritanceAssembler; import org.apache.maven.project.injection.ModelDefaultsInjector; import org.apache.maven.project.interpolation.ModelInterpolationException; @@ -67,7 +66,6 @@ import org.apache.maven.project.interpolation.ModelInterpolator; import org.apache.maven.project.path.PathTranslator; import org.apache.maven.project.validation.ModelValidationResult; import org.apache.maven.project.validation.ModelValidator; -import org.apache.maven.wagon.events.TransferListener; import org.codehaus.plexus.PlexusConstants; import org.codehaus.plexus.PlexusContainer; import org.codehaus.plexus.component.repository.exception.ComponentLookupException; @@ -141,7 +139,9 @@ Notes */ public class DefaultMavenProjectBuilder extends AbstractLogEnabled - implements MavenProjectBuilder, Initializable, Contextualizable + implements MavenProjectBuilder, + Initializable, + Contextualizable { protected PlexusContainer container; @@ -174,16 +174,6 @@ public class DefaultMavenProjectBuilder private MavenTools mavenTools; - // ---------------------------------------------------------------------- - // I am making this available for use with a new method that takes a - // a monitor wagon monitor as a parameter so that tools can use the - // methods here and receive callbacks. MNG-1015 - // - // Probably no longer relevant with wagonManager/wagonManager change - joakime - // ---------------------------------------------------------------------- - - private WagonManager wagonManager; - public static final String MAVEN_MODEL_VERSION = "4.0.0"; public void initialize() @@ -200,28 +190,24 @@ public class DefaultMavenProjectBuilder ProfileManager profileManager ) throws ProjectBuildingException { - return buildFromSourceFileInternal( projectDescriptor, localRepository, profileManager, true ); + return buildFromSourceFileInternal( projectDescriptor, localRepository, profileManager ); } - public MavenProject build( File projectDescriptor, - ArtifactRepository localRepository, - ProfileManager profileManager, - boolean checkDistributionManagementStatus ) - throws ProjectBuildingException - { - return buildFromSourceFileInternal( projectDescriptor, localRepository, profileManager, checkDistributionManagementStatus ); - } - - // jvz:note - // When asked for something from the repository are we getting it from the reactor? Yes, when using this call - // we are assuming that the reactor has been run and we have collected the projects required to satisfy it0042 - // which means the projects in the reactor are required for finding classes in /target/classes. Not - // sure this is ideal. I remove all caching from the builder and all reactor related ITs which assume - // access to simbling project resources failed. + /** @deprecated */ public MavenProject buildFromRepository( Artifact artifact, List remoteArtifactRepositories, ArtifactRepository localRepository, - boolean allowStubModel ) + boolean allowStub ) + throws ProjectBuildingException + + { + return buildFromRepository( artifact, remoteArtifactRepositories, localRepository ); + } + + + public MavenProject buildFromRepository( Artifact artifact, + List remoteArtifactRepositories, + ArtifactRepository localRepository ) throws ProjectBuildingException { ProjectBuildCache projectBuildCache = ProjectBuildCache.read( buildContextManager ); @@ -233,19 +219,11 @@ public class DefaultMavenProjectBuilder return project; } - Model model = findModelFromRepository( artifact, remoteArtifactRepositories, localRepository, allowStubModel ); + Model model = findModelFromRepository( artifact, remoteArtifactRepositories, localRepository ); return buildInternal( "Artifact [" + artifact + "]", model, localRepository, remoteArtifactRepositories, null, null, false ); } - public MavenProject buildFromRepository( Artifact artifact, - List remoteArtifactRepositories, - ArtifactRepository localRepository ) - throws ProjectBuildingException - { - return buildFromRepository( artifact, remoteArtifactRepositories, localRepository, true ); - } - private MavenProject superProject; public MavenProject buildStandaloneSuperProject() @@ -289,19 +267,7 @@ public class DefaultMavenProjectBuilder ProfileManager profileManager ) throws ProjectBuildingException { - return buildWithDependencies( projectDescriptor, localRepository, profileManager, null ); - } - - // note:jvz This was added for the embedder. - - /** @todo move to metadatasource itself? */ - public MavenProjectBuildingResult buildWithDependencies( File projectDescriptor, - ArtifactRepository localRepository, - ProfileManager profileManager, - TransferListener transferListener ) - throws ProjectBuildingException - { - MavenProject project = build( projectDescriptor, localRepository, profileManager, false ); + MavenProject project = build( projectDescriptor, localRepository, profileManager ); // ---------------------------------------------------------------------- // Typically when the project builder is being used from maven proper @@ -335,11 +301,6 @@ public class DefaultMavenProjectBuilder e.getMessage(), e ); } - if ( transferListener != null ) - { - wagonManager.setDownloadMonitor( transferListener ); - } - ArtifactResolutionRequest request = new ArtifactResolutionRequest() .setArtifact( projectArtifact ) .setArtifactDependencies( project.getDependencyArtifacts() ) @@ -377,8 +338,7 @@ public class DefaultMavenProjectBuilder } private Map createManagedVersionMap( String projectId, - DependencyManagement dependencyManagement, - MavenProject parent ) + DependencyManagement dependencyManagement ) throws ProjectBuildingException { Map map = null; @@ -399,10 +359,10 @@ public class DefaultMavenProjectBuilder try { VersionRange versionRange = VersionRange.createFromVersionSpec( d.getVersion() ); - Artifact artifact = artifactFactory.createDependencyArtifact( d.getGroupId(), d.getArtifactId(), - versionRange, d.getType(), - d.getClassifier(), d.getScope(), - d.isOptional() ); + + Artifact artifact = artifactFactory.createDependencyArtifact( d.getGroupId(), d.getArtifactId(), versionRange, d.getType(), + d.getClassifier(), d.getScope(), d.isOptional() ); + if ( getLogger().isDebugEnabled() ) { getLogger().debug( " " + artifact ); @@ -411,22 +371,27 @@ public class DefaultMavenProjectBuilder // If the dependencyManagement section listed exclusions, // add them to the managed artifacts here so that transitive // dependencies will be excluded if necessary. + if ( ( null != d.getExclusions() ) && !d.getExclusions().isEmpty() ) { List exclusions = new ArrayList(); - Iterator exclItr = d.getExclusions().iterator(); - while ( exclItr.hasNext() ) + + for ( Iterator j = d.getExclusions().iterator(); j.hasNext(); ) { - Exclusion e = (Exclusion) exclItr.next(); + Exclusion e = (Exclusion) j.next(); + exclusions.add( e.getGroupId() + ":" + e.getArtifactId() ); } + ExcludesArtifactFilter eaf = new ExcludesArtifactFilter( exclusions ); + artifact.setDependencyFilter( eaf ); } else { artifact.setDependencyFilter( null ); } + map.put( d.getManagementKey(), artifact ); } catch ( InvalidVersionSpecificationException e ) @@ -445,15 +410,16 @@ public class DefaultMavenProjectBuilder private MavenProject buildFromSourceFileInternal( File projectDescriptor, ArtifactRepository localRepository, - ProfileManager profileManager, - boolean checkDistributionManagementStatus ) + ProfileManager profileManager ) throws ProjectBuildingException { + /* // TODO: Remove this once we have build-context stuff working... if ( !container.getContext().contains( "SystemProperties" ) ) { container.addContextValue( "SystemProperties", System.getProperties() ); } + */ Model model = readModel( "unknown", projectDescriptor, STRICT_MODEL_PARSING ); @@ -465,29 +431,12 @@ public class DefaultMavenProjectBuilder profileManager, STRICT_MODEL_PARSING ); - /* - - MNG-3178: What is this actually for as we're not deploying this anymore. - - if ( checkDistributionManagementStatus ) - { - if ( ( project.getDistributionManagement() != null ) && ( project.getDistributionManagement().getStatus() != null ) ) - { - String projectId = safeVersionlessKey( project.getGroupId(), project.getArtifactId() ); - - throw new ProjectBuildingException( projectId, - "Invalid project file: distribution status must not be specified for a project outside of the repository" ); - } - } - */ - return project; } private Model findModelFromRepository( Artifact artifact, List remoteArtifactRepositories, - ArtifactRepository localRepository, - boolean allowStubModel ) + ArtifactRepository localRepository ) throws ProjectBuildingException { Artifact projectArtifact; @@ -553,16 +502,7 @@ public class DefaultMavenProjectBuilder } catch ( ArtifactNotFoundException e ) { - if ( allowStubModel ) - { - getLogger().debug( "Artifact not found - using stub model: " + e.getMessage() ); - - model = createStubModel( projectArtifact ); - } - else - { - throw new ProjectBuildingException( projectId, "POM '" + projectId + "' not found in repository: " + e.getMessage(), e ); - } + throw new ProjectBuildingException( projectId, "POM '" + projectId + "' not found in repository: " + e.getMessage(), e ); } return model; @@ -608,33 +548,6 @@ public class DefaultMavenProjectBuilder } } - // jvz:note - // This is used when requested artifacts do not have an associated POM. This is for the case where we are - // using an m1 repo where the only thing required to be present are the JAR files. - private Model createStubModel( Artifact projectArtifact ) - { - getLogger().debug( "Using defaults for missing POM " + projectArtifact ); - - Model model = new Model(); - - model.setModelVersion( "4.0.0" ); - - model.setArtifactId( projectArtifact.getArtifactId() ); - - model.setGroupId( projectArtifact.getGroupId() ); - - model.setVersion( projectArtifact.getVersion() ); - - // TODO: not correct in some instances - model.setPackaging( projectArtifact.getType() ); - - model.setDistributionManagement( new DistributionManagement() ); - - model.getDistributionManagement().setStatus( ArtifactStatus.GENERATED.toString() ); - - return model; - } - // jvz:note // We've got a mixture of things going in the USD and from the repository, sometimes the descriptor // is a real file and sometimes null which makes things confusing. @@ -661,6 +574,7 @@ public class DefaultMavenProjectBuilder String projectId = safeVersionlessKey( model.getGroupId(), model.getArtifactId() ); List explicitlyActive; + List explicitlyInactive; if ( externalProfileManager != null ) @@ -676,11 +590,13 @@ public class DefaultMavenProjectBuilder } explicitlyActive = externalProfileManager.getExplicitlyActivatedIds(); + explicitlyInactive = externalProfileManager.getExplicitlyDeactivatedIds(); } else { explicitlyActive = Collections.EMPTY_LIST; + explicitlyInactive = Collections.EMPTY_LIST; } @@ -696,17 +612,11 @@ public class DefaultMavenProjectBuilder Model originalModel = ModelUtils.cloneModel( model ); - MavenProject project = null; + MavenProject project; + try { - project = assembleLineage( model, - lineage, - localRepository, - projectDir, - parentSearchRepositories, - aggregatedRemoteWagonRepositories, - externalProfileManager, - strict ); + project = assembleLineage( model, lineage, localRepository, projectDir, aggregatedRemoteWagonRepositories, externalProfileManager, strict ); } catch ( InvalidRepositoryException e ) { @@ -734,7 +644,9 @@ public class DefaultMavenProjectBuilder } catch ( IOException e ) { - getLogger().debug( "Cannot determine whether " + currentProject.getId() + " is a module of " + previousProject.getId() + ". Reason: " + e.getMessage(), e ); + getLogger().debug( + "Cannot determine whether " + currentProject.getId() + " is a module of " + previousProject.getId() + ". Reason: " + e.getMessage(), + e ); } modelInheritanceAssembler.assembleModelInheritance( current, previous, pathAdjustment ); @@ -760,7 +672,7 @@ public class DefaultMavenProjectBuilder try { - project = processProjectLogic( pomLocation, project, externalProfileManager, projectDir, strict ); + project = processProjectLogic( pomLocation, project, projectDir, strict ); } catch ( ModelInterpolationException e ) { @@ -772,14 +684,13 @@ public class DefaultMavenProjectBuilder } ProjectBuildCache projectBuildCache = ProjectBuildCache.read( buildContextManager ); + projectBuildCache.cacheProject( project ); + projectBuildCache.store( buildContextManager ); - // jvz:note - // this only happens if we are building from a source file if ( projectDescriptor != null ) { - // Only translate the base directory for files in the source tree pathTranslator.alignToBaseDirectory( project.getModel(), projectDescriptor.getParentFile() ); Build build = project.getBuild(); @@ -807,8 +718,7 @@ public class DefaultMavenProjectBuilder } } - project.setManagedVersionMap( createManagedVersionMap( projectId, project.getDependencyManagement(), - project.getParent() ) ); + project.setManagedVersionMap( createManagedVersionMap( projectId, project.getDependencyManagement() ) ); return project; } @@ -851,9 +761,7 @@ public class DefaultMavenProjectBuilder List explicitlyInactive ) throws ProjectBuildingException { - Set reposFromProfiles = profileAdvisor.getArtifactRepositoriesFromActiveProfiles( model, projectDir, - explicitlyActive, - explicitlyInactive ); + Set reposFromProfiles = profileAdvisor.getArtifactRepositoriesFromActiveProfiles( model, projectDir, explicitlyActive, explicitlyInactive ); if ( ( reposFromProfiles != null ) && !reposFromProfiles.isEmpty() ) { @@ -861,6 +769,7 @@ public class DefaultMavenProjectBuilder } List modelRepos = model.getRepositories(); + if ( ( modelRepos != null ) && !modelRepos.isEmpty() ) { try @@ -920,7 +829,6 @@ public class DefaultMavenProjectBuilder */ private MavenProject processProjectLogic( String pomLocation, MavenProject project, - ProfileManager profileMgr, File projectDir, boolean strict ) throws ProjectBuildingException, ModelInterpolationException, InvalidRepositoryException @@ -1029,29 +937,31 @@ public class DefaultMavenProjectBuilder LinkedList lineage, ArtifactRepository localRepository, File projectDir, - List parentSearchRepositories, Set aggregatedRemoteWagonRepositories, ProfileManager externalProfileManager, boolean strict ) throws ProjectBuildingException, InvalidRepositoryException { ModelLineage modelLineage = new DefaultModelLineage(); + modelLineage.setOrigin( model, new File( projectDir, "pom.xml" ), new ArrayList( aggregatedRemoteWagonRepositories ) ); - // strict means "no stubs", so we invert it here for the allowStubs parameter. modelLineageBuilder.resumeBuildingModelLineage( modelLineage, localRepository, externalProfileManager, !strict ); ProjectBuildContext projectContext = ProjectBuildContext.getProjectBuildContext( buildContextManager, true ); projectContext.setModelLineage( modelLineage ); + projectContext.store( buildContextManager ); List explicitlyActive; + List explicitlyInactive; if ( externalProfileManager != null ) { explicitlyActive = externalProfileManager.getExplicitlyActivatedIds(); + explicitlyInactive = externalProfileManager.getExplicitlyDeactivatedIds(); } else diff --git a/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java b/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java index b5c82becab..d20f02cfcf 100644 --- a/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java +++ b/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java @@ -58,56 +58,34 @@ public interface MavenProjectBuilder boolean STRICT_MODEL_PARSING = true; - MavenProject build( File project, ArtifactRepository localRepository, ProfileManager globalProfileManager ) + MavenProject build( File project, + ArtifactRepository localRepository, + ProfileManager globalProfileManager ) throws ProjectBuildingException; - MavenProject build( File project, ArtifactRepository localRepository, ProfileManager globalProfileManager, - boolean checkDistributionManagementStatus ) + + MavenProjectBuildingResult buildWithDependencies( File project, + ArtifactRepository localRepository, + ProfileManager globalProfileManager ) throws ProjectBuildingException; - // ---------------------------------------------------------------------- - // These methods are used by the MavenEmbedder - // ---------------------------------------------------------------------- - - MavenProjectBuildingResult buildWithDependencies( File project, ArtifactRepository localRepository, - ProfileManager globalProfileManager, TransferListener transferListener ) - throws ProjectBuildingException; - - MavenProjectBuildingResult buildWithDependencies( File project, ArtifactRepository localRepository, - ProfileManager globalProfileManager ) - throws ProjectBuildingException; - - // ---------------------------------------------------------------------- - // - // ---------------------------------------------------------------------- - - /** - * Build the artifact from the local repository, resolving it if necessary. - * - * @param artifact the artifact description - * @param localRepository the local repository - * @param remoteArtifactRepositories the remote repository list - * @return the built project - * @throws ProjectBuildingException - */ - MavenProject buildFromRepository( Artifact artifact, List remoteArtifactRepositories, + MavenProject buildFromRepository( Artifact artifact, + List remoteArtifactRepositories, ArtifactRepository localRepository ) throws ProjectBuildingException; - /** - * Build the artifact from the local repository, resolving it if necessary. - * - * @param artifact the artifact description - * @param localRepository the local repository - * @param remoteArtifactRepositories the remote repository list - * @param allowStubModel return a stub if the POM is not found - * @return the built project - * @throws ProjectBuildingException - */ - MavenProject buildFromRepository( Artifact artifact, List remoteArtifactRepositories, - ArtifactRepository localRepository, boolean allowStubModel ) + /** @deprecated We do not want to allow projects to not have POMs. Maven 1.x repositories be damned. */ + MavenProject buildFromRepository( Artifact artifact, + List remoteArtifactRepositories, + ArtifactRepository localRepository, + boolean allowStub ) throws ProjectBuildingException; + /** + * + * @return + * @throws ProjectBuildingException + */ MavenProject buildStandaloneSuperProject() throws ProjectBuildingException; } diff --git a/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java b/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java index 48e238336d..132fdeed39 100644 --- a/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java +++ b/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java @@ -112,8 +112,7 @@ public class MavenMetadataSource { try { - project = mavenProjectBuilder.buildFromRepository( pomArtifact, remoteRepositories, localRepository, - true ); + project = mavenProjectBuilder.buildFromRepository( pomArtifact, remoteRepositories, localRepository ); } catch ( InvalidProjectModelException e ) { diff --git a/maven-project/src/main/resources/META-INF/plexus/components.xml b/maven-project/src/main/resources/META-INF/plexus/components.xml index 0a7c7ddd58..19faae2c57 100644 --- a/maven-project/src/main/resources/META-INF/plexus/components.xml +++ b/maven-project/src/main/resources/META-INF/plexus/components.xml @@ -184,9 +184,6 @@ under the License. org.apache.maven.context.BuildContextManager default - - org.apache.maven.artifact.manager.WagonManager - org.apache.maven.MavenTools