svn commit: r1227313 [1/2] - in /maven/maven-3/branches/maven-3.0.4-RCx: ./ apache-maven/ maven-artifact/src/main/java/org/apache/maven/artifact/repository/ maven-artifact/src/main/java/org/apache/maven/repository/ maven-compat/src/main/java/org/apache...

[ol...@apache.org]

Author: olamy
Date: Wed Jan  4 20:44:17 2012
New Revision: 1227313

URL: http://svn.apache.org/viewvc?rev=1227313&view=rev
Log:
[MNG-5224] REGRESSION: Injected Settings in a Mojo are missing the profiles from settings.xml

 merge -r1226841:1226842 https://svn.apache.org/repos/asf/maven/maven-3/trunk/

Modified:
    maven/maven-3/branches/maven-3.0.4-RCx/   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/apache-maven/   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-artifact/src/main/java/org/apache/maven/artifact/repository/Authentication.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-artifact/src/main/java/org/apache/maven/repository/Proxy.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/artifact/   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/profiles/activation/ProfileActivationException.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/project/inheritance/   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/project/path/   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorSelector.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/MavenArtifactMetadata.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraph.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraphNode.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/MirrorSelector.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/VersionNotFoundException.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/legacy/ChecksumFailedException.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/legacy/UpdateCheckManager.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonConfigurationException.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/LegacyArtifactCollector.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolver.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/AbstractVersionTransformation.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformation.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformationManager.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/DefaultArtifactTransformationManager.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/LatestArtifactTransformation.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ReleaseArtifactTransformation.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/SnapshotTransformation.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactMetadata.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathTransformation.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicy.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionException.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionPolicy.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolver.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphTransformationException.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolution.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionException.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequest.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequestTypeEnum.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataRetrievalException.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataSource.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataTreeNode.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/mdo/   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/test/   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/test/java/org/apache/maven/profiles/   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/test/java/org/apache/maven/project/ModelUtilsTest.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/test/java/org/apache/maven/project/ProjectClasspathTest.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/test/java/org/apache/maven/project/path/   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/test/java/org/apache/maven/repository/legacy/StringWagon.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonA.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonB.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonC.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonMock.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTest.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicyTest.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/test/java/org/apache/maven/repository/metadata/TestMetadataSource.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/java/org/apache/maven/MavenExecutionException.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/java/org/apache/maven/MissingModuleException.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/java/org/apache/maven/execution/SettingsAdapter.java   (contents, props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/java/org/apache/maven/plugin/PluginDescriptorParsingException.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/java/org/apache/maven/plugin/PluginLoaderException.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/java/org/apache/maven/project/   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/java/org/apache/maven/settings/SettingsUtils.java
    maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/main/mdo/toolchains.mdo   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/test/java/org/apache/maven/project/artifact/   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-core/src/test/java/org/apache/maven/project/canonical/   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-embedder/src/main/java/org/apache/maven/cli/MavenLoggerManager.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-model-builder/   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-model-builder/src/main/java/org/apache/maven/model/path/   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-model-builder/src/main/mdo/   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-model-builder/src/main/resources/   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-model-builder/src/test/java/org/apache/maven/model/validation/   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-plugin-api/   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-plugin-api/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-repository-metadata/src/site/   (props changed)
    maven/maven-3/branches/maven-3.0.4-RCx/maven-settings/src/site/   (props changed)

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -6,3 +6,4 @@
 /maven/components/sisbell-plugin-manager:738757-738972
 /maven/components/trunk:751453-767358,767708-768832
 /maven/maven-2/branches/maven-2.2.x:795521
+/maven/maven-3/trunk:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/apache-maven/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -5,3 +5,4 @@
 /maven/components/branches/sisbell-plugin-manager/apache-maven:738973-739966
 /maven/components/sisbell-plugin-manager/apache-maven:738757-738972
 /maven/components/trunk/apache-maven:751453-767358,767708-768832
+/maven/maven-3/trunk/apache-maven:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-artifact/src/main/java/org/apache/maven/artifact/repository/Authentication.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -5,3 +5,4 @@
 /maven/components/branches/sisbell-plugin-manager/maven-repository/src/main/java/org/apache/maven/repository/Authentication.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-repository/src/main/java/org/apache/maven/repository/Authentication.java:738757-738972
 /maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/Authentication.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/Authentication.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-artifact/src/main/java/org/apache/maven/repository/Proxy.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -5,3 +5,4 @@
 /maven/components/branches/sisbell-plugin-manager/maven-repository/src/main/java/org/apache/maven/repository/Proxy.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-repository/src/main/java/org/apache/maven/repository/Proxy.java:738757-738972
 /maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/Proxy.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/repository/Proxy.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/artifact/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -5,3 +5,4 @@
 /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:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/profiles/activation/ProfileActivationException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -6,3 +6,4 @@
 /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:768840-768841
 /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProfileActivationException.java:688587-696625,696644-699681
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/profiles/activation/ProfileActivationException.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -5,3 +5,4 @@
 /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:751453-767358,767708-768832
 /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java:688587-696625,696644-699681
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -6,3 +6,4 @@
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java:688587-696625,696644-699681
 /maven/components/trunk/maven-repository/src/main/java/org/apache/maven/project/ProjectUtils.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/project/inheritance/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -2,3 +2,4 @@
 /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:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/inheritance:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/project/path/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -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-compat/src/main/java/org/apache/maven/project/path:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorSelector.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -1 +1,2 @@
 /maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/DefaultMirrorBuilder.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorSelector.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/MavenArtifactMetadata.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -5,3 +5,4 @@
 /maven/components/branches/sisbell-plugin-manager/maven-repository/src/main/java/org/apache/maven/repository/MavenArtifactMetadata.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-repository/src/main/java/org/apache/maven/repository/MavenArtifactMetadata.java:738757-738972
 /maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenArtifactMetadata.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/MavenArtifactMetadata.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraph.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -5,3 +5,4 @@
 /maven/components/branches/sisbell-plugin-manager/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraph.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraph.java:738757-738972
 /maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraph.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraph.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraphNode.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -5,3 +5,4 @@
 /maven/components/branches/sisbell-plugin-manager/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraphNode.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraphNode.java:738757-738972
 /maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraphNode.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraphNode.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -5,3 +5,4 @@
 /maven/components/branches/sisbell-plugin-manager/maven-repository/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-repository/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java:738757-738972
 /maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -5,3 +5,4 @@
 /maven/components/branches/sisbell-plugin-manager/maven-repository/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-repository/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java:738757-738972
 /maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/MirrorSelector.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -1 +1,2 @@
 /maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MirrorBuilder.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/MirrorSelector.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -5,3 +5,4 @@
 /maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/UserLocalArtifactRepository.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/UserLocalArtifactRepository.java:738757-738972
 /maven/components/trunk/maven-core/src/main/java/org/apache/maven/UserLocalArtifactRepository.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/VersionNotFoundException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -5,3 +5,4 @@
 /maven/components/branches/sisbell-plugin-manager/maven-repository/src/main/java/org/apache/maven/repository/VersionNotFoundException.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-repository/src/main/java/org/apache/maven/repository/VersionNotFoundException.java:738757-738972
 /maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/VersionNotFoundException.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/VersionNotFoundException.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/legacy/ChecksumFailedException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -1,7 +1,8 @@
 /maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/manager/ChecksumFailedException.java:746145-746157
 /maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/ChecksumFailedException.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/ChecksumFailedException.java:679206
 /maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/manager/ChecksumFailedException.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/ChecksumFailedException.java:679206
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/manager/ChecksumFailedException.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/manager/ChecksumFailedException.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/ChecksumFailedException.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/ChecksumFailedException.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -1,7 +1,8 @@
 /maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManager.java:746145-746157
 /maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManager.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManager.java:679206
 /maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManager.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManager.java:679206
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManager.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManager.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManager.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -1,7 +1,8 @@
 /maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java:746145-746157
 /maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java:679206
 /maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java:679206
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -6,3 +6,4 @@
 /maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/DefaultMavenTools.java:738757-738972
 /maven/components/trunk/maven-project/src/main/java/org/apache/maven/DefaultMavenTools.java:688587-696625,696644-699681
 /maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/legacy/UpdateCheckManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -1,7 +1,8 @@
 /maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/manager/UpdateCheckManager.java:746145-746157
 /maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/UpdateCheckManager.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/UpdateCheckManager.java:679206
 /maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/manager/UpdateCheckManager.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/UpdateCheckManager.java:679206
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/manager/UpdateCheckManager.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/manager/UpdateCheckManager.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/UpdateCheckManager.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/UpdateCheckManager.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonConfigurationException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -1,7 +1,8 @@
 /maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonConfigurationException.java:746145-746157
 /maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonConfigurationException.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonConfigurationException.java:679206
 /maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/manager/WagonConfigurationException.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonConfigurationException.java:679206
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonConfigurationException.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonConfigurationException.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonConfigurationException.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonConfigurationException.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -1,7 +1,8 @@
 /maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java:746145-746157
 /maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonManager.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonManager.java:679206
 /maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/manager/WagonManager.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonManager.java:679206
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -1,7 +1,8 @@
 /maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java:746145-746157
 /maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java:679206
 /maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java:679206
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/LegacyArtifactCollector.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -1,7 +1,8 @@
 /maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java:746145-746157
 /maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java:679206
 /maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java:679206
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/LegacyArtifactCollector.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -1,7 +1,8 @@
 /maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict:746145-746157
 /maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/conflict:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/conflict:679206
 /maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/conflict:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/conflict:679206
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolver.java
            ('svn:mergeinfo' removed)

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/AbstractVersionTransformation.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -1,7 +1,8 @@
 /maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java:746145-746157
 /maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java:679206
 /maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java:679206
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/AbstractVersionTransformation.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformation.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -1,7 +1,8 @@
 /maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java:746145-746157
 /maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java:679206
 /maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java:679206
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformation.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformationManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -1,7 +1,8 @@
 /maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformationManager.java:746145-746157
 /maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformationManager.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformationManager.java:679206
 /maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformationManager.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformationManager.java:679206
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformationManager.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformationManager.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformationManager.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformationManager.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/DefaultArtifactTransformationManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -1,7 +1,8 @@
 /maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java:746145-746157
 /maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java:679206
 /maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java:679206
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/DefaultArtifactTransformationManager.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/LatestArtifactTransformation.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -1,7 +1,8 @@
 /maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java:746145-746157
 /maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java:679206
 /maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java:679206
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/LatestArtifactTransformation.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ReleaseArtifactTransformation.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -1,7 +1,8 @@
 /maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java:746145-746157
 /maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java:679206
 /maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java:679206
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ReleaseArtifactTransformation.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/SnapshotTransformation.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -1,7 +1,8 @@
 /maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java:746145-746157
 /maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java:679206
 /maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java:679206
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/SnapshotTransformation.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactMetadata.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -1,7 +1,8 @@
 /maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactMetadata.java:746145-746157
 /maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactMetadata.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactMetadata.java:679206
 /maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactMetadata.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactMetadata.java:679206
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactMetadata.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactMetadata.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactMetadata.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactMetadata.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -1,7 +1,8 @@
 /maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/transform/ClasspathContainer.java:746145-746157
 /maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ClasspathContainer.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ClasspathContainer.java:679206
 /maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ClasspathContainer.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ClasspathContainer.java:679206
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/transform/ClasspathContainer.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/transform/ClasspathContainer.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/ClasspathContainer.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathTransformation.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -1,7 +1,8 @@
 /maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/transform/ClasspathTransformation.java:746145-746157
 /maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ClasspathTransformation.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ClasspathTransformation.java:679206
 /maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ClasspathTransformation.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ClasspathTransformation.java:679206
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/transform/ClasspathTransformation.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/transform/ClasspathTransformation.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/ClasspathTransformation.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathTransformation.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -1,7 +1,8 @@
 /maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/transform/DefaultClasspathTransformation.java:746145-746157
 /maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/DefaultClasspathTransformation.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/DefaultClasspathTransformation.java:679206
 /maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/transform/DefaultClasspathTransformation.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/DefaultClasspathTransformation.java:679206
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/transform/DefaultClasspathTransformation.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/transform/DefaultClasspathTransformation.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/DefaultClasspathTransformation.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicy.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -1,7 +1,8 @@
 /maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicy.java:746145-746157
 /maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicy.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicy.java:679206
 /maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicy.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicy.java:679206
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicy.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicy.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicy.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicy.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -1,7 +1,8 @@
 /maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolver.java:746145-746157
 /maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolver.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolver.java:679206
 /maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolver.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolver.java:679206
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolver.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolver.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolver.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -1,7 +1,8 @@
 /maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionException.java:746145-746157
 /maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionException.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionException.java:679206
 /maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionException.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionException.java:679206
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionException.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionException.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionException.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionException.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionPolicy.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -1,7 +1,8 @@
 /maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionPolicy.java:746145-746157
 /maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionPolicy.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionPolicy.java:679206
 /maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionPolicy.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionPolicy.java:679206
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionPolicy.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionPolicy.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionPolicy.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionPolicy.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -1,7 +1,8 @@
 /maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolver.java:746145-746157
 /maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolver.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolver.java:679206
 /maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolver.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolver.java:679206
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolver.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolver.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolver.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolver.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -1,7 +1,8 @@
 /maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraph.java:746145-746157
 /maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraph.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraph.java:679206
 /maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraph.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraph.java:679206
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraph.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraph.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraph.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -1,7 +1,8 @@
 /maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphEdge.java:746145-746157
 /maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphEdge.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphEdge.java:679206
 /maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphEdge.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphEdge.java:679206
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphEdge.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphEdge.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphEdge.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphTransformationException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -1,7 +1,8 @@
 /maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/transform/MetadataGraphTransformationException.java:746145-746157
 /maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/MetadataGraphTransformationException.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/MetadataGraphTransformationException.java:679206
 /maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/transform/MetadataGraphTransformationException.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/MetadataGraphTransformationException.java:679206
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/transform/MetadataGraphTransformationException.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/transform/MetadataGraphTransformationException.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/MetadataGraphTransformationException.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphTransformationException.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -1,7 +1,8 @@
 /maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphVertex.java:746145-746157
 /maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphVertex.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphVertex.java:679206
 /maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphVertex.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphVertex.java:679206
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphVertex.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphVertex.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphVertex.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolution.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -1,7 +1,8 @@
 /maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolution.java:746145-746157
 /maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolution.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolution.java:679206
 /maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolution.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolution.java:679206
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolution.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolution.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolution.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolution.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -1,7 +1,8 @@
 /maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionException.java:746145-746157
 /maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionException.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionException.java:679206
 /maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionException.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionException.java:679206
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionException.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionException.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionException.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionException.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -1,7 +1,8 @@
 /maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequest.java:746145-746157
 /maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequest.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequest.java:679206
 /maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequest.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequest.java:679206
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequest.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequest.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequest.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequest.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequestTypeEnum.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -1,7 +1,8 @@
 /maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequestTypeEnum.java:746145-746157
 /maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequestTypeEnum.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequestTypeEnum.java:679206
 /maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequestTypeEnum.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequestTypeEnum.java:679206
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequestTypeEnum.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequestTypeEnum.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequestTypeEnum.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequestTypeEnum.java:1226842

Propchange: maven/maven-3/branches/maven-3.0.4-RCx/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 20:44:17 2012
@@ -1,7 +1,8 @@
 /maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionResult.java:746145-746157
 /maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionResult.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionResult.java:679206
 /maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionResult.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionResult.java:679206
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionResult.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionResult.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionResult.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java:1226842