You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by og...@apache.org on 2009/04/25 00:50:32 UTC
svn commit: r768438 [1/2] - in
/maven/components/branches/maven-3.0.x-mercury: ./ apache-maven/
maven-compat/src/main/java/org/apache/maven/artifact/
maven-compat/src/main/java/org/apache/maven/artifact/repository/
maven-compat/src/main/java/org/apache...
Author: ogusakov
Date: Fri Apr 24 22:50:30 2009
New Revision: 768438
URL: http://svn.apache.org/viewvc?rev=768438&view=rev
Log:
merge -r 768388:768429 https://svn.apache.org/repos/asf/maven/components/trunk
Added:
maven/components/branches/maven-3.0.x-mercury/maven-compat/src/main/java/org/apache/maven/artifact/repository/ReactorArtifactRepository.java (with props)
maven/components/branches/maven-3.0.x-mercury/maven-project/src/test/resources-project-builder/dependency-management-with-interpolation/
- copied from r768429, maven/components/trunk/maven-project/src/test/resources-project-builder/dependency-management-with-interpolation/
maven/components/branches/maven-3.0.x-mercury/maven-project/src/test/resources-project-builder/dependency-management-with-interpolation/pom.xml
- copied unchanged from r768429, maven/components/trunk/maven-project/src/test/resources-project-builder/dependency-management-with-interpolation/pom.xml
maven/components/branches/maven-3.0.x-mercury/maven-project/src/test/resources-project-builder/dependency-management-with-interpolation/sub/
- copied from r768429, maven/components/trunk/maven-project/src/test/resources-project-builder/dependency-management-with-interpolation/sub/
maven/components/branches/maven-3.0.x-mercury/maven-project/src/test/resources-project-builder/dependency-management-with-interpolation/sub/pom.xml
- copied unchanged from r768429, maven/components/trunk/maven-project/src/test/resources-project-builder/dependency-management-with-interpolation/sub/pom.xml
Modified:
maven/components/branches/maven-3.0.x-mercury/ (props changed)
maven/components/branches/maven-3.0.x-mercury/apache-maven/ (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-compat/src/main/java/org/apache/maven/artifact/ (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-compat/src/main/java/org/apache/maven/project/inheritance/ (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-compat/src/main/java/org/apache/maven/project/path/ (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-compat/src/main/mdo/ (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-compat/src/test/ (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-compat/src/test/java/org/apache/maven/project/path/ (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-core/src/main/java/org/apache/maven/listeners/ (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-core/src/main/java/org/apache/maven/plugin/PluginLoaderException.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionNotFoundException.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionResolutionException.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-embedder/src/main/java/org/apache/maven/embedder/execution/SettingsAdapter.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java
maven/components/branches/maven-3.0.x-mercury/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/ (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/DomainModel.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/ModelEventListener.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/ModelListener.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/PomClassicDomainModel.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/Processor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java (contents, props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/ProjectUri.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/ (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/ModelProperty.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/BaseProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/BuildProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/CiManagementProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ContributorsProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependenciesProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyManagementProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/DevelopersProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/DistributionManagementProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/IssueManagementProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/LicensesProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/MailingListProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModelProcessor.java (contents, props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModuleProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/OrganizationProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ParentProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsManagementProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/PrerequisitesProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilePropertiesProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilesModuleProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilesProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/PropertiesProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ReportingProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/RepositoriesProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ScmProcessor.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileActivationContext.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileActivationException.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileManager.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileManagerInfo.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/profiles/matchers/ (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/mdo/ (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/resources/ (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/branches/maven-3.0.x-mercury/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
maven/components/branches/maven-3.0.x-mercury/maven-project/src/test/resources-project-builder/plugin-management-duplicate/sub/pom.xml (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-repository-mercury/src/main/java/org/apache/maven/repository/mercury/MercuryRepositorySystem.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-repository/src/main/java/org/apache/maven/project/ProjectUtils.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-repository/src/main/java/org/apache/maven/repository/DefaultMirrorBuilder.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-repository/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-repository/src/main/java/org/apache/maven/repository/MirrorBuilder.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-repository/src/main/java/org/apache/maven/repository/RepositorySystem.java (props changed)
maven/components/branches/maven-3.0.x-mercury/maven-repository/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java (props changed)
Propchange: maven/components/branches/maven-3.0.x-mercury/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,4 +4,4 @@
/maven/components/branches/maven-2.1.x:739385,741841,747468,747683,748815,749612,766523
/maven/components/branches/sisbell-plugin-manager:738973-739966
/maven/components/sisbell-plugin-manager:738757-738972
-/maven/components/trunk:767743-768388
+/maven/components/trunk:767743-768429
Propchange: maven/components/branches/maven-3.0.x-mercury/apache-maven/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,4 +4,4 @@
/maven/components/branches/maven-2.1.x/apache-maven:766523
/maven/components/branches/sisbell-plugin-manager/apache-maven:738973-739966
/maven/components/sisbell-plugin-manager/apache-maven:738757-738972
-/maven/components/trunk/apache-maven:767743-768388
+/maven/components/trunk/apache-maven:767743-768429
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-compat/src/main/java/org/apache/maven/artifact/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,4 +4,4 @@
/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact:679206
/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact:738973-739966
/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact:738757-738972
-/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact:767743-768388
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact:767743-768429
Added: maven/components/branches/maven-3.0.x-mercury/maven-compat/src/main/java/org/apache/maven/artifact/repository/ReactorArtifactRepository.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-3.0.x-mercury/maven-compat/src/main/java/org/apache/maven/artifact/repository/ReactorArtifactRepository.java?rev=768438&view=auto
==============================================================================
--- maven/components/branches/maven-3.0.x-mercury/maven-compat/src/main/java/org/apache/maven/artifact/repository/ReactorArtifactRepository.java (added)
+++ maven/components/branches/maven-3.0.x-mercury/maven-compat/src/main/java/org/apache/maven/artifact/repository/ReactorArtifactRepository.java Fri Apr 24 22:50:30 2009
@@ -0,0 +1,161 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+package org.apache.maven.artifact.repository;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.metadata.ArtifactMetadata;
+import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
+import org.apache.maven.wagon.repository.Repository;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
+
+/**
+ *
+ *
+ * @author Oleg Gusakov
+ * @version $Id$
+ *
+ */
+
+@Component( role=ArtifactRepository.class,hint="reactor")
+public class ReactorArtifactRepository
+extends Repository
+implements ArtifactRepository
+{
+ private static final ArtifactRepositoryPolicy SNAPSHOTS_POLICY = new ArtifactRepositoryPolicy(true, ArtifactRepositoryPolicy.UPDATE_POLICY_NEVER, ArtifactRepositoryPolicy.CHECKSUM_POLICY_IGNORE);
+
+ private static final ArtifactRepositoryPolicy RELEASES_POLICY = new ArtifactRepositoryPolicy(true, ArtifactRepositoryPolicy.UPDATE_POLICY_NEVER, ArtifactRepositoryPolicy.CHECKSUM_POLICY_IGNORE);
+
+ private static final String ID = "reactorRepository";
+
+ private static String URL = "file:///tmp";
+
+ @Requirement(role=ArtifactRepositoryLayout.class, hint="default")
+ private static ArtifactRepositoryLayout layout;
+
+ private Map<String, File> storage = new HashMap<String, File>(16);
+
+ /**
+ * @throws IOException
+ *
+ */
+ public ReactorArtifactRepository()
+ {
+ super( ID, URL );
+ }
+
+ public String getKey()
+ {
+ return getId();
+ }
+
+ public ArtifactRepositoryLayout getLayout()
+ {
+ return layout;
+ }
+
+ public ArtifactRepositoryPolicy getReleases()
+ {
+ return RELEASES_POLICY;
+ }
+
+ public ArtifactRepositoryPolicy getSnapshots()
+ {
+ return SNAPSHOTS_POLICY;
+ }
+
+ public boolean isBlacklisted()
+ {
+ return false;
+ }
+
+ public boolean isUniqueVersion()
+ {
+ return true;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.maven.artifact.repository.ArtifactRepository#pathOf(org.apache.maven.artifact.Artifact)
+ */
+ public String pathOf( Artifact artifact )
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.maven.artifact.repository.ArtifactRepository#pathOfLocalRepositoryMetadata(org.apache.maven.artifact.metadata.ArtifactMetadata, org.apache.maven.artifact.repository.ArtifactRepository)
+ */
+ public String pathOfLocalRepositoryMetadata( ArtifactMetadata metadata, ArtifactRepository repository )
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.maven.artifact.repository.ArtifactRepository#pathOfRemoteRepositoryMetadata(org.apache.maven.artifact.metadata.ArtifactMetadata)
+ */
+ public String pathOfRemoteRepositoryMetadata( ArtifactMetadata artifactMetadata )
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.maven.artifact.repository.ArtifactRepository#setBlacklisted(boolean)
+ */
+ public void setBlacklisted( boolean blackListed )
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.maven.artifact.repository.ArtifactRepository#setLayout(org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout)
+ */
+ public void setLayout( ArtifactRepositoryLayout layout )
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.maven.artifact.repository.ArtifactRepository#setReleaseUpdatePolicy(org.apache.maven.artifact.repository.ArtifactRepositoryPolicy)
+ */
+ public void setReleaseUpdatePolicy( ArtifactRepositoryPolicy policy )
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.maven.artifact.repository.ArtifactRepository#setSnapshotUpdatePolicy(org.apache.maven.artifact.repository.ArtifactRepositoryPolicy)
+ */
+ public void setSnapshotUpdatePolicy( ArtifactRepositoryPolicy policy )
+ {
+ // TODO Auto-generated method stub
+
+ }
+}
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-compat/src/main/java/org/apache/maven/artifact/repository/ReactorArtifactRepository.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-compat/src/main/java/org/apache/maven/artifact/repository/ReactorArtifactRepository.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -3,5 +3,5 @@
/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java:679206,720042
/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java:738757-738972
-/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java:767743-768388
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java:767743-768429
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-compat/src/main/java/org/apache/maven/project/inheritance/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -1,4 +1,4 @@
/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/project/inheritance:746145-746157
/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/project/inheritance:738973-739966
/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/project/inheritance:738757-738972
-/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/project/inheritance:767743-768388
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/project/inheritance:767743-768429
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-compat/src/main/java/org/apache/maven/project/path/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -3,5 +3,5 @@
/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/path:679206,720042
/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/project/path:738973-739966
/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:767743-768388
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/project/path:767743-768429
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/path:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-compat/src/main/mdo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,4 +4,4 @@
/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/mdo:679206
/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/mdo:738973-739966
/maven/components/sisbell-plugin-manager/maven-compat/src/main/mdo:738757-738972
-/maven/components/trunk/maven-compat/src/main/mdo:767743-768388
+/maven/components/trunk/maven-compat/src/main/mdo:767743-768429
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-compat/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,4 +4,4 @@
/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test:679206
/maven/components/branches/sisbell-plugin-manager/maven-compat/src/test:738973-739966
/maven/components/sisbell-plugin-manager/maven-compat/src/test:738757-738972
-/maven/components/trunk/maven-compat/src/test:767743-768388
+/maven/components/trunk/maven-compat/src/test:767743-768429
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-compat/src/test/java/org/apache/maven/project/path/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -3,5 +3,5 @@
/maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/path:679206,720042
/maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/project/path:738973-739966
/maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/project/path:738757-738972
-/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/project/path:767743-768388
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/project/path:767743-768429
/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/path:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-core/src/main/java/org/apache/maven/listeners/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -3,5 +3,5 @@
/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/builder/listeners:679206
/maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/listeners:738973-739966
/maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/listeners:738757-738972
-/maven/components/trunk/maven-core/src/main/java/org/apache/maven/listeners:767743-768388
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/listeners:767743-768429
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/listeners:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -3,5 +3,5 @@
/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/builder/listeners/PluginExtensionListener.java:679206
/maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java:738757-738972
-/maven/components/trunk/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java:767743-768388
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java:767743-768429
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/listeners/PluginExtensionListener.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-core/src/main/java/org/apache/maven/plugin/PluginLoaderException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoaderException.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoaderException.java:738973-739966
/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:767743-768388
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginLoaderException.java:767743-768429
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoaderException.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionNotFoundException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java:738973-739966
/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:767743-768388
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionNotFoundException.java:767743-768429
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionResolutionException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java:738973-739966
/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:767743-768388
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionResolutionException.java:767743-768429
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-embedder/src/main/java/org/apache/maven/embedder/execution/SettingsAdapter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -3,5 +3,5 @@
/maven/components/branches/maven-2.0.x/maven-embedder/src/main/java/org/apache/maven/embedder/user/SettingsAdapter.java:679206
/maven/components/branches/sisbell-plugin-manager/maven-embedder/src/main/java/org/apache/maven/embedder/execution/SettingsAdapter.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-embedder/src/main/java/org/apache/maven/embedder/execution/SettingsAdapter.java:738757-738972
-/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/SettingsAdapter.java:767743-768388
+/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/SettingsAdapter.java:767743-768429
/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/user/SettingsAdapter.java:688587-696625,696644-699681
Modified: maven/components/branches/maven-3.0.x-mercury/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-3.0.x-mercury/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java?rev=768438&r1=768437&r2=768438&view=diff
==============================================================================
--- maven/components/branches/maven-3.0.x-mercury/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java (original)
+++ maven/components/branches/maven-3.0.x-mercury/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java Fri Apr 24 22:50:30 2009
@@ -119,7 +119,7 @@
}
iModels.get(0).setMostSpecialized(true);
- return new MavenDomainModel(ProcessorContext.build(iModels, null)).getDependencyMetadata();
+ return new MavenDomainModel( ProcessorContext.processManagementNodes(ProcessorContext.build(iModels, null).getModel() ) ).getDependencyMetadata();
} catch (IOException e) {
throw new DependencyProcessorException(e);
}
Modified: maven/components/branches/maven-3.0.x-mercury/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-3.0.x-mercury/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java?rev=768438&r1=768437&r2=768438&view=diff
==============================================================================
--- maven/components/branches/maven-3.0.x-mercury/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java (original)
+++ maven/components/branches/maven-3.0.x-mercury/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java Fri Apr 24 22:50:30 2009
@@ -27,6 +27,7 @@
import org.apache.maven.mercury.artifact.ArtifactMetadata;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Exclusion;
+import org.apache.maven.model.Model;
import org.apache.maven.model.Parent;
import org.apache.maven.model.PomClassicDomainModel;
@@ -54,6 +55,12 @@
super(model.getModel());
}
+ public MavenDomainModel(Model model)
+ throws IOException
+ {
+ super(model);
+ }
+
public boolean hasParent()
{
return getParentMetadata() != null;
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project-builder:739385,741841,747468,747683,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project-builder:738973-739966
/maven/components/sisbell-plugin-manager/maven-project-builder:738757-738972
-/maven/components/trunk/maven-model-builder:767743-768388
+/maven/components/trunk/maven-model-builder:767743-768429
/maven/components/trunk/maven-project-builder:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/DomainModel.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -1 +1 @@
-/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/DomainModel.java:767743-768388
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/DomainModel.java:767743-768429
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/ModelEventListener.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelEventListener.java:739385,741841,747468,747683,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelEventListener.java:738973-739966
/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:767743-768388
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelEventListener.java:767743-768429
/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelEventListener.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/ModelListener.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/ModelListener.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ModelListener.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ModelListener.java:738757-738972
-/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelListener.java:767743-768388
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelListener.java:767743-768429
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ModelListener.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/PomClassicDomainModel.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java:739385,741841,747468,747683,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java:738757-738972
-/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/PomClassicDomainModel.java:767743-768388
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/PomClassicDomainModel.java:767743-768429
/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/Processor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/Processor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/Processor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/Processor.java:738757-738972
-/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/Processor.java:767743-768388
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/Processor.java:767743-768429
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/Processor.java:688587-696625,696644-699681
Modified: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java?rev=768438&r1=768437&r2=768438&view=diff
==============================================================================
--- maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java (original)
+++ maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java Fri Apr 24 22:50:30 2009
@@ -93,7 +93,7 @@
new RepositoriesProcessor(), new DistributionManagementProcessor(),
new LicensesProcessor(), new ScmProcessor(), new PrerequisitesProcessor(),
new ContributorsProcessor(), new DevelopersProcessor(), new ProfilesProcessor() );
- Model target = processModelsForInheritance( convertDomainModelsToMavenModels( domainModels ), processors );
+ Model target = processModelsForInheritance( convertDomainModelsToMavenModels( domainModels ), processors, false );
if(listeners != null)
{
for(ModelEventListener listener : listeners)
@@ -148,7 +148,7 @@
DependencyManagement depMng = model.getDependencyManagement();
- Model target = processModelsForInheritance(profileModels, processors);
+ Model target = processModelsForInheritance(profileModels, processors, true);
PluginsManagementProcessor pmp = new PluginsManagementProcessor();
if( mng != null )
@@ -219,9 +219,9 @@
return models;
}
- private static Model processModelsForInheritance(List<Model> models, List<Processor> processors)
+ private static Model processModelsForInheritance(List<Model> models, List<Processor> processors, boolean isProfile)
{
- ModelProcessor modelProcessor = new ModelProcessor( processors );
+ ModelProcessor modelProcessor = new ModelProcessor( processors, isProfile );
Collections.reverse( models );
int length = models.size();
@@ -251,6 +251,14 @@
}
}
}
+
+ return target;
+
+ }
+
+ public static Model processManagementNodes(Model target)
+ throws IOException
+ {
// Dependency Management
DependencyManagementProcessor depProc = new DependencyManagementProcessor();
@@ -261,16 +269,14 @@
}
// Plugin Management
-
PluginsManagementProcessor procMng = new PluginsManagementProcessor();
if ( target.getBuild() != null && target.getBuild().getPluginManagement() != null)
{
procMng.process( null, new ArrayList<Plugin>( target.getBuild().getPluginManagement().getPlugins() ),
target.getBuild().getPlugins(), true );
}
-
- return target;
-
+
+ return target;
}
public static Profile copyOfProfile(Profile profile)
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/ProcessorContext.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ProcessorContext.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ProcessorContext.java:738757-738972
-/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java:767743-768388
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java:767743-768429
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ProcessorContext.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/ProjectUri.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java:739385,741841,747468,747683,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java:738757-738972
-/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ProjectUri.java:767743-768388
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ProjectUri.java:767743-768429
/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -1 +1 @@
-/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolator:767743-768388
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolator:767743-768429
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/ModelProperty.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/ModelProperty.java:739385,741841,747468,747683,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/ModelProperty.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/ModelProperty.java:738757-738972
-/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/ModelProperty.java:767743-768388
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/ModelProperty.java:767743-768429
/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/ModelProperty.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project-builder/src/main/java/org/apache/maven/project/builder:739385,741841,747468,747683,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder:738973-739966
/maven/components/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder:738757-738972
-/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors:767743-768388
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors:767743-768429
/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/BaseProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/BaseProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/BaseProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/BaseProcessor.java:738757-738972
-/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/BaseProcessor.java:767743-768388
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/BaseProcessor.java:767743-768429
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/BaseProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/BuildProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/BuildProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/BuildProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/BuildProcessor.java:738757-738972
-/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/BuildProcessor.java:767743-768388
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/BuildProcessor.java:767743-768429
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/BuildProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/CiManagementProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/CiManagementProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/CiManagementProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/CiManagementProcessor.java:738757-738972
-/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/CiManagementProcessor.java:767743-768388
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/CiManagementProcessor.java:767743-768429
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/CiManagementProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ContributorsProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/ContributorsProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ContributorsProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ContributorsProcessor.java:738757-738972
-/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ContributorsProcessor.java:767743-768388
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ContributorsProcessor.java:767743-768429
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ContributorsProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependenciesProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/DependenciesProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/DependenciesProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/DependenciesProcessor.java:738757-738972
-/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependenciesProcessor.java:767743-768388
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependenciesProcessor.java:767743-768429
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DependenciesProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyManagementProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/DependencyManagementProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/DependencyManagementProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/DependencyManagementProcessor.java:738757-738972
-/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyManagementProcessor.java:767743-768388
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyManagementProcessor.java:767743-768429
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DependencyManagementProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/DependencyProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/DependencyProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/DependencyProcessor.java:738757-738972
-/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyProcessor.java:767743-768388
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyProcessor.java:767743-768429
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DependencyProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/DevelopersProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/DevelopersProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/DevelopersProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/DevelopersProcessor.java:738757-738972
-/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DevelopersProcessor.java:767743-768388
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DevelopersProcessor.java:767743-768429
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DevelopersProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/DistributionManagementProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/DistributionManagementProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/DistributionManagementProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/DistributionManagementProcessor.java:738757-738972
-/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DistributionManagementProcessor.java:767743-768388
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DistributionManagementProcessor.java:767743-768429
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DistributionManagementProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/IssueManagementProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/IssueManagementProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/IssueManagementProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/IssueManagementProcessor.java:738757-738972
-/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/IssueManagementProcessor.java:767743-768388
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/IssueManagementProcessor.java:767743-768429
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/IssueManagementProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/LicensesProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/LicensesProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/LicensesProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/LicensesProcessor.java:738757-738972
-/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/LicensesProcessor.java:767743-768388
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/LicensesProcessor.java:767743-768429
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/LicensesProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/MailingListProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/MailingListProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/MailingListProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/MailingListProcessor.java:738757-738972
-/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/MailingListProcessor.java:767743-768388
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/MailingListProcessor.java:767743-768429
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/MailingListProcessor.java:688587-696625,696644-699681
Modified: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModelProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModelProcessor.java?rev=768438&r1=768437&r2=768438&view=diff
==============================================================================
--- maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModelProcessor.java (original)
+++ maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModelProcessor.java Fri Apr 24 22:50:30 2009
@@ -37,9 +37,12 @@
extends BaseProcessor
{
- public ModelProcessor( Collection<Processor> processors )
+ private boolean isProfile;
+
+ public ModelProcessor( Collection<Processor> processors, boolean isProfile )
{
super( processors );
+ this.isProfile = isProfile;
}
public void process( Object parent, Object child, Object target, boolean isChildMostSpecialized )
@@ -146,8 +149,17 @@
if(deps.size() > 0)
{
- t.setDependencies(deps);
- // t.getDependencies().addAll( deps );
+ //Multiple profiles may be processed so we need to add them
+ if(isProfile)
+ {
+ t.getDependencies().addAll( deps );
+ }
+ else
+ {
+ t.setDependencies(deps);
+ }
+
+ //
}
//Dependency Management
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModelProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/ModelProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ModelProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ModelProcessor.java:738757-738972
-/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModelProcessor.java:767743-768388
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModelProcessor.java:767743-768429
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ModelProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModuleProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/ModuleProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ModuleProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ModuleProcessor.java:738757-738972
-/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModuleProcessor.java:767743-768388
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModuleProcessor.java:767743-768429
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ModuleProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/OrganizationProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/OrganizationProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/OrganizationProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/OrganizationProcessor.java:738757-738972
-/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/OrganizationProcessor.java:767743-768388
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/OrganizationProcessor.java:767743-768429
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/OrganizationProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ParentProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/ParentProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ParentProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ParentProcessor.java:738757-738972
-/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ParentProcessor.java:767743-768388
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ParentProcessor.java:767743-768429
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ParentProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/PluginProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/PluginProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/PluginProcessor.java:738757-738972
-/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginProcessor.java:767743-768388
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginProcessor.java:767743-768429
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/PluginProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsManagementProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/PluginsManagementProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/PluginsManagementProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/PluginsManagementProcessor.java:738757-738972
-/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsManagementProcessor.java:767743-768388
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsManagementProcessor.java:767743-768429
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/PluginsManagementProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/PluginsProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/PluginsProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/PluginsProcessor.java:738757-738972
-/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsProcessor.java:767743-768388
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsProcessor.java:767743-768429
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/PluginsProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/PrerequisitesProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/PrerequisitesProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/PrerequisitesProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/PrerequisitesProcessor.java:738757-738972
-/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PrerequisitesProcessor.java:767743-768388
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PrerequisitesProcessor.java:767743-768429
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/PrerequisitesProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilePropertiesProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/ProfilePropertiesProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ProfilePropertiesProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ProfilePropertiesProcessor.java:738757-738972
-/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilePropertiesProcessor.java:767743-768388
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilePropertiesProcessor.java:767743-768429
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ProfilePropertiesProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilesModuleProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/ProfilesModuleProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ProfilesModuleProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ProfilesModuleProcessor.java:738757-738972
-/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilesModuleProcessor.java:767743-768388
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilesModuleProcessor.java:767743-768429
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ProfilesModuleProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilesProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/ProfilesProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ProfilesProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ProfilesProcessor.java:738757-738972
-/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilesProcessor.java:767743-768388
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilesProcessor.java:767743-768429
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ProfilesProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/PropertiesProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/PropertiesProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/PropertiesProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/PropertiesProcessor.java:738757-738972
-/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PropertiesProcessor.java:767743-768388
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PropertiesProcessor.java:767743-768429
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/PropertiesProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ReportingProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/ReportingProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ReportingProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ReportingProcessor.java:738757-738972
-/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ReportingProcessor.java:767743-768388
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ReportingProcessor.java:767743-768429
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ReportingProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/RepositoriesProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/RepositoriesProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/RepositoriesProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/RepositoriesProcessor.java:738757-738972
-/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/RepositoriesProcessor.java:767743-768388
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/RepositoriesProcessor.java:767743-768429
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/RepositoriesProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/model/processors/ScmProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/ScmProcessor.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ScmProcessor.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ScmProcessor.java:738757-738972
-/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ScmProcessor.java:767743-768388
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ScmProcessor.java:767743-768429
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ScmProcessor.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/DefaultProfileManager.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/DefaultProfileManager.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/DefaultProfileManager.java:738757-738972
-/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java:767743-768388
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java:767743-768429
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultProfileManager.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileActivationContext.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/profiles/activation/DefaultProfileActivationContext.java:739385,741841,747468
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/profiles/activation/DefaultProfileActivationContext.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/profiles/activation/DefaultProfileActivationContext.java:738757-738972
-/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileActivationContext.java:767743-768388
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileActivationContext.java:767743-768429
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/DefaultProfileActivationContext.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileActivationException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/ProfileActivationException.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/ProfileActivationException.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/ProfileActivationException.java:738757-738972
-/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileActivationException.java:767743-768388
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileActivationException.java:767743-768429
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProfileActivationException.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/ProfileManager.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/ProfileManager.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/ProfileManager.java:738757-738972
-/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileManager.java:767743-768388
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileManager.java:767743-768429
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProfileManager.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileManagerInfo.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/profiles/ProfileContextInfo.java:739385,741841,747468,747683,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/profiles/ProfileContextInfo.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/profiles/ProfileContextInfo.java:738757-738972
-/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileManagerInfo.java:767743-768388
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileManagerInfo.java:767743-768429
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/ProfileContextInfo.java:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/java/org/apache/maven/profiles/matchers/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/profiles/matchers:739385,741841,747468,747683,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/profiles/matchers:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/profiles/matchers:738757-738972
-/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/profiles/matchers:767743-768388
+/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/profiles/matchers:767743-768429
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/matchers:688587-696625,696644-699681
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-model-builder/src/main/mdo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 22:50:30 2009
@@ -3,4 +3,4 @@
/maven/components/branches/maven-2.0.x/maven-profile/src/main/mdo:679206
/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:767743-768388
+/maven/components/trunk/maven-model-builder/src/main/mdo:767743-768429