Modified: maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleWeaveBuilder.java URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleWeaveBuilder.java?rev=935529&r1=935528&r2=935529&view=diff ============================================================================== --- maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleWeaveBuilder.java (original) +++ maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleWeaveBuilder.java Mon Apr 19 11:15:42 2010 @@ -29,8 +29,8 @@ import org.codehaus.plexus.component.ann import org.codehaus.plexus.logging.Logger; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; +import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -73,13 +73,9 @@ public class LifecycleWeaveBuilder private Logger logger; @Requirement - private LifecycleDependencyResolver lifecycleDependencyResolver; - - @Requirement private ExecutionEventCatapult eventCatapult; - private final Map<MavenProject, MavenExecutionPlan> executionPlans = - Collections.synchronizedMap( new HashMap<MavenProject, MavenExecutionPlan>() ); + private Map<MavenProject, MavenExecutionPlan> executionPlans = new HashMap<MavenProject, MavenExecutionPlan>( ); @SuppressWarnings({"UnusedDeclaration"}) @@ -87,9 +83,8 @@ public class LifecycleWeaveBuilder { } - public LifecycleWeaveBuilder( MojoExecutor mojoExecutor, BuilderCommon builderCommon, Logger logger, - LifecycleDependencyResolver lifecycleDependencyResolver, - ExecutionEventCatapult eventCatapult ) + public LifecycleWeaveBuilder(MojoExecutor mojoExecutor, BuilderCommon builderCommon, Logger logger, + ExecutionEventCatapult eventCatapult) { this.mojoExecutor = mojoExecutor; this.builderCommon = builderCommon; @@ -110,14 +105,32 @@ public class LifecycleWeaveBuilder for ( TaskSegment taskSegment : taskSegments ) { ProjectBuildList segmentChunks = projectBuilds.getByTaskSegment( taskSegment ); - ThreadOutputMuxer muxer = null; // new ThreadOutputMuxer( segmentChunks, System.out ); + ThreadOutputMuxer muxer = null; // new ThreadOutputMuxer( segmentChunks, System.out ); + Set<String> projectArtifacts = new HashSet<String>(); + Set<Artifact> projectArtifactsA = new HashSet<Artifact>(); + for (ProjectSegment segmentChunk : segmentChunks) { + Artifact artifact = segmentChunk.getProject().getArtifact(); + if (artifact != null) { + projectArtifacts.add( ArtifactUtils.key(artifact)); + projectArtifactsA.add( artifact); + } + } for ( ProjectSegment projectBuild : segmentChunks ) { try { MavenExecutionPlan executionPlan = builderCommon.resolveBuildPlan( projectBuild.getSession(), projectBuild.getProject(), - projectBuild.getTaskSegment() ); + projectBuild.getTaskSegment(), projectArtifactsA ); + for (Artifact dependency : projectBuild.getProject().getDependencyArtifacts()) { + String s = ArtifactUtils.key(dependency); + if ( projectArtifacts.contains(s)){ + dependency.setFile( null); + dependency.setResolved( false); + dependency.setRepository( null); + } + } + executionPlans.put( projectBuild.getProject(), executionPlan ); DependencyContext dependencyContext = new DependencyContext( executionPlan, projectBuild.getTaskSegment().isAggregating() ); @@ -182,8 +195,7 @@ public class LifecycleWeaveBuilder try { - while ( current != null && !reactorBuildStatus.isHalted() && - !reactorBuildStatus.isBlackListed( projectBuild.getProject() ) ) + while (current != null && !reactorBuildStatus.isHaltedOrBlacklisted( projectBuild.getProject() )) { PhaseRecorder phaseRecorder = new PhaseRecorder( projectBuild.getProject() ); @@ -191,19 +203,7 @@ public class LifecycleWeaveBuilder concurrentBuildLogger.createBuildLogItem( projectBuild.getProject(), current ); final Schedule schedule = current.getSchedule(); - if ( schedule != null && schedule.isMojoSynchronized() ) - { - synchronized ( current.getPlugin() ) - { - buildExecutionPlanItem( reactorContext, current, projectBuild, dependencyContext, - phaseRecorder ); - } - } - else - { - buildExecutionPlanItem( reactorContext, current, projectBuild, dependencyContext, - phaseRecorder ); - } + buildExecutionPlanItem(current, phaseRecorder, schedule, reactorContext, projectBuild, dependencyContext); current.setComplete(); builtLogItem.setComplete(); @@ -212,62 +212,12 @@ public class LifecycleWeaveBuilder if ( nextPlanItem != null ) { - boolean mustReResolved = false; - final Schedule scheduleOfNext = nextPlanItem.getSchedule(); if ( scheduleOfNext == null || !scheduleOfNext.isParallel() ) { - for ( MavenProject upstreamProject : projectBuild.getImmediateUpstreamProjects() ) - { - final MavenExecutionPlan upstreamPlan = executionPlans.get( upstreamProject ); - final String nextPhase = nextPlanItem.getLifecyclePhase(); - final ExecutionPlanItem inSchedule = upstreamPlan.findLastInPhase( nextPhase ); - - if ( inSchedule != null ) - { - if ( upstreamPhaseModifiesArtifactResolutionState( inSchedule ) ) - { - String key = ArtifactUtils.key( upstreamProject.getGroupId(), - upstreamProject.getArtifactId(), - upstreamProject.getVersion() ); - final Set<Artifact> deps = - projectBuild.getProject().getDependencyArtifacts(); - for ( Artifact dep : deps ) - { - String depKey = - ArtifactUtils.key( dep.getGroupId(), dep.getArtifactId(), - dep.getVersion() ); - if ( key.equals( depKey ) ) - { - dep.setResolved( false ); - mustReResolved = true; - } - } - } - long startWait = System.currentTimeMillis(); - inSchedule.waitUntilDone(); - builtLogItem.addWait( upstreamProject, inSchedule, startWait ); - } - else if ( !upstreamPlan.containsPhase( nextPhase ) ) - { - // Still a bit of a kludge; if we cannot connect in a sensible way to - // the upstream build plan we just revert to waiting for it all to - // complete. Real problem is per-mojo phase->lifecycle mapping - builtLogItem.addDependency( upstreamProject, "No phase tracking possible " ); - upstreamPlan.waitUntilAllDone(); - } - else - { - builtLogItem.addDependency( upstreamProject, "No schedule" ); - } - } - } - if ( mustReResolved ) - { - lifecycleDependencyResolver.resolveDependencies( false, projectBuild.getProject(), - projectBuild.getSession(), - executionPlan ); + waitForAppropriateUpstreamExecutionsToFinish(builtLogItem, nextPlanItem, projectBuild); } + reResolveReactorDependencies(nextPlanItem, projectBuild); } current = nextPlanItem; } @@ -293,15 +243,139 @@ public class LifecycleWeaveBuilder } return null; } + }; } - private boolean upstreamPhaseModifiesArtifactResolutionState( ExecutionPlanItem inSchedule ) + private void reResolveReactorDependencies(ExecutionPlanItem nextPlanItem, ProjectSegment projectBuild) { + if ( requiresReResolutionOfUpstreamReactorArtifacts( nextPlanItem ) ) + { + reresolveUpstreamProjectArtifacts(projectBuild); + } + else if (requiresReResolutionOfUpstreamTestScopedReactorArtifacts( nextPlanItem)) + { + reresolveUpstreamTestScopedArtifacts( projectBuild); + } + } + + private void waitForAppropriateUpstreamExecutionsToFinish(BuildLogItem builtLogItem, ExecutionPlanItem nextPlanItem, ProjectSegment projectBuild) throws InterruptedException { + for ( MavenProject upstreamProject : projectBuild.getImmediateUpstreamProjects() ) + { + final MavenExecutionPlan upstreamPlan = executionPlans.get( upstreamProject ); + final String nextPhase = nextPlanItem.getLifecyclePhase(); + final ExecutionPlanItem inSchedule = upstreamPlan.findLastInPhase( nextPhase ); + + if ( inSchedule != null ) + { + long startWait = System.currentTimeMillis(); + inSchedule.waitUntilDone(); + builtLogItem.addWait( upstreamProject, inSchedule, startWait ); + } + else if ( !upstreamPlan.containsPhase( nextPhase ) ) + { + // Still a bit of a kludge; if we cannot connect in a sensible way to + // the upstream build plan we just revert to waiting for it all to + // complete. Real problem is per-mojo phase->lifecycle mapping + builtLogItem.addDependency( upstreamProject, "No phase tracking possible " ); + upstreamPlan.waitUntilAllDone(); + } + else + { + builtLogItem.addDependency( upstreamProject, "No schedule" ); + } + } + } + + private void reresolveUpstreamProjectArtifacts(ProjectSegment projectBuild) { + for ( MavenProject upstreamProject : projectBuild.getTransitiveUpstreamProjects() ){ + Artifact upStreamArtifact = upstreamProject.getArtifact(); + Artifact dependencyArtifact = findDependency(projectBuild.getProject(), upStreamArtifact); + if (dependencyArtifact != null){ + dependencyArtifact.setFile( upStreamArtifact.getFile()); + dependencyArtifact.setResolved( true ); + dependencyArtifact.setRepository( upStreamArtifact.getRepository()); + } + + } + } + + private void reresolveUpstreamTestScopedArtifacts(ProjectSegment projectBuild) { + for ( MavenProject upstreamProject : projectBuild.getTransitiveUpstreamProjects() ){ + Artifact upStreamArtifact = findTestScopedArtifact(upstreamProject); + Artifact dependencyArtifact = findDependency(projectBuild.getProject(), upStreamArtifact); + if (dependencyArtifact != null){ + dependencyArtifact.setFile( upStreamArtifact.getFile()); + dependencyArtifact.setResolved( upStreamArtifact.isResolved()); + dependencyArtifact.setRepository( upStreamArtifact.getRepository()); + } + + } + } + + private Artifact findTestScopedArtifact(MavenProject upstreamProject) { + if ( upstreamProject == null){ + return null; + } + + List<Artifact> artifactList = upstreamProject.getAttachedArtifacts(); + for (Artifact artifact : artifactList) { + if (Artifact.SCOPE_TEST.equals( artifact.getScope())){ + return artifact; + } + } + return null; + } + + private static Artifact findDependency(MavenProject project, Artifact upStreamArtifact) { + if (upStreamArtifact == null){ + return null; + } + + String key = ArtifactUtils.key( upStreamArtifact.getGroupId(), + upStreamArtifact.getArtifactId(), + upStreamArtifact.getVersion() ); + final Set<Artifact> deps = project.getDependencyArtifacts(); + for ( Artifact dep : deps ) + { + String depKey = ArtifactUtils.key(dep.getGroupId(), dep.getArtifactId(), dep.getVersion()); + if ( key.equals( depKey ) ) + { + return dep; + } + } + return null; + + } + + private boolean requiresReResolutionOfUpstreamReactorArtifacts( ExecutionPlanItem nextExecutionPlanItem ) { - final String phase = inSchedule.getLifecyclePhase(); - return "install".equals( phase ) || "compile".equals( phase ) || "test-compile".equals( phase ); + final String phase = nextExecutionPlanItem.getLifecyclePhase(); + return "package".equals(phase) || "install".equals( phase ) || "compile".equals( phase ); } + private boolean requiresReResolutionOfUpstreamTestScopedReactorArtifacts( ExecutionPlanItem nextExecutionPlanItem ) + { + final String phase = nextExecutionPlanItem.getLifecyclePhase(); + return "package".equals(phase) || "install".equals( phase ) || "compile".equals( phase ) || "test-compile".equals( phase ); + } + + private void buildExecutionPlanItem(ExecutionPlanItem current, PhaseRecorder phaseRecorder, Schedule schedule, ReactorContext reactorContext, ProjectSegment projectBuild, DependencyContext dependencyContext) throws LifecycleExecutionException { + if ( schedule != null && schedule.isMojoSynchronized() ) + { + synchronized ( current.getPlugin() ) + { + buildExecutionPlanItem( reactorContext, current, projectBuild, dependencyContext, + phaseRecorder ); + } + } + else + { + buildExecutionPlanItem( reactorContext, current, projectBuild, dependencyContext, + phaseRecorder ); + } + } + + private void buildExecutionPlanItem( ReactorContext reactorContext, ExecutionPlanItem node, ProjectSegment projectBuild, DependencyContext dependencyContext, PhaseRecorder phaseRecorder )
Modified: maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectSegment.java URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectSegment.java?rev=935529&r1=935528&r2=935529&view=diff ============================================================================== --- maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectSegment.java (original) +++ maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectSegment.java Mon Apr 19 11:15:42 2010 @@ -53,12 +53,18 @@ public final class ProjectSegment private final MavenSession session; + private final List<MavenProject> nonTransitiveUpstreamProjects; + + private final List<MavenProject> transitiveUpstreamProjects; public ProjectSegment( MavenProject project, TaskSegment taskSegment, MavenSession copiedSession ) { this.project = project; this.taskSegment = taskSegment; this.session = copiedSession; + final ProjectDependencyGraph dependencyGraph = getSession().getProjectDependencyGraph(); + nonTransitiveUpstreamProjects = dependencyGraph.getUpstreamProjects( getProject(), false ); + transitiveUpstreamProjects = dependencyGraph.getUpstreamProjects( getProject(), true ); } public MavenSession getSession() @@ -78,8 +84,12 @@ public final class ProjectSegment public List<MavenProject> getImmediateUpstreamProjects() { - final ProjectDependencyGraph dependencyGraph = getSession().getProjectDependencyGraph(); - return dependencyGraph.getUpstreamProjects( getProject(), false ); + return nonTransitiveUpstreamProjects; + } + + public List<MavenProject> getTransitiveUpstreamProjects() + { + return transitiveUpstreamProjects; } @Override Propchange: maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 19 11:15:42 2010 @@ -5,3 +5,4 @@ /maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java:738973-739966 /maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java:738757-738972 /maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java:688587-696625,696644-699681,751453-767358,767708-768832 +/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java:935334-935341 Propchange: maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 19 11:15:42 2010 @@ -5,3 +5,4 @@ /maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java:738973-739966 /maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java:738757-738972 /maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java:688587-696625,696644-699681,751453-767358,767708-768832 +/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java:935334-935341 Propchange: maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/plugin/PluginDescriptorParsingException.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 19 11:15:42 2010 @@ -5,3 +5,4 @@ /maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/PluginConfigurationException.java:738973-739966 /maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/PluginConfigurationException.java:738757-738972 /maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginConfigurationException.java:751453-767358,767708-768832 +/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginDescriptorParsingException.java:935334-935341 Propchange: maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/plugin/PluginLoaderException.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 19 11:15:42 2010 @@ -6,3 +6,4 @@ /maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoaderException.java:738757-738972 /maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginLoaderException.java:751453-767358,767708-768832 /maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoaderException.java:688587-696625,696644-699681 +/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginLoaderException.java:935334-935341 Propchange: maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 19 11:15:42 2010 @@ -6,3 +6,4 @@ /maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java:738757-738972 /maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionNotFoundException.java:751453-767358,767708-768832 /maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java:688587-696625,696644-699681 +/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java:935334-935341 Propchange: maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 19 11:15:42 2010 @@ -6,3 +6,4 @@ /maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java:738757-738972 /maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionResolutionException.java:751453-767358,767708-768832 /maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java:688587-696625,696644-699681 +/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java:935334-935341 Propchange: maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/project/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 19 11:15:42 2010 @@ -5,3 +5,4 @@ /maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project:738973-739966 /maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project:738757-738972 /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project:751453-767358,767708-768832 +/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project:935334-935341 Propchange: maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 19 11:15:42 2010 @@ -5,3 +5,4 @@ /maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/execution/ProjectSorter.java:738973-739966 /maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/execution/ProjectSorter.java:738757-738972 /maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/ProjectSorter.java:751453-767358,767708-768832 +/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java:935334-935341 Propchange: maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 19 11:15:42 2010 @@ -5,3 +5,4 @@ /maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/DelegatingLocalArtifactRepository.java:738973-739966 /maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/DelegatingLocalArtifactRepository.java:738757-738972 /maven/components/trunk/maven-core/src/main/java/org/apache/maven/DelegatingLocalArtifactRepository.java:751453-767358,767708-768832 +/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java:935334-935341 Propchange: maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 19 11:15:42 2010 @@ -5,3 +5,4 @@ /maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/LocalArtifactRepository.java:738973-739966 /maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/LocalArtifactRepository.java:738757-738972 /maven/components/trunk/maven-core/src/main/java/org/apache/maven/LocalArtifactRepository.java:751453-767358,767708-768832 +/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java:935334-935341 Propchange: maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 19 11:15:42 2010 @@ -6,3 +6,4 @@ /maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/MavenTools.java:738757-738972 /maven/components/trunk/maven-project/src/main/java/org/apache/maven/MavenTools.java:688587-696625,696644-699681 /maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/RepositorySystem.java:751453-767358,767708-768832 +/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java:935334-935341 Propchange: maven/maven-3/branches/MNG-1803/maven-core/src/main/mdo/toolchains.mdo ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 19 11:15:42 2010 @@ -1 +1,2 @@ /maven/components/branches/maven-2.1.x/maven-toolchain/src/main/mdo/toolchains.mdo:768778,768796 +/maven/maven-3/trunk/maven-core/src/main/mdo/toolchains.mdo:935334-935341 Modified: maven/maven-3/branches/MNG-1803/maven-core/src/main/resources/META-INF/plexus/components.xml URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-core/src/main/resources/META-INF/plexus/components.xml?rev=935529&r1=935528&r2=935529&view=diff ============================================================================== --- maven/maven-3/branches/MNG-1803/maven-core/src/main/resources/META-INF/plexus/components.xml (original) +++ maven/maven-3/branches/MNG-1803/maven-core/src/main/resources/META-INF/plexus/components.xml Mon Apr 19 11:15:42 2010 @@ -22,37 +22,6 @@ <implementation>org.apache.maven.plugin.MavenPluginCollector </implementation> </component> - <!-- component> - <role>org.apache.maven.lifecycle.LifecycleExecutor</role> - <implementation>org.apache.maven.lifecycle.DefaultLifecycleExecutor - </implementation> - <requirements> - <requirement> - <role>org.apache.maven.lifecycle.LifeCyclePluginAnalyzer</role> - </requirement> - <requirement> - <role>org.apache.maven.lifecycle.DefaultLifecycles</role> - </requirement> - <requirement> - <role>org.codehaus.plexus.logging.Logger</role> - <role-hint>default</role-hint> - <field-name>logger</field-name> - </requirement> - <requirement> - <role>org.apache.maven.lifecycle.internal.LifecycleModuleBuilder</role> - </requirement> - <requirement> - <role>org.apache.maven.lifecycle.internal.LifecycleWeaveBuilder</role> - </requirement> - <requirement> - <role>org.apache.maven.lifecycle.internal.BuildListCalculator</role> - </requirement> - <requirement> - <role>org.apache.maven.lifecycle.internal.LifecycleDebugLogger</role> - </requirement> - </requirements> - - </component --> <component> <role>org.apache.maven.lifecycle.DefaultLifecycles</role> <implementation>org.apache.maven.lifecycle.DefaultLifecycles</implementation> @@ -67,30 +36,30 @@ <field-name>lifecycles</field-name> </requirement> </requirements> - - <configuration> - <schedules> - <scheduling> - <lifecycle>default</lifecycle> - <schedules> - <schedule> - <phase>test</phase> - <mojoSynchronized>false</mojoSynchronized> - <parallel>true</parallel> - </schedule> - <schedule> - <mojoClass>org.apache.maven.plugins:maven-assembly-plugin</mojoClass> - <mojoSynchronized>true</mojoSynchronized> - </schedule> - <!--schedule> - <mojoClass>org.codehaus.modello:modello-maven-plugin</mojoClass> - <mojoSynchronized>true</mojoSynchronized> - </schedule --> - </schedules> - </scheduling> - </schedules> - </configuration> </component> + <component> + <role>org.apache.maven.lifecycle.DefaultSchedules</role> + <implementation>org.apache.maven.lifecycle.DefaultSchedules</implementation> + + <configuration> + <schedules> + <scheduling> + <lifecycle>default</lifecycle> + <schedules> + <schedule> + <phase>test</phase> + <mojoSynchronized>false</mojoSynchronized> + <parallel>true</parallel> + </schedule> + <schedule> + <mojoClass>org.apache.maven.plugins:maven-assembly-plugin</mojoClass> + <mojoSynchronized>true</mojoSynchronized> + </schedule> + </schedules> + </scheduling> + </schedules> + </configuration> + </component> <component> <role>org.apache.maven.lifecycle.Lifecycle</role> Propchange: maven/maven-3/branches/MNG-1803/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 19 11:15:42 2010 @@ -5,3 +5,4 @@ /maven/components/branches/sisbell-plugin-manager/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTest.java:738973-739966 /maven/components/sisbell-plugin-manager/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTest.java:738757-738972 /maven/components/trunk/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTest.java:688587-696625,696644-699681 +/maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java:935334-935341 Modified: maven/maven-3/branches/MNG-1803/maven-core/src/test/java/org/apache/maven/lifecycle/DefaultLifecyclesTest.java URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-core/src/test/java/org/apache/maven/lifecycle/DefaultLifecyclesTest.java?rev=935529&r1=935528&r2=935529&view=diff ============================================================================== --- maven/maven-3/branches/MNG-1803/maven-core/src/test/java/org/apache/maven/lifecycle/DefaultLifecyclesTest.java (original) +++ maven/maven-3/branches/MNG-1803/maven-core/src/test/java/org/apache/maven/lifecycle/DefaultLifecyclesTest.java Mon Apr 19 11:15:42 2010 @@ -56,21 +56,4 @@ public class DefaultLifecyclesTest } - public void testScheduling() - throws Exception - { - final List<Scheduling> schedulings = defaultLifeCycles.getSchedules(); - assertNotNull( schedulings ); - assertTrue( schedulings.size() > 0 ); - Scheduling first = schedulings.get( 0 ); - assertNotNull( first.getLifecycle() ); - final List<Schedule> schedules = first.getSchedules(); - assertNotNull( schedules ); - // Ok so if we ever change the first schedule this test will have to change - Schedule firstSchedule = schedules.get( 0 ); - assertEquals( "test", firstSchedule.getPhase() ); - assertTrue( "Should be parllel", firstSchedule.isParallel() ); - - } - } \ No newline at end of file Modified: maven/maven-3/branches/MNG-1803/maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuilderCommonTest.java URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuilderCommonTest.java?rev=935529&r1=935528&r2=935529&view=diff ============================================================================== --- maven/maven-3/branches/MNG-1803/maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuilderCommonTest.java (original) +++ maven/maven-3/branches/MNG-1803/maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuilderCommonTest.java Mon Apr 19 11:15:42 2010 @@ -16,6 +16,7 @@ package org.apache.maven.lifecycle.internal; import junit.framework.TestCase; +import org.apache.maven.artifact.Artifact; import org.apache.maven.execution.MavenSession; import org.apache.maven.lifecycle.MavenExecutionPlan; import org.apache.maven.lifecycle.internal.stub.LifecycleExecutionPlanCalculatorStub; @@ -23,6 +24,8 @@ import org.apache.maven.lifecycle.intern import org.apache.maven.lifecycle.internal.stub.ProjectDependenciesResolverStub; import org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub; +import java.util.HashSet; + /** * @author Kristian Rosenvold */ @@ -40,7 +43,8 @@ public class BuilderCommonTest final BuilderCommon builderCommon = getBuilderCommon(); final MavenExecutionPlan plan = - builderCommon.resolveBuildPlan( session1, ProjectDependencyGraphStub.A, taskSegment1 ); + builderCommon.resolveBuildPlan( session1, ProjectDependencyGraphStub.A, taskSegment1, + new HashSet<Artifact>() ); assertEquals( LifecycleExecutionPlanCalculatorStub.getProjectAExceutionPlan().size(), plan.size() ); } Modified: maven/maven-3/branches/MNG-1803/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java?rev=935529&r1=935528&r2=935529&view=diff ============================================================================== --- maven/maven-3/branches/MNG-1803/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java (original) +++ maven/maven-3/branches/MNG-1803/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java Mon Apr 19 11:15:42 2010 @@ -20,6 +20,7 @@ import org.apache.maven.execution.MavenS import org.apache.maven.lifecycle.MavenExecutionPlan; import org.apache.maven.lifecycle.internal.stub.BuildPluginManagerStub; import org.apache.maven.lifecycle.internal.stub.DefaultLifecyclesStub; +import org.apache.maven.lifecycle.internal.stub.DefaultSchedulesStub; import org.apache.maven.lifecycle.internal.stub.PluginPrefixResolverStub; import org.apache.maven.lifecycle.internal.stub.PluginVersionResolverStub; import org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub; @@ -65,8 +66,9 @@ public class LifecycleExecutionPlanCalcu LifecyclePluginResolver lifecyclePluginResolver = new LifecyclePluginResolver( new PluginVersionResolverStub() ); return new LifecycleExecutionPlanCalculatorImpl( new BuildPluginManagerStub(), - DefaultLifecyclesStub.createDefaultLifeCycles(), - mojoDescriptorCreator, lifecyclePluginResolver ); + DefaultLifecyclesStub.createDefaultLifecycles(), + mojoDescriptorCreator, lifecyclePluginResolver, + DefaultSchedulesStub.createDefaultSchedules()); } public static MojoDescriptorCreator createMojoDescriptorCreator() Modified: maven/maven-3/branches/MNG-1803/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleWeaveBuilderTest.java URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleWeaveBuilderTest.java?rev=935529&r1=935528&r2=935529&view=diff ============================================================================== --- maven/maven-3/branches/MNG-1803/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleWeaveBuilderTest.java (original) +++ maven/maven-3/branches/MNG-1803/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleWeaveBuilderTest.java Mon Apr 19 11:15:42 2010 @@ -122,8 +122,7 @@ public class LifecycleWeaveBuilderTest final LoggerStub loggerStub = new LoggerStub(); final LifecycleDependencyResolver lifecycleDependencyResolver = new LifecycleDependencyResolver( new ProjectDependenciesResolverStub(), loggerStub ); - return new LifecycleWeaveBuilder( mojoExecutor, builderCommon, loggerStub, lifecycleDependencyResolver, - new ExecutionEventCatapultStub() ); + return new LifecycleWeaveBuilder( mojoExecutor, builderCommon, loggerStub, new ExecutionEventCatapultStub() ); } private BuilderCommon getBuilderCommon() Modified: maven/maven-3/branches/MNG-1803/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/DefaultLifecyclesStub.java URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/DefaultLifecyclesStub.java?rev=935529&r1=935528&r2=935529&view=diff ============================================================================== --- maven/maven-3/branches/MNG-1803/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/DefaultLifecyclesStub.java (original) +++ maven/maven-3/branches/MNG-1803/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/DefaultLifecyclesStub.java Mon Apr 19 11:15:42 2010 @@ -34,7 +34,7 @@ import static org.apache.maven.lifecycle public class DefaultLifecyclesStub { - public static DefaultLifecycles createDefaultLifeCycles() + public static DefaultLifecycles createDefaultLifecycles() { List<String> stubDefaultCycle = @@ -44,11 +44,10 @@ public class DefaultLifecyclesStub // The two phases below are really for future expansion, some would say they lack a drink // The point being that they do not really have to match the "real" stuff, - List<String> stubCleanCycle = - Arrays.asList( PRE_CLEAN.getPhase(), CLEAN.getPhase(), POST_CLEAN.getPhase() ); + List<String> stubCleanCycle = Arrays.asList( PRE_CLEAN.getPhase(), CLEAN.getPhase(), POST_CLEAN.getPhase() ); List<String> stubSiteCycle = - Arrays.asList( PRE_SITE.getPhase(), SITE.getPhase(), POST_SITE.getPhase(), SITE_DEPLOY.getPhase()); + Arrays.asList( PRE_SITE.getPhase(), SITE.getPhase(), POST_SITE.getPhase(), SITE_DEPLOY.getPhase() ); Iterator<List<String>> lcs = Arrays.asList( stubDefaultCycle, stubCleanCycle, stubSiteCycle ).iterator(); @@ -59,8 +58,7 @@ public class DefaultLifecyclesStub lifeCycles.put( s, lifecycle ); } - final List<Scheduling> schedulingList = getSchedulingList(); - return new DefaultLifecycles( lifeCycles, schedulingList, new LoggerStub() ); + return new DefaultLifecycles( lifeCycles, new LoggerStub() ); } public static List<Scheduling> getSchedulingList() Modified: maven/maven-3/branches/MNG-1803/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleExecutionPlanCalculatorStub.java URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleExecutionPlanCalculatorStub.java?rev=935529&r1=935528&r2=935529&view=diff ============================================================================== --- maven/maven-3/branches/MNG-1803/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleExecutionPlanCalculatorStub.java (original) +++ maven/maven-3/branches/MNG-1803/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleExecutionPlanCalculatorStub.java Mon Apr 19 11:15:42 2010 @@ -157,9 +157,9 @@ public class LifecycleExecutionPlanCalcu LifecyclePhaseNotFoundException, LifecycleNotFoundException { final List<ExecutionPlanItem> planItemList = - DefaultLifecyclesStub.createDefaultLifeCycles().createExecutionPlanItem( project, mojoExecutions ); + DefaultSchedulesStub.createDefaultSchedules().createExecutionPlanItem( project, mojoExecutions ); return new MavenExecutionPlan( getScopes(), getScopes(), planItemList, - DefaultLifecyclesStub.createDefaultLifeCycles() ); + DefaultLifecyclesStub.createDefaultLifecycles() ); } private static MojoExecution createMojoExecution( Plugin plugin, String goal, String executionId, Modified: maven/maven-3/branches/MNG-1803/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependenciesResolverStub.java URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependenciesResolverStub.java?rev=935529&r1=935528&r2=935529&view=diff ============================================================================== --- maven/maven-3/branches/MNG-1803/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependenciesResolverStub.java (original) +++ maven/maven-3/branches/MNG-1803/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependenciesResolverStub.java Mon Apr 19 11:15:42 2010 @@ -51,4 +51,12 @@ public class ProjectDependenciesResolver { return new HashSet<Artifact>(); } + + public Set<Artifact> resolve( MavenProject project, Collection<String> scopesToCollect, + Collection<String> scopesToResolve, MavenSession session, + Set<Artifact> ignoreableArtifacts ) + throws ArtifactResolutionException, ArtifactNotFoundException + { + return new HashSet<Artifact>(); + } } Modified: maven/maven-3/branches/MNG-1803/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStub.java URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStub.java?rev=935529&r1=935528&r2=935529&view=diff ============================================================================== --- maven/maven-3/branches/MNG-1803/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStub.java (original) +++ maven/maven-3/branches/MNG-1803/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStub.java Mon Apr 19 11:15:42 2010 @@ -190,10 +190,10 @@ public class ProjectDependencyGraphStub public List<MavenProject> getUpstreamProjects( MavenProject project, boolean transitive ) { - if ( transitive ) + /* if ( transitive ) { throw new RuntimeException( "Not implemented yet" ); - } + }*/ List<MavenProject> result = new ArrayList<MavenProject>(); final List<Dependency> dependencies = getDependencies(); for ( Dependency dependency : dependencies ) Propchange: maven/maven-3/branches/MNG-1803/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 19 11:15:42 2010 @@ -5,3 +5,4 @@ /maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java:738973-739966 /maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java:738757-738972 /maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java:751453-767358,767708-768832 +/maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java:935334-935341 Propchange: maven/maven-3/branches/MNG-1803/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 19 11:15:42 2010 @@ -5,3 +5,4 @@ /maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java:738973-739966 /maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java:738757-738972 /maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java:751453-767358,767708-768832 +/maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java:935334-935341 Propchange: maven/maven-3/branches/MNG-1803/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 19 11:15:42 2010 @@ -5,3 +5,4 @@ /maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java:738973-739966 /maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java:738757-738972 /maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java:751453-767358,767708-768832 +/maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java:935334-935341 Propchange: maven/maven-3/branches/MNG-1803/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 19 11:15:42 2010 @@ -5,3 +5,4 @@ /maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java:738973-739966 /maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java:738757-738972 /maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java:751453-767358,767708-768832 +/maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java:935334-935341 Propchange: maven/maven-3/branches/MNG-1803/maven-core/src/test/java/org/apache/maven/project/artifact/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 19 11:15:42 2010 @@ -5,3 +5,4 @@ /maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/artifact:738973-739966 /maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/artifact:738757-738972 /maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/artifact:751453-767358,767708-768832 +/maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/artifact:935334-935341 Propchange: maven/maven-3/branches/MNG-1803/maven-core/src/test/java/org/apache/maven/project/canonical/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 19 11:15:42 2010 @@ -5,3 +5,4 @@ /maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/canonical:738973-739966 /maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/canonical:738757-738972 /maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/canonical:751453-767358,767708-768832 +/maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/canonical:935334-935341 Propchange: maven/maven-3/branches/MNG-1803/maven-core/src/test/java/org/apache/maven/project/inheritance/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 19 11:15:42 2010 @@ -5,3 +5,4 @@ /maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/inheritance:738973-739966 /maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/inheritance:738757-738972 /maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance:751453-767358,767708-768832 +/maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/inheritance:935334-935341 Propchange: maven/maven-3/branches/MNG-1803/maven-embedder/src/main/java/org/apache/maven/cli/MavenLoggerManager.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 19 11:15:42 2010 @@ -6,3 +6,4 @@ /maven/components/sisbell-plugin-manager/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderLoggerManager.java:738757-738972 /maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderLoggerManager.java:751453-767358,767708-768832 /maven/maven-2/branches/maven-2.2.x/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderLoggerManager.java:795521 +/maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenLoggerManager.java:935334-935341 Propchange: maven/maven-3/branches/MNG-1803/maven-model-builder/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 19 11:15:42 2010 @@ -6,3 +6,4 @@ /maven/components/sisbell-plugin-manager/maven-project-builder:738757-738972 /maven/components/trunk/maven-model-builder:767708-768832 /maven/components/trunk/maven-project-builder:688587-696625,696644-699681 +/maven/maven-3/trunk/maven-model-builder:935334-935341 Propchange: maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelEventListener.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 19 11:15:42 2010 @@ -6,3 +6,4 @@ /maven/components/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelEventListener.java:738757-738972 /maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelEventListener.java:768840-768841 /maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelEventListener.java:688587-696625,696644-699681 +/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelEventListener.java:935334-935341 Propchange: maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/path/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 19 11:15:42 2010 @@ -5,3 +5,4 @@ /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/project/path:738757-738972 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/project/path:751453-767358,767708-768832 /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/path:688587-696625,696644-699681 +/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/path:935334-935341 Propchange: maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/mdo/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 19 11:15:42 2010 @@ -4,3 +4,4 @@ /maven/components/branches/sisbell-plugin-manager/maven-project/src/main/mdo:738973-739966 /maven/components/sisbell-plugin-manager/maven-project/src/main/mdo:738757-738972 /maven/components/trunk/maven-model-builder/src/main/mdo:767708-768832 +/maven/maven-3/trunk/maven-model-builder/src/main/mdo:935334-935341 Propchange: maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/resources/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 19 11:15:42 2010 @@ -5,3 +5,4 @@ /maven/components/sisbell-plugin-manager/maven-project-builder/src/main/resources:738757-738972 /maven/components/trunk/maven-model-builder/src/main/resources:767708-768832 /maven/components/trunk/maven-project/src/main/resources:688587-696625,696644-699681 +/maven/maven-3/trunk/maven-model-builder/src/main/resources:935334-935341 Propchange: maven/maven-3/branches/MNG-1803/maven-model-builder/src/test/java/org/apache/maven/model/validation/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 19 11:15:42 2010 @@ -5,3 +5,4 @@ /maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/validation:738973-739966 /maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/validation:738757-738972 /maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/validation:751453-767358,767708-768832 +/maven/maven-3/trunk/maven-model-builder/src/test/java/org/apache/maven/model/validation:935334-935341 Propchange: maven/maven-3/branches/MNG-1803/maven-plugin-api/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 19 11:15:42 2010 @@ -5,3 +5,4 @@ /maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java:738973-739966 /maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java:738757-738972 /maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java:688587-696625,696644-699681 +/maven/maven-3/trunk/maven-plugin-api/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java:935334-935341
